Dinesh Gehlot has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/71630 )
Change subject: soc/intel/meteorlake: Use common gpio.h include ......................................................................
soc/intel/meteorlake: 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 will include soc/gpio.h which will include intelblocks/gpio.h which will include soc/gpio_defs.h
BUG=b:261778357 TEST=Able to build and boot Google/brya.
Signed-off-by: Dinesh Gehlot digehlot@google.com Change-Id: I58e428cde5e13f4f0dfe528d798c0613b7f8a94a --- M src/soc/intel/meteorlake/acpi/gpio.asl M src/soc/intel/meteorlake/chip.c M src/soc/intel/meteorlake/chip.h M src/soc/intel/meteorlake/finalize.c M src/soc/intel/meteorlake/gpio.c M src/soc/intel/meteorlake/pmutil.c 6 files changed, 24 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/71630/1
diff --git a/src/soc/intel/meteorlake/acpi/gpio.asl b/src/soc/intel/meteorlake/acpi/gpio.asl index f7dbc87..440ee75 100644 --- a/src/soc/intel/meteorlake/acpi/gpio.asl +++ b/src/soc/intel/meteorlake/acpi/gpio.asl @@ -1,5 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <intelblocks/gpio.h> #include <soc/gpio_defs.h> #include <soc/intel/common/acpi/gpio.asl> #include <soc/intel/common/block/acpi/acpi/gpio_op.asl> diff --git a/src/soc/intel/meteorlake/chip.c b/src/soc/intel/meteorlake/chip.c index 041b16d..a4ac0e9 100644 --- a/src/soc/intel/meteorlake/chip.c +++ b/src/soc/intel/meteorlake/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/p2sb.h> #include <intelblocks/pcie_rp.h> diff --git a/src/soc/intel/meteorlake/chip.h b/src/soc/intel/meteorlake/chip.h index 19b34a2..330f6af 100644 --- a/src/soc/intel/meteorlake/chip.h +++ b/src/soc/intel/meteorlake/chip.h @@ -4,8 +4,8 @@ #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/power_limit.h> #include <intelblocks/pcie_rp.h> diff --git a/src/soc/intel/meteorlake/finalize.c b/src/soc/intel/meteorlake/finalize.c index c33bf5a..6bd304c 100644 --- a/src/soc/intel/meteorlake/finalize.c +++ b/src/soc/intel/meteorlake/finalize.c @@ -6,8 +6,8 @@ #include <cpu/x86/smm.h> #include <delay.h> #include <device/pci.h> +#include <gpio.h> #include <intelblocks/cse.h> -#include <intelblocks/gpio.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/pcr.h> #include <intelblocks/pmclib.h> diff --git a/src/soc/intel/meteorlake/gpio.c b/src/soc/intel/meteorlake/gpio.c index 1420827..2662dde 100644 --- a/src/soc/intel/meteorlake/gpio.c +++ b/src/soc/intel/meteorlake/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/meteorlake/pmutil.c b/src/soc/intel/meteorlake/pmutil.c index 6f35428..fc627c3 100644 --- a/src/soc/intel/meteorlake/pmutil.c +++ b/src/soc/intel/meteorlake/pmutil.c @@ -8,18 +8,18 @@ #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 <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>