Skip to content

Commit 264555a

Browse files
kv2019ikv2019i
committed
app: boards: intel_adsp: move common driver settings to shared file
Move common Zephyr driver options to the shared defconfig file for Intel DSPs. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent c564b67 commit 264555a

11 files changed

+16
-72
lines changed

‎app/boards/intel_adsp/Kconfig.defconfig‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,22 @@ config CLOCK_CONTROL
9696
# note: CONFIG_CLOCK_CONTROL_ADSP is enabled by default
9797
# based on DT definition.
9898

99+
config DAI
100+
default y
101+
102+
config DAI_INTEL_DMIC
103+
default y
104+
105+
config DAI_INTEL_SSP
106+
default y
107+
108+
config INTEL_ADSP_IPC
109+
default y
110+
111+
config INTEL_ADSP_TIMER
112+
default y
113+
114+
99115
# Zephyr / logging
100116
# ----------------------------------------
101117

‎app/boards/intel_adsp_ace15_mtpm.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,12 @@ CONFIG_THREAD_RUNTIME_STATS=y
6464
CONFIG_SCHED_THREAD_USAGE=y
6565

6666
# Zephyr / device drivers
67-
CONFIG_DAI=y
6867
CONFIG_DAI_DMIC_HAS_OWNERSHIP=y
6968
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
7069
CONFIG_DAI_DMIC_HW_IOCLK=38400000
7170
CONFIG_DAI_INIT_PRIORITY=70
72-
CONFIG_DAI_INTEL_DMIC=y
73-
CONFIG_DAI_INTEL_DMIC_NHLT=y
74-
CONFIG_DAI_INTEL_SSP=y
75-
CONFIG_DMA=y
7671
CONFIG_DMA_DW_LLI_POOL_SIZE=50
7772
CONFIG_DMA_INTEL_ADSP_GPDMA=y
78-
CONFIG_INTEL_ADSP_IPC=y
79-
CONFIG_INTEL_ADSP_TIMER=y
8073
CONFIG_MEMORY_WIN_2_SIZE=12288
8174
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
8275
CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2

‎app/boards/intel_adsp_ace20_lnl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,11 @@ CONFIG_MODULES=y
4444
CONFIG_TIMING_FUNCTIONS=y
4545

4646
# Zephyr / device drivers
47-
CONFIG_DAI=y
4847
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
4948
CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
5049
CONFIG_DAI_DMIC_HW_IOCLK=38400000
5150
CONFIG_DAI_INIT_PRIORITY=70
52-
CONFIG_DAI_INTEL_DMIC=y
53-
CONFIG_DAI_INTEL_DMIC_NHLT=y
54-
CONFIG_DAI_INTEL_SSP=y
55-
CONFIG_DMA=y
5651
CONFIG_DMA_INTEL_ADSP_GPDMA=n
57-
CONFIG_INTEL_ADSP_IPC=y
58-
CONFIG_INTEL_ADSP_TIMER=y
5952
CONFIG_MEMORY_WIN_2_SIZE=12288
6053
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
6154
CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2

‎app/boards/intel_adsp_ace30_ptl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,12 @@ CONFIG_LLEXT_EXPERIMENTAL=y
4343
CONFIG_MODULES=y
4444

4545
# Zephyr / device drivers
46-
CONFIG_DAI=y
4746
CONFIG_DAI_INIT_PRIORITY=70
48-
CONFIG_DAI_INTEL_DMIC=y
4947
CONFIG_DAI_DMIC_HW_IOCLK=38400000
50-
CONFIG_DAI_INTEL_DMIC_NHLT=y
5148
CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
5249
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
53-
CONFIG_DAI_INTEL_SSP=y
54-
CONFIG_DMA=y
5550
CONFIG_DMA_INTEL_ADSP_GPDMA=n
5651
CONFIG_DMA_DW_LLI_POOL_SIZE=50
57-
CONFIG_INTEL_ADSP_IPC=y
58-
CONFIG_INTEL_ADSP_TIMER=y
5952
CONFIG_MEMORY_WIN_2_SIZE=12288
6053
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
6154
CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2

‎app/boards/intel_adsp_ace30_ptl_sim.conf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,15 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1010
CONFIG_PM=n
1111

1212
# enable Zephyr drivers
13-
CONFIG_DAI=y
1413
CONFIG_DAI_INIT_PRIORITY=70
15-
CONFIG_DAI_INTEL_DMIC=y
1614
CONFIG_DAI_DMIC_HW_IOCLK=19200000
17-
CONFIG_DAI_INTEL_DMIC_NHLT=y
1815
CONFIG_DAI_DMIC_HAS_OWNERSHIP=y
1916
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
2017
CONFIG_DAI_INTEL_SSP=n
21-
CONFIG_DMA=y
2218
CONFIG_DMA_INTEL_ADSP_GPDMA=n
2319
CONFIG_DMA_DW_LLI_POOL_SIZE=50
2420
CONFIG_INTEL_MODULES=n
2521
CONFIG_LIBRARY_MANAGER=n
26-
CONFIG_INTEL_ADSP_TIMER=y
2722

2823
CONFIG_HEAP_MEM_POOL_SIZE=8192
2924
CONFIG_RIMAGE_SIGNING_SCHEMA="ptl"

‎app/boards/intel_adsp_ace30_wcl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,11 @@ CONFIG_LLEXT_EXPERIMENTAL=y
3737
CONFIG_MODULES=y
3838

3939
# Zephyr / device drivers
40-
CONFIG_DAI=y
4140
CONFIG_DAI_INIT_PRIORITY=70
42-
CONFIG_DAI_INTEL_DMIC=y
4341
CONFIG_DAI_DMIC_HW_IOCLK=38400000
44-
CONFIG_DAI_INTEL_DMIC_NHLT=y
4542
CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
4643
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
47-
CONFIG_DAI_INTEL_SSP=y
48-
CONFIG_DMA=y
4944
CONFIG_DMA_INTEL_ADSP_GPDMA=n
50-
CONFIG_INTEL_ADSP_IPC=y
51-
CONFIG_INTEL_ADSP_TIMER=y
5245
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
5346
CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2
5447
CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000

‎app/boards/intel_adsp_ace30_wcl_sim.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1010
CONFIG_PM=n
1111

1212
# enable Zephyr drivers
13-
CONFIG_DAI=y
1413
CONFIG_DAI_INIT_PRIORITY=70
15-
CONFIG_DAI_INTEL_DMIC=y
1614
CONFIG_DAI_DMIC_HW_IOCLK=19200000
17-
CONFIG_DAI_INTEL_DMIC_NHLT=y
1815
CONFIG_DAI_DMIC_HAS_OWNERSHIP=y
1916
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
2017
CONFIG_DAI_INTEL_SSP=n
21-
CONFIG_DMA=y
2218
CONFIG_DMA_INTEL_ADSP_GPDMA=n
2319
CONFIG_INTEL_MODULES=n
2420
CONFIG_LIBRARY_MANAGER=n
@@ -40,9 +36,6 @@ CONFIG_SOF_LOG_LEVEL_INF=n
4036
CONFIG_SOF_LOG_LEVEL_OFF=y
4137
CONFIG_ZEPHYR_LOG=n
4238

43-
CONFIG_INTEL_ADSP_IPC=y
44-
45-
4639
# Temporary disabled options
4740
CONFIG_PM_DEVICE=y
4841
CONFIG_PM_DEVICE_RUNTIME=n

‎app/boards/intel_adsp_ace40_nvl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,11 @@ CONFIG_SOF_LOG_LEVEL_INF=y
3232
CONFIG_HEAP_MEM_POOL_SIZE=8192
3333

3434
# Zephyr / device drivers
35-
CONFIG_DAI=y
3635
CONFIG_DAI_INIT_PRIORITY=70
37-
CONFIG_DAI_INTEL_DMIC=y
3836
CONFIG_DAI_DMIC_HW_IOCLK=38400000
39-
CONFIG_DAI_INTEL_DMIC_NHLT=y
4037
CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
4138
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
42-
CONFIG_DAI_INTEL_SSP=y
43-
CONFIG_DMA=y
4439
CONFIG_DMA_INTEL_ADSP_GPDMA=n
45-
CONFIG_INTEL_ADSP_IPC=y
46-
CONFIG_INTEL_ADSP_TIMER=y
4740
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
4841
CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
4942

‎app/boards/intel_adsp_ace40_nvls.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,11 @@ CONFIG_SOF_LOG_LEVEL_INF=y
3333
CONFIG_HEAP_MEM_POOL_SIZE=8192
3434

3535
# Zephyr / device drivers
36-
CONFIG_DAI=y
3736
CONFIG_DAI_INIT_PRIORITY=70
38-
CONFIG_DAI_INTEL_DMIC=y
3937
CONFIG_DAI_DMIC_HW_IOCLK=38400000
40-
CONFIG_DAI_INTEL_DMIC_NHLT=y
4138
CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
4239
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
43-
CONFIG_DAI_INTEL_SSP=y
44-
CONFIG_DMA=y
4540
CONFIG_DMA_INTEL_ADSP_GPDMA=n
46-
CONFIG_INTEL_ADSP_IPC=y
47-
CONFIG_INTEL_ADSP_TIMER=y
4841
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
4942
CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
5043

‎app/boards/intel_adsp_cavs25.conf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,12 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
3636
CONFIG_HEAP_MEM_POOL_SIZE=8192
3737

3838
# Zephyr / device drivers
39-
CONFIG_DAI=y
4039
CONFIG_DAI_INIT_PRIORITY=70
41-
CONFIG_DAI_INTEL_SSP=y
42-
CONFIG_DAI_INTEL_DMIC=y
43-
CONFIG_DAI_INTEL_ALH=y
44-
CONFIG_DAI_INTEL_DMIC_NHLT=y
45-
CONFIG_DAI_INTEL_HDA=y
4640
CONFIG_DAI_DMIC_HW_IOCLK=38400000
47-
CONFIG_DMA=y
4841
CONFIG_DMA_DW_LLI_POOL_SIZE=100
4942
CONFIG_DMA_DW_HW_LLI=y
5043
CONFIG_DMA_DW_FIFO_PARTITION=y
5144
CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y
52-
CONFIG_INTEL_ADSP_IPC=y
53-
CONFIG_INTEL_ADSP_TIMER=y
5445
CONFIG_MM_DRV=y
5546

5647
# Zephyr / power settings

0 commit comments

Comments
 (0)