Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/60229 )
Change subject: starlabs: Convert EC_GPE_SCI to Kconfig ......................................................................
starlabs: Convert EC_GPE_SCI to Kconfig
Convert EC_GPI_SCI to Kconfig option with default value of 0x50 that is used by most boards.
Signed-off-by: Sean Rhodes sean@starlabs.systems Change-Id: I8d47ebe76394fe1bcb217e0c6211db1566f82189 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60229 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/ec/starlabs/merlin/Kconfig M src/ec/starlabs/merlin/acpi/ec.asl M src/mainboard/starlabs/labtop/Kconfig M src/mainboard/starlabs/labtop/dsdt.asl 4 files changed, 9 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/ec/starlabs/merlin/Kconfig b/src/ec/starlabs/merlin/Kconfig index fe94b85..67582ac 100644 --- a/src/ec/starlabs/merlin/Kconfig +++ b/src/ec/starlabs/merlin/Kconfig @@ -55,3 +55,7 @@ config EC_VARIANT_DIR string default "merlin" if EC_STARLABS_MERLIN + +config EC_GPE_SCI + hex + default 0x50 diff --git a/src/ec/starlabs/merlin/acpi/ec.asl b/src/ec/starlabs/merlin/acpi/ec.asl index 2c2b8d7..c540c03 100644 --- a/src/ec/starlabs/merlin/acpi/ec.asl +++ b/src/ec/starlabs/merlin/acpi/ec.asl @@ -10,7 +10,7 @@ { Name (_HID, EisaId ("PNP0C09")) Name (_UID, 0x01) - Name (_GPE, EC_GPE_SCI) + Name (_GPE, CONFIG_EC_GPE_SCI) Name (ECAV, 0x00) Name (ECTK, 0x01) Name (B2ST, 0x00) diff --git a/src/mainboard/starlabs/labtop/Kconfig b/src/mainboard/starlabs/labtop/Kconfig index 9d74d2b93..e133faa 100644 --- a/src/mainboard/starlabs/labtop/Kconfig +++ b/src/mainboard/starlabs/labtop/Kconfig @@ -40,6 +40,10 @@ config DRIVER_TPM_SPI_CHIP default 2
+config EC_GPE_SCI + default 0x6e if BOARD_STARLABS_STARBOOK_TGL + default 0x50 + config EC_STARLABS_ADD_ITE_BIN default y
diff --git a/src/mainboard/starlabs/labtop/dsdt.asl b/src/mainboard/starlabs/labtop/dsdt.asl index ebb3de3..ac6bc43 100644 --- a/src/mainboard/starlabs/labtop/dsdt.asl +++ b/src/mainboard/starlabs/labtop/dsdt.asl @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#define EC_GPE_SCI 0x6e - #include <acpi/acpi.h> DefinitionBlock( "dsdt.aml",