app: boards: intel_adsp: move common CLOCK_CONTROL options to defconfig

kv2019i · kv2019i · commit c564b672f08b · 2025-09-12T14:31:34.000+03:00
Move common settings for CONFIG_CLOCK_CONTROL_* to the shared defconfig
file Intel DSPs.

Signed-off-by: Kai Vehmanen &lt;kai.vehmanen@linux.intel.com&gt;
diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig
@@ -87,6 +87,15 @@ config ZEPHYR_NATIVE_DRIVERS
 config ZEPHYR_LOG
 	default y
 
+# Zephyr / device drivers
+# ----------------------------------------
+
+config CLOCK_CONTROL
+	default y
+
+# note: CONFIG_CLOCK_CONTROL_ADSP is enabled by default
+# based on DT definition.
+
 # Zephyr / logging
 # ----------------------------------------
 
diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
@@ -64,8 +64,6 @@ CONFIG_THREAD_RUNTIME_STATS=y
 CONFIG_SCHED_THREAD_USAGE=y
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_DMIC_HAS_OWNERSHIP=y
 CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf
@@ -44,8 +44,6 @@ CONFIG_MODULES=y
 CONFIG_TIMING_FUNCTIONS=y
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
 CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf
@@ -43,8 +43,6 @@ CONFIG_LLEXT_EXPERIMENTAL=y
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_INTEL_DMIC=y
diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf
@@ -52,6 +52,4 @@ CONFIG_PM_DEVICE_POWER_DOMAIN=n
 CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
 CONFIG_COMP_KPB=n
 
-CONFIG_CLOCK_CONTROL_ADSP=y
-CONFIG_CLOCK_CONTROL=y
 CONFIG_USERSPACE=y
diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf
@@ -37,8 +37,6 @@ CONFIG_LLEXT_EXPERIMENTAL=y
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_INTEL_DMIC=y
diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf
@@ -50,6 +50,4 @@ CONFIG_PM_DEVICE_POWER_DOMAIN=n
 CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
 CONFIG_COMP_KPB=n
 
-CONFIG_CLOCK_CONTROL_ADSP=y
-CONFIG_CLOCK_CONTROL=y
 CONFIG_USERSPACE=y
diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf
@@ -32,8 +32,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_INTEL_DMIC=y
diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf
@@ -33,8 +33,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_INTEL_DMIC=y
diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf
@@ -36,8 +36,6 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_INTEL_SSP=y
diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf
@@ -36,8 +36,6 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
 
 # Zephyr / device drivers
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_INTEL_SSP=y
