diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2022-12-06 21:29:49 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-12-10 05:04:25 +0000 |
| commit | 8d1ef734a220d2cbb297a4f9485c0364c5a76071 (patch) | |
| tree | c100003e5efeb92eb2f0b87798b40ca3975c8d17 /src/mainboard/google/skyrim/variants/baseboard | |
| parent | fa0bf5c2a4ad5091deb9ef1ad2c7625c9a7eb7ee (diff) | |
mb/google/skyrim: use gpio.h include
Replace the amdblocks/gpio.h and soc/gpio.h includes with the common
gpio.h which will include soc/gpio.h which will include amdblocks/gpio.h
in the AMD SoC case.
Since baseboard/ec.h and indirectly baseboard/gpio.h files will get
included in the DSDT, the soc/gpio.h includes in those aren't replaced
with a gpio.h include for now.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ib982e338b5c6bc145ec1a8f6dd75175a42dfb426
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70436
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/skyrim/variants/baseboard')
6 files changed, 6 insertions, 4 deletions
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) { |