20 files changed, 18 insertions, 20 deletions

diff --git a/src/soc/mediatek/mt8173/gpio_init.c b/src/soc/mediatek/mt8173/gpio_init.c
index 80652d895d4c..b03de9fcf175 100644
--- a/src/soc/mediatek/mt8173/gpio_init.c
+++ b/src/soc/mediatek/mt8173/gpio_init.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/mmio.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/mipi.h>
 
 /*
diff --git a/src/soc/mediatek/mt8173/spi.c b/src/soc/mediatek/mt8173/spi.c
index d3c8ad4cbb3a..b7d6d94f71c0 100644
--- a/src/soc/mediatek/mt8173/spi.c
+++ b/src/soc/mediatek/mt8173/spi.c
@@ -2,10 +2,10 @@
 
 #include <device/mmio.h>
 #include <assert.h>
+#include <gpio.h>
 #include <spi_flash.h>
 #include <soc/addressmap.h>
 #include <soc/flash_controller_common.h>
-#include <soc/gpio.h>
 #include <soc/spi.h>
 
 struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = {
diff --git a/src/soc/mediatek/mt8183/i2c.c b/src/soc/mediatek/mt8183/i2c.c
index 1aaa236dd51a..8bd7c3639533 100644
--- a/src/soc/mediatek/mt8183/i2c.c
+++ b/src/soc/mediatek/mt8183/i2c.c
@@ -3,8 +3,8 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/i2c.h>
-#include <soc/gpio.h>
 
 struct mtk_i2c mtk_i2c_bus_controller[] = {
 	/* i2c0 setting */
diff --git a/src/soc/mediatek/mt8183/mt8183.c b/src/soc/mediatek/mt8183/mt8183.c
index 1c34246f2f60..ca47e4993d72 100644
--- a/src/soc/mediatek/mt8183/mt8183.c
+++ b/src/soc/mediatek/mt8183/mt8183.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <gpio.h>
 #include <soc/mt8183.h>
 #include <soc/wdt.h>
-#include <soc/gpio.h>
 
 void mt8183_early_init(void)
 {
diff --git a/src/soc/mediatek/mt8183/spi.c b/src/soc/mediatek/mt8183/spi.c
index c172f377da92..9404f93c1373 100644
--- a/src/soc/mediatek/mt8183/spi.c
+++ b/src/soc/mediatek/mt8183/spi.c
@@ -2,10 +2,10 @@
 
 #include <device/mmio.h>
 #include <assert.h>
+#include <gpio.h>
 #include <spi_flash.h>
 #include <soc/addressmap.h>
 #include <soc/flash_controller.h>
-#include <soc/gpio.h>
 #include <soc/spi.h>
 
 struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = {
diff --git a/src/soc/mediatek/mt8186/i2c.c b/src/soc/mediatek/mt8186/i2c.c
index 834563700837..9e7e4b3c0407 100644
--- a/src/soc/mediatek/mt8186/i2c.c
+++ b/src/soc/mediatek/mt8186/i2c.c
@@ -9,8 +9,8 @@
 #include <console/console.h>
 #include <device/mmio.h>
 #include <device/i2c_simple.h>
+#include <gpio.h>
 #include <soc/i2c.h>
-#include <soc/gpio.h>
 
 struct mtk_i2c mtk_i2c_bus_controller[] = {
 	[0] = {
diff --git a/src/soc/mediatek/mt8186/msdc.c b/src/soc/mediatek/mt8186/msdc.c
index 1a316db34db6..c1e21de9830c 100644
--- a/src/soc/mediatek/mt8186/msdc.c
+++ b/src/soc/mediatek/mt8186/msdc.c
@@ -6,8 +6,8 @@
  */
 
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
-#include <soc/gpio.h>
 #include <soc/regulator.h>
 #include <soc/msdc.h>
 
diff --git a/src/soc/mediatek/mt8186/spi.c b/src/soc/mediatek/mt8186/spi.c
index 11f8b6ae92c1..adbd437e4ac3 100644
--- a/src/soc/mediatek/mt8186/spi.c
+++ b/src/soc/mediatek/mt8186/spi.c
@@ -8,10 +8,10 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <spi_flash.h>
 #include <soc/addressmap.h>
 #include <soc/flash_controller_common.h>
-#include <soc/gpio.h>
 #include <soc/spi.h>
 
 struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = {
diff --git a/src/soc/mediatek/mt8186/usb.c b/src/soc/mediatek/mt8186/usb.c
index 98d9c7c00e03..42804dd77f2b 100644
--- a/src/soc/mediatek/mt8186/usb.c
+++ b/src/soc/mediatek/mt8186/usb.c
@@ -7,7 +7,6 @@
 
 #include <device/mmio.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/pll_common.h>
 #include <soc/usb.h>
 
diff --git a/src/soc/mediatek/mt8188/i2c.c b/src/soc/mediatek/mt8188/i2c.c
index c9841cb377f8..1de37c50529a 100644
--- a/src/soc/mediatek/mt8188/i2c.c
+++ b/src/soc/mediatek/mt8188/i2c.c
@@ -9,8 +9,8 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/i2c.h>
-#include <soc/gpio.h>
 
 struct mtk_i2c mtk_i2c_bus_controller[] = {
 	[0] = {
diff --git a/src/soc/mediatek/mt8188/msdc.c b/src/soc/mediatek/mt8188/msdc.c
index 72044f0a3076..37a96a736ca6 100644
--- a/src/soc/mediatek/mt8188/msdc.c
+++ b/src/soc/mediatek/mt8188/msdc.c
@@ -6,8 +6,8 @@
  */
 
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
-#include <soc/gpio.h>
 #include <soc/regulator.h>
 #include <soc/msdc.h>
 #include <soc/mt6359p.h>
diff --git a/src/soc/mediatek/mt8188/spi.c b/src/soc/mediatek/mt8188/spi.c
index 67249b493f9b..56efec5d9d43 100644
--- a/src/soc/mediatek/mt8188/spi.c
+++ b/src/soc/mediatek/mt8188/spi.c
@@ -7,9 +7,9 @@
 
 #include <assert.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/flash_controller_common.h>
-#include <soc/gpio.h>
 #include <soc/spi.h>
 #include <spi_flash.h>
 
diff --git a/src/soc/mediatek/mt8188/usb.c b/src/soc/mediatek/mt8188/usb.c
index 58cee55bee52..6c575cf44ba5 100644
--- a/src/soc/mediatek/mt8188/usb.c
+++ b/src/soc/mediatek/mt8188/usb.c
@@ -7,7 +7,6 @@
 
 #include <device/mmio.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/infracfg.h>
 #include <soc/pll_common.h>
 #include <soc/usb.h>
diff --git a/src/soc/mediatek/mt8192/i2c.c b/src/soc/mediatek/mt8192/i2c.c
index 6d888334ef94..a3f236ad8a7a 100644
--- a/src/soc/mediatek/mt8192/i2c.c
+++ b/src/soc/mediatek/mt8192/i2c.c
@@ -3,8 +3,8 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/i2c.h>
-#include <soc/gpio.h>
 
 #define I2C_FULL_DUTY 100
 #define I2C_HALF_DUTY 50
diff --git a/src/soc/mediatek/mt8192/msdc.c b/src/soc/mediatek/mt8192/msdc.c
index 89f25a3adf8c..ec02b242084a 100644
--- a/src/soc/mediatek/mt8192/msdc.c
+++ b/src/soc/mediatek/mt8192/msdc.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
-#include <soc/gpio.h>
 #include <soc/regulator.h>
 #include <soc/msdc.h>
 
diff --git a/src/soc/mediatek/mt8192/spi.c b/src/soc/mediatek/mt8192/spi.c
index b5abc85b839b..42e5b4aaa92b 100644
--- a/src/soc/mediatek/mt8192/spi.c
+++ b/src/soc/mediatek/mt8192/spi.c
@@ -2,9 +2,9 @@
 
 #include <device/mmio.h>
 #include <assert.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/flash_controller_common.h>
-#include <soc/gpio.h>
 #include <soc/spi.h>
 
 struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = {
diff --git a/src/soc/mediatek/mt8195/i2c.c b/src/soc/mediatek/mt8195/i2c.c
index 3f322217a2c9..e4041075d3e1 100644
--- a/src/soc/mediatek/mt8195/i2c.c
+++ b/src/soc/mediatek/mt8195/i2c.c
@@ -4,8 +4,8 @@
 #include <console/console.h>
 #include <device/mmio.h>
 #include <device/i2c_simple.h>
+#include <gpio.h>
 #include <soc/i2c.h>
-#include <soc/gpio.h>
 
 struct mtk_i2c mtk_i2c_bus_controller[] = {
 	[0] = {
diff --git a/src/soc/mediatek/mt8195/msdc.c b/src/soc/mediatek/mt8195/msdc.c
index eb37b58b0dce..8036e976399c 100644
--- a/src/soc/mediatek/mt8195/msdc.c
+++ b/src/soc/mediatek/mt8195/msdc.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only OR MIT */
 
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
-#include <soc/gpio.h>
 #include <soc/i2c.h>
 #include <soc/regulator.h>
 #include <soc/msdc.h>
diff --git a/src/soc/mediatek/mt8195/pcie.c b/src/soc/mediatek/mt8195/pcie.c
index a95afe431040..c9f8ecd08b5a 100644
--- a/src/soc/mediatek/mt8195/pcie.c
+++ b/src/soc/mediatek/mt8195/pcie.c
@@ -5,9 +5,9 @@
 #include <device/mmio.h>
 #include <device/resource.h>
 #include <delay.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/early_init.h>
-#include <soc/gpio.h>
 #include <soc/pcie.h>
 #include <soc/pcie_common.h>
 #include <stdlib.h>
diff --git a/src/soc/mediatek/mt8195/spi.c b/src/soc/mediatek/mt8195/spi.c
index 44ab5a4eb140..2772612b09c0 100644
--- a/src/soc/mediatek/mt8195/spi.c
+++ b/src/soc/mediatek/mt8195/spi.c
@@ -2,9 +2,9 @@
 
 #include <assert.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/flash_controller_common.h>
-#include <soc/gpio.h>
 #include <soc/spi.h>
 
 struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = {