diff options
| author | Dinesh Gehlot <digehlot@google.com> | 2023-01-17 05:23:16 +0000 |
|---|---|---|
| committer | Elyes Haouas <ehaouas@noos.fr> | 2023-01-18 05:20:01 +0000 |
| commit | a464af451e4765cfb65b65fbe9314c309a1671b3 (patch) | |
| tree | 437fa82a322dabfe44a3bf7b78e0e308604a3692 /src/soc | |
| parent | 58cc96f0caa204a7c7eb08119fdd1df6b60605db (diff) | |
soc/intel/elkhartlake: 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.
BUG=b:261778357
TEST=Able to build and boot.
Signed-off-by: Dinesh Gehlot <digehlot@google.com>
Change-Id: I73bac9560d0ff315d6fe6f4efc3ee9011f77c660
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72036
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/elkhartlake/acpi/gpio.asl | 3 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/chip.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/chip.h | 4 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/gpio.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/pmutil.c | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/src/soc/intel/elkhartlake/acpi/gpio.asl b/src/soc/intel/elkhartlake/acpi/gpio.asl index fa3ef57ec7..aa140e8688 100644 --- a/src/soc/intel/elkhartlake/acpi/gpio.asl +++ b/src/soc/intel/elkhartlake/acpi/gpio.asl @@ -1,7 +1,6 @@ /* 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/elkhartlake/chip.c b/src/soc/intel/elkhartlake/chip.c index 03f9cc9b0f..4d61c3b5ed 100644 --- a/src/soc/intel/elkhartlake/chip.c +++ b/src/soc/intel/elkhartlake/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/elkhartlake/chip.h b/src/soc/intel/elkhartlake/chip.h index 0188e70b05..8743eb0871 100644 --- a/src/soc/intel/elkhartlake/chip.h +++ b/src/soc/intel/elkhartlake/chip.h @@ -4,14 +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/gpio_defs.h> #include <soc/pch.h> #include <soc/pci_devs.h> #include <soc/pmc.h> diff --git a/src/soc/intel/elkhartlake/gpio.c b/src/soc/intel/elkhartlake/gpio.c index 91ab9601fd..d329b52029 100644 --- a/src/soc/intel/elkhartlake/gpio.c +++ b/src/soc/intel/elkhartlake/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/elkhartlake/pmutil.c b/src/soc/intel/elkhartlake/pmutil.c index 072daffb1b..0cf4227cb6 100644 --- a/src/soc/intel/elkhartlake/pmutil.c +++ b/src/soc/intel/elkhartlake/pmutil.c @@ -13,13 +13,13 @@ #include <device/mmio.h> #include <device/pci.h> #include <device/pci_def.h> +#include <gpio.h> #include <intelblocks/pmclib.h> #include <intelblocks/rtc.h> #include <intelblocks/tco.h> #include <security/vboot/vbnv.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> |