From 6fecff20c1a7cd48763f9c93977b9d1e27b965b3 Mon Sep 17 00:00:00 2001
From: Dinesh Gehlot <digehlot@google.com>
Date: Tue, 17 Jan 2023 06:02:16 +0000
Subject: 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>
---
 src/soc/intel/xeon_sp/skx/chip.c | 2 +-
 src/soc/intel/xeon_sp/skx/chip.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/soc/intel/xeon_sp/skx')

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 */
-- 
cgit v1.2.3