Skip to content

Commit 59028ad

Browse files
committed
drivers: Intel: remove Intel XTOS drivers
Now that Intel cAVS2.5 has been migrated to use native Zephyr drivers, we have no need to keep the Intel specific XTOS drivers in the tree anymore. Adjust board configuration files to not refer to removed Kconfig options. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 35b17a4 commit 59028ad

25 files changed

+2
-7387
lines changed

app/boards/intel_adsp_ace15_mtpm.conf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
CONFIG_METEORLAKE=y
22
CONFIG_IPC_MAJOR_4=y
33

4-
# turn off SOF drivers
5-
CONFIG_INTEL_DMIC=n
6-
CONFIG_INTEL_DMIC_NHLT=n
7-
CONFIG_INTEL_SSP=n
8-
CONFIG_INTEL_ALH=n
94
CONFIG_COMP_SRC=y
105
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
116
CONFIG_COMP_DRC=y

app/boards/intel_adsp_ace20_lnl.conf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
CONFIG_LUNARLAKE=y
22
CONFIG_IPC_MAJOR_4=y
33

4-
# turn off SOF drivers
5-
CONFIG_INTEL_DMIC=n
6-
CONFIG_INTEL_DMIC_NHLT=n
7-
CONFIG_INTEL_SSP=n
8-
CONFIG_INTEL_ALH=n
94
CONFIG_COMP_SRC=y
105

116
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y

app/boards/intel_adsp_cavs25.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
CONFIG_TIGERLAKE=y
2-
CONFIG_INTEL_DMIC=y
32
CONFIG_COMP_CHAIN_DMA=y
4-
CONFIG_DMIC_HW_IOCLK=38400000
5-
CONFIG_INTEL_SSP=y
63
CONFIG_AMS=y
7-
CONFIG_INTEL_ALH=y
84
CONFIG_LP_MEMORY_BANKS=1
95
CONFIG_HP_MEMORY_BANKS=30
106
CONFIG_MM_DRV=y

app/boards/intel_adsp_cavs25_tgph.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_TIGERLAKE=y
2-
CONFIG_INTEL_DMIC=y
32
CONFIG_COMP_CHAIN_DMA=y
43
CONFIG_LP_MEMORY_BANKS=1
54
CONFIG_HP_MEMORY_BANKS=30

src/drivers/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ if(CONFIG_IMX)
44
add_subdirectory(imx)
55
endif()
66

7-
if(CONFIG_INTEL)
8-
add_subdirectory(intel)
9-
endif()
10-
117
if(CONFIG_AMD)
128
add_subdirectory(amd)
139
endif()

src/drivers/intel/CMakeLists.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/drivers/intel/Kconfig

Lines changed: 2 additions & 203 deletions
Original file line numberDiff line numberDiff line change
@@ -1,211 +1,10 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22

3-
config INTEL_HDA
4-
bool "Intel HDA driver"
5-
depends on CAVS
6-
default n
7-
help
8-
Select this to enable Intel HDA driver. The HDA driver provides
9-
interface for host and HD-Audio data transfers.
10-
3+
# TODO: to be removed once Zephyr SSP driver has been updated
4+
# not to depend on this
115
config INTEL_MN
126
bool
137
depends on CAVS
148
default n
159
help
1610
Select this if the platform supports M/N dividers.
17-
18-
config INTEL_MCLK
19-
bool
20-
depends on CAVS
21-
default n
22-
help
23-
Select this to enable driver for Intel MCLK and M/N dividers.
24-
25-
config INTEL_SSP
26-
bool "Intel SSP driver"
27-
depends on CAVS
28-
select INTEL_MCLK
29-
default n
30-
help
31-
Select this to enable Intel Synchronous Serial Port (SSP) driver.
32-
33-
config INTEL_ALH
34-
bool "Intel ALH driver"
35-
depends on CAVS
36-
default n
37-
help
38-
Select this to enable Intel ALH driver.
39-
The ALH is an intermediary device, which acts as a hub and provides an
40-
abstracted support for numerous sound interfaces (e.g. SoundWire).
41-
42-
config INTEL_DMIC
43-
bool "Intel DMIC driver"
44-
depends on CAVS
45-
select NUMBERS_NORM
46-
select NUMBERS_VECTOR_FIND
47-
select MATH_DECIBELS
48-
default n
49-
help
50-
Select this to enable Intel DMIC driver. The DMIC driver provides
51-
as DAI the SoC direct attach digital microphones interface.
52-
53-
if INTEL_DMIC
54-
55-
config DMIC_HW_IOCLK
56-
int "Set DMIC hw IO clock"
57-
default 0
58-
help
59-
Hardware specific DMIC IO clock speed defined by each platform.
60-
May be overridden from hardware values for simulation purposes.
61-
62-
choice
63-
prompt "Driver operation mode"
64-
default INTEL_DMIC_TPLG_PARAMS
65-
help
66-
The driver can support two operation modes.
67-
- A HW registers dump blob that is passed via IPC
68-
- DAI tokens those describe the use case PCM format
69-
and PDM bus and microphone parameters
70-
71-
config INTEL_DMIC_NHLT
72-
bool "Use NHLT DMIC blob"
73-
help
74-
All registers configuration is retrieved from blob. The
75-
number of channels, sample rate, and PCM format are
76-
defined in the blob and there are no runtime made
77-
configuration choices.
78-
79-
config INTEL_DMIC_TPLG_PARAMS
80-
bool "Use parameters from topology"
81-
help
82-
All registers confifguration is computed on the fly
83-
based on use case and microphone datasheet parameters
84-
and topology defined PCM format. The parameters are
85-
easy to to customize in the topology.
86-
87-
endchoice
88-
89-
if INTEL_DMIC_TPLG_PARAMS
90-
91-
choice
92-
prompt "FIR decimation coefficients set"
93-
default INTEL_DMIC_FIR_FULL
94-
95-
config INTEL_DMIC_FIR_FULL
96-
bool "Full set"
97-
select INTEL_DMIC_FIR_DECIMATE_BY_2
98-
select INTEL_DMIC_FIR_DECIMATE_BY_3
99-
select INTEL_DMIC_FIR_DECIMATE_BY_4
100-
select INTEL_DMIC_FIR_DECIMATE_BY_5
101-
select INTEL_DMIC_FIR_DECIMATE_BY_6
102-
select INTEL_DMIC_FIR_DECIMATE_BY_8
103-
select INTEL_DMIC_FIR_DECIMATE_BY_10
104-
select INTEL_DMIC_FIR_DECIMATE_BY_12
105-
help
106-
This option adds to previous all currently defined FIR
107-
coefficients sets to support sample rates 8 - 96 kHz with
108-
several microphone clock rates. The tables increase the size
109-
of the driver so this option should not be used in minimal
110-
systems.
111-
112-
config INTEL_DMIC_FIR_LOW_MEMORY
113-
bool "Small set"
114-
select INTEL_DMIC_FIR_DECIMATE_BY_2
115-
select INTEL_DMIC_FIR_DECIMATE_BY_6
116-
help
117-
This option is used to minimize driver footprint but
118-
preserve support for 48 kHz and 16 kHz sample rates
119-
at typical 2.4 MHz microphone clock rate. The option
120-
enables decimation factors 2 and 6.
121-
122-
config INTEL_DMIC_FIR_CUSTOM
123-
bool "Custom set"
124-
help
125-
This option is used to select each supported decimation
126-
factor.
127-
128-
endchoice
129-
130-
menu "Decimation factors"
131-
visible if INTEL_DMIC_FIR_CUSTOM
132-
133-
config INTEL_DMIC_FIR_DECIMATE_BY_2
134-
bool "FIR decimate by 2"
135-
default n
136-
help
137-
This includes FIR coefficients to decimate by 2 into the build. It
138-
is commonly used for 48 kHz capture with 2.4 MHz microphone clock.
139-
Decimate by 2 in FIR gives good bandwidth vs. Nyquist and narrow
140-
transition region due to lower FIR order need compared to higher
141-
decimation factors.
142-
143-
config INTEL_DMIC_FIR_DECIMATE_BY_3
144-
bool "FIR decimate by 3"
145-
default n
146-
help
147-
This includes FIR coefficients to decimate by 3 into the build.
148-
Decimation by 3 in FIR is useful with microphone clock and sample
149-
rate combinations where a 3 is the lowest factor of the oversampling
150-
ratio. Having this low prime decimation factor for FIR enabled is
151-
useful when decimation by 2 is not possible.
152-
153-
config INTEL_DMIC_FIR_DECIMATE_BY_4
154-
bool "FIR decimate by 4"
155-
default n
156-
help
157-
This includes FIR coefficients to decimate by 4 into the build.
158-
Decimation by 4 in FIR is useful in some cases with high microphone
159-
clock rates due to max. decimation factor limit of CIC. In such
160-
cases decimation by 2 may not be usable.
161-
162-
config INTEL_DMIC_FIR_DECIMATE_BY_5
163-
bool "FIR decimate by 5"
164-
default n
165-
help
166-
This includes FIR coefficients to decimate by 5 into the build.
167-
Decimation by 5 in FIR is useful with microphone clock and sample
168-
rate combinations where a 5 is the lowest factor of the oversampling
169-
ratio.
170-
171-
config INTEL_DMIC_FIR_DECIMATE_BY_6
172-
bool "FIR decimate by 6"
173-
default n
174-
help
175-
This includes FIR coefficients to decimate by 6 into the build. It
176-
is commonly used for 16 kHz capture from secondary FIFO while
177-
primary FIFO is configured for 48 kHz rate.
178-
179-
config INTEL_DMIC_FIR_DECIMATE_BY_8
180-
bool "FIR decimate by 8"
181-
default n
182-
help
183-
This includes FIR coefficients to decimate by 8 into the build.
184-
The high FIR decimation factors are needed for high microphone clock
185-
rates due to max. decimation factor limitation of CIC. Also dual
186-
FIFO configurations may need for one FIR decimation such high
187-
decimation factor.
188-
189-
config INTEL_DMIC_FIR_DECIMATE_BY_10
190-
bool "FIR decimate by 10"
191-
default n
192-
help
193-
This includes FIR coefficients to decimate by 10 into the build.
194-
The high FIR decimation factors are needed for high microphone clock
195-
rates due to max. decimation factor limitation of CIC. Also dual
196-
FIFO configurations may need for one FIR decimation such high
197-
decimation factor.
198-
199-
config INTEL_DMIC_FIR_DECIMATE_BY_12
200-
bool "FIR decimate by 12"
201-
default n
202-
help
203-
This includes FIR coefficients to decimate by 12 into the build. It
204-
is used for 16 kHz capture for secondary FIFO while the primary
205-
FIFO is configured for 96 kHz.
206-
207-
endmenu # "Decimation factors"
208-
209-
endif
210-
211-
endif # INTEL_DMIC

0 commit comments

Comments
 (0)