summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/apollolake/Kconfig1
-rw-r--r--src/soc/intel/common/block/pmc/Kconfig6
2 files changed, 7 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 6395f16f7c..0302546335 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -48,6 +48,7 @@ config CPU_SPECIFIC_OPTIONS
select MRC_SETTINGS_PROTECT
select MRC_SETTINGS_VARIABLE_DATA
select NO_XIP_EARLY_STAGES
+ select NO_PM_ACPI_TIMER
select PARALLEL_MP_AP_WORK
select PCIEXP_ASPM
select PCIEXP_COMMON_CLOCK
diff --git a/src/soc/intel/common/block/pmc/Kconfig b/src/soc/intel/common/block/pmc/Kconfig
index f60dc69692..6ec9339806 100644
--- a/src/soc/intel/common/block/pmc/Kconfig
+++ b/src/soc/intel/common/block/pmc/Kconfig
@@ -50,6 +50,11 @@ config PMC_GLOBAL_RESET_ENABLE_LOCK
Note that the reset register is still at 0xCF9 this only
controls the enable and lock feature.
+config NO_PM_ACPI_TIMER
+ bool
+ help
+ Selected by SoCs that do not have a PM ACPI timer.
+
config PM_ACPI_TIMER_OPTIONAL
bool
default n
@@ -62,6 +67,7 @@ if PM_ACPI_TIMER_OPTIONAL
config USE_PM_ACPI_TIMER
bool "Enable ACPI PM timer"
default y
+ depends on !NO_PM_ACPI_TIMER
help
This should be disabled for devices running on battery since
it can draw much power. Further, it must be disabled, if S0ix