diff options
| author | Dinesh Gehlot <digehlot@google.com> | 2023-01-17 05:54:17 +0000 |
|---|---|---|
| committer | Elyes Haouas <ehaouas@noos.fr> | 2023-01-18 05:18:42 +0000 |
| commit | 770a46c6d79b08a4effe4f5c365e58ee51f59131 (patch) | |
| tree | a8ca0a05041a6e415b17562a068c07de439bd306 /src/soc/intel | |
| parent | 6fecff20c1a7cd48763f9c93977b9d1e27b965b3 (diff) | |
soc/intel/skylake: 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: I02fe236506abbc0d97982747cfcf3c0e9ef4897a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72040
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Sridhar Siricilla <sridhar.siricilla@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/skylake/acpi/gpio.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/chip.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/gpio.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/pmutil.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/intel/skylake/acpi/gpio.asl b/src/soc/intel/skylake/acpi/gpio.asl index f863fc7021..1d22b78f66 100644 --- a/src/soc/intel/skylake/acpi/gpio.asl +++ b/src/soc/intel/skylake/acpi/gpio.asl @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <gpio.h> #include <soc/intel/common/block/acpi/acpi/gpio_op.asl> -#include <soc/gpio.h> Device (GPIO) { diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 12a6ae9762..ce8712ca69 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -7,13 +7,13 @@ #include <device/i2c_simple.h> #include <drivers/i2c/designware/dw_i2c.h> #include <drivers/intel/gma/gma.h> +#include <gpio.h> #include <intelblocks/cfg.h> #include <intelblocks/gspi.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/power_limit.h> #include <stdint.h> #include <soc/gpe.h> -#include <soc/gpio.h> #include <soc/irq.h> #include <soc/pci_devs.h> #include <soc/pmc.h> diff --git a/src/soc/intel/skylake/gpio.c b/src/soc/intel/skylake/gpio.c index 1ac99121fc..0480a061a1 100644 --- a/src/soc/intel/skylake/gpio.c +++ b/src/soc/intel/skylake/gpio.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#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/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c index d411c762df..c31fb06567 100644 --- a/src/soc/intel/skylake/pmutil.c +++ b/src/soc/intel/skylake/pmutil.c @@ -8,17 +8,17 @@ #define __SIMPLE_DEVICE__ #include <acpi/acpi.h> +#include <console/console.h> #include <device/mmio.h> #include <device/pci_ops.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/lpc_lib.h> #include <intelblocks/tco.h> #include <soc/gpe.h> -#include <soc/gpio.h> #include <soc/iomap.h> #include <soc/pci_devs.h> #include <soc/pm.h> |