summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/alderlake/finalize.c4
-rw-r--r--src/soc/intel/cannonlake/finalize.c15
-rw-r--r--src/soc/intel/common/block/include/intelblocks/pmclib.h3
-rw-r--r--src/soc/intel/common/block/pmc/pmclib.c7
-rw-r--r--src/soc/intel/elkhartlake/finalize.c4
-rw-r--r--src/soc/intel/icelake/finalize.c4
-rw-r--r--src/soc/intel/jasperlake/finalize.c4
-rw-r--r--src/soc/intel/skylake/finalize.c4
-rw-r--r--src/soc/intel/tigerlake/finalize.c4
9 files changed, 5 insertions, 44 deletions
diff --git a/src/soc/intel/alderlake/finalize.c b/src/soc/intel/alderlake/finalize.c
index 24dbbd6ab7..b18d72bb6e 100644
--- a/src/soc/intel/alderlake/finalize.c
+++ b/src/soc/intel/alderlake/finalize.c
@@ -64,10 +64,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pch_handle_sideband(config);
pmc_clear_pmcon_sts();
diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c
index 9eb9cbea8c..6ef43b97f8 100644
--- a/src/soc/intel/cannonlake/finalize.c
+++ b/src/soc/intel/cannonlake/finalize.c
@@ -73,16 +73,11 @@ static void pch_finalize(void)
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- if (config->s0ix_enable) {
- /* Disable XTAL shutdown qualification for low power idle. */
- pmc_ignore_xtal_shutdown();
-
- if (config->cppmvric2_adsposcdis) {
- /* Enable Audio DSP OSC qualification for S0ix */
- reg32 = read32(pmcbase + CPPMVRIC2);
- reg32 &= ~ADSPOSCDIS;
- write32(pmcbase + CPPMVRIC2, reg32);
- }
+ if (config->s0ix_enable && config->cppmvric2_adsposcdis) {
+ /* Enable Audio DSP OSC qualification for S0ix */
+ reg32 = read32(pmcbase + CPPMVRIC2);
+ reg32 &= ~ADSPOSCDIS;
+ write32(pmcbase + CPPMVRIC2, reg32);
}
pch_handle_sideband(config);
diff --git a/src/soc/intel/common/block/include/intelblocks/pmclib.h b/src/soc/intel/common/block/include/intelblocks/pmclib.h
index fa063f293e..2acc275b2f 100644
--- a/src/soc/intel/common/block/include/intelblocks/pmclib.h
+++ b/src/soc/intel/common/block/include/intelblocks/pmclib.h
@@ -232,7 +232,4 @@ uint8_t get_pm_pwr_cyc_dur(uint8_t slp_s4_min_assert, uint8_t slp_s3_min_assert,
/* Disabling ACPI PM timer to ensure switches off TCO and necessary of XTAL OSC shutdown */
void pmc_disable_acpi_timer(void);
-/* Disable XTAL shutdown qualification for low power idle. */
-void pmc_ignore_xtal_shutdown(void);
-
#endif /* SOC_INTEL_COMMON_BLOCK_PMCLIB_H */
diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c
index 8825bbe441..a5dff2d75b 100644
--- a/src/soc/intel/common/block/pmc/pmclib.c
+++ b/src/soc/intel/common/block/pmc/pmclib.c
@@ -708,11 +708,4 @@ void pmc_disable_acpi_timer(void)
setbits8(pmcbase + PCH_PWRM_ACPI_TMR_CTL, ACPI_TIM_DIS);
}
-
-void pmc_ignore_xtal_shutdown(void)
-{
- uint8_t *pmcbase = pmc_mmio_regs();
-
- setbits8(pmcbase + CPPMVRIC, XTALSDQDIS);
-}
#endif /* PMC_LOW_POWER_MODE_PROGRAM */
diff --git a/src/soc/intel/elkhartlake/finalize.c b/src/soc/intel/elkhartlake/finalize.c
index bae8bcf5a8..a1cfd8be29 100644
--- a/src/soc/intel/elkhartlake/finalize.c
+++ b/src/soc/intel/elkhartlake/finalize.c
@@ -45,10 +45,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pmc_clear_pmcon_sts();
}
diff --git a/src/soc/intel/icelake/finalize.c b/src/soc/intel/icelake/finalize.c
index 363f579b0f..395bd395c4 100644
--- a/src/soc/intel/icelake/finalize.c
+++ b/src/soc/intel/icelake/finalize.c
@@ -70,10 +70,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pch_handle_sideband(config);
pmc_clear_pmcon_sts();
diff --git a/src/soc/intel/jasperlake/finalize.c b/src/soc/intel/jasperlake/finalize.c
index 1badad3425..61b8e33527 100644
--- a/src/soc/intel/jasperlake/finalize.c
+++ b/src/soc/intel/jasperlake/finalize.c
@@ -63,10 +63,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pch_handle_sideband(config);
pmc_clear_pmcon_sts();
diff --git a/src/soc/intel/skylake/finalize.c b/src/soc/intel/skylake/finalize.c
index ff3218981a..9edc7a2e18 100644
--- a/src/soc/intel/skylake/finalize.c
+++ b/src/soc/intel/skylake/finalize.c
@@ -73,10 +73,6 @@ static void pch_finalize_script(struct device *dev)
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
/* we should disable Heci1 based on the devicetree policy */
if (config->HeciEnabled == 0)
pch_disable_heci();
diff --git a/src/soc/intel/tigerlake/finalize.c b/src/soc/intel/tigerlake/finalize.c
index 2cc9671c30..44e6806162 100644
--- a/src/soc/intel/tigerlake/finalize.c
+++ b/src/soc/intel/tigerlake/finalize.c
@@ -51,10 +51,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pmc_clear_pmcon_sts();
}