HAOUAS Elyes has uploaded this change for review.
mb/google/octopus: 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: I4a24a819ca3e8db888c4388cb7c90a8e7c1337da
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/mainboard/google/octopus/bootblock.c
M src/mainboard/google/octopus/chromeos.c
M src/mainboard/google/octopus/mainboard.c
M src/mainboard/google/octopus/smihandler.c
M src/mainboard/google/octopus/variants/bloog/gpio.c
M src/mainboard/google/octopus/variants/bobba/gpio.c
M src/mainboard/google/octopus/variants/casta/gpio.c
M src/mainboard/google/octopus/variants/dood/gpio.c
M src/mainboard/google/octopus/variants/fleex/gpio.c
M src/mainboard/google/octopus/variants/foob/gpio.c
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/lick/gpio.c
M src/mainboard/google/octopus/variants/meep/gpio.c
M src/mainboard/google/octopus/variants/phaser/gpio.c
M src/mainboard/google/octopus/variants/yorp/gpio.c
15 files changed, 4 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/41299/1
diff --git a/src/mainboard/google/octopus/bootblock.c b/src/mainboard/google/octopus/bootblock.c
index 0add453..988bf83 100644
--- a/src/mainboard/google/octopus/bootblock.c
+++ b/src/mainboard/google/octopus/bootblock.c
@@ -4,7 +4,7 @@
#include <bootblock_common.h>
#include <ec/ec.h>
#include <intelblocks/lpc_lib.h>
-#include <soc/gpio.h>
+#include <gpio.h>
void bootblock_mainboard_init(void)
{
diff --git a/src/mainboard/google/octopus/chromeos.c b/src/mainboard/google/octopus/chromeos.c
index 03d3b4f..d558ae8 100644
--- a/src/mainboard/google/octopus/chromeos.c
+++ b/src/mainboard/google/octopus/chromeos.c
@@ -3,9 +3,8 @@
#include <baseboard/variants.h>
#include <boot/coreboot_tables.h>
#include <ec/google/chromeec/ec.h>
-#include <gpio.h>
#include <vendorcode/google/chromeos/chromeos.h>
-#include <soc/gpio.h>
+#include <gpio.h>
#include <variant/gpio.h>
void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index e6dbd03..951a752 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -14,7 +14,7 @@
#include <nhlt.h>
#include <smbios.h>
#include <soc/cpu.h>
-#include <soc/gpio.h>
+#include <gpio.h>
#include <soc/nhlt.h>
#include <soc/pci_devs.h>
#include <stdint.h>
diff --git a/src/mainboard/google/octopus/smihandler.c b/src/mainboard/google/octopus/smihandler.c
index 2c68045..f27af53 100644
--- a/src/mainboard/google/octopus/smihandler.c
+++ b/src/mainboard/google/octopus/smihandler.c
@@ -8,7 +8,7 @@
#include <elog.h>
#include <intelblocks/smihandler.h>
#include <soc/pm.h>
-#include <soc/gpio.h>
+#include <gpio.h>
#include <variant/ec.h>
#include <variant/gpio.h>
diff --git a/src/mainboard/google/octopus/variants/bloog/gpio.c b/src/mainboard/google/octopus/variants/bloog/gpio.c
index d278136..c4a5607 100644
--- a/src/mainboard/google/octopus/variants/bloog/gpio.c
+++ b/src/mainboard/google/octopus/variants/bloog/gpio.c
@@ -3,7 +3,6 @@
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <gpio.h>
-#include <soc/gpio.h>
static const struct pad_config default_override_table[] = {
diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index fd94377..9c731c1 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
#include <ec/google/chromeec/ec.h>
enum {
diff --git a/src/mainboard/google/octopus/variants/casta/gpio.c b/src/mainboard/google/octopus/variants/casta/gpio.c
index 9c8e2a6..f6c82bd 100644
--- a/src/mainboard/google/octopus/variants/casta/gpio.c
+++ b/src/mainboard/google/octopus/variants/casta/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
static const struct pad_config default_override_table[] = {
PAD_NC(GPIO_50, UP_20K), /* PCH_I2C_PEN_SDA -- unused */
diff --git a/src/mainboard/google/octopus/variants/dood/gpio.c b/src/mainboard/google/octopus/variants/dood/gpio.c
index dfb88d8..95fe5d3 100644
--- a/src/mainboard/google/octopus/variants/dood/gpio.c
+++ b/src/mainboard/google/octopus/variants/dood/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
#include <ec/google/chromeec/ec.h>
enum {
diff --git a/src/mainboard/google/octopus/variants/fleex/gpio.c b/src/mainboard/google/octopus/variants/fleex/gpio.c
index 4d92630..67839c1 100644
--- a/src/mainboard/google/octopus/variants/fleex/gpio.c
+++ b/src/mainboard/google/octopus/variants/fleex/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
static const struct pad_config default_override_table[] = {
diff --git a/src/mainboard/google/octopus/variants/foob/gpio.c b/src/mainboard/google/octopus/variants/foob/gpio.c
index 3e059c8..61597ed 100644
--- a/src/mainboard/google/octopus/variants/foob/gpio.c
+++ b/src/mainboard/google/octopus/variants/foob/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
#include <ec/google/chromeec/ec.h>
static const struct pad_config default_override_table[] = {
diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c
index dca07f6..97f7414 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
#include <variant/sku.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/octopus/variants/lick/gpio.c b/src/mainboard/google/octopus/variants/lick/gpio.c
index e813fb1..4d7289f 100644
--- a/src/mainboard/google/octopus/variants/lick/gpio.c
+++ b/src/mainboard/google/octopus/variants/lick/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
#include <ec/google/chromeec/ec.h>
#define SKU_UNKNOWN 0xFFFFFFFF
diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c
index 31cd64e..6f89aea 100644
--- a/src/mainboard/google/octopus/variants/meep/gpio.c
+++ b/src/mainboard/google/octopus/variants/meep/gpio.c
@@ -3,7 +3,6 @@
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <gpio.h>
-#include <soc/gpio.h>
#include <variant/sku.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/octopus/variants/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c
index 29b64b5..b421b4d 100644
--- a/src/mainboard/google/octopus/variants/phaser/gpio.c
+++ b/src/mainboard/google/octopus/variants/phaser/gpio.c
@@ -4,7 +4,6 @@
#include <baseboard/variants.h>
#include <boardid.h>
#include <gpio.h>
-#include <soc/gpio.h>
#include <ec/google/chromeec/ec.h>
#define SKU_UNKNOWN 0xFFFFFFFF
diff --git a/src/mainboard/google/octopus/variants/yorp/gpio.c b/src/mainboard/google/octopus/variants/yorp/gpio.c
index e6b8359..9182548 100644
--- a/src/mainboard/google/octopus/variants/yorp/gpio.c
+++ b/src/mainboard/google/octopus/variants/yorp/gpio.c
@@ -3,7 +3,6 @@
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <gpio.h>
-#include <soc/gpio.h>
/* GPIOs needed prior to ramstage. */
static const struct pad_config early_gpio_table[] = {
To view, visit change 41299. To unsubscribe, or for help writing mail filters, visit settings.