diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2022-12-06 21:24:52 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-12-08 18:50:00 +0000 |
| commit | ee2f0b499ba50bf66b9dcdb1726c26860f08b2cb (patch) | |
| tree | 9117f9d6fd88092159b9f00a38392f2334e0a7e4 /src/mainboard/google/zork/variants/baseboard | |
| parent | 2cc2bd2d2f7613e211f36b0d3e383ef38d03aabd (diff) | |
mb/google/zork: use gpio.h include
Replace the amdblocks/gpio.h, amdblocks/gpio_defs.h and soc/gpio.h
includes with the common gpio.h which will include soc/gpio.h which will
include amdblocks/gpio.h which will include amdblocks/gpio_defs.h in the
AMD SoC case.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I37a33dd8821a00b7edfd1e5b593f71bea0e77630
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70434
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Diffstat (limited to 'src/mainboard/google/zork/variants/baseboard')
5 files changed, 3 insertions, 6 deletions
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c index 5d68ee9917..5c5933920b 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c @@ -3,7 +3,6 @@ #include <baseboard/variants.h> #include <delay.h> #include <gpio.h> -#include <soc/gpio.h> #include <soc/smi.h> #include <variant/gpio.h> diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c index ef9eab2c65..c789660b8c 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c @@ -5,7 +5,6 @@ #include <delay.h> #include <ec/google/chromeec/ec.h> #include <gpio.h> -#include <soc/gpio.h> #include <soc/smi.h> #include <variant/gpio.h> diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h index 46f73767d1..ae6b0883c2 100644 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h @@ -4,8 +4,7 @@ #define __BASEBOARD_GPIO_H__ #ifndef __ACPI__ -#include <amdblocks/gpio_defs.h> -#include <soc/gpio.h> +#include <gpio.h> #if CONFIG(BOARD_GOOGLE_BASEBOARD_TREMBYLE) #define EC_IN_RW_OD GPIO_130 diff --git a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c index afb890b698..3c203f5442 100644 --- a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c +++ b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c @@ -9,7 +9,7 @@ #include <drivers/i2c/hid/chip.h> #include <drivers/usb/acpi/chip.h> #include <ec/google/chromeec/ec.h> -#include <soc/gpio.h> +#include <gpio.h> #include <soc/iomap.h> #include <soc/pci_devs.h> diff --git a/src/mainboard/google/zork/variants/baseboard/tpm_tis.c b/src/mainboard/google/zork/variants/baseboard/tpm_tis.c index 46952c3318..97eac5db92 100644 --- a/src/mainboard/google/zork/variants/baseboard/tpm_tis.c +++ b/src/mainboard/google/zork/variants/baseboard/tpm_tis.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <gpio.h> #include <security/tpm/tis.h> -#include <soc/gpio.h> #include <variant/gpio.h> int tis_plat_irq_status(void) |