diff options
author | Dinesh Gehlot <digehlot@google.com> | 2023-01-17 05:57:56 +0000 |
---|---|---|
committer | Elyes Haouas <ehaouas@noos.fr> | 2023-01-18 05:18:05 +0000 |
commit | 3e866812e96d88872af31f2cbb590c6870262205 (patch) | |
tree | 9093222a4b84cbd6952e30bec74d334cb9985e01 | |
parent | 8a2c904616722f51f5d3a500ba41b7e21b4735e2 (diff) | |
download | coreboot-3e866812e96d88872af31f2cbb590c6870262205.tar.gz |
soc/intel/tigerlake: 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: I12497d46e58aae41ec8dcb5d567267579dc12fc6
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72041
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r-- | src/soc/intel/tigerlake/acpi/gpio.asl | 3 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/acpi/gpio_pch_h.asl | 2 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/chip.c | 2 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/chip.h | 3 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/fsp_params.c | 6 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/gpio.c | 2 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/gpio_pch_h.c | 2 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/pmutil.c | 4 | ||||
-rw-r--r-- | src/soc/intel/tigerlake/romstage/fsp_params.c | 2 |
9 files changed, 12 insertions, 14 deletions
diff --git a/src/soc/intel/tigerlake/acpi/gpio.asl b/src/soc/intel/tigerlake/acpi/gpio.asl index 5a6e54a4a7..4c5f7c73ca 100644 --- a/src/soc/intel/tigerlake/acpi/gpio.asl +++ b/src/soc/intel/tigerlake/acpi/gpio.asl @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <intelblocks/gpio.h> -#include <soc/gpio_defs.h> +#include <gpio.h> #include <soc/intel/common/acpi/gpio.asl> #include <soc/intel/common/block/acpi/acpi/gpio_op.asl> #include <soc/irq.h> diff --git a/src/soc/intel/tigerlake/acpi/gpio_pch_h.asl b/src/soc/intel/tigerlake/acpi/gpio_pch_h.asl index e58e723d4b..3615d5bc18 100644 --- a/src/soc/intel/tigerlake/acpi/gpio_pch_h.asl +++ b/src/soc/intel/tigerlake/acpi/gpio_pch_h.asl @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <intelblocks/gpio.h> +#include <gpio.h> #include <soc/gpio_defs_pch_h.h> #include <soc/intel/common/acpi/gpio.asl> #include <soc/intel/common/block/acpi/acpi/gpio_op.asl> diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c index 867e4108bc..242ec987d2 100644 --- a/src/soc/intel/tigerlake/chip.c +++ b/src/soc/intel/tigerlake/chip.c @@ -4,9 +4,9 @@ #include <device/pci.h> #include <fsp/api.h> #include <fsp/util.h> +#include <gpio.h> #include <intelblocks/acpi.h> #include <intelblocks/cfg.h> -#include <intelblocks/gpio.h> #include <intelblocks/irq.h> #include <intelblocks/itss.h> #include <intelblocks/pcie_rp.h> diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h index c34892a39a..6aa040840e 100644 --- a/src/soc/intel/tigerlake/chip.h +++ b/src/soc/intel/tigerlake/chip.h @@ -5,15 +5,14 @@ #include <drivers/i2c/designware/dw_i2c.h> #include <drivers/intel/gma/gma.h> +#include <gpio.h> #include <intelblocks/cfg.h> -#include <intelblocks/gpio.h> #include <intelblocks/gspi.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/pcie_rp.h> #include <intelblocks/power_limit.h> #include <intelblocks/tcss.h> #include <soc/gpe.h> -#include <soc/gpio.h> #include <soc/pch.h> #include <soc/pci_devs.h> #include <soc/pmc.h> diff --git a/src/soc/intel/tigerlake/fsp_params.c b/src/soc/intel/tigerlake/fsp_params.c index f67e205652..b823f50301 100644 --- a/src/soc/intel/tigerlake/fsp_params.c +++ b/src/soc/intel/tigerlake/fsp_params.c @@ -2,15 +2,15 @@ #include <assert.h> #include <console/console.h> -#include <device/device.h> #include <cpu/intel/cpu_ids.h> +#include <device/device.h> #include <device/pci_ops.h> #include <device/pci.h> #include <device/pci_ids.h> #include <fsp/api.h> #include <fsp/ppi/mp_service_ppi.h> #include <fsp/util.h> -#include <option.h> +#include <gpio.h> #include <intelblocks/cse.h> #include <intelblocks/irq.h> #include <intelblocks/lpss.h> @@ -18,8 +18,8 @@ #include <intelblocks/tcss.h> #include <intelblocks/xdci.h> #include <intelpch/lockdown.h> +#include <option.h> #include <security/vboot/vboot_common.h> -#include <soc/gpio.h> #include <soc/intel/common/vbt.h> #include <soc/lpm.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/tigerlake/gpio.c b/src/soc/intel/tigerlake/gpio.c index 3fd8bfb97c..7053f3a207 100644 --- a/src/soc/intel/tigerlake/gpio.c +++ b/src/soc/intel/tigerlake/gpio.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <intelblocks/gpio.h> +#include <gpio.h> #include <intelblocks/pcr.h> #include <soc/pcr_ids.h> #include <soc/pmc.h> diff --git a/src/soc/intel/tigerlake/gpio_pch_h.c b/src/soc/intel/tigerlake/gpio_pch_h.c index 96f07a6938..64662d735b 100644 --- a/src/soc/intel/tigerlake/gpio_pch_h.c +++ b/src/soc/intel/tigerlake/gpio_pch_h.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <intelblocks/gpio.h> +#include <gpio.h> #include <intelblocks/pcr.h> #include <soc/pcr_ids.h> #include <soc/pmc.h> diff --git a/src/soc/intel/tigerlake/pmutil.c b/src/soc/intel/tigerlake/pmutil.c index b8bf975bde..346fb35603 100644 --- a/src/soc/intel/tigerlake/pmutil.c +++ b/src/soc/intel/tigerlake/pmutil.c @@ -14,17 +14,17 @@ #define __SIMPLE_DEVICE__ #include <acpi/acpi_pm.h> +#include <console/console.h> #include <device/mmio.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_def.h> -#include <console/console.h> +#include <gpio.h> #include <intelblocks/pmclib.h> #include <intelblocks/rtc.h> #include <intelblocks/tco.h> #include <soc/espi.h> #include <soc/gpe.h> -#include <soc/gpio.h> #include <soc/iomap.h> #include <soc/pci_devs.h> #include <soc/pm.h> diff --git a/src/soc/intel/tigerlake/romstage/fsp_params.c b/src/soc/intel/tigerlake/romstage/fsp_params.c index d4e694e4e0..dd771655f2 100644 --- a/src/soc/intel/tigerlake/romstage/fsp_params.c +++ b/src/soc/intel/tigerlake/romstage/fsp_params.c @@ -6,9 +6,9 @@ #include <cpu/x86/msr.h> #include <device/device.h> #include <fsp/util.h> +#include <gpio.h> #include <intelblocks/cpulib.h> #include <option.h> -#include <soc/gpio.h> #include <soc/iomap.h> #include <soc/msr.h> #include <soc/pci_devs.h> |