diff options
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/intel/skylake/bootblock/pch.c | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index ae86198935..e22f1e37a4 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -52,6 +52,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_BLOCK select SOC_INTEL_COMMON_BLOCK_GSPI select SOC_INTEL_COMMON_BLOCK_PCR + select SOC_INTEL_COMMON_BLOCK_RTC select SOC_INTEL_COMMON_BLOCK_SA select SOC_INTEL_COMMON_BLOCK_XHCI select SOC_INTEL_COMMON_LPSS_I2C diff --git a/src/soc/intel/skylake/bootblock/pch.c b/src/soc/intel/skylake/bootblock/pch.c index ebd68f1988..12ce3d00a9 100644 --- a/src/soc/intel/skylake/bootblock/pch.c +++ b/src/soc/intel/skylake/bootblock/pch.c @@ -19,6 +19,7 @@ #include <device/device.h> #include <device/pci_def.h> #include <intelblocks/pcr.h> +#include <intelblocks/rtc.h> #include <soc/bootblock.h> #include <soc/iomap.h> #include <soc/itss.h> @@ -45,9 +46,6 @@ #define PCR_DMI_LPCIOD 0x2770 #define PCR_DMI_LPCIOE 0x2774 -#define PCR_RTC_CONF 0x3400 -#define PCR_RTC_CONF_UCMOS_EN 0x4 - /* * Enable Prefetching and Caching. */ @@ -247,12 +245,6 @@ static void soc_config_tco(void) outw(tcocnt, tcobase + TCO1_CNT); } -static void soc_config_rtc(void) -{ - /* Enable upper 128 bytes of CMOS */ - pcr_or32(PID_RTC, PCR_RTC_CONF, PCR_RTC_CONF_UCMOS_EN); -} - static void enable_heci(void) { device_t dev = PCH_DEV_CSE; @@ -322,7 +314,7 @@ void pch_early_init(void) /* Set up GPE configuration */ pmc_gpe_init(); - soc_config_rtc(); + enable_rtc_upper_bank(); enable_heci(); } |