PandaBoardES: adapt to ucm2

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

diff --git a/ucm/PandaBoardES/PandaBoardES.conf b/ucm/PandaBoardES/PandaBoardES.conf
deleted file mode 100644 (file)
index 6069712..0000000
--- a/ucm/PandaBoardES/PandaBoardES.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# UCM configuration for PandaBoardES
-SectionUseCase."Record" {
-               File "Record.conf"
-               Comment "Record"
-}
-
-SectionUseCase."HiFi" {
-               File "HiFi.conf"
-               Comment "Play HiFi quality Music"
-}
-
-SectionUseCase."HiFi_Low_Power" {
-               File "HiFiLP.conf"
-               Comment "Play HiFi quality Music in Low Power Mode"
-}
-
-SectionUseCase."Voice" {
-               File "Voice.conf"
-               Comment "Playback Voice quality."
-}
-
-SectionUseCase."Voice_Low_Power" {
-               File "Voice.conf"
-               Comment "Playback Voice quality in Low Power Mode"
-}
-
-SectionUseCase."Voice_Call" {
-               File "VoiceCall.conf"
-               Comment "Capture and Playback in Voice quality"
-}
-
-SectionUseCase."Voice_Call_IP" {
-               File "VoiceCall.conf"
-               Comment "Capture and Playback in Voice quality"
-}
-
-SectionUseCase."FM_Analog_Radio" {
-               File "FMAnalog.conf"
-               Comment "Capture FM Analog Radio"
-}
-
-SectionDefaults [
-                cdev "hw:PandaBoardES"
-               exec "echo Im setting PandaBoardES defaults"
-]

diff --git a/ucm/PandaBoardES/FMAnalog.conf b/ucm2/PandaBoardES/FMAnalog.conf
similarity index 82%
rename from ucm/PandaBoardES/FMAnalog.conf
rename to ucm2/PandaBoardES/FMAnalog.conf
index 6885cc8d020d2f2594bd670a17e6d62a9deb12ef..a4d5a23b7f4f1cd2d3c77ef5dc2aca6e935d3a63 100644 (file)
--- a/ucm/PandaBoardES/FMAnalog.conf
+++ b/ucm2/PandaBoardES/FMAnalog.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='AMIC_UL PDM Switch' 1"
                 cset "name='MUX_UL00' 9"
                 cset "name='MUX_UL01' 10"
@@ -12,7 +11,6 @@ SectionVerb {
 
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='AMIC_UL PDM Switch' 0"
                 cset "name='MUX_UL00' 0"
                 cset "name='MUX_UL01' 0"
@@ -22,22 +20,20 @@ SectionVerb {
        # Optional TQ and ALSA PCMs
        Value {
                TQ "Music"
-                CapturePCM "hw:0,0"
+                CapturePCM "hw:${CardId},0"
        }
 }
 
-SectionDevice."Headset".0 {
+SectionDevice."Headset" {
        Comment "PandaBoardES 3.5mm Headset"
        
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Analog Left Capture Route' 2"
                 cset "name='Analog Right Capture Route' 2"
                 cset "name='Capture Preamplifier Volume' 2"
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Analog Left Capture Route' 3"
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"

diff --git a/ucm/PandaBoardES/HiFi.conf b/ucm2/PandaBoardES/HiFi.conf
similarity index 66%
rename from ucm/PandaBoardES/HiFi.conf
rename to ucm2/PandaBoardES/HiFi.conf
index be00e60c335167847ebe1c546ca31377a5bcb4c9..856dd9f9026270cdc2f391bae69de386e3d62a6f 100644 (file)
--- a/ucm/PandaBoardES/HiFi.conf
+++ b/ucm2/PandaBoardES/HiFi.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
        EnableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='DL1 Mixer Multimedia' 1"
                cset "name='Sidetone Mixer Playback' 1"
                 cset "name='DL1 PDM Switch' 1"
@@ -16,7 +15,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='DL1 Mixer Multimedia' 0"
                cset "name='Sidetone Mixer Playback' 0"
                 cset "name='DL1 PDM Switch' 0"
@@ -31,53 +29,24 @@ SectionVerb {
        # Optional TQ and ALSA PCMs
 #      Value {
 #              TQ "Music"
-#              PlaybackPCM "hw:0,0"
+#              PlaybackPCM "hw:${CardId},0"
 #                PlaybackVolume "name='DL1 Media Playback Volume' 90,90"
 #                PlaybackSwitch "name='DL1 PDM Switch' 1"
 #      }
 }
 
-SectionDevice."Headset".0 {
+SectionDevice."Headset" {
        Comment "PandaBoardES 3.5mm Headset"
        
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Headset Left Playback' 1"
                 cset "name='Headset Right Playback' 1"
                 cset "name='Headset Playback Volume' 13"
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='Headset Right Playback' 0"
                cset "name='Headset Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
        ]
 }
-
-#SectionModifier."RecordMedia".0 {
-#      SupportedDevice [
-#              "Headset"
-#      ]
- #       EnableSequence [
- #         ....
- #       ]
- #
- #       DisableSequence [
- #         ...
- #       ]
- #
- #       TransitionSequence."ToModifierName" [
- #         ...
- #       ]
- #
- #       # Optional TQ and ALSA PCMs
- #       Value {
- #               TQ Voice
- #               CapturePCM "hw:1"
- #               PlaybackVolume "name='Master Playback Volume',index=2"
- #               PlaybackSwitch "name='Master Playback Switch',index=2"
- #       }
-#
-#}
-

diff --git a/ucm/PandaBoardES/HiFiLP.conf b/ucm2/PandaBoardES/HiFiLP.conf
similarity index 83%
rename from ucm/PandaBoardES/HiFiLP.conf
rename to ucm2/PandaBoardES/HiFiLP.conf
index c817a58113770dbf6854c1707963dd586bb56f64..a6a258d282e7167dbaaf042d387845a5766df1e7 100644 (file)
--- a/ucm/PandaBoardES/HiFiLP.conf
+++ b/ucm2/PandaBoardES/HiFiLP.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
        EnableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='DL1 Mixer Multimedia' 1"
                cset "name='Sidetone Mixer Playback' 1"
                 cset "name='DL1 PDM Switch' 1"
@@ -12,7 +11,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='DL1 Mixer Multimedia' 0"
                cset "name='Sidetone Mixer Playback' 0"
                 cset "name='DL1 PDM Switch' 0"
@@ -23,22 +21,20 @@ SectionVerb {
        # Optional TQ and ALSA PCMs
        Value {
                TQ "Music"
-               PlaybackPCM "hw:0,6"
+               PlaybackPCM "hw:${CardId},6"
        }
 }
 
-SectionDevice."Headset".0 {
+SectionDevice."Headset" {
        Comment "PandaBoardES 3.5mm Headset"
        
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Headset Left Playback' 1"
                 cset "name='Headset Right Playback' 1"
                 cset "name='Headset Playback Volume' 13"
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='Headset Right Playback' 0"
                cset "name='Headset Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"

diff --git a/ucm2/PandaBoardES/PandaBoardES.conf b/ucm2/PandaBoardES/PandaBoardES.conf
new file mode 100644 (file)
index 0000000..946c2cf
--- /dev/null
+++ b/ucm2/PandaBoardES/PandaBoardES.conf
@@ -0,0 +1,43 @@
+# UCM configuration for PandaBoardES
+
+Syntax 2
+
+SectionUseCase."Record" {
+       File "Record.conf"
+       Comment "Record"
+}
+
+SectionUseCase."HiFi" {
+       File "HiFi.conf"
+       Comment "Play HiFi quality Music"
+}
+
+SectionUseCase."HiFi_Low_Power" {
+       File "HiFiLP.conf"
+       Comment "Play HiFi quality Music in Low Power Mode"
+}
+
+SectionUseCase."Voice" {
+       File "Voice.conf"
+       Comment "Playback Voice quality."
+}
+
+SectionUseCase."Voice_Low_Power" {
+       File "Voice.conf"
+       Comment "Playback Voice quality in Low Power Mode"
+}
+
+SectionUseCase."Voice_Call" {
+       File "VoiceCall.conf"
+       Comment "Capture and Playback in Voice quality"
+}
+
+SectionUseCase."Voice_Call_IP" {
+       File "VoiceCall.conf"
+       Comment "Capture and Playback in Voice quality"
+}
+
+SectionUseCase."FM_Analog_Radio" {
+       File "FMAnalog.conf"
+       Comment "Capture FM Analog Radio"
+}

diff --git a/ucm/PandaBoardES/Record.conf b/ucm2/PandaBoardES/Record.conf
similarity index 80%
rename from ucm/PandaBoardES/Record.conf
rename to ucm2/PandaBoardES/Record.conf
index 4f272a9c25abac12973ef2dd427905c9f3e5ae69..57ad61261586f1ba96dc088b56e1ad2f9e1e0e92 100644 (file)
--- a/ucm/PandaBoardES/Record.conf
+++ b/ucm2/PandaBoardES/Record.conf
@@ -1,9 +1,7 @@
-# Use case Configuration for TI PandaBoardES HiFi Music
 # By Liam Girdwood <lrg@slimlogic.co.uk>
 
 SectionVerb {
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 # No more AMIC PDM Switch in current kernels
                 #cset "name='AMIC_UL PDM Switch' 1"
                 cset "name='MUX_UL00' 9"
@@ -12,7 +10,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                 # No more AMIC PDM Switch in current kernels
                 #cset "name='AMIC_UL PDM Switch' 0"
                 cset "name='MUX_UL00' 0"
@@ -23,23 +20,21 @@ SectionVerb {
        # Optional TQ and ALSA PCMs
        Value {
                TQ "Music"
-               CapturePCM "hw:0,0"
+               CapturePCM "hw:${CardId},0"
        }
 
 }
 
-SectionDevice."Headset".0 {
+SectionDevice."Headset" {
        Comment "PandaBoardES 3.5mm Headset"
        
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Analog Left Capture Route' 0"
                 cset "name='Analog Right Capture Route' 0"
                 cset "name='Capture Preamplifier Volume' 2"
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Analog Left Capture Route' 3"
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"

diff --git a/ucm/PandaBoardES/Voice.conf b/ucm2/PandaBoardES/Voice.conf
similarity index 83%
rename from ucm/PandaBoardES/Voice.conf
rename to ucm2/PandaBoardES/Voice.conf
index e2b3f798251eacab8228f80d402ff83afbb48f02..a198c238f6573e1f2bad7548e37672d685039d79 100644 (file)
--- a/ucm/PandaBoardES/Voice.conf
+++ b/ucm2/PandaBoardES/Voice.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
        EnableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='DL1 Mixer Voice' 1"
                cset "name='Sidetone Mixer Playback' 1"
                 cset "name='DL1 PDM Switch' 1"
@@ -12,7 +11,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='DL1 Mixer Voice' 0"
                cset "name='Sidetone Mixer Playback' 0"
                 cset "name='DL1 PDM Switch' 0"
@@ -23,22 +21,20 @@ SectionVerb {
        # Optional TQ and ALSA PCMs
        Value {
                TQ "Voice"
-               PlaybackPCM "hw:0,2"
+               PlaybackPCM "hw:${CardId},2"
        }
 }
 
-SectionDevice."Headset".0 {
+SectionDevice."Headset" {
        Comment "PandaBoardES 3.5mm Headset"
        
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Headset Left Playback' 1"
                 cset "name='Headset Right Playback' 1"
                 cset "name='Headset Playback Volume' 13"
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                cset "name='Headset Right Playback' 0"
                cset "name='Headset Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"

diff --git a/ucm/PandaBoardES/VoiceCall.conf b/ucm2/PandaBoardES/VoiceCall.conf
similarity index 89%
rename from ucm/PandaBoardES/VoiceCall.conf
rename to ucm2/PandaBoardES/VoiceCall.conf
index 57b1c800bab7f06576ec0ad3353ed476f43b8f97..4aed020c238b238b33c62d3746e6c5acf9edc5b1 100644 (file)
--- a/ucm/PandaBoardES/VoiceCall.conf
+++ b/ucm2/PandaBoardES/VoiceCall.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='AMIC_UL PDM Switch' 1"
                 cset "name='Sidetone Mixer Capture' 1"
                 cset "name='MUX_VX0' 9"
@@ -19,7 +18,6 @@ SectionVerb {
 
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='AMIC_UL PDM Switch' 0"
                 cset "name='Sidetone Mixer Capture' 0"
                 cset "name='MUX_VX0' 0"
@@ -36,16 +34,15 @@ SectionVerb {
        # Optional TQ and ALSA PCMs
        Value {
                TQ "Voice"
-                CapturePCM "hw:0,2"
-               PlaybackPCM "hw:0,2"
+                CapturePCM "hw:${CardId},2"
+               PlaybackPCM "hw:${CardId},2"
        }
 }
 
-SectionDevice."Headset".0 {
+SectionDevice."Headset" {
        Comment "PandaBoardES 3.5mm Headset"
        
        EnableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Analog Left Capture Route' 0"
                 cset "name='Analog Right Capture Route' 0"
                 cset "name='Capture Preamplifier Volume' 2"
@@ -55,7 +52,6 @@ SectionDevice."Headset".0 {
        ]
 
        DisableSequence [
-                cdev "hw:PandaBoardES"
                 cset "name='Analog Left Capture Route' 3"
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"