diff options
| author | Dinesh Gehlot <digehlot@google.com> | 2023-01-17 05:46:33 +0000 |
|---|---|---|
| committer | Elyes Haouas <ehaouas@noos.fr> | 2023-01-18 05:19:02 +0000 |
| commit | 4da8830c3d4f65b2bd53ed1c0f4fd7f623ca8c1e (patch) | |
| tree | 235aab04805e5cd35cc644c160ad9c45edc3bcdb | |
| parent | 770a46c6d79b08a4effe4f5c365e58ee51f59131 (diff) | |
soc/intel/jasperlake: 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: If069e66f2762eb373d35d635c09226ac5be99c7d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72039
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>
| -rw-r--r-- | src/soc/intel/jasperlake/acpi/gpio.asl | 3 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/chip.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/chip.h | 3 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/gpio.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/pmutil.c | 4 |
5 files changed, 6 insertions, 8 deletions
diff --git a/src/soc/intel/jasperlake/acpi/gpio.asl b/src/soc/intel/jasperlake/acpi/gpio.asl index 421abc3a21..786a6c69ab 100644 --- a/src/soc/intel/jasperlake/acpi/gpio.asl +++ b/src/soc/intel/jasperlake/acpi/gpio.asl @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <intelblocks/gpio.h> +#include <gpio.h> #include <soc/intel/common/block/acpi/acpi/gpio_op.asl> -#include <soc/gpio_defs.h> #include <soc/irq.h> #include <soc/pcr_ids.h> diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c index 3464399405..567dccb6c9 100644 --- a/src/soc/intel/jasperlake/chip.c +++ b/src/soc/intel/jasperlake/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/itss.h> #include <intelblocks/pcie_rp.h> #include <intelblocks/systemagent.h> diff --git a/src/soc/intel/jasperlake/chip.h b/src/soc/intel/jasperlake/chip.h index 896a79a0f9..2839148764 100644 --- a/src/soc/intel/jasperlake/chip.h +++ b/src/soc/intel/jasperlake/chip.h @@ -4,13 +4,12 @@ #define _SOC_CHIP_H_ #include <drivers/i2c/designware/dw_i2c.h> +#include <gpio.h> #include <intelblocks/cfg.h> -#include <intelblocks/gpio.h> #include <intelblocks/gspi.h> #include <intelblocks/pcie_rp.h> #include <intelblocks/power_limit.h> #include <soc/gpe.h> -#include <soc/gpio.h> #include <soc/pch.h> #include <soc/pci_devs.h> #include <soc/pcie_modphy.h> diff --git a/src/soc/intel/jasperlake/gpio.c b/src/soc/intel/jasperlake/gpio.c index 7ffc2aa8de..42eb183aff 100644 --- a/src/soc/intel/jasperlake/gpio.c +++ b/src/soc/intel/jasperlake/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/jasperlake/pmutil.c b/src/soc/intel/jasperlake/pmutil.c index 23d5fe77ff..b438e9db0e 100644 --- a/src/soc/intel/jasperlake/pmutil.c +++ b/src/soc/intel/jasperlake/pmutil.c @@ -8,17 +8,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> |