diff options
11 files changed, 11 insertions, 9 deletions
diff --git a/src/mainboard/google/skyrim/ec.c b/src/mainboard/google/skyrim/ec.c index 05994eb4c2..f265cbf229 100644 --- a/src/mainboard/google/skyrim/ec.c +++ b/src/mainboard/google/skyrim/ec.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <acpi/acpi.h> -#include <amdblocks/gpio.h> #include <amdblocks/smi.h> #include <console/console.h> #include <ec/google/chromeec/ec.h> +#include <gpio.h> #include <soc/smi.h> #include <variant/ec.h> diff --git a/src/mainboard/google/skyrim/port_descriptors.c b/src/mainboard/google/skyrim/port_descriptors.c index c7b1a8b211..3af2d858fc 100644 --- a/src/mainboard/google/skyrim/port_descriptors.c +++ b/src/mainboard/google/skyrim/port_descriptors.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <baseboard/variants.h> -#include <soc/gpio.h> +#include <gpio.h> #include <soc/platform_descriptors.h> #include <types.h> diff --git a/src/mainboard/google/skyrim/variants/baseboard/gpio.c b/src/mainboard/google/skyrim/variants/baseboard/gpio.c index 2e265d18eb..d17f8e0f56 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/gpio.c +++ b/src/mainboard/google/skyrim/variants/baseboard/gpio.c @@ -3,7 +3,7 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <soc/gpio.h> +#include <gpio.h> /* GPIO configuration in ramstage*/ static const struct soc_amd_gpio base_gpio_table[] = { diff --git a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h index b8b466b6a8..4c02c59d00 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/skyrim/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/skyrim/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/gpio.h index dbbb85d19c..66a8362e90 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/skyrim/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/skyrim/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h index 4d71c5cc5c..f2cd76bbe5 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/skyrim/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/skyrim/variants/baseboard/smihandler.c b/src/mainboard/google/skyrim/variants/baseboard/smihandler.c index dcc19f3623..0243747da7 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/smihandler.c +++ b/src/mainboard/google/skyrim/variants/baseboard/smihandler.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <amdblocks/gpio.h> #include <baseboard/variants.h> #include <console/console.h> #include <cpu/x86/smm.h> #include <ec/google/chromeec/ec.h> #include <ec/google/chromeec/smm.h> #include <elog.h> +#include <gpio.h> #include <variant/ec.h> void mainboard_smi_sleep(u8 slp_typ) diff --git a/src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c b/src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c index 0102baa8ce..7e513ef79f 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c +++ b/src/mainboard/google/skyrim/variants/baseboard/tpm_tis.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <security/tpm/tis.h> -#include <soc/gpio.h> +#include <gpio.h> int tis_plat_irq_status(void) { diff --git a/src/mainboard/google/skyrim/variants/frostflow/gpio.c b/src/mainboard/google/skyrim/variants/frostflow/gpio.c index a80693fac6..45ead98f77 100644 --- a/src/mainboard/google/skyrim/variants/frostflow/gpio.c +++ b/src/mainboard/google/skyrim/variants/frostflow/gpio.c @@ -3,7 +3,7 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <soc/gpio.h> +#include <gpio.h> /* GPIO configuration in ramstage */ static const struct soc_amd_gpio override_gpio_table[] = { diff --git a/src/mainboard/google/skyrim/variants/winterhold/gpio.c b/src/mainboard/google/skyrim/variants/winterhold/gpio.c index bed7f4b92f..340bfb6fd2 100644 --- a/src/mainboard/google/skyrim/variants/winterhold/gpio.c +++ b/src/mainboard/google/skyrim/variants/winterhold/gpio.c @@ -2,7 +2,7 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <soc/gpio.h> +#include <gpio.h> /* GPIO configuration in ramstage */ static const struct soc_amd_gpio override_gpio_table[] = { diff --git a/src/mainboard/google/skyrim/verstage.c b/src/mainboard/google/skyrim/verstage.c index 5c176a507f..1079e9b52d 100644 --- a/src/mainboard/google/skyrim/verstage.c +++ b/src/mainboard/google/skyrim/verstage.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <amdblocks/acpimmio.h> -#include <amdblocks/gpio.h> #include <arch/io.h> #include <baseboard/variants.h> +#include <gpio.h> #include <psp_verstage.h> #include <security/vboot/vboot_common.h> #include <soc/espi.h> |