From e4fc252975ca7129d366e64b409883c808401aed Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 30 Sep 2020 17:20:34 -0500 Subject: [PATCH] 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 Signed-off-by: Libin Yang Signed-off-by: Jaroslav Kysela --- ucm2/sof-soundwire/HiFi.conf | 2 +- ucm2/sof-soundwire/{rt1308-4.conf => rt1308-1.conf} | 7 ------- ucm2/sof-soundwire/rt1308-2.conf | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) rename ucm2/sof-soundwire/{rt1308-4.conf => rt1308-1.conf} (63%) 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" ] -- 2.47.1