sof-soundwire: Correct the PCM device for cs35l56 bridge speakers

In the case the speaker amps are connected through the codec the current
routing is hijacking the headphone PCM device and using that. It would
be better to use the dedicated speaker PCM device. Update the PCM and
the routing to match.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/778
Fixes: e4277a204cd6 ("sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/sof-soundwire/cs35l56-bridge.conf b/ucm2/sof-soundwire/cs35l56-bridge.conf
index 176f8801cce6e50023ab9bdca8c5c2974aea9753..2e8c1c62a729d0dd3501de0fbb6d4288224b8440 100644 (file)
--- a/ucm2/sof-soundwire/cs35l56-bridge.conf
+++ b/ucm2/sof-soundwire/cs35l56-bridge.conf
@@ -23,8 +23,8 @@ SectionDevice."Speaker" {
        EnableSequence [
                cset "name='cs42l43 Speaker L Input 1' 'ASPRX1'"
                cset "name='cs42l43 Speaker R Input 1' 'ASPRX2'"
-               cset "name='cs42l43 ASPTX1 Input' 'DP5RX1'"
-               cset "name='cs42l43 ASPTX2 Input' 'DP5RX2'"
+               cset "name='cs42l43 ASPTX1 Input' 'DP6RX1'"
+               cset "name='cs42l43 ASPTX2 Input' 'DP6RX2'"
 
                cset "name='AMPL ASP1 TX1 Source' 'DSP1TX1'"
                cset "name='AMPL ASP1 TX2 Source' 'None'"
@@ -54,7 +54,7 @@ SectionDevice."Speaker" {
 
        Value {
                PlaybackPriority 100
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPCM "hw:${CardId},2"
                PlaybackMixer "default:${CardId}"
                PlaybackMixerElem "Speaker"
        }