Skip to content

Commit

Permalink
drivers: Intel: remove Intel XTOS drivers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kv2019i committed Aug 18, 2023
1 parent de11d51 commit 53c16ba
Show file tree
Hide file tree
Showing 25 changed files with 2 additions and 7,387 deletions.
5 changes: 0 additions & 5 deletions app/boards/intel_adsp_ace15_mtpm.conf
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
CONFIG_METEORLAKE=y
CONFIG_IPC_MAJOR_4=y

# turn off SOF drivers
CONFIG_INTEL_DMIC=n
CONFIG_INTEL_DMIC_NHLT=n
CONFIG_INTEL_SSP=n
CONFIG_INTEL_ALH=n
CONFIG_COMP_SRC=y
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
CONFIG_COMP_DRC=y
Expand Down
5 changes: 0 additions & 5 deletions app/boards/intel_adsp_ace20_lnl.conf
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
CONFIG_LUNARLAKE=y
CONFIG_IPC_MAJOR_4=y

# turn off SOF drivers
CONFIG_INTEL_DMIC=n
CONFIG_INTEL_DMIC_NHLT=n
CONFIG_INTEL_SSP=n
CONFIG_INTEL_ALH=n
CONFIG_COMP_SRC=y

CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
Expand Down
4 changes: 0 additions & 4 deletions app/boards/intel_adsp_cavs25.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
CONFIG_TIGERLAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_COMP_CHAIN_DMA=y
CONFIG_DMIC_HW_IOCLK=38400000
CONFIG_INTEL_SSP=y
CONFIG_AMS=y
CONFIG_INTEL_ALH=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=30
CONFIG_MM_DRV=y
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_cavs25_tgph.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
CONFIG_TIGERLAKE=y
CONFIG_INTEL_DMIC=y
CONFIG_COMP_CHAIN_DMA=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=30
Expand Down
4 changes: 0 additions & 4 deletions src/drivers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ if(CONFIG_IMX)
add_subdirectory(imx)
endif()

if(CONFIG_INTEL)
add_subdirectory(intel)
endif()

if(CONFIG_AMD)
add_subdirectory(amd)
endif()
Expand Down
21 changes: 0 additions & 21 deletions src/drivers/intel/CMakeLists.txt

This file was deleted.

205 changes: 2 additions & 203 deletions src/drivers/intel/Kconfig
Original file line number Diff line number Diff line change
@@ -1,211 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause

config INTEL_HDA
bool "Intel HDA driver"
depends on CAVS
default n
help
Select this to enable Intel HDA driver. The HDA driver provides
interface for host and HD-Audio data transfers.

# TODO: to be removed once Zephyr SSP driver has been updated
# not to depend on this
config INTEL_MN
bool
depends on CAVS
default n
help
Select this if the platform supports M/N dividers.

config INTEL_MCLK
bool
depends on CAVS
default n
help
Select this to enable driver for Intel MCLK and M/N dividers.

config INTEL_SSP
bool "Intel SSP driver"
depends on CAVS
select INTEL_MCLK
default n
help
Select this to enable Intel Synchronous Serial Port (SSP) driver.

config INTEL_ALH
bool "Intel ALH driver"
depends on CAVS
default n
help
Select this to enable Intel ALH driver.
The ALH is an intermediary device, which acts as a hub and provides an
abstracted support for numerous sound interfaces (e.g. SoundWire).

config INTEL_DMIC
bool "Intel DMIC driver"
depends on CAVS
select NUMBERS_NORM
select NUMBERS_VECTOR_FIND
select MATH_DECIBELS
default n
help
Select this to enable Intel DMIC driver. The DMIC driver provides
as DAI the SoC direct attach digital microphones interface.

if INTEL_DMIC

config DMIC_HW_IOCLK
int "Set DMIC hw IO clock"
default 0
help
Hardware specific DMIC IO clock speed defined by each platform.
May be overridden from hardware values for simulation purposes.

choice
prompt "Driver operation mode"
default INTEL_DMIC_TPLG_PARAMS
help
The driver can support two operation modes.
- A HW registers dump blob that is passed via IPC
- DAI tokens those describe the use case PCM format
and PDM bus and microphone parameters

config INTEL_DMIC_NHLT
bool "Use NHLT DMIC blob"
help
All registers configuration is retrieved from blob. The
number of channels, sample rate, and PCM format are
defined in the blob and there are no runtime made
configuration choices.

config INTEL_DMIC_TPLG_PARAMS
bool "Use parameters from topology"
help
All registers confifguration is computed on the fly
based on use case and microphone datasheet parameters
and topology defined PCM format. The parameters are
easy to to customize in the topology.

endchoice

if INTEL_DMIC_TPLG_PARAMS

choice
prompt "FIR decimation coefficients set"
default INTEL_DMIC_FIR_FULL

config INTEL_DMIC_FIR_FULL
bool "Full set"
select INTEL_DMIC_FIR_DECIMATE_BY_2
select INTEL_DMIC_FIR_DECIMATE_BY_3
select INTEL_DMIC_FIR_DECIMATE_BY_4
select INTEL_DMIC_FIR_DECIMATE_BY_5
select INTEL_DMIC_FIR_DECIMATE_BY_6
select INTEL_DMIC_FIR_DECIMATE_BY_8
select INTEL_DMIC_FIR_DECIMATE_BY_10
select INTEL_DMIC_FIR_DECIMATE_BY_12
help
This option adds to previous all currently defined FIR
coefficients sets to support sample rates 8 - 96 kHz with
several microphone clock rates. The tables increase the size
of the driver so this option should not be used in minimal
systems.

config INTEL_DMIC_FIR_LOW_MEMORY
bool "Small set"
select INTEL_DMIC_FIR_DECIMATE_BY_2
select INTEL_DMIC_FIR_DECIMATE_BY_6
help
This option is used to minimize driver footprint but
preserve support for 48 kHz and 16 kHz sample rates
at typical 2.4 MHz microphone clock rate. The option
enables decimation factors 2 and 6.

config INTEL_DMIC_FIR_CUSTOM
bool "Custom set"
help
This option is used to select each supported decimation
factor.

endchoice

menu "Decimation factors"
visible if INTEL_DMIC_FIR_CUSTOM

config INTEL_DMIC_FIR_DECIMATE_BY_2
bool "FIR decimate by 2"
default n
help
This includes FIR coefficients to decimate by 2 into the build. It
is commonly used for 48 kHz capture with 2.4 MHz microphone clock.
Decimate by 2 in FIR gives good bandwidth vs. Nyquist and narrow
transition region due to lower FIR order need compared to higher
decimation factors.

config INTEL_DMIC_FIR_DECIMATE_BY_3
bool "FIR decimate by 3"
default n
help
This includes FIR coefficients to decimate by 3 into the build.
Decimation by 3 in FIR is useful with microphone clock and sample
rate combinations where a 3 is the lowest factor of the oversampling
ratio. Having this low prime decimation factor for FIR enabled is
useful when decimation by 2 is not possible.

config INTEL_DMIC_FIR_DECIMATE_BY_4
bool "FIR decimate by 4"
default n
help
This includes FIR coefficients to decimate by 4 into the build.
Decimation by 4 in FIR is useful in some cases with high microphone
clock rates due to max. decimation factor limit of CIC. In such
cases decimation by 2 may not be usable.

config INTEL_DMIC_FIR_DECIMATE_BY_5
bool "FIR decimate by 5"
default n
help
This includes FIR coefficients to decimate by 5 into the build.
Decimation by 5 in FIR is useful with microphone clock and sample
rate combinations where a 5 is the lowest factor of the oversampling
ratio.

config INTEL_DMIC_FIR_DECIMATE_BY_6
bool "FIR decimate by 6"
default n
help
This includes FIR coefficients to decimate by 6 into the build. It
is commonly used for 16 kHz capture from secondary FIFO while
primary FIFO is configured for 48 kHz rate.

config INTEL_DMIC_FIR_DECIMATE_BY_8
bool "FIR decimate by 8"
default n
help
This includes FIR coefficients to decimate by 8 into the build.
The high FIR decimation factors are needed for high microphone clock
rates due to max. decimation factor limitation of CIC. Also dual
FIFO configurations may need for one FIR decimation such high
decimation factor.

config INTEL_DMIC_FIR_DECIMATE_BY_10
bool "FIR decimate by 10"
default n
help
This includes FIR coefficients to decimate by 10 into the build.
The high FIR decimation factors are needed for high microphone clock
rates due to max. decimation factor limitation of CIC. Also dual
FIFO configurations may need for one FIR decimation such high
decimation factor.

config INTEL_DMIC_FIR_DECIMATE_BY_12
bool "FIR decimate by 12"
default n
help
This includes FIR coefficients to decimate by 12 into the build. It
is used for 16 kHz capture for secondary FIFO while the primary
FIFO is configured for 96 kHz.

endmenu # "Decimation factors"

endif

endif # INTEL_DMIC
Loading

0 comments on commit 53c16ba

Please sign in to comment.