HAOUAS Elyes has uploaded this change for review.

View Change

mb/google/hatch: Remove direct 'include <soc/gpio.h>'

Don't directly include <soc/gpio.h>. All code using GPIO features
should always and only include <gpio.h>, which should indirectly
include the SoC-specific <soc/gpio.h>.

Change-Id: Ice18f4e584f160378b7aa2ac54ed626ed35617e2
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/mainboard/google/hatch/bootblock.c
M src/mainboard/google/hatch/ramstage.c
M src/mainboard/google/hatch/variants/dratini/ramstage.c
M src/mainboard/google/hatch/variants/hatch/ramstage.c
M src/mainboard/google/hatch/variants/helios/ramstage.c
M src/mainboard/google/hatch/variants/jinlon/ramstage.c
M src/mainboard/google/hatch/variants/kohaku/ramstage.c
M src/mainboard/google/hatch/variants/mushu/ramstage.c
M src/mainboard/google/hatch/variants/nightfury/ramstage.c
9 files changed, 9 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/41294/1

diff --git a/src/mainboard/google/hatch/bootblock.c b/src/mainboard/google/hatch/bootblock.c
index 041ffcf..520129b 100644
--- a/src/mainboard/google/hatch/bootblock.c
+++ b/src/mainboard/google/hatch/bootblock.c
@@ -2,7 +2,7 @@
 
 #include <baseboard/variants.h>
 #include <bootblock_common.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 static void early_config_gpio(void)
 {
diff --git a/src/mainboard/google/hatch/ramstage.c b/src/mainboard/google/hatch/ramstage.c
index af88100..6635311 100644
--- a/src/mainboard/google/hatch/ramstage.c
+++ b/src/mainboard/google/hatch/ramstage.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi.h>
 #include <baseboard/variants.h>
 #include <ec/ec.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/ramstage.h>
 #include <variant/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/hatch/variants/dratini/ramstage.c b/src/mainboard/google/hatch/variants/dratini/ramstage.c
index 176527b..828605d 100644
--- a/src/mainboard/google/hatch/variants/dratini/ramstage.c
+++ b/src/mainboard/google/hatch/variants/dratini/ramstage.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <delay.h>
-#include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/hatch/ramstage.c b/src/mainboard/google/hatch/variants/hatch/ramstage.c
index 38bca41..472ff5b 100644
--- a/src/mainboard/google/hatch/variants/hatch/ramstage.c
+++ b/src/mainboard/google/hatch/variants/hatch/ramstage.c
@@ -5,9 +5,8 @@
  */
 
 #include <delay.h>
-#include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/helios/ramstage.c b/src/mainboard/google/hatch/variants/helios/ramstage.c
index 176527b..828605d 100644
--- a/src/mainboard/google/hatch/variants/helios/ramstage.c
+++ b/src/mainboard/google/hatch/variants/helios/ramstage.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <delay.h>
-#include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/jinlon/ramstage.c b/src/mainboard/google/hatch/variants/jinlon/ramstage.c
index 176527b..828605d 100644
--- a/src/mainboard/google/hatch/variants/jinlon/ramstage.c
+++ b/src/mainboard/google/hatch/variants/jinlon/ramstage.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <delay.h>
-#include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/kohaku/ramstage.c b/src/mainboard/google/hatch/variants/kohaku/ramstage.c
index 176527b..828605d 100644
--- a/src/mainboard/google/hatch/variants/kohaku/ramstage.c
+++ b/src/mainboard/google/hatch/variants/kohaku/ramstage.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <delay.h>
-#include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/mushu/ramstage.c b/src/mainboard/google/hatch/variants/mushu/ramstage.c
index 38bca41..472ff5b 100644
--- a/src/mainboard/google/hatch/variants/mushu/ramstage.c
+++ b/src/mainboard/google/hatch/variants/mushu/ramstage.c
@@ -5,9 +5,8 @@
  */
 
 #include <delay.h>
-#include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void variant_ramstage_init(void)
 {
diff --git a/src/mainboard/google/hatch/variants/nightfury/ramstage.c b/src/mainboard/google/hatch/variants/nightfury/ramstage.c
index d5a57af..2977cb3 100644
--- a/src/mainboard/google/hatch/variants/nightfury/ramstage.c
+++ b/src/mainboard/google/hatch/variants/nightfury/ramstage.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <delay.h>
-#include <gpio.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void variant_ramstage_init(void)
 {

To view, visit change 41294. To unsubscribe, or for help writing mail filters, visit settings.