Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

topology1: add sof-adl-rt1316-l02-4ch support #9740

Open
wants to merge 2 commits into
base: stable-v2.2
Choose a base branch
from
Open

topology1: add sof-adl-rt1316-l02-4ch support #9740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9c62e2
Topology1: sof-icl-rt711-rt1308-rt715-hdmi: add PCH DMIC support
bardliao Dec 20, 2024
21d31f8
topology1: add sof-adl-rt1316-l02-4ch support
bardliao Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tools/topology/topology1/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ set(TPLGS
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l12-rt714-l0\;-DPLATFORM=adl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0"
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-l3\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=3"
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-rpl-rt1316-l12-rt714-l0\;-DPLATFORM=rpl\;-DNOJACK\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DEXT_AMP_REF\;-DMIC_LINK=0\;-DDYNAMIC=1"
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l02-4ch\;-DCHANNELS=4\;-DEXT_AMP\;-DEXT_AMP_REF\;-DNOJACK\;-DNOHDMI4\;-DNO_LOCAL_MIC\;-DAMP_1_LINK=0\;-DAMP_2_LINK=2\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DPLATFORM=adl"
## end SoundWire NOJACK topologies

"sof-ehl-rt5660\;sof-ehl-rt5660\;-DHDMI=1"
Expand Down
29 changes: 29 additions & 0 deletions tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
# Topology for Icelake with rt711 + rt1308 (x2) + rt715.
#

# if XPROC is not defined, define with default pipe
ifdef(`DMICPROC', , `define(DMICPROC, eq-iir-volume)')
ifdef(`DMIC16KPROC', , `define(DMIC16KPROC, eq-iir-volume)')

# Include topology builder
include(`utils.m4')
include(`dai.m4')
include(`pipeline.m4')
include(`alh.m4')
include(`muxdemux.m4')
include(`hda.m4')
include(`platform/intel/dmic.m4')

# Include TLV library
include(`common/tlv.m4')
Expand All @@ -19,6 +24,9 @@ include(`sof/tokens.m4')
# Include Platform specific DSP configuration
include(`platform/intel/'PLATFORM`.m4')

ifdef(`CHANNELS',`',
`define(CHANNELS, `0')')

ifdef(`UAJ_LINK',`',
`define(UAJ_LINK, `0')')

Expand Down Expand Up @@ -91,6 +99,27 @@ ifdef(`NO_LOCAL_MIC', `',
define(HDMI_BE_ID_BASE, `5')'
)

# Define pipeline id for intel-generic-dmic.m4
# to generate dmic setting
ifelse(CHANNELS, `0',
`
'
,
`
define(DMIC_PCM_48k_ID, `10')
define(DMIC_PCM_16k_ID, `11')
define(DMIC_PIPELINE_48k_ID, `10')
define(DMIC_PIPELINE_16k_ID, `11')

define(DMIC_DAI_LINK_48k_ID, `4')
define(DMIC_DAI_LINK_16k_ID, eval(DMIC_DAI_LINK_48k_ID+1))
include(`platform/intel/intel-generic-dmic.m4')
undefine(`HDMI_BE_ID_BASE')
define(HDMI_BE_ID_BASE, eval(DMIC_DAI_LINK_16k_ID+1))
'
)


DEBUG_START

dnl Configure demux
Expand Down
Loading