Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/71817 )
Change subject: mainboard: Remove duplicated <soc/gpio.h> ......................................................................
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 --- M src/mainboard/google/asurada/mainboard.c M src/mainboard/google/brya/variants/baseboard/nissa/ramstage.c M src/mainboard/google/brya/variants/moli/gpio.c M src/mainboard/google/brya/variants/primus/variant.c M src/mainboard/google/brya/variants/primus4es/variant.c M src/mainboard/google/cherry/bootblock.c M src/mainboard/google/cherry/mainboard.c M src/mainboard/google/cyan/chromeos.c M src/mainboard/google/cyan/spd/spd.c M src/mainboard/google/cyan/variants/celes/spd_util.c M src/mainboard/google/cyan/variants/setzer/spd_util.c M src/mainboard/google/drallion/chromeos.c M src/mainboard/google/eve/bootblock.c M src/mainboard/google/eve/chromeos.c M src/mainboard/google/eve/spd/spd.c M src/mainboard/google/fizz/chromeos.c M src/mainboard/google/fizz/mainboard.c M src/mainboard/google/gale/blsp.c M src/mainboard/google/glados/chromeos.c M src/mainboard/google/glados/spd/spd.c M src/mainboard/google/hatch/variants/dratini/ramstage.c M src/mainboard/google/hatch/variants/hatch/ramstage.c M src/mainboard/google/hatch/variants/helios/ramstage.c M src/mainboard/google/hatch/variants/jinlon/ramstage.c M src/mainboard/google/hatch/variants/kohaku/ramstage.c M src/mainboard/google/hatch/variants/mushu/ramstage.c M src/mainboard/google/hatch/variants/nightfury/ramstage.c M src/mainboard/google/kukui/mainboard.c M src/mainboard/google/oak/bootblock.c M src/mainboard/google/octopus/chromeos.c M src/mainboard/google/octopus/smihandler.c M src/mainboard/google/octopus/variants/bloog/gpio.c M src/mainboard/google/octopus/variants/bobba/gpio.c M src/mainboard/google/octopus/variants/casta/gpio.c M src/mainboard/google/octopus/variants/dood/gpio.c M src/mainboard/google/octopus/variants/fleex/gpio.c M src/mainboard/google/octopus/variants/foob/gpio.c M src/mainboard/google/octopus/variants/garg/gpio.c M src/mainboard/google/octopus/variants/lick/gpio.c M src/mainboard/google/octopus/variants/meep/gpio.c M src/mainboard/google/octopus/variants/phaser/gpio.c M src/mainboard/google/octopus/variants/yorp/gpio.c M src/mainboard/google/poppy/chromeos.c M src/mainboard/google/poppy/smihandler.c M src/mainboard/google/reef/chromeos.c M src/mainboard/google/reef/mainboard.c M src/mainboard/google/sarien/chromeos.c M src/mainboard/google/trogdor/board.h M src/mainboard/google/volteer/mainboard.c M src/mainboard/google/volteer/romstage.c M src/mainboard/google/volteer/variants/drobit/ramstage.c M src/mainboard/google/volteer/variants/eldrid/ramstage.c M src/mainboard/google/volteer/variants/elemi/ramstage.c M src/mainboard/google/volteer/variants/halvor/ramstage.c M src/mainboard/google/volteer/variants/malefor/ramstage.c M src/mainboard/google/volteer/variants/terrador/ramstage.c M src/mainboard/google/volteer/variants/trondo/ramstage.c M src/mainboard/google/volteer/variants/voema/ramstage.c M src/mainboard/google/volteer/variants/volet/ramstage.c M src/mainboard/google/volteer/variants/volteer2/ramstage.c M src/mainboard/google/volteer/variants/voxel/ramstage.c M src/mainboard/hp/280_g2/bootblock.c M src/mainboard/intel/coffeelake_rvp/chromeos.c M src/mainboard/intel/glkrvp/chromeos.c M src/mainboard/intel/kblrvp/chromeos.c M src/mainboard/intel/kblrvp/romstage.c M src/mainboard/intel/kunimitsu/chromeos.c M src/mainboard/intel/kunimitsu/romstage.c M src/mainboard/prodrive/hermes/bootblock.c M src/mainboard/prodrive/hermes/mainboard.c M src/mainboard/purism/librem_cnl/variants/librem_mini/die.c M src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c M src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c 73 files changed, 16 insertions(+), 73 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved
diff --git a/src/mainboard/google/asurada/mainboard.c b/src/mainboard/google/asurada/mainboard.c index ddc2be4..2da9719 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 670f8e3..dc686fe 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 9f56b53..a8edf20 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 90999ec..e78dfdc 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 90999ec..e78dfdc 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 c811c4e..5091dcc 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 704a299..4447806 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 a218cc3..8afc599 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 169b983..bd08b82 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 2eec267..c918cc7 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 bb20141..f5ec218 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 4c5c8b8..cbbac11 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 2579c8b..96a5a3c 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 81fc391..dcd9219 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 e9405f0..c053177 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 59105ce..9a754a9 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 15be049..b0d94a0 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 040b662..8b76c3b 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 299a372..3e33f80 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 9bfb202..a6e655b 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 434d357..240bcae 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 8282d1d..af89621 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 176527b..5e12864 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 176527b..5e12864 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 e861cfb..d16be38 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 8282d1d..af89621 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 0e6eae6..5307cbf 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 a0ce674..e1c50f4 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 2a0bf57..dd3d7a3 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 42eeeee..12aabe6 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 8d84840..4400342 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 79a5097..f77d429 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 089bc3a..fa6ce2f 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 ea488ad..71f8fd7 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 ca709ed..2efc641 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 f8875d0..0b561d8 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 c824b96..f86ba31 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 4f19881..ba69bff 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 089b28a..5fafda2 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 106c266..68f0a2d 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 f0142c9..72ad723 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 c8b56f0..817661a 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 2ed2828..4b1cfb0 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 d54de09..84339e6 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 ca3de03..3f1e4af 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 8cae959..ff3bb36 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 8cdd15c..93128b5 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 7245743..c42a779 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 38b7b58..4b15e1b 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 0bb5280..da4e8d4 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 b198992..f7a174d 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 f42c3f2..f89ecf7 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 0ec0978..85587d9 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 bc27b27..203634a 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 f1c02ea..59d1a34 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 fb02f21..78b326c 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 b285dde..f9f5c9f 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 f6bd5c2..56c8611 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 9db1fa8..8f2687f 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 88cb597..0b0eb88 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 8147abb..878811d 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 3395160..1121399 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 37eb7ae..e259348 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