summaryrefslogtreecommitdiff
path: root/src/soc/intel/apollolake
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel/apollolake')
-rw-r--r--src/soc/intel/apollolake/Kconfig1
-rw-r--r--src/soc/intel/apollolake/include/soc/pm.h3
-rw-r--r--src/soc/intel/apollolake/pmutil.c14
3 files changed, 1 insertions, 17 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 91d203eb2c..9e489718de 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -107,6 +107,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_BLOCK_SMBUS
select SOC_INTEL_COMMON_FSP_RESET
select SOC_INTEL_COMMON_RESET
+ select SOC_INTEL_MEM_MAPPED_PM_CONFIGURATION
select SOC_INTEL_NO_BOOTGUARD_MSR
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
select TSC_MONOTONIC_TIMER
diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h
index 3c0b1e7cf8..1e6a927613 100644
--- a/src/soc/intel/apollolake/include/soc/pm.h
+++ b/src/soc/intel/apollolake/include/soc/pm.h
@@ -242,7 +242,4 @@ uint8_t *pmc_mmio_regs(void);
/* STM Support */
uint16_t get_pmbase(void);
-/* Clear PMCON status bits */
-void pmc_clear_pmcon_sts(void);
-
#endif
diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 79ece4b2e4..fbb2345653 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -237,17 +237,3 @@ void pmc_soc_set_afterg3_en(const bool on)
reg32 |= SLEEP_AFTER_POWER_FAIL;
write32p(gen_pmcon1, reg32);
}
-
-void pmc_clear_pmcon_sts(void)
-{
- uint32_t reg_val;
- uint8_t *addr;
- addr = pmc_mmio_regs();
-
- reg_val = read32(addr + GEN_PMCON1);
- /* Clear SUS_PWR_FLR, GBL_RST_STS, HOST_RST_STS, PWR_FLR bits
- * while retaining MS4V write-1-to-clear bit */
- reg_val &= ~(MS4V);
-
- write32((addr + GEN_PMCON1), reg_val);
-}