diff options
Diffstat (limited to 'src/mainboard/google/guybrush/variants')
11 files changed, 7 insertions, 9 deletions
diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c index 595f680487df..cb56515c2787 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c +++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c @@ -4,7 +4,6 @@ #include <baseboard/variants.h> #include <commonlib/helpers.h> #include <gpio.h> -#include <soc/gpio.h> /* GPIO configuration in ramstage */ /* Please make sure that *ALL* GPIOs are configured in this table */ diff --git a/src/mainboard/google/guybrush/variants/baseboard/helpers.c b/src/mainboard/google/guybrush/variants/baseboard/helpers.c index fe30e15386ab..84fe7328fa60 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/helpers.c +++ b/src/mainboard/google/guybrush/variants/baseboard/helpers.c @@ -2,7 +2,7 @@ #include <baseboard/variants.h> #include <device/device.h> -#include <soc/gpio.h> +#include <gpio.h> bool __weak variant_has_pcie_wwan(void) { diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h index 34e2eddd5827..3cbb9ee0f68c 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h @@ -6,6 +6,7 @@ #include <ec/ec.h> #include <ec/google/chromeec/ec_commands.h> #include <baseboard/gpio.h> +/* Since this ends up being included in dsdt.asl, <gpio.h> can't be included instead */ #include <soc/gpio.h> #define MAINBOARD_EC_SCI_EVENTS \ diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h index 90f4420a5936..56552a6d1bcf 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h @@ -3,6 +3,7 @@ #ifndef __BASEBOARD_GPIO_H__ #define __BASEBOARD_GPIO_H__ +/* Since this ends up being included in dsdt.asl, <gpio.h> can't be included instead */ #include <soc/gpio.h> /* SPI Write protect */ 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 24c03b0cb32b..9f99b9f2a9e7 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.h> +#include <gpio.h> #include <soc/pci_devs.h> #include <platform_descriptors.h> diff --git a/src/mainboard/google/guybrush/variants/baseboard/tpm_tis.c b/src/mainboard/google/guybrush/variants/baseboard/tpm_tis.c index aa8eaa0e6ad9..2f3e426ef97e 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/tpm_tis.c +++ b/src/mainboard/google/guybrush/variants/baseboard/tpm_tis.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <boardid.h> +#include <gpio.h> #include <security/tpm/tis.h> -#include <soc/gpio.h> int tis_plat_irq_status(void) { diff --git a/src/mainboard/google/guybrush/variants/dewatt/gpio.c b/src/mainboard/google/guybrush/variants/dewatt/gpio.c index 571cbb463227..73081ede5ba7 100644 --- a/src/mainboard/google/guybrush/variants/dewatt/gpio.c +++ b/src/mainboard/google/guybrush/variants/dewatt/gpio.c @@ -3,7 +3,6 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <gpio.h> -#include <soc/gpio.h> /* This table is used by guybrush variant */ static const struct soc_amd_gpio override_ramstage_gpio_table[] = { diff --git a/src/mainboard/google/guybrush/variants/guybrush/gpio.c b/src/mainboard/google/guybrush/variants/guybrush/gpio.c index dcbda20f7f1d..60013b1a58c1 100644 --- a/src/mainboard/google/guybrush/variants/guybrush/gpio.c +++ b/src/mainboard/google/guybrush/variants/guybrush/gpio.c @@ -4,7 +4,6 @@ #include <baseboard/variants.h> #include <boardid.h> #include <gpio.h> -#include <soc/gpio.h> /* This table is used by guybrush variant with board version < 2. */ static const struct soc_amd_gpio bid1_ramstage_gpio_table[] = { diff --git a/src/mainboard/google/guybrush/variants/guybrush/variant.c b/src/mainboard/google/guybrush/variants/guybrush/variant.c index 974e357cd94a..394270c7e2e9 100644 --- a/src/mainboard/google/guybrush/variants/guybrush/variant.c +++ b/src/mainboard/google/guybrush/variants/guybrush/variant.c @@ -3,8 +3,8 @@ #include <baseboard/variants.h> #include <boardid.h> #include <device/device.h> -#include <soc/gpio.h> #include <amdblocks/cpu.h> +#include <gpio.h> bool variant_has_pcie_wwan(void) { diff --git a/src/mainboard/google/guybrush/variants/nipperkin/gpio.c b/src/mainboard/google/guybrush/variants/nipperkin/gpio.c index c9f637c739a0..1c415bf0456c 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/gpio.c +++ b/src/mainboard/google/guybrush/variants/nipperkin/gpio.c @@ -4,7 +4,6 @@ #include <baseboard/variants.h> #include <boardid.h> #include <gpio.h> -#include <soc/gpio.h> /* This table is used by nipperkin variant with board version < 2. */ static const struct soc_amd_gpio bid1_override_gpio_table[] = { diff --git a/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c b/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c index c2f4fbffcd98..247c132bf63c 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c +++ b/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c @@ -5,7 +5,7 @@ #include <device/device.h> #include <drivers/i2c/tpm/chip.h> #include <drivers/uart/acpi/chip.h> -#include <soc/gpio.h> +#include <gpio.h> static void cr50_devtree_update(void) { |