From 5e2602ae4817eba77e7893ab41681fd0a74f6558 Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Sat, 14 Jan 2023 05:46:25 +0100
Subject: [PATCH] soc/amd: Include <gpio.h> instead of <soc/gpio.h>

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

Change-Id: I112e41ad4c7ee638954dfe3f1ddfeb10c138459a
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71807
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
---
 src/soc/amd/cezanne/gpio.c                | 2 +-
 src/soc/amd/cezanne/include/soc/i2c.h     | 2 +-
 src/soc/amd/cezanne/uart.c                | 2 +-
 src/soc/amd/common/block/acpi/gpio.c      | 2 +-
 src/soc/amd/common/block/gpio/gpio.c      | 1 -
 src/soc/amd/glinda/gpio.c                 | 2 +-
 src/soc/amd/glinda/include/soc/i2c.h      | 2 +-
 src/soc/amd/glinda/uart.c                 | 2 +-
 src/soc/amd/mendocino/gpio.c              | 2 +-
 src/soc/amd/mendocino/include/soc/i2c.h   | 2 +-
 src/soc/amd/mendocino/uart.c              | 2 +-
 src/soc/amd/phoenix/gpio.c                | 2 +-
 src/soc/amd/phoenix/include/soc/i2c.h     | 2 +-
 src/soc/amd/phoenix/uart.c                | 2 +-
 src/soc/amd/picasso/acpi.c                | 2 +-
 src/soc/amd/picasso/gpio.c                | 2 +-
 src/soc/amd/picasso/include/soc/i2c.h     | 2 +-
 src/soc/amd/picasso/uart.c                | 2 +-
 src/soc/amd/stoneyridge/acpi.c            | 2 +-
 src/soc/amd/stoneyridge/gpio.c            | 2 +-
 src/soc/amd/stoneyridge/include/soc/i2c.h | 2 +-
 src/soc/amd/stoneyridge/uart.c            | 2 +-
 22 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/soc/amd/cezanne/gpio.c b/src/soc/amd/cezanne/gpio.c
index 8ac2870dee..522ac4e484 100644
--- a/src/soc/amd/cezanne/gpio.c
+++ b/src/soc/amd/cezanne/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/gpio.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 /* see the IOMUX function table for the mapping from GPIO number to GEVENT number */
diff --git a/src/soc/amd/cezanne/include/soc/i2c.h b/src/soc/amd/cezanne/include/soc/i2c.h
index fa7a5e41b5..52f439b20a 100644
--- a/src/soc/amd/cezanne/include/soc/i2c.h
+++ b/src/soc/amd/cezanne/include/soc/i2c.h
@@ -3,7 +3,7 @@
 #ifndef AMD_CEZANNE_I2C_H
 #define AMD_CEZANNE_I2C_H
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 #define GPIO_I2C0_SCL		BIT(0)
diff --git a/src/soc/amd/cezanne/uart.c b/src/soc/amd/cezanne/uart.c
index 189a1e5a87..0d05b399f8 100644
--- a/src/soc/amd/cezanne/uart.c
+++ b/src/soc/amd/cezanne/uart.c
@@ -4,8 +4,8 @@
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/aoac_defs.h>
-#include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/common/block/acpi/gpio.c b/src/soc/amd/common/block/acpi/gpio.c
index c4e3801545..7e7503bfe5 100644
--- a/src/soc/amd/common/block/acpi/gpio.c
+++ b/src/soc/amd/common/block/acpi/gpio.c
@@ -2,7 +2,7 @@
 
 #include <acpi/acpigen.h>
 #include <console/console.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 static int acpigen_soc_gpio_op(const char *op, unsigned int gpio_num)
 {
diff --git a/src/soc/amd/common/block/gpio/gpio.c b/src/soc/amd/common/block/gpio/gpio.c
index e8203a1f15..ce098d0643 100644
--- a/src/soc/amd/common/block/gpio/gpio.c
+++ b/src/soc/amd/common/block/gpio/gpio.c
@@ -10,7 +10,6 @@
 #include <amdblocks/acpimmio.h>
 #include <amdblocks/gpio.h>
 #include <amdblocks/smi.h>
-#include <soc/gpio.h>
 #include <soc/smi.h>
 #include <assert.h>
 #include <string.h>
diff --git a/src/soc/amd/glinda/gpio.c b/src/soc/amd/glinda/gpio.c
index 35d2bca47a..1f7f00e8eb 100644
--- a/src/soc/amd/glinda/gpio.c
+++ b/src/soc/amd/glinda/gpio.c
@@ -3,7 +3,7 @@
 /* TODO: Update for Glinda */
 
 #include <amdblocks/gpio.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 /* see the IOMUX function table for the mapping from GPIO number to GEVENT number */
diff --git a/src/soc/amd/glinda/include/soc/i2c.h b/src/soc/amd/glinda/include/soc/i2c.h
index bf8997463e..f942c3bfff 100644
--- a/src/soc/amd/glinda/include/soc/i2c.h
+++ b/src/soc/amd/glinda/include/soc/i2c.h
@@ -5,7 +5,7 @@
 #ifndef AMD_GLINDA_I2C_H
 #define AMD_GLINDA_I2C_H
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 #define GPIO_I2C0_SCL		BIT(0)
diff --git a/src/soc/amd/glinda/uart.c b/src/soc/amd/glinda/uart.c
index 45c672dc8d..e4ee5bc13f 100644
--- a/src/soc/amd/glinda/uart.c
+++ b/src/soc/amd/glinda/uart.c
@@ -6,8 +6,8 @@
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/aoac_defs.h>
-#include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/mendocino/gpio.c b/src/soc/amd/mendocino/gpio.c
index 74eecadcce..271e749b92 100644
--- a/src/soc/amd/mendocino/gpio.c
+++ b/src/soc/amd/mendocino/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/gpio.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 /* see the IOMUX function table for the mapping from GPIO number to GEVENT number */
diff --git a/src/soc/amd/mendocino/include/soc/i2c.h b/src/soc/amd/mendocino/include/soc/i2c.h
index c691267615..468347fffa 100644
--- a/src/soc/amd/mendocino/include/soc/i2c.h
+++ b/src/soc/amd/mendocino/include/soc/i2c.h
@@ -3,7 +3,7 @@
 #ifndef AMD_MENDOCINO_I2C_H
 #define AMD_MENDOCINO_I2C_H
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 #define GPIO_I2C0_SCL		BIT(0)
diff --git a/src/soc/amd/mendocino/uart.c b/src/soc/amd/mendocino/uart.c
index 03fc593624..1d3c82928f 100644
--- a/src/soc/amd/mendocino/uart.c
+++ b/src/soc/amd/mendocino/uart.c
@@ -4,8 +4,8 @@
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/aoac_defs.h>
-#include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/phoenix/gpio.c b/src/soc/amd/phoenix/gpio.c
index 74eecadcce..271e749b92 100644
--- a/src/soc/amd/phoenix/gpio.c
+++ b/src/soc/amd/phoenix/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/gpio.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 /* see the IOMUX function table for the mapping from GPIO number to GEVENT number */
diff --git a/src/soc/amd/phoenix/include/soc/i2c.h b/src/soc/amd/phoenix/include/soc/i2c.h
index 5146bf49f7..056753332c 100644
--- a/src/soc/amd/phoenix/include/soc/i2c.h
+++ b/src/soc/amd/phoenix/include/soc/i2c.h
@@ -3,7 +3,7 @@
 #ifndef AMD_PHOENIX_I2C_H
 #define AMD_PHOENIX_I2C_H
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 #define GPIO_I2C0_SCL		BIT(0)
diff --git a/src/soc/amd/phoenix/uart.c b/src/soc/amd/phoenix/uart.c
index 03fc593624..1d3c82928f 100644
--- a/src/soc/amd/phoenix/uart.c
+++ b/src/soc/amd/phoenix/uart.c
@@ -4,8 +4,8 @@
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
 #include <device/mmio.h>
+#include <gpio.h>
 #include <soc/aoac_defs.h>
-#include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 6d46698847..a4464ebfb7 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -15,6 +15,7 @@
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
+#include <gpio.h>
 #include <amdblocks/acpimmio.h>
 #include <amdblocks/acpi.h>
 #include <amdblocks/chip.h>
@@ -24,7 +25,6 @@
 #include <soc/pci_devs.h>
 #include <soc/msr.h>
 #include <soc/southbridge.h>
-#include <soc/gpio.h>
 #include <version.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/picasso/gpio.c b/src/soc/amd/picasso/gpio.c
index 65fb4d8f5b..3a302f7bbd 100644
--- a/src/soc/amd/picasso/gpio.c
+++ b/src/soc/amd/picasso/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/gpio.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 static const struct soc_amd_event gpio_event_table[] = {
diff --git a/src/soc/amd/picasso/include/soc/i2c.h b/src/soc/amd/picasso/include/soc/i2c.h
index 6a4d1ff948..164fdeb966 100644
--- a/src/soc/amd/picasso/include/soc/i2c.h
+++ b/src/soc/amd/picasso/include/soc/i2c.h
@@ -3,8 +3,8 @@
 #ifndef AMD_PICASSO_I2C_H
 #define AMD_PICASSO_I2C_H
 
+#include <gpio.h>
 #include <types.h>
-#include <soc/gpio.h>
 
 #define GPIO_I2C2_SCL		BIT(2)
 #define GPIO_I2C3_SCL		BIT(3)
diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c
index 2120ad71b9..38076c2add 100644
--- a/src/soc/amd/picasso/uart.c
+++ b/src/soc/amd/picasso/uart.c
@@ -4,8 +4,8 @@
 #include <amdblocks/gpio.h>
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
+#include <gpio.h>
 #include <soc/aoac_defs.h>
-#include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/southbridge.h>
 #include <soc/uart.h>
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index cc0194b6bc..c862c4d53d 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -13,6 +13,7 @@
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
+#include <gpio.h>
 #include <amdblocks/acpimmio.h>
 #include <amdblocks/acpi.h>
 #include <amdblocks/ioapic.h>
@@ -20,7 +21,6 @@
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>
 #include <soc/northbridge.h>
-#include <soc/gpio.h>
 #include <version.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/soc/amd/stoneyridge/gpio.c b/src/soc/amd/stoneyridge/gpio.c
index b16172f507..2b6f78f412 100644
--- a/src/soc/amd/stoneyridge/gpio.c
+++ b/src/soc/amd/stoneyridge/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/gpio.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <types.h>
 
 static const struct soc_amd_event gpio_event_table[] = {
diff --git a/src/soc/amd/stoneyridge/include/soc/i2c.h b/src/soc/amd/stoneyridge/include/soc/i2c.h
index 0ffff377f4..94a02b484b 100644
--- a/src/soc/amd/stoneyridge/include/soc/i2c.h
+++ b/src/soc/amd/stoneyridge/include/soc/i2c.h
@@ -3,8 +3,8 @@
 #ifndef AMD_STONEYRIDGE_I2C_H
 #define AMD_STONEYRIDGE_I2C_H
 
+#include <gpio.h>
 #include <types.h>
-#include <soc/gpio.h>
 
 #define GPIO_I2C0_SCL			BIT(0)
 #define GPIO_I2C1_SCL			BIT(1)
diff --git a/src/soc/amd/stoneyridge/uart.c b/src/soc/amd/stoneyridge/uart.c
index 7fbba07a78..74b7359958 100644
--- a/src/soc/amd/stoneyridge/uart.c
+++ b/src/soc/amd/stoneyridge/uart.c
@@ -3,8 +3,8 @@
 #include <amdblocks/gpio.h>
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
+#include <gpio.h>
 #include <soc/aoac_defs.h>
-#include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <types.h>