From 419a2a75df59236251cbfd168e007e43f078fdb0 Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Wed, 11 Jan 2023 10:15:09 +0100
Subject: mainboard: Remove duplicated <soc/gpio.h>

<gpio.h> chain-include <soc/gpio.h>.

Change-Id: Ia57d5cd33c70b6a755babd4db56c64c0e3666f9f
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71817
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
---
 src/mainboard/google/octopus/chromeos.c             | 1 -
 src/mainboard/google/octopus/smihandler.c           | 1 -
 src/mainboard/google/octopus/variants/bloog/gpio.c  | 1 -
 src/mainboard/google/octopus/variants/bobba/gpio.c  | 1 -
 src/mainboard/google/octopus/variants/casta/gpio.c  | 1 -
 src/mainboard/google/octopus/variants/dood/gpio.c   | 1 -
 src/mainboard/google/octopus/variants/fleex/gpio.c  | 1 -
 src/mainboard/google/octopus/variants/foob/gpio.c   | 1 -
 src/mainboard/google/octopus/variants/garg/gpio.c   | 1 -
 src/mainboard/google/octopus/variants/lick/gpio.c   | 1 -
 src/mainboard/google/octopus/variants/meep/gpio.c   | 1 -
 src/mainboard/google/octopus/variants/phaser/gpio.c | 1 -
 src/mainboard/google/octopus/variants/yorp/gpio.c   | 1 -
 13 files changed, 13 deletions(-)

(limited to 'src/mainboard/google/octopus')

diff --git a/src/mainboard/google/octopus/chromeos.c b/src/mainboard/google/octopus/chromeos.c
index 42eeeeef67..12aabe6c90 100644
--- a/src/mainboard/google/octopus/chromeos.c
+++ b/src/mainboard/google/octopus/chromeos.c
@@ -5,7 +5,6 @@
 #include <ec/google/chromeec/ec.h>
 #include <gpio.h>
 #include <types.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/google/octopus/smihandler.c b/src/mainboard/google/octopus/smihandler.c
index 8d84840848..4400342be5 100644
--- a/src/mainboard/google/octopus/smihandler.c
+++ b/src/mainboard/google/octopus/smihandler.c
@@ -9,7 +9,6 @@
 #include <gpio.h>
 #include <intelblocks/smihandler.h>
 #include <soc/pm.h>
-#include <soc/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 79a50976b7..f77d429e91 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 089bc3a105..fa6ce2fc59 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.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 ea488ad90d..71f8fd772e 100644
--- a/src/mainboard/google/octopus/variants/casta/gpio.c
+++ b/src/mainboard/google/octopus/variants/casta/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[] = {
 	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 ca709ed840..2efc641de3 100644
--- a/src/mainboard/google/octopus/variants/dood/gpio.c
+++ b/src/mainboard/google/octopus/variants/dood/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.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 f8875d026c..0b561d857b 100644
--- a/src/mainboard/google/octopus/variants/fleex/gpio.c
+++ b/src/mainboard/google/octopus/variants/fleex/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/foob/gpio.c b/src/mainboard/google/octopus/variants/foob/gpio.c
index c824b962ef..f86ba31587 100644
--- a/src/mainboard/google/octopus/variants/foob/gpio.c
+++ b/src/mainboard/google/octopus/variants/foob/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.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 4f198814c6..ba69bff30b 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/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/lick/gpio.c b/src/mainboard/google/octopus/variants/lick/gpio.c
index 089b28a4cd..5fafda2504 100644
--- a/src/mainboard/google/octopus/variants/lick/gpio.c
+++ b/src/mainboard/google/octopus/variants/lick/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.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 106c26688e..68f0a2da4d 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 f0142c96bd..72ad7239fe 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 c8b56f068f..817661acc0 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[] = {
-- 
cgit v1.2.3