From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Wed, 30 Sep 2020 22:20:34 +0000 (-0500)
Subject: ucm2: soundwire: use cfg-amp instead of cfg-spk component string
X-Git-Tag: v1.2.5~38
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=e4fc252975ca7129d366e64b409883c808401aed;p=alsa-ucm-conf.git

ucm2: soundwire: use cfg-amp instead of cfg-spk component string

For now we don't have a specific handing of the number of speakers, we
should be handling the number of amplifiers instead. The number of
speakers was added in machine drivers as a placeholder, if and when we
you it it would be in addition to the number of amplifiers, not as a
substitute.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf
index f2240e8..e780ea4 100644
--- a/ucm2/sof-soundwire/HiFi.conf
+++ b/ucm2/sof-soundwire/HiFi.conf
@@ -9,7 +9,7 @@ If.spkdev {
 		Type String
 		Empty "${var:SpeakerCodec1}"
 	}
-	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerChannels1}.conf"
+	False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerAmps1}.conf"
 }
 
 If.micdev {
diff --git a/ucm2/sof-soundwire/rt1308-4.conf b/ucm2/sof-soundwire/rt1308-1.conf
similarity index 63%
rename from ucm2/sof-soundwire/rt1308-4.conf
rename to ucm2/sof-soundwire/rt1308-1.conf
index f88cb81..6da5b7e 100644
--- a/ucm2/sof-soundwire/rt1308-4.conf
+++ b/ucm2/sof-soundwire/rt1308-1.conf
@@ -4,21 +4,14 @@ SectionDevice."Speaker" {
 	Comment	"Speaker"
 
 	EnableSequence [
-		cset "name='rt1308-1 RX Channel Select' LL"
-		cset "name='rt1308-2 RX Channel Select' RR"
-
 		cset "name='rt1308-1 DAC L Switch' 1"
 		cset "name='rt1308-1 DAC R Switch' 1"
-		cset "name='rt1308-2 DAC L Switch' 1"
-		cset "name='rt1308-2 DAC R Switch' 1"
 		cset "name='Speaker Switch' on"
 	]
 
 	DisableSequence [
 		cset "name='rt1308-1 DAC L Switch' 0"
 		cset "name='rt1308-1 DAC R Switch' 0"
-		cset "name='rt1308-2 DAC L Switch' 0"
-		cset "name='rt1308-2 DAC R Switch' 0"
 		cset "name='Speaker Switch' off"
 	]
 
diff --git a/ucm2/sof-soundwire/rt1308-2.conf b/ucm2/sof-soundwire/rt1308-2.conf
index 6da5b7e..f88cb81 100644
--- a/ucm2/sof-soundwire/rt1308-2.conf
+++ b/ucm2/sof-soundwire/rt1308-2.conf
@@ -4,14 +4,21 @@ SectionDevice."Speaker" {
 	Comment	"Speaker"
 
 	EnableSequence [
+		cset "name='rt1308-1 RX Channel Select' LL"
+		cset "name='rt1308-2 RX Channel Select' RR"
+
 		cset "name='rt1308-1 DAC L Switch' 1"
 		cset "name='rt1308-1 DAC R Switch' 1"
+		cset "name='rt1308-2 DAC L Switch' 1"
+		cset "name='rt1308-2 DAC R Switch' 1"
 		cset "name='Speaker Switch' on"
 	]
 
 	DisableSequence [
 		cset "name='rt1308-1 DAC L Switch' 0"
 		cset "name='rt1308-1 DAC R Switch' 0"
+		cset "name='rt1308-2 DAC L Switch' 0"
+		cset "name='rt1308-2 DAC R Switch' 0"
 		cset "name='Speaker Switch' off"
 	]