ucm2: HDA - make Speaker device optional

BugLink: https://github.com/alsa-project/alsa-ucm-conf/issues/141
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/HDA/HiFi-analog.conf b/ucm2/HDA/HiFi-analog.conf
index f1e8fa4b7e20cb8941dead5d2a027595ad6505d3..2434c6d639782bd32720595b44918780529dd456 100644 (file)
--- a/ucm2/HDA/HiFi-analog.conf
+++ b/ucm2/HDA/HiFi-analog.conf
@@ -95,43 +95,49 @@ SectionDevice."Headphones" {
        }
 }
 
-SectionDevice."Speaker" {
-       Comment "Speaker"
+If.spk {
+       Condition {
+               Type ControlExists
+               Control "name='Speaker Playback Switch'"
+       }
+       True.SectionDevice."Speaker" {
+               Comment "Speaker"
 
-       If.seq {
-               Condition {
-                       Type ControlExists
-                       Control "name='Bass Speaker Playback Switch'"
-               }
-               True {
-                       EnableSequence [
-                               cset "name='Speaker Playback Switch' on"
-                               cset "name='Bass Speaker Playback Switch' on"
-                       ]
+               If.seq {
+                       Condition {
+                               Type ControlExists
+                               Control "name='Bass Speaker Playback Switch'"
+                       }
+                       True {
+                               EnableSequence [
+                                       cset "name='Speaker Playback Switch' on"
+                                       cset "name='Bass Speaker Playback Switch' on"
+                               ]
 
-                       DisableSequence [
-                               cset "name='Speaker Playback Switch' off"
-                               cset "name='Bass Speaker Playback Switch' off"
-                       ]
-               }
-               False {
-                       EnableSequence [
-                               cset "name='Speaker Playback Switch' on"
-                       ]
+                               DisableSequence [
+                                       cset "name='Speaker Playback Switch' off"
+                                       cset "name='Bass Speaker Playback Switch' off"
+                               ]
+                       }
+                       False {
+                               EnableSequence [
+                                       cset "name='Speaker Playback Switch' on"
+                               ]
 
-                       DisableSequence [
-                               cset "name='Speaker Playback Switch' off"
-                       ]
+                               DisableSequence [
+                                       cset "name='Speaker Playback Switch' off"
+                               ]
+                       }
                }
-       }
 
-       Value {
-               PlaybackPriority 100
-               PlaybackPCM "hw:${CardId}"
-               PlaybackMixerElem "Speaker"
-               PlaybackMasterElem "Master"
-               PlaybackVolume "Speaker Playback Volume"
-               PlaybackSwitch "Speaker Playback Switch"
+               Value {
+                       PlaybackPriority 100
+                       PlaybackPCM "hw:${CardId}"
+                       PlaybackMixerElem "Speaker"
+                       PlaybackMasterElem "Master"
+                       PlaybackVolume "Speaker Playback Volume"
+                       PlaybackSwitch "Speaker Playback Switch"
+               }
        }
 }