From b9c62e2c85a7c84de3a76a6d08686c31ea0986fc Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Fri, 20 Dec 2024 10:31:24 +0800 Subject: [PATCH 1/2] Topology1: sof-icl-rt711-rt1308-rt715-hdmi: add PCH DMIC support PCH DMIC may be used along with SoundWire codecs. Signed-off-by: Bard Liao --- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 index c3fd8099199b..26430f3d45fe 100644 --- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -2,6 +2,10 @@ # 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') @@ -9,6 +13,7 @@ include(`pipeline.m4') include(`alh.m4') include(`muxdemux.m4') include(`hda.m4') +include(`platform/intel/dmic.m4') # Include TLV library include(`common/tlv.m4') @@ -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')') @@ -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 From 21d31f842faed084e408f9a7aa01e00d9f40c255 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Thu, 19 Dec 2024 10:12:30 +0800 Subject: [PATCH 2/2] topology1: add sof-adl-rt1316-l02-4ch support The configuration has no jack and use rt1316 amps and PCH DMIC. Signed-off-by: Bard Liao --- tools/topology/topology1/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index 7b473939066e..2f5f0eeaa4e4 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -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"