From 9dc73bb8c3d6c025295b9d02e58a40766892ea60 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 5 Nov 2024 16:16:31 +0200 Subject: [PATCH 1/6] versions.js: bump version to 2.11.2 Bump the version to 2.11.2 to prepare for release. Signed-off-by: Kai Vehmanen --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index f7e7858a491d..06213eaa89d7 100644 --- a/versions.json +++ b/versions.json @@ -2,6 +2,6 @@ "SOF": { "MAJOR": "2", "MINOR": "11", - "MICRO": "1" + "MICRO": "2" } } From 6f72c2ce4efbc0fa471706bbaa7bfa6f442a8bdb Mon Sep 17 00:00:00 2001 From: Shuming Fan Date: Tue, 8 Oct 2024 16:32:46 +0800 Subject: [PATCH 2/6] topology2: add rt713 and rt1318 support on LNL machine SDW link0: rt713 SDW link1: rt1318 And 2ch PCH-attached DMICs. Signed-off-by: Shuming Fan (cherry picked from commit d2cf7c3cc859c7d89ddd6cdec880ed20e26dc613) Signed-off-by: Kai Vehmanen --- tools/topology/topology2/production/tplg-targets-ace2.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-ace2.cmake b/tools/topology/topology2/production/tplg-targets-ace2.cmake index 7d97379cc119..e33b849313e8 100644 --- a/tools/topology/topology2/production/tplg-targets-ace2.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace2.cmake @@ -18,6 +18,12 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" +"cavs-sdw\;sof-lnl-rt713-l0-rt1318-l1-2ch\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=1,\ +SDW_SPK_STREAM=SDW1-Playback,SDW_AMP_FEEDBACK=false,\ +NUM_DMICS=2,PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt713-l0-rt1318-l1-2ch.bin,\ +HDMI1_ID=6,HDMI2_ID=7,HDMI3_ID=8" + # No SDW Jack. SDW DMIC+SPK "cavs-sdw\;sof-lnl-rt1318-l12-rt714-l0\;PLATFORM=lnl,SDW_JACK=false,SDW_DMIC=1,\ NUM_SDW_AMP_LINKS=2,SDW_DMIC_STREAM=SDW0-Capture" From 2cedbcc30f93b45c3e9777f6ddf8e7b39a0574f6 Mon Sep 17 00:00:00 2001 From: Mac Chiang Date: Mon, 23 Sep 2024 20:13:06 +0800 Subject: [PATCH 3/6] topology2: add rt722 codec and rt1320 amp support This patch adds below soundwire hardware configuration on ARL platform: link 0: RT722 multi-function codec with 2 endpoints: Headset and DMIC link 2: RT1320 Left and Right amplifier Note: the RT722 codec internal speaker output is not used. Signed-off-by: Mac Chiang (cherry picked from commit 886fbff2c5cba5a1efe816ed95acffd34e30f6fc) Signed-off-by: Kai Vehmanen --- tools/topology/topology2/production/tplg-targets-ace1.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-ace1.cmake b/tools/topology/topology2/production/tplg-targets-ace1.cmake index a0c5d1c176c2..b9ddf3c4c08c 100644 --- a/tools/topology/topology2/production/tplg-targets-ace1.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace1.cmake @@ -106,6 +106,10 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" +"cavs-sdw\;sof-arl-rt722-l0-rt1320-l2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=1,SDW_DMIC=1,\ +SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ +SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" + # Below topologies are used on Chromebooks "cavs-rt5682\;sof-mtl-max98357a-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\ From 26d12307fdc9232bffb134876770223c24fb547d Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Tue, 8 Oct 2024 14:39:03 +0100 Subject: [PATCH 4/6] topology2: Add support for cs42l43 SKU with host DMICs Add support for a Lenovo SKU that uses cs42l43 and the host side DMICs rather than the CODECs DMICs. Signed-off-by: Charles Keepax (cherry picked from commit 5dcc7c8ec789b947b0aad55990d8f732629fbc49) Signed-off-by: Kai Vehmanen --- .../topology/topology2/production/tplg-targets-ace2.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-ace2.cmake b/tools/topology/topology2/production/tplg-targets-ace2.cmake index e33b849313e8..c977e4646222 100644 --- a/tools/topology/topology2/production/tplg-targets-ace2.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace2.cmake @@ -37,6 +37,13 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" +"cavs-sdw\;sof-lnl-cs42l43-l0-cs35l56-l3-2ch\;PLATFORM=lnl,\ +NUM_DMICS=2,PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=sof-lnl-cs42l43-l0-cs35l56-l3-2ch.bin,\ +NUM_SDW_AMP_LINKS=1,SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,\ +SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\ +HDMI1_ID=6,HDMI2_ID=7,HDMI3_ID=8" + "cavs-sdw\;sof-lnl-cs42l43-l0-cs35l56-l23\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" From e60b4ced45a176009fc8be006d01ab8f891f3a15 Mon Sep 17 00:00:00 2001 From: Balamurugan C Date: Thu, 17 Oct 2024 14:06:44 +0530 Subject: [PATCH 5/6] topology2: mtl: Generate topology for Everest(Es83x6) codec. Adding support to generte the topology binary for the products which contains everest codec with out HDMI-in capture feature. Signed-off-by: Balamurugan C (cherry picked from commit c3c3e2fd88cac7ddd997877d717b458ac9492f9a) Signed-off-by: Kai Vehmanen --- tools/topology/topology2/production/tplg-targets-ace1.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-ace1.cmake b/tools/topology/topology2/production/tplg-targets-ace1.cmake index b9ddf3c4c08c..9620d160c163 100644 --- a/tools/topology/topology2/production/tplg-targets-ace1.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace1.cmake @@ -189,6 +189,12 @@ HDMI_IN_CAPTURE=true" NHLT_BIN=nhlt-sof-mtl-hdmi-ssp02.bin,HEADSET_CODEC=false,HDMI_IN_CAPTURE=true,\ HDMI_IN_1_ID=0,HDMI_IN_2_ID=1" +#ES83x6 codec alone without HDMI-in capture +"cavs-es83x6\;sof-mtl-es83x6-ssp1\;PLATFORM=mtl,PREPROCESS_PLUGINS=nhlt,\ +NHLT_BIN=nhlt-sof-mtl-es83x6-ssp1.bin,HEADSET_SSP_DAI_INDEX=1,\ +HEADSET_CODEC=true,HEADSET_CODEC_NAME=SSP1-Codec,HDMI1_ID=3,HDMI2_ID=4,HDMI3_ID=5,\ +HDMI_IN_CAPTURE=false" + # SDW + DMIC + HDMI "cavs-sdw\;sof-mtl-sdw-cs42l42-l0-max98363-l2\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\ PDM1_MIC_B_ENABLE=1,DMIC0_ID=3,DMIC1_ID=4,\ From 566d32426d0ab443d326f0226bbfc8e1b9424213 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Tue, 5 Nov 2024 18:59:25 +0800 Subject: [PATCH 6/6] topology2: rename sof-arl-rt722-l0-rt1320-l2 The file name defined in the Linux kernel is sof-arl-rt722-l0_rt1320-l2.tplg. Signed-off-by: Bard Liao (cherry picked from commit 72d03ef718329e0196ac31b8cfd05c8cc9feb33d) Signed-off-by: Kai Vehmanen --- tools/topology/topology2/production/tplg-targets-ace1.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/topology/topology2/production/tplg-targets-ace1.cmake b/tools/topology/topology2/production/tplg-targets-ace1.cmake index 9620d160c163..c6c256de79e8 100644 --- a/tools/topology/topology2/production/tplg-targets-ace1.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace1.cmake @@ -106,7 +106,7 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" -"cavs-sdw\;sof-arl-rt722-l0-rt1320-l2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=1,SDW_DMIC=1,\ +"cavs-sdw\;sof-arl-rt722-l0_rt1320-l2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=1,SDW_DMIC=1,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"