diff --git a/src/arch/xtensa/configs/cannonlake_defconfig b/src/arch/xtensa/configs/cannonlake_defconfig index 60b02f93fc93..f9154d8b746e 100644 --- a/src/arch/xtensa/configs/cannonlake_defconfig +++ b/src/arch/xtensa/configs/cannonlake_defconfig @@ -2,8 +2,6 @@ CONFIG_CANNONLAKE=y CONFIG_CAVS_DMIC=y CONFIG_CAVS_SSP=y CONFIG_CAVS_ALH=y -CONFIG_CAVS_LPS=y -CONFIG_CAVS_LPRO=y CONFIG_CORE_COUNT=4 CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=47 diff --git a/src/arch/xtensa/configs/icelake_defconfig b/src/arch/xtensa/configs/icelake_defconfig index 160a542b405a..53ac339451c4 100644 --- a/src/arch/xtensa/configs/icelake_defconfig +++ b/src/arch/xtensa/configs/icelake_defconfig @@ -2,7 +2,6 @@ CONFIG_ICELAKE=y CONFIG_CAVS_DMIC=y CONFIG_CAVS_SSP=y CONFIG_CAVS_ALH=y -CONFIG_CAVS_LPRO=y CONFIG_CORE_COUNT=4 CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=47 diff --git a/src/arch/xtensa/configs/override/cannonlake_chrome.config b/src/arch/xtensa/configs/override/cannonlake_chrome.config new file mode 100644 index 000000000000..3ac57df516da --- /dev/null +++ b/src/arch/xtensa/configs/override/cannonlake_chrome.config @@ -0,0 +1,2 @@ +CONFIG_CAVS_LPS=y +CONFIG_CAVS_LPRO=y diff --git a/src/arch/xtensa/configs/override/jasperlake_chrome.config b/src/arch/xtensa/configs/override/jasperlake_chrome.config new file mode 100644 index 000000000000..3ac57df516da --- /dev/null +++ b/src/arch/xtensa/configs/override/jasperlake_chrome.config @@ -0,0 +1,2 @@ +CONFIG_CAVS_LPS=y +CONFIG_CAVS_LPRO=y diff --git a/src/arch/xtensa/configs/override/tigerlake_chrome.config b/src/arch/xtensa/configs/override/tigerlake_chrome.config new file mode 100644 index 000000000000..79cee681a82b --- /dev/null +++ b/src/arch/xtensa/configs/override/tigerlake_chrome.config @@ -0,0 +1 @@ +CONFIG_CAVS_LPS=y diff --git a/src/arch/xtensa/configs/tigerlake_defconfig b/src/arch/xtensa/configs/tigerlake_defconfig index aabcfca06988..18e9e22d9228 100644 --- a/src/arch/xtensa/configs/tigerlake_defconfig +++ b/src/arch/xtensa/configs/tigerlake_defconfig @@ -2,7 +2,6 @@ CONFIG_TIGERLAKE=y CONFIG_CAVS_DMIC=y CONFIG_CAVS_SSP=y CONFIG_CAVS_ALH=y -CONFIG_CAVS_LPRO=y CONFIG_CORE_COUNT=4 CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=46 diff --git a/src/platform/Kconfig b/src/platform/Kconfig index 0e6c67980cb8..d150d590edbb 100644 --- a/src/platform/Kconfig +++ b/src/platform/Kconfig @@ -260,6 +260,7 @@ config CONFIG_CHERRYTRAIL_EXTRA_DW_DMA config CAVS_LPRO bool "Enable low power ring oscillator as the default clock" + default n depends on CAVS && !CAVS_VERSION_1_5 help Select if you want to use 120MHz LPRO as the DSP clock source.