sof-hda-dsp: add MixerId values, change order for BassSpeaker

- do not set the speaker volume for the BassSpeaker
- do not set ConflictingDevice for HeadphoneMic
  (one way should be enough in DigitalMic)

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
index 5fbdd37f9203bd9069d02dd1b04d9b1d9a2a9f20..2d17cd736951db629891be4819257cd159fd5653 100644 (file)
--- a/ucm2/sof-hda-dsp/HiFi.conf
+++ b/ucm2/sof-hda-dsp/HiFi.conf
@@ -20,6 +20,7 @@ SectionDevice."Headphone" {
 
        Value {
                PlaybackPCM "hw:${CardId},0"
+               PlaybackMixerId "Headphone"
                PlaybackVolume "Headphone Playback Volume"
                PlaybackSwitch "Headphone Playback Switch"
                PlaybackChannels "2"
@@ -66,6 +67,7 @@ SectionDevice."Speaker" {
 
        Value {
                PlaybackPCM "hw:${CardId},0"
+               PlaybackMixerId "Speaker"
                PlaybackVolume "Speaker Playback Volume"
                PlaybackSwitch "Speaker Playback Switch"
                PlaybackChannels "2"
@@ -73,6 +75,7 @@ SectionDevice."Speaker" {
 }
 
 If.1 {
+       After.SectionDevice "Speaker"
        Condition {
                Type ControlExists
                Control "name='Bass Speaker Playback Switch'"
@@ -81,10 +84,13 @@ If.1 {
                SectionDevice."BassSpeaker" {
                        Comment "Bass Speaker"
 
+                       ConflictingDevice [
+                               "Speaker"
+                       ]
+
                        EnableSequence [
                                cset "name='Bass Speaker Playback Switch' on"
                                cset "name='Speaker Playback Switch' on"
-                               cset "name='Speaker Playback Volume' 80"
                        ]
 
                        DisableSequence [
@@ -94,6 +100,9 @@ If.1 {
 
                        Value {
                                PlaybackPCM "hw:${CardId},0"
+                               PlaybackMixerId "Speaker"
+                               PlaybackVolume "Speaker Playback Volume"
+                               PlaybackSwitch "Speaker Playback Switch"
                                PlaybackChannels "2"
                        }
                }
@@ -103,12 +112,9 @@ If.1 {
 SectionDevice."HeadsetMic" {
        Comment "Headset Microphone"
 
-       ConflictingDevice [
-               "DigitalMic"
-       ]
-
        Value {
                CapturePCM "hw:${CardId},0"
+               CaptureMixerId "Capture"
                CaptureVolume "Capture Volume"
                CaptureSwitch "Capture Switch"
                CaptureChannels "2"
@@ -125,6 +131,7 @@ SectionDevice."DigitalMic" {
 
        Value {
                CapturePCM "hw:${CardId},6"
+               CaptureMixerId "Dmic0 Capture"
                CaptureVolume "Dmic0 Capture Volume"
                CaptureSwitch "Dmic0 Capture Switch"
                CaptureChannels "2"