ucm: delete HDMI verb.

Delete HDMI verb and move the HDMI device into the HiFi verb.
Move the volume control into the SectionVerb.

tested:
alsaucm -c bcm2835 set _verb HiFi set _enadev Speaker
alsaucm -c bcm2835 set _verb Hifi set _enadev HDMI

Change-Id: I2a5244ad47c09ccd1b37bdee3272f6ca2eff8af1
Signed-off-by: Hackseung Lee <lhs@dignsys.com>

diff --git a/bcm2835/bcm2835.conf b/bcm2835/bcm2835.conf
index f8ab3a85f5d75b438d023cb6a26b3ea507d037ad..26c39aef7fec73779e79165051f012878826ad72 100644 (file)
--- a/bcm2835/bcm2835.conf
+++ b/bcm2835/bcm2835.conf
@@ -8,12 +8,6 @@ SectionUseCase."HiFi" {
   Comment "Hifi audio path"
 }
 
-SectionUseCase."HDMI" {
-  File "hdmi"
-  Comment "HDMI audio path"
-}
-
-
 ValueDefaults {
   PlaybackCTL "hw:1"
   CaptureCTL "hw:1"

diff --git a/bcm2835/hdmi b/bcm2835/hdmi
deleted file mode 100644 (file)
index 8d825c5..0000000
--- a/bcm2835/hdmi
+++ /dev/null
@@ -1,25 +0,0 @@
-SectionVerb {
-  EnableSequence [
-  ]
-  DisableSequence [
-  ]
-
-  Value {
-    TQ "Music"
-    PlaybackCTL "hw:1"
-  }
-}
-
-SectionDevice."HDMI" {
-  Comment "HDMI AUDIO"
-
-  EnableSequence [
-  ]
-
-  DisableSequence [
-  ]
-
-  Value {
-    PlaybackPCM "hw:1,1"
-  }
-}

diff --git a/bcm2835/hifi b/bcm2835/hifi
index 076473560eb361b4bcc02e9f984b8800f36fd58e..1fe0b391a87e1bd0b1a27773c22ffe2a5dc18467 100644 (file)
--- a/bcm2835/hifi
+++ b/bcm2835/hifi
@@ -1,7 +1,10 @@
 SectionVerb {
   EnableSequence [
+               cset "name='PCM Playback Volume' 90%"
+               cset "name='PCM Playback Switch' on"
   ]
   DisableSequence [
+               cset "name='PCM Playback Switch' off"
   ]
 
   Value {
@@ -14,6 +17,7 @@ SectionDevice."Speaker" {
   Comment "3.5mm Speaker"
 
   EnableSequence [
+               cset "name='PCM Playback Route' 1"
   ]
 
   DisableSequence [
@@ -23,3 +27,19 @@ SectionDevice."Speaker" {
     PlaybackPCM "hw:1,0"
   }
 }
+
+SectionDevice."HDMI" {
+  Comment "HDMI audio"
+
+  EnableSequence [
+                cset "name='PCM Playback Route' 2"
+  ]
+
+  DisableSequence [
+  ]
+
+  Value {
+    PlaybackPCM "hw:1,1"
+  }
+}
+

diff --git a/bcm2835/inactive b/bcm2835/inactive
index 17e9a8035561fac5f22292ab0b76dd48140b491b..59506f28d63059c1a72958d94439adff74c81192 100644 (file)
--- a/bcm2835/inactive
+++ b/bcm2835/inactive
@@ -1,13 +1,14 @@
 SectionVerb {
   EnableSequence [
+               cset "name='PCM Playback Route' off"
   ]
+
   DisableSequence [
   ]
 
   Value {
     TQ "Music"
     PlaybackCTL "hw:1"
-    CaptureCTL "hw:1"
   }
 }
 
@@ -30,13 +31,3 @@ SectionDevice."Playback" {
   DisableSequence [
   ]
 }
-
-SectionDevice."Capture" {
-  Comment "reset capture"
-
-  EnableSequence [
-  ]
-
-  DisableSequence [
-  ]
-}