diff -Nru alsa-ucm-conf-1.2.2/debian/changelog alsa-ucm-conf-1.2.2/debian/changelog --- alsa-ucm-conf-1.2.2/debian/changelog 2021-05-25 19:42:01.000000000 +0800 +++ alsa-ucm-conf-1.2.2/debian/changelog 2021-07-26 12:12:59.000000000 +0800 @@ -1,3 +1,12 @@ +alsa-ucm-conf (1.2.2-1ubuntu0.9) focal; urgency=medium + + * d/p/0001-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch + The mixer name is changed in the codec driver rt1316-sdw.c, so need + to handle the new mixer name. (LP: #1937980) + https://github.com/alsa-project/alsa-ucm-conf/pull/109 + + -- Hui Wang Mon, 26 Jul 2021 12:12:59 +0800 + alsa-ucm-conf (1.2.2-1ubuntu0.8) focal; urgency=medium * d/p/0001-HDA-Intel-add-RearMic-JackControl.patch diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch alsa-ucm-conf-1.2.2/debian/patches/0001-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.2/debian/patches/0001-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch 2021-07-26 12:12:38.000000000 +0800 @@ -0,0 +1,139 @@ +From 47f19f276255ddfbcb7fbb71c24f435ccf8bc7a5 Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Fri, 23 Jul 2021 11:13:02 +0800 +Subject: [PATCH] sof-soundwire: rt1316 - DAC L and R is replaced by DAC + +In the latest codec driver rt1316-sdw.c, the DAC L and DAC R are +replaced by DAC, so we change the ucm to add the condition checking, +if 'DAC L' exists, will set those mixers in the old way, otherwise, +set the mixers with new name. + +The codec rt1316 is used on a Dell TGL soundwire audio machine. + +Signed-off-by: Hui Wang +--- + ucm2/sof-soundwire/rt1316-1.conf | 39 +++++++++++++++++------ + ucm2/sof-soundwire/rt1316-2.conf | 54 ++++++++++++++++++++++---------- + 2 files changed, 67 insertions(+), 26 deletions(-) + +diff --git a/ucm2/sof-soundwire/rt1316-1.conf b/ucm2/sof-soundwire/rt1316-1.conf +index f442a79..aa277dd 100644 +--- a/ucm2/sof-soundwire/rt1316-1.conf ++++ b/ucm2/sof-soundwire/rt1316-1.conf +@@ -3,17 +3,36 @@ + SectionDevice."Speaker" { + Comment "Speaker" + +- EnableSequence [ +- cset "name='rt1316-1 DAC L Switch' 1" +- cset "name='rt1316-1 DAC R Switch' 1" +- cset "name='Speaker Switch' on" +- ] ++ If.lrswitch { ++ Condition { ++ Type ControlExists ++ Control "name='rt1316-1 DAC L Switch'" ++ } ++ True { ++ EnableSequence [ ++ cset "name='rt1316-1 DAC L Switch' 1" ++ cset "name='rt1316-1 DAC R Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] + +- DisableSequence [ +- cset "name='rt1316-1 DAC L Switch' 0" +- cset "name='rt1316-1 DAC R Switch' 0" +- cset "name='Speaker Switch' off" +- ] ++ DisableSequence [ ++ cset "name='rt1316-1 DAC L Switch' 0" ++ cset "name='rt1316-1 DAC R Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ } ++ False { ++ EnableSequence [ ++ cset "name='rt1316-1 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt1316-1 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ } ++ } + + Value { + PlaybackPriority 100 +diff --git a/ucm2/sof-soundwire/rt1316-2.conf b/ucm2/sof-soundwire/rt1316-2.conf +index f2fd9ab..94223e1 100644 +--- a/ucm2/sof-soundwire/rt1316-2.conf ++++ b/ucm2/sof-soundwire/rt1316-2.conf +@@ -3,24 +3,46 @@ + SectionDevice."Speaker" { + Comment "Speaker" + +- EnableSequence [ +- cset "name='rt1316-1 RX Channel Select' L,L" +- cset "name='rt1316-2 RX Channel Select' R,R" ++ If.lrswitch { ++ Condition { ++ Type ControlExists ++ Control "name='rt1316-1 DAC L Switch'" ++ } ++ True { ++ EnableSequence [ ++ cset "name='rt1316-1 RX Channel Select' L,L" ++ cset "name='rt1316-2 RX Channel Select' R,R" ++ cset "name='rt1316-1 DAC L Switch' 1" ++ cset "name='rt1316-1 DAC R Switch' 1" ++ cset "name='rt1316-2 DAC L Switch' 1" ++ cset "name='rt1316-2 DAC R Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] + +- cset "name='rt1316-1 DAC L Switch' 1" +- cset "name='rt1316-1 DAC R Switch' 1" +- cset "name='rt1316-2 DAC L Switch' 1" +- cset "name='rt1316-2 DAC R Switch' 1" +- cset "name='Speaker Switch' on" +- ] ++ DisableSequence [ ++ cset "name='rt1316-1 DAC L Switch' 0" ++ cset "name='rt1316-1 DAC R Switch' 0" ++ cset "name='rt1316-2 DAC L Switch' 0" ++ cset "name='rt1316-2 DAC R Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ } ++ False { ++ EnableSequence [ ++ cset "name='rt1316-1 RX Channel Select' L,L" ++ cset "name='rt1316-2 RX Channel Select' R,R" ++ cset "name='rt1316-1 DAC Switch' 1" ++ cset "name='rt1316-2 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] + +- DisableSequence [ +- cset "name='rt1316-1 DAC L Switch' 0" +- cset "name='rt1316-1 DAC R Switch' 0" +- cset "name='rt1316-2 DAC L Switch' 0" +- cset "name='rt1316-2 DAC R Switch' 0" +- cset "name='Speaker Switch' off" +- ] ++ DisableSequence [ ++ cset "name='rt1316-1 DAC Switch' 0" ++ cset "name='rt1316-2 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ } ++ } + + Value { + PlaybackPriority 100 +-- +2.25.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/series alsa-ucm-conf-1.2.2/debian/patches/series --- alsa-ucm-conf-1.2.2/debian/patches/series 2021-05-25 19:42:01.000000000 +0800 +++ alsa-ucm-conf-1.2.2/debian/patches/series 2021-07-26 12:12:54.000000000 +0800 @@ -28,3 +28,5 @@ 0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch 0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch 0027-HDA-Intel-add-RearMic-JackControl.patch + +0001-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch