soc/intel/xeon_sp: Use common gpio.h include

Replace the intelblocks/gpio.h, soc/gpio.h and soc/gpio_defs.h includes
with the common gpio.h which includes soc/gpio.h which includes
intelblocks/gpio.h which includes soc/gpio_defs.h. This patch also fixes
alphabetic ordering of included headers.

BUG=b:261778357
TEST=Able to build and boot.

Signed-off-by: Dinesh Gehlot <digehlot@google.com>
Change-Id: I8135dc918cb04c854dc003966b7657806a42bad9
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72042
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>

6 files changed, 7 insertions, 8 deletions

diff --git a/src/soc/intel/xeon_sp/acpi/gpio.asl b/src/soc/intel/xeon_sp/acpi/gpio.asl
index c7a9f9589e..ea00b03ee4 100644
--- a/src/soc/intel/xeon_sp/acpi/gpio.asl
+++ b/src/soc/intel/xeon_sp/acpi/gpio.asl
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/pcr_ids.h>
 #include <soc/irq.h>
 #include <soc/intel/common/block/acpi/acpi/gpio_op.asl>
diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c
index 15bd5dec0e..21d6e1748e 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.c
+++ b/src/soc/intel/xeon_sp/cpx/chip.c
@@ -6,8 +6,8 @@
 #include <cpu/x86/mp.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
+#include <gpio.h>
 #include <intelblocks/acpi.h>
-#include <intelblocks/gpio.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/p2sb.h>
 #include <soc/acpi.h>
diff --git a/src/soc/intel/xeon_sp/cpx/chip.h b/src/soc/intel/xeon_sp/cpx/chip.h
index abd358efab..321073b57f 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.h
+++ b/src/soc/intel/xeon_sp/cpx/chip.h
@@ -3,9 +3,9 @@
 #ifndef _SOC_CHIP_H_
 #define _SOC_CHIP_H_
 
+#include <gpio.h>
 #include <intelblocks/cfg.h>
 #include <soc/acpi.h>
-#include <soc/gpio.h>
 #include <soc/irq.h>
 #include <stdint.h>
 
diff --git a/src/soc/intel/xeon_sp/lbg/soc_gpio.c b/src/soc/intel/xeon_sp/lbg/soc_gpio.c
index 7fd7a3ed87..01e13fc330 100644
--- a/src/soc/intel/xeon_sp/lbg/soc_gpio.c
+++ b/src/soc/intel/xeon_sp/lbg/soc_gpio.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
-#include <intelblocks/gpio.h>
+#include <gpio.h>
 #include <intelblocks/pcr.h>
 #include <soc/pcr_ids.h>
 #include <soc/pm.h>
diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index 35e834aab3..924ce22bf6 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -3,8 +3,8 @@
 #include <cbfs.h>
 #include <console/console.h>
 #include <device/pci.h>
+#include <gpio.h>
 #include <intelblocks/acpi.h>
-#include <intelblocks/gpio.h>
 #include <soc/acpi.h>
 #include <soc/chip_common.h>
 #include <soc/pch.h>
diff --git a/src/soc/intel/xeon_sp/skx/chip.h b/src/soc/intel/xeon_sp/skx/chip.h
index b852c4a128..0c0521178c 100644
--- a/src/soc/intel/xeon_sp/skx/chip.h
+++ b/src/soc/intel/xeon_sp/skx/chip.h
@@ -3,11 +3,11 @@
 #ifndef _SOC_CHIP_H_
 #define _SOC_CHIP_H_
 
-#include <stdint.h>
+#include <gpio.h>
 #include <intelblocks/cfg.h>
 #include <soc/acpi.h>
-#include <soc/gpio.h>
 #include <soc/irq.h>
+#include <stdint.h>
 
 struct soc_intel_xeon_sp_skx_config {
 	/* Common struct containing soc config data required by common code */