From 508dc163f183f99f4683365ef3a6443658979846 Mon Sep 17 00:00:00 2001 From: Lean Sheng Tan Date: Wed, 16 Jun 2021 01:32:22 -0700 Subject: soc/intel/common: Move PMC EPOC related code to Intel common code Move PMC EPOC related code to intel/common/block because it is generic for most Intel platforms and ADL, TGL & EHL use it. Add a kconfig 'PMC_EPOC' to guard this common EPOC code. The PMC EPOC register indicates which external crystal oscillator is connected to the PCH. This frequency is important for determining the IP clock of internal PCH devices. Signed-off-by: Lean Sheng Tan Change-Id: Ib5fd3c4a648964678ee40ed0f60ca10fe7953f56 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55565 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Tim Wawrzynczak --- src/soc/intel/alderlake/Kconfig | 1 + src/soc/intel/alderlake/include/soc/pmc.h | 24 ------------------------ src/soc/intel/alderlake/pmc.c | 7 ------- src/soc/intel/alderlake/soundwire.c | 1 - 4 files changed, 1 insertion(+), 32 deletions(-) (limited to 'src/soc/intel/alderlake') diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index eafd08dba6..b590dfaab7 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -43,6 +43,7 @@ config CPU_SPECIFIC_OPTIONS select REG_SCRIPT select PMC_GLOBAL_RESET_ENABLE_LOCK select PMC_LOW_POWER_MODE_PROGRAM + select PMC_EPOC select SOC_INTEL_COMMON select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE select SOC_INTEL_COMMON_BLOCK diff --git a/src/soc/intel/alderlake/include/soc/pmc.h b/src/soc/intel/alderlake/include/soc/pmc.h index 289568fb6d..2c02a2d467 100644 --- a/src/soc/intel/alderlake/include/soc/pmc.h +++ b/src/soc/intel/alderlake/include/soc/pmc.h @@ -100,30 +100,6 @@ extern struct device_operations pmc_ops; #define PCH2CPU_TPR_CFG_LOCK (1 << 31) #define PCH2CPU_TT_EN (1 << 26) -#define PCH_PMC_EPOC 0x18EC -#define PCH_EPOC_2LM(__epoc) ((__epoc) & 0x1) -/* XTAL frequency in bits 21, 20, 17 */ -#define PCH_EPOC_XTAL_FREQ(__epoc) ((((__epoc) >> 19) & 0x6) | ((__epoc) >> 17 & 0x1)) - -/** - * enum pch_pmc_xtal - External crystal oscillator frequency. - * @XTAL_24_MHZ: 24 MHz external crystal. - * @XTAL_19_2_MHZ: 19.2 MHz external crystal. - * @XTAL_38_4_MHZ: 38.4 MHz external crystal. - */ -enum pch_pmc_xtal { - XTAL_24_MHZ, - XTAL_19_2_MHZ, - XTAL_38_4_MHZ, -}; - -/** - * pmc_get_xtal_freq() - Return frequency of external oscillator. - * - * Return &enum pch_pmc_xtal corresponding to frequency returned by PMC. - */ -enum pch_pmc_xtal pmc_get_xtal_freq(void); - #define PCH_PWRM_ACPI_TMR_CTL 0x18FC #define ACPI_TIM_DIS (1 << 1) #define GPIO_GPE_CFG 0x1920 diff --git a/src/soc/intel/alderlake/pmc.c b/src/soc/intel/alderlake/pmc.c index 6ee3ef10f1..dd88b1d461 100644 --- a/src/soc/intel/alderlake/pmc.c +++ b/src/soc/intel/alderlake/pmc.c @@ -23,13 +23,6 @@ #define PMC_HID "INTC1026" -enum pch_pmc_xtal pmc_get_xtal_freq(void) -{ - uint8_t *const pmcbase = pmc_mmio_regs(); - - return PCH_EPOC_XTAL_FREQ(read32(pmcbase + PCH_PMC_EPOC)); -} - static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable) { uint32_t reg; diff --git a/src/soc/intel/alderlake/soundwire.c b/src/soc/intel/alderlake/soundwire.c index c3ff05d2e3..1fbdb4418e 100644 --- a/src/soc/intel/alderlake/soundwire.c +++ b/src/soc/intel/alderlake/soundwire.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include -- cgit v1.2.3