diff --git a/src/soc/amd/common/block/gpio_banks/Kconfig b/src/soc/amd/common/block/gpio/Kconfig
similarity index 100%
rename from src/soc/amd/common/block/gpio_banks/Kconfig
rename to src/soc/amd/common/block/gpio/Kconfig
diff --git a/src/soc/amd/common/block/gpio_banks/Makefile.inc b/src/soc/amd/common/block/gpio/Makefile.inc
similarity index 100%
rename from src/soc/amd/common/block/gpio_banks/Makefile.inc
rename to src/soc/amd/common/block/gpio/Makefile.inc
diff --git a/src/soc/amd/common/block/gpio_banks/gpio.c b/src/soc/amd/common/block/gpio/gpio.c
similarity index 100%
rename from src/soc/amd/common/block/gpio_banks/gpio.c
rename to src/soc/amd/common/block/gpio/gpio.c