From a1843d8411d3caebd0600421c2b6a4c6b0588c19 Mon Sep 17 00:00:00 2001 From: Michael Niewöhner Date: Fri, 2 Oct 2020 18:28:22 +0200 Subject: soc/intel/{skl,cnl}: replace PM ACPI timer dt option by Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Select `PM_ACPI_TIMER_OPTIONAL` to enable the new PM ACPI Kconfig and set the FSP option for PM ACPI timer enablement from its value instead of using the old devicetree option. Also drop the obsolete devicetree option from soc code and from the mainboards and add a corresponding Kconfig entry instead. Change-Id: I10724ccf1647594404cec15c2349ab05b6c9714f Signed-off-by: Michael Niewöhner Reviewed-on: https://review.coreboot.org/c/coreboot/+/45955 Reviewed-by: Tim Wawrzynczak Reviewed-by: Angel Pons Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- src/mainboard/libretrend/lt1000/Kconfig | 3 +++ src/mainboard/libretrend/lt1000/devicetree.cb | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/mainboard/libretrend') diff --git a/src/mainboard/libretrend/lt1000/Kconfig b/src/mainboard/libretrend/lt1000/Kconfig index 9c4223ae4b..bfd532a85a 100644 --- a/src/mainboard/libretrend/lt1000/Kconfig +++ b/src/mainboard/libretrend/lt1000/Kconfig @@ -44,4 +44,7 @@ config CBFS_SIZE hex default 0x600000 +config USE_PM_ACPI_TIMER + default n + endif diff --git a/src/mainboard/libretrend/lt1000/devicetree.cb b/src/mainboard/libretrend/lt1000/devicetree.cb index 911690f053..f6e73c6bd6 100644 --- a/src/mainboard/libretrend/lt1000/devicetree.cb +++ b/src/mainboard/libretrend/lt1000/devicetree.cb @@ -55,7 +55,6 @@ chip soc/intel/skylake register "PmConfigSlpS4MinAssert" = "1" # 1s register "PmConfigSlpSusMinAssert" = "3" # 500ms register "PmConfigSlpAMinAssert" = "3" # 2s - register "PmTimerDisabled" = "1" # VR Settings Configuration for 4 Domains #+----------------+-------+-------+-------------+-------+ -- cgit v1.2.3