sof-soundwire: rt1316/rt1318 - fix channel selection for one amp

Like in commit 9e29f9e27f4e27dce40d8d6803031bb4f7be3c48, use L-R
channel selection when single amp is present.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/sof-soundwire/rt1316.conf b/ucm2/sof-soundwire/rt1316.conf
index a8038b61778fb23c67af2d1d9a968fe52d4e670c..cf231f89e4e71492ac68b4831ea564213f8e5364 100644 (file)
--- a/ucm2/sof-soundwire/rt1316.conf
+++ b/ucm2/sof-soundwire/rt1316.conf
@@ -47,8 +47,9 @@ DefineMacro.rt1316spk.If.0 {
 SectionDevice."Speaker" {
        Comment "Speaker"
 
-       Macro.num1.rt1316spk { ForAmps "[12]" Amp 1 Sel "L,L" }
-       Macro.num2.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" }
+       Macro.num1.rt1316spk { ForAmps "1" Amp 1 Sel "L,R" }
+       Macro.num2.rt1316spk { ForAmps "2" Amp 1 Sel "L,L" }
+       Macro.num3.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" }
 
        EnableSequence [
                cset "name='Speaker Switch' on"

diff --git a/ucm2/sof-soundwire/rt1318.conf b/ucm2/sof-soundwire/rt1318.conf
index 0709747e6fc53f86b1e76a6a11be203020eb8a21..9d018860a7929e056b2285ae409747ef8906b82f 100644 (file)
--- a/ucm2/sof-soundwire/rt1318.conf
+++ b/ucm2/sof-soundwire/rt1318.conf
@@ -26,8 +26,9 @@ DefineMacro.rt1318spk.If.0 {
 SectionDevice."Speaker" {
        Comment "Speaker"
 
-       Macro.num1.rt1318spk { ForAmps "[12]" Amp 1 Sel "L,L" }
-       Macro.num2.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" }
+       Macro.num1.rt1318spk { ForAmps "1" Amp 1 Sel "L,R" }
+       Macro.num2.rt1318spk { ForAmps "2" Amp 1 Sel "L,L" }
+       Macro.num3.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" }
 
        EnableSequence [
                cset "name='Speaker Switch' on"