summaryrefslogtreecommitdiff
path: root/src/soc/intel/tigerlake
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel/tigerlake')
-rw-r--r--src/soc/intel/tigerlake/Kconfig1
-rw-r--r--src/soc/intel/tigerlake/chip.h2
-rw-r--r--src/soc/intel/tigerlake/finalize.c10
3 files changed, 3 insertions, 10 deletions
diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index 37391782d2..fe7805ae70 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -40,6 +40,7 @@ config CPU_SPECIFIC_OPTIONS
select MRC_SETTINGS_PROTECT
select PARALLEL_MP_AP_WORK
select PLATFORM_USES_FSP2_2
+ select PM_ACPI_TIMER_OPTIONAL
select PMC_GLOBAL_RESET_ENABLE_LOCK
select PMC_LOW_POWER_MODE_PROGRAM
select SOC_INTEL_COMMON
diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h
index 465dea279a..f0858db1b8 100644
--- a/src/soc/intel/tigerlake/chip.h
+++ b/src/soc/intel/tigerlake/chip.h
@@ -289,7 +289,7 @@ struct soc_intel_tigerlake_config {
/* Enable C6 DRAM */
uint8_t enable_c6dram;
- uint8_t PmTimerDisabled;
+
/*
* SerialIO device mode selection:
* PchSerialIoDisabled,
diff --git a/src/soc/intel/tigerlake/finalize.c b/src/soc/intel/tigerlake/finalize.c
index 6ed60e7eef..26cba96491 100644
--- a/src/soc/intel/tigerlake/finalize.c
+++ b/src/soc/intel/tigerlake/finalize.c
@@ -30,8 +30,6 @@
static void pch_finalize(void)
{
- config_t *config;
-
/* TCO Lock down */
tco_lockdown();
@@ -42,14 +40,8 @@ static void pch_finalize(void)
*
* Disabling ACPI PM timer is necessary for XTAL OSC shutdown.
* Disabling ACPI PM timer also switches off TCO
- *
- * SA_DEV_ROOT device is used here instead of PCH_DEV_PMC since it is
- * just required to get to chip config. PCH_DEV_PMC is hidden by this
- * point and hence removed from the root bus. pcidev_path_on_root thus
- * returns NULL for PCH_DEV_PMC device.
*/
- config = config_of_soc();
- if (config->PmTimerDisabled)
+ if (!CONFIG(USE_PM_ACPI_TIMER))
pmc_disable_acpi_timer();
pmc_clear_pmcon_sts();