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 f2240e8e31a80973c87fb124983fa5a8ffc0477b..e780ea47c3591e0a02dd0483c9ece3ccfc77d7bd 100644 (file)
--- 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 f88cb819d6a36265ddc3436d80ac78c7b059af55..6da5b7e30a5feedaef769a01a0cab43921f342c6 100644 (file)
--- 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 6da5b7e30a5feedaef769a01a0cab43921f342c6..f88cb819d6a36265ddc3436d80ac78c7b059af55 100644 (file)
--- 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"
        ]