From 2557d02eee4e57399da6015bc4990e76041cf18d Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 8 Dec 2022 20:44:21 +0100 Subject: [PATCH] mb/google/guybrush,skyrim: use gpio.h include everywhere Now that gpio.h will only include the defines in the IASL case, gpio.h can be included instead of soc/gpio.h in the files that will be directly or indirectly included in the DSDT. Signed-off-by: Felix Held Change-Id: Ifc8d8fe4e4148e5b5628f32778368d1fc7f44e5b Reviewed-on: https://review.coreboot.org/c/coreboot/+/70510 Reviewed-by: Elyes Haouas Tested-by: build bot (Jenkins) --- .../google/guybrush/variants/baseboard/include/baseboard/ec.h | 3 +-- .../guybrush/variants/baseboard/include/baseboard/gpio.h | 3 +-- .../google/skyrim/variants/baseboard/include/baseboard/ec.h | 3 +-- .../google/skyrim/variants/baseboard/include/baseboard/gpio.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) 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 3cbb9ee0f6..643c534189 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h @@ -6,8 +6,7 @@ #include #include #include -/* Since this ends up being included in dsdt.asl, can't be included instead */ -#include +#include #define MAINBOARD_EC_SCI_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) \ 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 56552a6d1b..2262e3d4de 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h @@ -3,8 +3,7 @@ #ifndef __BASEBOARD_GPIO_H__ #define __BASEBOARD_GPIO_H__ -/* Since this ends up being included in dsdt.asl, can't be included instead */ -#include +#include /* SPI Write protect */ #define CROS_WP_GPIO GPIO_67 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 4c02c59d00..0be43a461e 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h @@ -6,8 +6,7 @@ #include #include #include -/* Since this ends up being included in dsdt.asl, can't be included instead */ -#include +#include #define MAINBOARD_EC_SCI_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) \ 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 66a8362e90..eb17eff2a6 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/gpio.h @@ -3,8 +3,7 @@ #ifndef __BASEBOARD_GPIO_H__ #define __BASEBOARD_GPIO_H__ -/* Since this ends up being included in dsdt.asl, can't be included instead */ -#include +#include /* SPI Write protect */ #define CROS_WP_GPIO GPIO_138