From ba09eb71c8ffe94ea752cdbc83ac5f400ebc3772 Mon Sep 17 00:00:00 2001 From: Dinesh Gehlot Date: Tue, 17 Jan 2023 05:06:10 +0000 Subject: [PATCH] soc/intel/braswell: 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 Change-Id: I55fa5941a9255f60c2aa23b90d16cf342d6f458f Reviewed-on: https://review.coreboot.org/c/coreboot/+/72032 Reviewed-by: Elyes Haouas Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai --- src/soc/intel/braswell/bootblock/bootblock.c | 2 +- src/soc/intel/braswell/gpio.c | 4 ++-- src/soc/intel/braswell/gpio_support.c | 3 +-- src/soc/intel/braswell/lpc_init.c | 4 ++-- src/soc/intel/braswell/ramstage.c | 2 +- src/soc/intel/braswell/smihandler.c | 6 +++--- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/soc/intel/braswell/bootblock/bootblock.c b/src/soc/intel/braswell/bootblock/bootblock.c index 545642f608..2c9783ad5b 100644 --- a/src/soc/intel/braswell/bootblock/bootblock.c +++ b/src/soc/intel/braswell/bootblock/bootblock.c @@ -6,8 +6,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/soc/intel/braswell/gpio.c b/src/soc/intel/braswell/gpio.c index 854d4b5ca7..58970e83c4 100644 --- a/src/soc/intel/braswell/gpio.c +++ b/src/soc/intel/braswell/gpio.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include #include +#include #include #include -#include +#include #include #include diff --git a/src/soc/intel/braswell/gpio_support.c b/src/soc/intel/braswell/gpio_support.c index 078ced6e55..677007d52b 100644 --- a/src/soc/intel/braswell/gpio_support.c +++ b/src/soc/intel/braswell/gpio_support.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include #include -#include +#include /* * Return family number and internal pad number in that community by pad number diff --git a/src/soc/intel/braswell/lpc_init.c b/src/soc/intel/braswell/lpc_init.c index a69b85d25a..d476d5d6e6 100644 --- a/src/soc/intel/braswell/lpc_init.c +++ b/src/soc/intel/braswell/lpc_init.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include -#include #include +#include #include +#include #define SUSPEND_CYCLE 1 #define RESUME_CYCLE 0 diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c index 6784eb9a5d..27a0cce87c 100644 --- a/src/soc/intel/braswell/ramstage.c +++ b/src/soc/intel/braswell/ramstage.c @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c index f34eb6448f..44a66123d8 100644 --- a/src/soc/intel/braswell/smihandler.c +++ b/src/soc/intel/braswell/smihandler.c @@ -2,20 +2,20 @@ #include #include -#include -#include #include #include #include #include +#include +#include #include #include +#include #include #include #include #include #include -#include #include void southbridge_smi_set_eos(void)