HAOUAS Elyes has uploaded this change for review.

View Change

mb/google/cyan: 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: I396ce75d109dd5493d8f0f4ab1bcce5a08316f18
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/mainboard/google/cyan/chromeos.c
M src/mainboard/google/cyan/com_init.c
M src/mainboard/google/cyan/smihandler.c
M src/mainboard/google/cyan/spd/spd.c
M src/mainboard/google/cyan/variants/banon/gpio.c
M src/mainboard/google/cyan/variants/celes/gpio.c
M src/mainboard/google/cyan/variants/celes/spd_util.c
M src/mainboard/google/cyan/variants/cyan/gpio.c
M src/mainboard/google/cyan/variants/edgar/gpio.c
M src/mainboard/google/cyan/variants/kefka/gpio.c
M src/mainboard/google/cyan/variants/reks/gpio.c
M src/mainboard/google/cyan/variants/relm/gpio.c
M src/mainboard/google/cyan/variants/setzer/gpio.c
M src/mainboard/google/cyan/variants/setzer/spd_util.c
M src/mainboard/google/cyan/variants/terra/gpio.c
M src/mainboard/google/cyan/variants/ultima/gpio.c
M src/mainboard/google/cyan/variants/wizpig/gpio.c
17 files changed, 13 insertions(+), 17 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/41284/1

diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index b88862c..9c7ec7a 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -3,7 +3,6 @@
 #include <boot/coreboot_tables.h>
 #include <device/mmio.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 /* The WP status pin lives on MF_ISH_GPIO_4 */
diff --git a/src/mainboard/google/cyan/com_init.c b/src/mainboard/google/cyan/com_init.c
index b11ae36..ab1ec99 100644
--- a/src/mainboard/google/cyan/com_init.c
+++ b/src/mainboard/google/cyan/com_init.c
@@ -3,7 +3,7 @@
 #include <bootblock_common.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
 
diff --git a/src/mainboard/google/cyan/smihandler.c b/src/mainboard/google/cyan/smihandler.c
index 160b14b..a42d3c7 100644
--- a/src/mainboard/google/cyan/smihandler.c
+++ b/src/mainboard/google/cyan/smihandler.c
@@ -10,7 +10,7 @@
 #include <elog.h>
 #include <soc/nvs.h>
 #include <soc/pm.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 #include <variant/onboard.h>
 
diff --git a/src/mainboard/google/cyan/spd/spd.c b/src/mainboard/google/cyan/spd/spd.c
index 1c08d90..247a2d4 100644
--- a/src/mainboard/google/cyan/spd/spd.c
+++ b/src/mainboard/google/cyan/spd/spd.c
@@ -8,7 +8,6 @@
 #include <memory_info.h>
 #include <smbios.h>
 #include <spd.h>
-#include <soc/gpio.h>
 #include <soc/romstage.h>
 #include <string.h>
 #include <spd_bin.h>
diff --git a/src/mainboard/google/cyan/variants/banon/gpio.c b/src/mainboard/google/cyan/variants/banon/gpio.c
index 6bc9e82..de7ed6c 100644
--- a/src/mainboard/google/cyan/variants/banon/gpio.c
+++ b/src/mainboard/google/cyan/variants/banon/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/celes/gpio.c b/src/mainboard/google/cyan/variants/celes/gpio.c
index 62ee365..f307155 100644
--- a/src/mainboard/google/cyan/variants/celes/gpio.c
+++ b/src/mainboard/google/cyan/variants/celes/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/celes/spd_util.c b/src/mainboard/google/cyan/variants/celes/spd_util.c
index 2eec267..c918cc7 100644
--- a/src/mainboard/google/cyan/variants/celes/spd_util.c
+++ b/src/mainboard/google/cyan/variants/celes/spd_util.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <mainboard/google/cyan/spd/spd_util.h>
 
 /*
diff --git a/src/mainboard/google/cyan/variants/cyan/gpio.c b/src/mainboard/google/cyan/variants/cyan/gpio.c
index 8eee5cb..645819d 100644
--- a/src/mainboard/google/cyan/variants/cyan/gpio.c
+++ b/src/mainboard/google/cyan/variants/cyan/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/edgar/gpio.c b/src/mainboard/google/cyan/variants/edgar/gpio.c
index f327e15..86d7f8c 100644
--- a/src/mainboard/google/cyan/variants/edgar/gpio.c
+++ b/src/mainboard/google/cyan/variants/edgar/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/kefka/gpio.c b/src/mainboard/google/cyan/variants/kefka/gpio.c
index 1f12104..96428b7 100644
--- a/src/mainboard/google/cyan/variants/kefka/gpio.c
+++ b/src/mainboard/google/cyan/variants/kefka/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/reks/gpio.c b/src/mainboard/google/cyan/variants/reks/gpio.c
index ecc5c54..f65eec1 100644
--- a/src/mainboard/google/cyan/variants/reks/gpio.c
+++ b/src/mainboard/google/cyan/variants/reks/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/relm/gpio.c b/src/mainboard/google/cyan/variants/relm/gpio.c
index fca36bb..d4c8fc2 100644
--- a/src/mainboard/google/cyan/variants/relm/gpio.c
+++ b/src/mainboard/google/cyan/variants/relm/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/setzer/gpio.c b/src/mainboard/google/cyan/variants/setzer/gpio.c
index 7938855..dd9f6f4 100644
--- a/src/mainboard/google/cyan/variants/setzer/gpio.c
+++ b/src/mainboard/google/cyan/variants/setzer/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/setzer/spd_util.c b/src/mainboard/google/cyan/variants/setzer/spd_util.c
index bb20141..f5ec218 100644
--- a/src/mainboard/google/cyan/variants/setzer/spd_util.c
+++ b/src/mainboard/google/cyan/variants/setzer/spd_util.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <mainboard/google/cyan/spd/spd_util.h>
 
 /*
diff --git a/src/mainboard/google/cyan/variants/terra/gpio.c b/src/mainboard/google/cyan/variants/terra/gpio.c
index 4b970b2..95a892b 100644
--- a/src/mainboard/google/cyan/variants/terra/gpio.c
+++ b/src/mainboard/google/cyan/variants/terra/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/ultima/gpio.c b/src/mainboard/google/cyan/variants/ultima/gpio.c
index 741b73e..e34b2bf 100644
--- a/src/mainboard/google/cyan/variants/ultima/gpio.c
+++ b/src/mainboard/google/cyan/variants/ultima/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {
diff --git a/src/mainboard/google/cyan/variants/wizpig/gpio.c b/src/mainboard/google/cyan/variants/wizpig/gpio.c
index 300f7d6..7eb362b 100644
--- a/src/mainboard/google/cyan/variants/wizpig/gpio.c
+++ b/src/mainboard/google/cyan/variants/wizpig/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <mainboard/google/cyan/irqroute.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* South East Community */
 static const struct soc_gpio_map gpse_gpio_map[] = {

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