From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 11 Mar 2024 12:09:08 +0000 (+0100)
Subject: sof-soundwire: rt1316/rt1318 - fix channel selection for one amp
X-Git-Tag: v1.2.12~20
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=73981e94bb69da1be5b1e4a69ff99df28bcfb320;p=alsa-ucm-conf.git

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 a8038b6..cf231f8 100644
--- 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 0709747..9d01886 100644
--- 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"