Change in coreboot[master]: soc/amd/common/blocks/include: rename gpio_banks.h to gpio.h
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/57842 )
Change subject: soc/amd/common/blocks/include: rename gpio_banks.h to gpio.h ......................................................................
soc/amd/common/blocks/include: rename gpio_banks.h to gpio.h
This brings the AMD SoC GPIO code in line with the Intel SoC code and removes the not really needed suffix.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: Ie2dbec81dfe503869beb2872b01a7475e2b88b33 --- M src/mainboard/google/guybrush/ec.c M src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/guybrush/verstage.c M src/mainboard/google/mancomb/ec.c M src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/mancomb/verstage.c M src/mainboard/google/zork/mainboard.c M src/mainboard/google/zork/verstage.c M src/mainboard/pcengines/apu2/romstage.c M src/soc/amd/cezanne/fch.c M src/soc/amd/cezanne/gpio.c M src/soc/amd/cezanne/include/soc/gpio.h M src/soc/amd/cezanne/uart.c M src/soc/amd/cezanne/xhci.c M src/soc/amd/common/block/gpio/gpio.c M src/soc/amd/common/block/i2c/i2c.c M src/soc/amd/common/block/include/amdblocks/acpi.h R src/soc/amd/common/block/include/amdblocks/gpio.h M src/soc/amd/common/block/include/amdblocks/i2c.h M src/soc/amd/common/block/pm/chipset_state.c M src/soc/amd/picasso/fch.c M src/soc/amd/picasso/gpio.c M src/soc/amd/picasso/include/soc/gpio.h M src/soc/amd/picasso/uart.c M src/soc/amd/picasso/xhci.c M src/soc/amd/stoneyridge/gpio.c M src/soc/amd/stoneyridge/include/soc/gpio.h M src/southbridge/amd/pi/hudson/soc/gpio.h 28 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/57842/1
diff --git a/src/mainboard/google/guybrush/ec.c b/src/mainboard/google/guybrush/ec.c index 67fdda1..f62ca20 100644 --- a/src/mainboard/google/guybrush/ec.c +++ b/src/mainboard/google/guybrush/ec.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <ec/google/chromeec/ec.h> #include <soc/smi.h> diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h index b9a7088..aab905b 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h @@ -3,7 +3,7 @@ #ifndef __BASEBOARD_VARIANTS_H__ #define __BASEBOARD_VARIANTS_H__
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <soc/pci_devs.h>
#define WLAN_DEVFN PCIE_GPP_2_0_DEVFN diff --git a/src/mainboard/google/guybrush/verstage.c b/src/mainboard/google/guybrush/verstage.c index e15cc33..aaaaf03 100644 --- a/src/mainboard/google/guybrush/verstage.c +++ b/src/mainboard/google/guybrush/verstage.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <amdblocks/acpimmio.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <arch/io.h> #include <baseboard/variants.h> #include <security/vboot/vboot_common.h> diff --git a/src/mainboard/google/mancomb/ec.c b/src/mainboard/google/mancomb/ec.c index 67fdda1..f62ca20 100644 --- a/src/mainboard/google/mancomb/ec.c +++ b/src/mainboard/google/mancomb/ec.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <ec/google/chromeec/ec.h> #include <soc/smi.h> diff --git a/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h index dccaed0..632849d 100644 --- a/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h @@ -3,7 +3,7 @@ #ifndef __BASEBOARD_VARIANTS_H__ #define __BASEBOARD_VARIANTS_H__
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h>
/* * This function provides base GPIO configuration table. It is typically provided by diff --git a/src/mainboard/google/mancomb/verstage.c b/src/mainboard/google/mancomb/verstage.c index 0e90231..d2d9277 100644 --- a/src/mainboard/google/mancomb/verstage.c +++ b/src/mainboard/google/mancomb/verstage.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <baseboard/variants.h> #include <security/vboot/vboot_common.h>
diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c index 6b51d52..ea292f1 100644 --- a/src/mainboard/google/zork/mainboard.c +++ b/src/mainboard/google/zork/mainboard.c @@ -7,7 +7,7 @@ #include <acpi/acpi.h> #include <acpi/acpigen.h> #include <amdblocks/amd_pci_util.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <baseboard/variants.h> #include <boardid.h> diff --git a/src/mainboard/google/zork/verstage.c b/src/mainboard/google/zork/verstage.c index 0c7a04f..e1277f4 100644 --- a/src/mainboard/google/zork/verstage.c +++ b/src/mainboard/google/zork/verstage.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <baseboard/variants.h> #include <security/vboot/vboot_common.h>
diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c index 4c142d0..2509031 100644 --- a/src/mainboard/pcengines/apu2/romstage.c +++ b/src/mainboard/pcengines/apu2/romstage.c @@ -2,7 +2,7 @@
#include <stdint.h> #include <amdblocks/acpimmio.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/gpio_defs.h> #include <device/pci_def.h> #include <device/pci_ops.h> diff --git a/src/soc/amd/cezanne/fch.c b/src/soc/amd/cezanne/fch.c index f39eeb6..80ce946 100644 --- a/src/soc/amd/cezanne/fch.c +++ b/src/soc/amd/cezanne/fch.c @@ -3,7 +3,7 @@ #include <amdblocks/acpi.h> #include <amdblocks/acpimmio.h> #include <amdblocks/amd_pci_util.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <assert.h> #include <bootstate.h> diff --git a/src/soc/amd/cezanne/gpio.c b/src/soc/amd/cezanne/gpio.c index f2a59e0..8ac2870 100644 --- a/src/soc/amd/cezanne/gpio.c +++ b/src/soc/amd/cezanne/gpio.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <soc/gpio.h> #include <types.h>
diff --git a/src/soc/amd/cezanne/include/soc/gpio.h b/src/soc/amd/cezanne/include/soc/gpio.h index d12d7b5..904c3fc 100644 --- a/src/soc/amd/cezanne/include/soc/gpio.h +++ b/src/soc/amd/cezanne/include/soc/gpio.h @@ -8,7 +8,7 @@
#ifndef __ACPI__ #include <soc/iomap.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #endif /* !__ACPI__ */
#include <amdblocks/gpio_defs.h> diff --git a/src/soc/amd/cezanne/uart.c b/src/soc/amd/cezanne/uart.c index 5aca5a2..e5f2e4e 100644 --- a/src/soc/amd/cezanne/uart.c +++ b/src/soc/amd/cezanne/uart.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/aoac.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/uart.h> #include <commonlib/helpers.h> #include <console/console.h> diff --git a/src/soc/amd/cezanne/xhci.c b/src/soc/amd/cezanne/xhci.c index a77830c..f599007 100644 --- a/src/soc/amd/cezanne/xhci.c +++ b/src/soc/amd/cezanne/xhci.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <bootstate.h> #include <device/device.h> diff --git a/src/soc/amd/common/block/gpio/gpio.c b/src/soc/amd/common/block/gpio/gpio.c index 2637579..1141846 100644 --- a/src/soc/amd/common/block/gpio/gpio.c +++ b/src/soc/amd/common/block/gpio/gpio.c @@ -8,7 +8,7 @@ #include <gpio.h> #include <amdblocks/acpi.h> #include <amdblocks/acpimmio.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <soc/gpio.h> #include <soc/smi.h> diff --git a/src/soc/amd/common/block/i2c/i2c.c b/src/soc/amd/common/block/i2c/i2c.c index bba3de7..892c83e 100644 --- a/src/soc/amd/common/block/i2c/i2c.c +++ b/src/soc/amd/common/block/i2c/i2c.c @@ -3,7 +3,7 @@ #include <acpi/acpi.h> #include <assert.h> #include <amdblocks/acpimmio.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/gpio_defs.h> #include <amdblocks/i2c.h> #include <console/console.h> diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index f0ba2ac..550b7d7 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -4,7 +4,7 @@ #define AMD_BLOCK_ACPI_H
#include <acpi/acpi.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <types.h>
/* ACPI MMIO registers 0xfed80800 */ diff --git a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h b/src/soc/amd/common/block/include/amdblocks/gpio.h similarity index 100% rename from src/soc/amd/common/block/include/amdblocks/gpio_banks.h rename to src/soc/amd/common/block/include/amdblocks/gpio.h diff --git a/src/soc/amd/common/block/include/amdblocks/i2c.h b/src/soc/amd/common/block/include/amdblocks/i2c.h index 22a408e..6660e37 100644 --- a/src/soc/amd/common/block/include/amdblocks/i2c.h +++ b/src/soc/amd/common/block/include/amdblocks/i2c.h @@ -3,7 +3,7 @@ #ifndef AMD_COMMON_BLOCK_I2C_H #define AMD_COMMON_BLOCK_I2C_H
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <device/i2c.h> #include <drivers/i2c/designware/dw_i2c.h> #include <types.h> diff --git a/src/soc/amd/common/block/pm/chipset_state.c b/src/soc/amd/common/block/pm/chipset_state.c index 302ee60..42d1a15 100644 --- a/src/soc/amd/common/block/pm/chipset_state.c +++ b/src/soc/amd/common/block/pm/chipset_state.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/acpi.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/pmlib.h> #include <cbmem.h> #include <elog.h> diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c index 0798e20..711091c 100644 --- a/src/soc/amd/picasso/fch.c +++ b/src/soc/amd/picasso/fch.c @@ -13,7 +13,7 @@ #include <amdblocks/reset.h> #include <amdblocks/acpimmio.h> #include <amdblocks/acpi.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/i2c.h> #include <amdblocks/smi.h> #include <soc/acpi.h> diff --git a/src/soc/amd/picasso/gpio.c b/src/soc/amd/picasso/gpio.c index fe7d14b..65fb4d8 100644 --- a/src/soc/amd/picasso/gpio.c +++ b/src/soc/amd/picasso/gpio.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <soc/gpio.h> #include <types.h>
diff --git a/src/soc/amd/picasso/include/soc/gpio.h b/src/soc/amd/picasso/include/soc/gpio.h index b3c8140..01a997d 100644 --- a/src/soc/amd/picasso/include/soc/gpio.h +++ b/src/soc/amd/picasso/include/soc/gpio.h @@ -8,7 +8,7 @@
#ifndef __ACPI__ #include <soc/iomap.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #endif /* !__ACPI__ */
#include <amdblocks/gpio_defs.h> diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c index 6e1fb95..b8532aa 100644 --- a/src/soc/amd/picasso/uart.c +++ b/src/soc/amd/picasso/uart.c @@ -4,7 +4,7 @@ #include <commonlib/helpers.h> #include <device/device.h> #include <device/mmio.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/aoac.h> #include <amdblocks/uart.h> #include <soc/aoac_defs.h> diff --git a/src/soc/amd/picasso/xhci.c b/src/soc/amd/picasso/xhci.c index a7e4807..84b3a2b 100644 --- a/src/soc/amd/picasso/xhci.c +++ b/src/soc/amd/picasso/xhci.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <bootstate.h> #include <device/device.h> diff --git a/src/soc/amd/stoneyridge/gpio.c b/src/soc/amd/stoneyridge/gpio.c index 90c23a2..b16172f 100644 --- a/src/soc/amd/stoneyridge/gpio.c +++ b/src/soc/amd/stoneyridge/gpio.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h> #include <soc/gpio.h> #include <types.h>
diff --git a/src/soc/amd/stoneyridge/include/soc/gpio.h b/src/soc/amd/stoneyridge/include/soc/gpio.h index 6fefa79..5cd688d 100644 --- a/src/soc/amd/stoneyridge/include/soc/gpio.h +++ b/src/soc/amd/stoneyridge/include/soc/gpio.h @@ -8,7 +8,7 @@
#ifndef __ACPI__ #include <soc/iomap.h> -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h>
/* The following sections describe only the GPIOs defined for this SOC */
diff --git a/src/southbridge/amd/pi/hudson/soc/gpio.h b/src/southbridge/amd/pi/hudson/soc/gpio.h index 6069ee0..0850fe1 100644 --- a/src/southbridge/amd/pi/hudson/soc/gpio.h +++ b/src/southbridge/amd/pi/hudson/soc/gpio.h @@ -4,7 +4,7 @@ #define SOC_GPIO_H
/* <soc/gpio.h> must provide gpio_t. */ -#include <amdblocks/gpio_banks.h> +#include <amdblocks/gpio.h>
#define SOC_GPIO_TOTAL_PINS 133
-
Felix Held (Code Review)