summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2022-12-08 20:44:21 +0100
committerFelix Held <felix-coreboot@felixheld.de>2022-12-13 15:23:52 +0000
commit2557d02eee4e57399da6015bc4990e76041cf18d (patch)
treebc929db55e337fddeb399b09b63306a4b2060dcf /src/mainboard
parentacf96dfcdc0ea73c416a4d598bdaeaf55e88bc4c (diff)
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 <felix-coreboot@felixheld.de> Change-Id: Ifc8d8fe4e4148e5b5628f32778368d1fc7f44e5b Reviewed-on: https://review.coreboot.org/c/coreboot/+/70510 Reviewed-by: Elyes Haouas <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h3
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/include/baseboard/gpio.h3
-rw-r--r--src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h3
-rw-r--r--src/mainboard/google/skyrim/variants/baseboard/include/baseboard/gpio.h3
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 <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>
+#include <gpio.h>
#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, <gpio.h> can't be included instead */
-#include <soc/gpio.h>
+#include <gpio.h>
/* 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 <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>
+#include <gpio.h>
#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, <gpio.h> can't be included instead */
-#include <soc/gpio.h>
+#include <gpio.h>
/* SPI Write protect */
#define CROS_WP_GPIO GPIO_138