From ee2f0b499ba50bf66b9dcdb1726c26860f08b2cb Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Tue, 6 Dec 2022 21:24:52 +0100
Subject: [PATCH] mb/google/zork: use gpio.h include

Replace the amdblocks/gpio.h, amdblocks/gpio_defs.h and soc/gpio.h
includes with the common gpio.h which will include soc/gpio.h which will
include amdblocks/gpio.h which will include amdblocks/gpio_defs.h in the
AMD SoC case.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I37a33dd8821a00b7edfd1e5b593f71bea0e77630
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70434
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
---
 src/mainboard/google/zork/mainboard.c                          | 2 --
 .../google/zork/variants/baseboard/gpio_baseboard_dalboz.c     | 1 -
 .../google/zork/variants/baseboard/gpio_baseboard_trembyle.c   | 1 -
 .../google/zork/variants/baseboard/include/baseboard/gpio.h    | 3 +--
 src/mainboard/google/zork/variants/baseboard/ramstage_common.c | 2 +-
 src/mainboard/google/zork/variants/baseboard/tpm_tis.c         | 2 +-
 src/mainboard/google/zork/variants/berknip/gpio.c              | 1 -
 src/mainboard/google/zork/variants/dalboz/gpio.c               | 1 -
 src/mainboard/google/zork/variants/dirinboz/gpio.c             | 1 -
 src/mainboard/google/zork/variants/ezkinil/gpio.c              | 1 -
 src/mainboard/google/zork/variants/gumboz/gpio.c               | 1 -
 src/mainboard/google/zork/variants/morphius/gpio.c             | 1 -
 src/mainboard/google/zork/variants/shuboz/gpio.c               | 1 -
 src/mainboard/google/zork/variants/trembyle/gpio.c             | 1 -
 src/mainboard/google/zork/variants/vilboz/gpio.c               | 1 -
 src/mainboard/google/zork/variants/woomax/gpio.c               | 2 +-
 src/mainboard/google/zork/verstage.c                           | 2 +-
 17 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c
index 90c74d7e4e..89460cc676 100644
--- a/src/mainboard/google/zork/mainboard.c
+++ b/src/mainboard/google/zork/mainboard.c
@@ -6,14 +6,12 @@
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
 #include <amdblocks/amd_pci_util.h>
-#include <amdblocks/gpio.h>
 #include <amdblocks/smi.h>
 #include <baseboard/variants.h>
 #include <boardid.h>
 #include <gpio.h>
 #include <smbios.h>
 #include <soc/cpu.h>
-#include <soc/gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/platform_descriptors.h>
 #include <soc/southbridge.h>
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 5d68ee9917..5c5933920b 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -3,7 +3,6 @@
 #include <baseboard/variants.h>
 #include <delay.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/smi.h>
 #include <variant/gpio.h>
 
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
index ef9eab2c65..c789660b8c 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -5,7 +5,6 @@
 #include <delay.h>
 #include <ec/google/chromeec/ec.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/smi.h>
 #include <variant/gpio.h>
 
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h
index 46f73767d1..ae6b0883c2 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h
@@ -4,8 +4,7 @@
 #define __BASEBOARD_GPIO_H__
 
 #ifndef __ACPI__
-#include <amdblocks/gpio_defs.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 #if CONFIG(BOARD_GOOGLE_BASEBOARD_TREMBYLE)
 #define EC_IN_RW_OD		GPIO_130
diff --git a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
index afb890b698..3c203f5442 100644
--- a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
+++ b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
@@ -9,7 +9,7 @@
 #include <drivers/i2c/hid/chip.h>
 #include <drivers/usb/acpi/chip.h>
 #include <ec/google/chromeec/ec.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
 
diff --git a/src/mainboard/google/zork/variants/baseboard/tpm_tis.c b/src/mainboard/google/zork/variants/baseboard/tpm_tis.c
index 46952c3318..97eac5db92 100644
--- a/src/mainboard/google/zork/variants/baseboard/tpm_tis.c
+++ b/src/mainboard/google/zork/variants/baseboard/tpm_tis.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <gpio.h>
 #include <security/tpm/tis.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 
 int tis_plat_irq_status(void)
diff --git a/src/mainboard/google/zork/variants/berknip/gpio.c b/src/mainboard/google/zork/variants/berknip/gpio.c
index 2452a1defe..33e1a149d5 100644
--- a/src/mainboard/google/zork/variants/berknip/gpio.c
+++ b/src/mainboard/google/zork/variants/berknip/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 soc_amd_gpio berknip_bid1_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/dalboz/gpio.c b/src/mainboard/google/zork/variants/dalboz/gpio.c
index a71aa78f02..78b3a5a071 100644
--- a/src/mainboard/google/zork/variants/dalboz/gpio.c
+++ b/src/mainboard/google/zork/variants/dalboz/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>
 
 /* This table is used by dalboz variant with board version < 2. */
diff --git a/src/mainboard/google/zork/variants/dirinboz/gpio.c b/src/mainboard/google/zork/variants/dirinboz/gpio.c
index aeebd0707b..43ea041a8b 100644
--- a/src/mainboard/google/zork/variants/dirinboz/gpio.c
+++ b/src/mainboard/google/zork/variants/dirinboz/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 soc_amd_gpio bid_1_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/ezkinil/gpio.c b/src/mainboard/google/zork/variants/ezkinil/gpio.c
index 295fb21de2..13a85f1fc0 100644
--- a/src/mainboard/google/zork/variants/ezkinil/gpio.c
+++ b/src/mainboard/google/zork/variants/ezkinil/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 soc_amd_gpio ezkinil_bid1_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/gumboz/gpio.c b/src/mainboard/google/zork/variants/gumboz/gpio.c
index 501c14402e..100c480a0d 100644
--- a/src/mainboard/google/zork/variants/gumboz/gpio.c
+++ b/src/mainboard/google/zork/variants/gumboz/gpio.c
@@ -3,7 +3,6 @@
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 
 static const struct soc_amd_gpio dirinboz_gpio_set_stage_ram[] = {
 	/* PEN_DETECT_ODL - no used */
diff --git a/src/mainboard/google/zork/variants/morphius/gpio.c b/src/mainboard/google/zork/variants/morphius/gpio.c
index 778c6e4407..2aa1f0f0c5 100644
--- a/src/mainboard/google/zork/variants/morphius/gpio.c
+++ b/src/mainboard/google/zork/variants/morphius/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 soc_amd_gpio morphius_bid1_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/shuboz/gpio.c b/src/mainboard/google/zork/variants/shuboz/gpio.c
index 43575820ec..8f32dd6864 100644
--- a/src/mainboard/google/zork/variants/shuboz/gpio.c
+++ b/src/mainboard/google/zork/variants/shuboz/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 soc_amd_gpio bid_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/trembyle/gpio.c b/src/mainboard/google/zork/variants/trembyle/gpio.c
index 0546df4ae2..fda4f5afa5 100644
--- a/src/mainboard/google/zork/variants/trembyle/gpio.c
+++ b/src/mainboard/google/zork/variants/trembyle/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 soc_amd_gpio trembyle_bid1_bid2_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/vilboz/gpio.c b/src/mainboard/google/zork/variants/vilboz/gpio.c
index 5c918fddde..e49ae8d8d4 100644
--- a/src/mainboard/google/zork/variants/vilboz/gpio.c
+++ b/src/mainboard/google/zork/variants/vilboz/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 soc_amd_gpio bid_1_gpio_set_stage_ram[] = {
diff --git a/src/mainboard/google/zork/variants/woomax/gpio.c b/src/mainboard/google/zork/variants/woomax/gpio.c
index 329e7dddb3..dc853e1615 100644
--- a/src/mainboard/google/zork/variants/woomax/gpio.c
+++ b/src/mainboard/google/zork/variants/woomax/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 static const struct soc_amd_gpio woomax_bid0_gpio_set_stage_ram[] = {
 	/* GPIO_4 NC */
diff --git a/src/mainboard/google/zork/verstage.c b/src/mainboard/google/zork/verstage.c
index 06032577e2..86cf3a6c83 100644
--- a/src/mainboard/google/zork/verstage.c
+++ b/src/mainboard/google/zork/verstage.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <amdblocks/gpio.h>
 #include <baseboard/variants.h>
+#include <gpio.h>
 #include <psp_verstage.h>
 #include <security/vboot/vboot_common.h>