mainboard: Remove duplicated <soc/gpio.h>

<gpio.h> chain-include <soc/gpio.h>.

Change-Id: Ia57d5cd33c70b6a755babd4db56c64c0e3666f9f
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71817
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

73 files changed, 1 insertions, 73 deletions

diff --git a/src/mainboard/google/asurada/mainboard.c b/src/mainboard/google/asurada/mainboard.c
index ddc2be4e53..2da9719a19 100644
--- a/src/mainboard/google/asurada/mainboard.c
+++ b/src/mainboard/google/asurada/mainboard.c
@@ -13,7 +13,6 @@
 #include <soc/ddp.h>
 #include <soc/dpm.h>
 #include <soc/dsi.h>
-#include <soc/gpio.h>
 #include <soc/gpio_common.h>
 #include <soc/i2c.h>
 #include <soc/msdc.h>
diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/ramstage.c b/src/mainboard/google/brya/variants/baseboard/nissa/ramstage.c
index 670f8e392a..dc686fe242 100644
--- a/src/mainboard/google/brya/variants/baseboard/nissa/ramstage.c
+++ b/src/mainboard/google/brya/variants/baseboard/nissa/ramstage.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/ramstage.h>
 
 void variant_configure_pads(void)
diff --git a/src/mainboard/google/brya/variants/moli/gpio.c b/src/mainboard/google/brya/variants/moli/gpio.c
index 9f56b536c5..a8edf20ff1 100644
--- a/src/mainboard/google/brya/variants/moli/gpio.c
+++ b/src/mainboard/google/brya/variants/moli/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <commonlib/helpers.h>
-#include <soc/gpio.h>
 #include <boardid.h>
 #include <gpio.h>
 
diff --git a/src/mainboard/google/brya/variants/primus/variant.c b/src/mainboard/google/brya/variants/primus/variant.c
index 90999ec223..e78dfdc5db 100644
--- a/src/mainboard/google/brya/variants/primus/variant.c
+++ b/src/mainboard/google/brya/variants/primus/variant.c
@@ -6,7 +6,6 @@
 #include <drivers/i2c/hid/chip.h>
 #include <fw_config.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 static void devtree_update_emmc_rtd3(uint32_t board_ver)
 {
diff --git a/src/mainboard/google/brya/variants/primus4es/variant.c b/src/mainboard/google/brya/variants/primus4es/variant.c
index 90999ec223..e78dfdc5db 100644
--- a/src/mainboard/google/brya/variants/primus4es/variant.c
+++ b/src/mainboard/google/brya/variants/primus4es/variant.c
@@ -6,7 +6,6 @@
 #include <drivers/i2c/hid/chip.h>
 #include <fw_config.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 static void devtree_update_emmc_rtd3(uint32_t board_ver)
 {
diff --git a/src/mainboard/google/cherry/bootblock.c b/src/mainboard/google/cherry/bootblock.c
index c811c4eb2e..5091dcc6e5 100644
--- a/src/mainboard/google/cherry/bootblock.c
+++ b/src/mainboard/google/cherry/bootblock.c
@@ -3,7 +3,6 @@
 #include <bootblock_common.h>
 #include <device/mmio.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/i2c.h>
 #include <soc/pcie.h>
 #include <soc/spi.h>
diff --git a/src/mainboard/google/cherry/mainboard.c b/src/mainboard/google/cherry/mainboard.c
index 704a299e0c..44478062a3 100644
--- a/src/mainboard/google/cherry/mainboard.c
+++ b/src/mainboard/google/cherry/mainboard.c
@@ -14,7 +14,6 @@
 #include <soc/ddp.h>
 #include <soc/dpm.h>
 #include <soc/dptx.h>
-#include <soc/gpio.h>
 #include <soc/i2c.h>
 #include <soc/msdc.h>
 #include <soc/mtcmos.h>
diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index a218cc38d7..8afc599d68 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -4,7 +4,6 @@
 #include <boot/coreboot_tables.h>
 #include <device/mmio.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/cyan/spd/spd.c b/src/mainboard/google/cyan/spd/spd.c
index 169b983e8f..bd08b8257c 100644
--- a/src/mainboard/google/cyan/spd/spd.c
+++ b/src/mainboard/google/cyan/spd/spd.c
@@ -8,7 +8,6 @@
 #include <memory_info.h>
 #include <smbios.h>
 #include <spd.h>
-#include <soc/gpio.h>
 #include <soc/romstage.h>
 #include <string.h>
 #include <spd_bin.h>
diff --git a/src/mainboard/google/cyan/variants/celes/spd_util.c b/src/mainboard/google/cyan/variants/celes/spd_util.c
index 2eec2675f8..c918cc7ad2 100644
--- a/src/mainboard/google/cyan/variants/celes/spd_util.c
+++ b/src/mainboard/google/cyan/variants/celes/spd_util.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <mainboard/google/cyan/spd/spd_util.h>
 
 /*
diff --git a/src/mainboard/google/cyan/variants/setzer/spd_util.c b/src/mainboard/google/cyan/variants/setzer/spd_util.c
index bb20141c8a..f5ec218779 100644
--- a/src/mainboard/google/cyan/variants/setzer/spd_util.c
+++ b/src/mainboard/google/cyan/variants/setzer/spd_util.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <mainboard/google/cyan/spd/spd_util.h>
 
 /*
diff --git a/src/mainboard/google/drallion/chromeos.c b/src/mainboard/google/drallion/chromeos.c
index 4c5c8b8b6d..cbbac11043 100644
--- a/src/mainboard/google/drallion/chromeos.c
+++ b/src/mainboard/google/drallion/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/eve/bootblock.c b/src/mainboard/google/eve/bootblock.c
index 2579c8b63f..96a5a3ca51 100644
--- a/src/mainboard/google/eve/bootblock.c
+++ b/src/mainboard/google/eve/bootblock.c
@@ -3,7 +3,7 @@
 #include <bootblock_common.h>
 #include <ec/google/chromeec/ec.h>
 #include <gpio.h>
-#include <soc/gpio.h>
+
 #include "gpio.h"
 
 static void early_config_gpio(void)
diff --git a/src/mainboard/google/eve/chromeos.c b/src/mainboard/google/eve/chromeos.c
index 81fc391d50..dcd9219278 100644
--- a/src/mainboard/google/eve/chromeos.c
+++ b/src/mainboard/google/eve/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/eve/spd/spd.c b/src/mainboard/google/eve/spd/spd.c
index e9405f08cb..c053177d55 100644
--- a/src/mainboard/google/eve/spd/spd.c
+++ b/src/mainboard/google/eve/spd/spd.c
@@ -3,7 +3,6 @@
 #include <cbfs.h>
 #include <console/console.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/romstage.h>
 #include <string.h>
 
diff --git a/src/mainboard/google/fizz/chromeos.c b/src/mainboard/google/fizz/chromeos.c
index 59105ceb55..9a754a994d 100644
--- a/src/mainboard/google/fizz/chromeos.c
+++ b/src/mainboard/google/fizz/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <types.h>
 
 #include <variant/gpio.h>
diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c
index 15be049496..b0d94a09d7 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.c
@@ -12,7 +12,6 @@
 #include <gpio.h>
 #include <intelblocks/power_limit.h>
 #include <smbios.h>
-#include <soc/gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/nhlt.h>
 #include <string.h>
diff --git a/src/mainboard/google/gale/blsp.c b/src/mainboard/google/gale/blsp.c
index 040b662f24..8b76c3b4b1 100644
--- a/src/mainboard/google/gale/blsp.c
+++ b/src/mainboard/google/gale/blsp.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/blsp.h>
 #include <soc/qup.h>
 
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index 299a372766..3e33f807a4 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <variant/gpio.h>
diff --git a/src/mainboard/google/glados/spd/spd.c b/src/mainboard/google/glados/spd/spd.c
index 9bfb202bb9..a6e655bbef 100644
--- a/src/mainboard/google/glados/spd/spd.c
+++ b/src/mainboard/google/glados/spd/spd.c
@@ -3,7 +3,6 @@
 #include <cbfs.h>
 #include <console/console.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/romstage.h>
 #include <string.h>
 #include <baseboard/variant.h>
diff --git a/src/mainboard/google/hatch/variants/dratini/ramstage.c b/src/mainboard/google/hatch/variants/dratini/ramstage.c
index 434d357b1d..240bcaeb93 100644
--- a/src/mainboard/google/hatch/variants/dratini/ramstage.c
+++ b/src/mainboard/google/hatch/variants/dratini/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/hatch/ramstage.c b/src/mainboard/google/hatch/variants/hatch/ramstage.c
index 8282d1d398..af896214a5 100644
--- a/src/mainboard/google/hatch/variants/hatch/ramstage.c
+++ b/src/mainboard/google/hatch/variants/hatch/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/helios/ramstage.c b/src/mainboard/google/hatch/variants/helios/ramstage.c
index 176527b363..5e128644b2 100644
--- a/src/mainboard/google/hatch/variants/helios/ramstage.c
+++ b/src/mainboard/google/hatch/variants/helios/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/jinlon/ramstage.c b/src/mainboard/google/hatch/variants/jinlon/ramstage.c
index 176527b363..5e128644b2 100644
--- a/src/mainboard/google/hatch/variants/jinlon/ramstage.c
+++ b/src/mainboard/google/hatch/variants/jinlon/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/kohaku/ramstage.c b/src/mainboard/google/hatch/variants/kohaku/ramstage.c
index e861cfb34b..d16be38562 100644
--- a/src/mainboard/google/hatch/variants/kohaku/ramstage.c
+++ b/src/mainboard/google/hatch/variants/kohaku/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_final(void)
 {
diff --git a/src/mainboard/google/hatch/variants/mushu/ramstage.c b/src/mainboard/google/hatch/variants/mushu/ramstage.c
index 8282d1d398..af896214a5 100644
--- a/src/mainboard/google/hatch/variants/mushu/ramstage.c
+++ b/src/mainboard/google/hatch/variants/mushu/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/nightfury/ramstage.c b/src/mainboard/google/hatch/variants/nightfury/ramstage.c
index 0e6eae644e..5307cbf1b8 100644
--- a/src/mainboard/google/hatch/variants/nightfury/ramstage.c
+++ b/src/mainboard/google/hatch/variants/nightfury/ramstage.c
@@ -2,7 +2,6 @@
 
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/kukui/mainboard.c b/src/mainboard/google/kukui/mainboard.c
index a0ce67400a..e1c50f4a37 100644
--- a/src/mainboard/google/kukui/mainboard.c
+++ b/src/mainboard/google/kukui/mainboard.c
@@ -14,7 +14,6 @@
 #include <soc/bl31.h>
 #include <soc/ddp.h>
 #include <soc/dsi.h>
-#include <soc/gpio.h>
 #include <soc/mmu_operations.h>
 #include <soc/mtcmos.h>
 #include <soc/spm.h>
diff --git a/src/mainboard/google/oak/bootblock.c b/src/mainboard/google/oak/bootblock.c
index 2a0bf57412..dd3d7a362a 100644
--- a/src/mainboard/google/oak/bootblock.c
+++ b/src/mainboard/google/oak/bootblock.c
@@ -4,7 +4,6 @@
 #include <bootblock_common.h>
 #include <gpio.h>
 #include <device/mmio.h>
-#include <soc/gpio.h>
 #include <soc/i2c.h>
 #include <soc/mt6391.h>
 #include <soc/pericfg.h>
diff --git a/src/mainboard/google/octopus/chromeos.c b/src/mainboard/google/octopus/chromeos.c
index 42eeeeef67..12aabe6c90 100644
--- a/src/mainboard/google/octopus/chromeos.c
+++ b/src/mainboard/google/octopus/chromeos.c
@@ -5,7 +5,6 @@
 #include <ec/google/chromeec/ec.h>
 #include <gpio.h>
 #include <types.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/google/octopus/smihandler.c b/src/mainboard/google/octopus/smihandler.c
index 8d84840848..4400342be5 100644
--- a/src/mainboard/google/octopus/smihandler.c
+++ b/src/mainboard/google/octopus/smihandler.c
@@ -9,7 +9,6 @@
 #include <gpio.h>
 #include <intelblocks/smihandler.h>
 #include <soc/pm.h>
-#include <soc/gpio.h>
 #include <variant/ec.h>
 #include <variant/gpio.h>
 
diff --git a/src/mainboard/google/octopus/variants/bloog/gpio.c b/src/mainboard/google/octopus/variants/bloog/gpio.c
index 79a50976b7..f77d429e91 100644
--- a/src/mainboard/google/octopus/variants/bloog/gpio.c
+++ b/src/mainboard/google/octopus/variants/bloog/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 static const struct pad_config default_override_table[] = {
 
diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index 089bc3a105..fa6ce2fc59 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
 
 enum {
diff --git a/src/mainboard/google/octopus/variants/casta/gpio.c b/src/mainboard/google/octopus/variants/casta/gpio.c
index ea488ad90d..71f8fd772e 100644
--- a/src/mainboard/google/octopus/variants/casta/gpio.c
+++ b/src/mainboard/google/octopus/variants/casta/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 static const struct pad_config default_override_table[] = {
 	PAD_NC(GPIO_50, UP_20K), /* PCH_I2C_PEN_SDA -- unused */
diff --git a/src/mainboard/google/octopus/variants/dood/gpio.c b/src/mainboard/google/octopus/variants/dood/gpio.c
index ca709ed840..2efc641de3 100644
--- a/src/mainboard/google/octopus/variants/dood/gpio.c
+++ b/src/mainboard/google/octopus/variants/dood/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
 
 enum {
diff --git a/src/mainboard/google/octopus/variants/fleex/gpio.c b/src/mainboard/google/octopus/variants/fleex/gpio.c
index f8875d026c..0b561d857b 100644
--- a/src/mainboard/google/octopus/variants/fleex/gpio.c
+++ b/src/mainboard/google/octopus/variants/fleex/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 static const struct pad_config default_override_table[] = {
 
diff --git a/src/mainboard/google/octopus/variants/foob/gpio.c b/src/mainboard/google/octopus/variants/foob/gpio.c
index c824b962ef..f86ba31587 100644
--- a/src/mainboard/google/octopus/variants/foob/gpio.c
+++ b/src/mainboard/google/octopus/variants/foob/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
 
 static const struct pad_config default_override_table[] = {
diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c
index 4f198814c6..ba69bff30b 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <variant/sku.h>
 #include <ec/google/chromeec/ec.h>
 
diff --git a/src/mainboard/google/octopus/variants/lick/gpio.c b/src/mainboard/google/octopus/variants/lick/gpio.c
index 089b28a4cd..5fafda2504 100644
--- a/src/mainboard/google/octopus/variants/lick/gpio.c
+++ b/src/mainboard/google/octopus/variants/lick/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
 
 #define SKU_UNKNOWN            0xFFFFFFFF
diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c
index 106c26688e..68f0a2da4d 100644
--- a/src/mainboard/google/octopus/variants/meep/gpio.c
+++ b/src/mainboard/google/octopus/variants/meep/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <variant/sku.h>
 #include <ec/google/chromeec/ec.h>
 
diff --git a/src/mainboard/google/octopus/variants/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c
index f0142c96bd..72ad7239fe 100644
--- a/src/mainboard/google/octopus/variants/phaser/gpio.c
+++ b/src/mainboard/google/octopus/variants/phaser/gpio.c
@@ -4,7 +4,6 @@
 #include <baseboard/variants.h>
 #include <boardid.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
 
 #define SKU_UNKNOWN            0xFFFFFFFF
diff --git a/src/mainboard/google/octopus/variants/yorp/gpio.c b/src/mainboard/google/octopus/variants/yorp/gpio.c
index c8b56f068f..817661acc0 100644
--- a/src/mainboard/google/octopus/variants/yorp/gpio.c
+++ b/src/mainboard/google/octopus/variants/yorp/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 /* GPIOs needed prior to ramstage. */
 static const struct pad_config early_gpio_table[] = {
diff --git a/src/mainboard/google/poppy/chromeos.c b/src/mainboard/google/poppy/chromeos.c
index 2ed2828579..4b1cfb0ea4 100644
--- a/src/mainboard/google/poppy/chromeos.c
+++ b/src/mainboard/google/poppy/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <types.h>
 
 #include <variant/gpio.h>
diff --git a/src/mainboard/google/poppy/smihandler.c b/src/mainboard/google/poppy/smihandler.c
index d54de09149..84339e65cb 100644
--- a/src/mainboard/google/poppy/smihandler.c
+++ b/src/mainboard/google/poppy/smihandler.c
@@ -5,7 +5,6 @@
 #include <ec/google/chromeec/smm.h>
 #include <elog.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <intelblocks/smihandler.h>
 
 #include <baseboard/variants.h>
diff --git a/src/mainboard/google/reef/chromeos.c b/src/mainboard/google/reef/chromeos.c
index ca3de03dc8..3f1e4af00b 100644
--- a/src/mainboard/google/reef/chromeos.c
+++ b/src/mainboard/google/reef/chromeos.c
@@ -4,7 +4,6 @@
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
 #include <types.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c
index 8cae9592d7..ff3bb36e09 100644
--- a/src/mainboard/google/reef/mainboard.c
+++ b/src/mainboard/google/reef/mainboard.c
@@ -9,7 +9,6 @@
 #include <gpio.h>
 #include <nhlt.h>
 #include <smbios.h>
-#include <soc/gpio.h>
 #include <soc/nhlt.h>
 #include <string.h>
 #include <variant/ec.h>
diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index 8cdd15c769..93128b5c44 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/trogdor/board.h b/src/mainboard/google/trogdor/board.h
index 72457433fa..c42a779ea2 100644
--- a/src/mainboard/google/trogdor/board.h
+++ b/src/mainboard/google/trogdor/board.h
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include <boardid.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 #define GPIO_EC_IN_RW	GPIO(118)
 #define GPIO_AP_EC_INT	GPIO(94)
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index 38b7b5853f..4b15e1be04 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -10,7 +10,6 @@
 #include <intelblocks/gpio.h>
 #include <security/tpm/tss.h>
 #include <intelblocks/tcss.h>
-#include <soc/gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include <variant/gpio.h>
diff --git a/src/mainboard/google/volteer/romstage.c b/src/mainboard/google/volteer/romstage.c
index 0bb52807e2..da4e8d4afa 100644
--- a/src/mainboard/google/volteer/romstage.c
+++ b/src/mainboard/google/volteer/romstage.c
@@ -6,7 +6,6 @@
 #include <fw_config.h>
 #include <gpio.h>
 #include <memory_info.h>
-#include <soc/gpio.h>
 #include <soc/meminit.h>
 #include <soc/romstage.h>
 #include <variant/gpio.h>
diff --git a/src/mainboard/google/volteer/variants/drobit/ramstage.c b/src/mainboard/google/volteer/variants/drobit/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/drobit/ramstage.c
+++ b/src/mainboard/google/volteer/variants/drobit/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/eldrid/ramstage.c b/src/mainboard/google/volteer/variants/eldrid/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/eldrid/ramstage.c
+++ b/src/mainboard/google/volteer/variants/eldrid/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/elemi/ramstage.c b/src/mainboard/google/volteer/variants/elemi/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/elemi/ramstage.c
+++ b/src/mainboard/google/volteer/variants/elemi/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/halvor/ramstage.c b/src/mainboard/google/volteer/variants/halvor/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/halvor/ramstage.c
+++ b/src/mainboard/google/volteer/variants/halvor/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/malefor/ramstage.c b/src/mainboard/google/volteer/variants/malefor/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/malefor/ramstage.c
+++ b/src/mainboard/google/volteer/variants/malefor/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/terrador/ramstage.c b/src/mainboard/google/volteer/variants/terrador/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/terrador/ramstage.c
+++ b/src/mainboard/google/volteer/variants/terrador/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/trondo/ramstage.c b/src/mainboard/google/volteer/variants/trondo/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/trondo/ramstage.c
+++ b/src/mainboard/google/volteer/variants/trondo/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/voema/ramstage.c b/src/mainboard/google/volteer/variants/voema/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/voema/ramstage.c
+++ b/src/mainboard/google/volteer/variants/voema/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/volet/ramstage.c b/src/mainboard/google/volteer/variants/volet/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/volet/ramstage.c
+++ b/src/mainboard/google/volteer/variants/volet/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/volteer2/ramstage.c b/src/mainboard/google/volteer/variants/volteer2/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/volteer2/ramstage.c
+++ b/src/mainboard/google/volteer/variants/volteer2/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/volteer/variants/voxel/ramstage.c b/src/mainboard/google/volteer/variants/voxel/ramstage.c
index b198992824..f7a174d888 100644
--- a/src/mainboard/google/volteer/variants/voxel/ramstage.c
+++ b/src/mainboard/google/volteer/variants/voxel/ramstage.c
@@ -3,7 +3,6 @@
 #include <delay.h>
 #include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/hp/280_g2/bootblock.c b/src/mainboard/hp/280_g2/bootblock.c
index f42c3f26f7..f89ecf7f09 100644
--- a/src/mainboard/hp/280_g2/bootblock.c
+++ b/src/mainboard/hp/280_g2/bootblock.c
@@ -4,7 +4,6 @@
 #include <console/console.h>
 #include <device/pnp_ops.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <superio/ite/common/ite.h>
 #include <types.h>
 
diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos.c b/src/mainboard/intel/coffeelake_rvp/chromeos.c
index 0ec0978ec9..85587d94c5 100644
--- a/src/mainboard/intel/coffeelake_rvp/chromeos.c
+++ b/src/mainboard/intel/coffeelake_rvp/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <types.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/intel/glkrvp/chromeos.c b/src/mainboard/intel/glkrvp/chromeos.c
index bc27b27f31..203634ad18 100644
--- a/src/mainboard/intel/glkrvp/chromeos.c
+++ b/src/mainboard/intel/glkrvp/chromeos.c
@@ -5,7 +5,6 @@
 #include <ec/google/chromeec/ec.h>
 #include <gpio.h>
 #include <types.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index f1c02eadce..59d1a345d9 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -4,7 +4,6 @@
 #include <boot/coreboot_tables.h>
 #include <device/device.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/kblrvp/romstage.c b/src/mainboard/intel/kblrvp/romstage.c
index fb02f21edc..78b326c326 100644
--- a/src/mainboard/intel/kblrvp/romstage.c
+++ b/src/mainboard/intel/kblrvp/romstage.c
@@ -5,7 +5,6 @@
 #include <gpio.h>
 #include "gpio.h"
 #include <soc/romstage.h>
-#include <soc/gpio.h>
 #include "spd/spd.h"
 #include <spd_bin.h>
 #include "board_id.h"
diff --git a/src/mainboard/intel/kunimitsu/chromeos.c b/src/mainboard/intel/kunimitsu/chromeos.c
index b285dde11a..f9f5c9f95f 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.c
+++ b/src/mainboard/intel/kunimitsu/chromeos.c
@@ -3,7 +3,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include "gpio.h"
diff --git a/src/mainboard/intel/kunimitsu/romstage.c b/src/mainboard/intel/kunimitsu/romstage.c
index f6bd5c23c9..56c86115cc 100644
--- a/src/mainboard/intel/kunimitsu/romstage.c
+++ b/src/mainboard/intel/kunimitsu/romstage.c
@@ -4,7 +4,6 @@
 #include <gpio.h>
 #include "gpio.h"
 #include <soc/romstage.h>
-#include <soc/gpio.h>
 #include "spd/spd.h"
 
 void mainboard_memory_init_params(FSPM_UPD *mupd)
diff --git a/src/mainboard/prodrive/hermes/bootblock.c b/src/mainboard/prodrive/hermes/bootblock.c
index 9db1fa8306..8f2687f217 100644
--- a/src/mainboard/prodrive/hermes/bootblock.c
+++ b/src/mainboard/prodrive/hermes/bootblock.c
@@ -3,7 +3,6 @@
 #include <bootblock_common.h>
 #include <console/console.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 #include "gpio.h"
 
diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c
index 88cb597b87..0b0eb88ff6 100644
--- a/src/mainboard/prodrive/hermes/mainboard.c
+++ b/src/mainboard/prodrive/hermes/mainboard.c
@@ -14,7 +14,6 @@
 #include <intelblocks/gpio.h>
 #include <intelblocks/pmclib.h>
 #include <smbios.h>
-#include <soc/gpio.h>
 #include <soc/pm.h>
 #include <string.h>
 #include <types.h>
diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/die.c b/src/mainboard/purism/librem_cnl/variants/librem_mini/die.c
index 8147abb170..878811d140 100644
--- a/src/mainboard/purism/librem_cnl/variants/librem_mini/die.c
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/die.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <delay.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 void die_notify(void)
 {
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c
index 339516057a..1121399754 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c
@@ -5,7 +5,6 @@
 #include <device/pci_ids.h>
 #include <gpio.h>
 #include <intelblocks/pcr.h>
-#include <soc/gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>
 
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c
index 37eb7aecf3..e25934848b 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c
@@ -4,7 +4,6 @@
 #include <bootstate.h>
 #include <device/pci_ops.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/pci_devs.h>
 
 #define HOSTCTRL2		0x3E