SDP4430: adapt to ucm2

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

8 files changed, 53 insertions, 106 deletions

diff --git a/ucm/SDP4430/SDP4430.conf b/ucm/SDP4430/SDP4430.conf
deleted file mode 100644
index 29aa721..0000000
--- a/ucm/SDP4430/SDP4430.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# UCM configuration for SDP4430
-SectionUseCase."Record" {
- 		File "Record.conf"
- 		Comment "Record"
-}
-
-SectionUseCase."HiFi" {
- 		File "HiFi.conf"
- 		Comment "Play HiFi quality Music"
-}
-
-SectionUseCase."HiFi_Low_Power" {
- 		File "HiHiLP.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:SDP4430"
-		exec "echo Im setting defaults"
-]
diff --git a/ucm/SDP4430/FMAnalog.conf b/ucm2/SDP4430/FMAnalog.conf
index 876527a..9681465 100644
--- a/ucm/SDP4430/FMAnalog.conf
+++ b/ucm2/SDP4430/FMAnalog.conf
@@ -1,9 +1,8 @@
-# Use case Configurationfor TI SDP4430 HiFi Music
+# Use case Configuratio
 # By Liam Girdwood <lrg@slimlogic.co.uk>
 
 SectionVerb {
   	EnableSequence [
-                cdev "hw:SDP4430"
                 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:SDP4430"
                 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 "SDP4430 3.5mm Headset"
 	
 	EnableSequence [
-                cdev "hw:SDP4430"
                 cset "name='Analog Left Capture Route' 2"
                 cset "name='Analog Right Capture Route' 2"
                 cset "name='Capture Preamplifier Volume' 2"
 	]
 
 	DisableSequence [
-                cdev "hw:SDP4430"
                 cset "name='Analog Left Capture Route' 3"
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"
diff --git a/ucm/SDP4430/HiFi.conf b/ucm2/SDP4430/HiFi.conf
index a3293c5..af5b8fb 100644
--- a/ucm/SDP4430/HiFi.conf
+++ b/ucm2/SDP4430/HiFi.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
   	EnableSequence [
-                cdev "hw:SDP4430"
 		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:SDP4430"
 		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 "SDP4430 3.5mm Headset"
 	
 	EnableSequence [
-                cdev "hw:SDP4430"
                 cset "name='HS Left Playback' 1"
                 cset "name='HS Right Playback' 1"
                 cset "name='Headset Playback Volume' 13"
 	]
 
 	DisableSequence [
-                cdev "hw:SDP4430"
 		cset "name='HS Right Playback' 0"
 		cset "name='HS 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/SDP4430/HiFiLP.conf b/ucm2/SDP4430/HiFiLP.conf
index ccf3d87..82d583b 100644
--- a/ucm/SDP4430/HiFiLP.conf
+++ b/ucm2/SDP4430/HiFiLP.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
   	EnableSequence [
-                cdev "hw:SDP4430"
 		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:SDP4430"
 		cset "name='DL1 Mixer Multimedia' 0"
 		cset "name='Sidetone Mixer Playback' 0"
                 cset "name='DL1 PDM Switch' 0"
@@ -23,7 +21,7 @@ SectionVerb {
 	# Optional TQ and ALSA PCMs
 	Value {
 		TQ "Music"
-		PlaybackPCM "hw:0,6"
+		PlaybackPCM "hw:${CardID},6"
 	}
 }
 
@@ -31,14 +29,12 @@ SectionDevice."Headset".0 {
 	Comment "SDP4430 3.5mm Headset"
 	
 	EnableSequence [
-                cdev "hw:SDP4430"
                 cset "name='HS Left Playback' 1"
                 cset "name='HS Right Playback' 1"
                 cset "name='Headset Playback Volume' 13"
 	]
 
 	DisableSequence [
-                cdev "hw:SDP4430"
 		cset "name='HS Right Playback' 0"
 		cset "name='HS Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
diff --git a/ucm/SDP4430/Record.conf b/ucm2/SDP4430/Record.conf
index d680f25..16a9f8b 100644
--- a/ucm/SDP4430/Record.conf
+++ b/ucm2/SDP4430/Record.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
   	EnableSequence [
-                cdev "hw:SDP4430"
                 cset "name='AMIC_UL PDM Switch' 1"
                 cset "name='MUX_UL00' 9"
                 cset "name='MUX_UL01' 10"
@@ -11,7 +10,6 @@ SectionVerb {
 	]
 
 	DisableSequence [
-                cdev "hw:SDP4430"
                 cset "name='AMIC_UL PDM Switch' 0"
                 cset "name='MUX_UL00' 0"
                 cset "name='MUX_UL01' 0"
@@ -21,7 +19,7 @@ SectionVerb {
 	# Optional TQ and ALSA PCMs
 	Value {
 		TQ "Music"
-		CapturePCM "hw:0,0"
+		CapturePCM "hw:${CardId},0"
 	}
 
 }
@@ -30,14 +28,12 @@ SectionDevice."Headset".0 {
 	Comment "SDP4430 3.5mm Headset"
 	
 	EnableSequence [
-                cdev "hw:SDP4430"
                 cset "name='Analog Left Capture Route' 0"
                 cset "name='Analog Right Capture Route' 0"
                 cset "name='Capture Preamplifier Volume' 2"
 	]
 
 	DisableSequence [
-                cdev "hw:SDP4430"
                 cset "name='Analog Left Capture Route' 3"
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"
diff --git a/ucm2/SDP4430/SDP4430.conf b/ucm2/SDP4430/SDP4430.conf
new file mode 100644
index 0000000..df5b5b9
--- /dev/null
+++ b/ucm2/SDP4430/SDP4430.conf
@@ -0,0 +1,43 @@
+# UCM configuration for SDP4430
+
+Syntax 2
+
+SectionUseCase."Record" {
+	File "Record.conf"
+	Comment "Record"
+}
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
+
+SectionUseCase."HiFi_Low_Power" {
+	File "HiHiLP.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/SDP4430/Voice.conf b/ucm2/SDP4430/Voice.conf
index 8bea89c..257faf8 100644
--- a/ucm/SDP4430/Voice.conf
+++ b/ucm2/SDP4430/Voice.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
   	EnableSequence [
-                cdev "hw:SDP4430"
 		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:SDP4430"
 		cset "name='DL1 Mixer Voice' 0"
 		cset "name='Sidetone Mixer Playback' 0"
                 cset "name='DL1 PDM Switch' 0"
@@ -23,7 +21,7 @@ SectionVerb {
 	# Optional TQ and ALSA PCMs
 	Value {
 		TQ "Voice"
-		PlaybackPCM "hw:0,2"
+		PlaybackPCM "hw:${CardId},2"
 	}
 }
 
@@ -31,14 +29,12 @@ SectionDevice."Headset".0 {
 	Comment "SDP4430 3.5mm Headset"
 	
 	EnableSequence [
-                cdev "hw:SDP4430"
                 cset "name='HS Left Playback' 1"
                 cset "name='HS Right Playback' 1"
                 cset "name='Headset Playback Volume' 13"
 	]
 
 	DisableSequence [
-                cdev "hw:SDP4430"
 		cset "name='HS Right Playback' 0"
 		cset "name='HS Left Playback' 0"
                 cset "name='Headset Playback Volume' 0"
diff --git a/ucm/SDP4430/VoiceAll.conf b/ucm2/SDP4430/VoiceAll.conf
index 4c06106..03e6211 100644
--- a/ucm/SDP4430/VoiceAll.conf
+++ b/ucm2/SDP4430/VoiceAll.conf
@@ -3,7 +3,6 @@
 
 SectionVerb {
   	EnableSequence [
-                cdev "hw:SDP4430"
                 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:SDP4430"
                 cset "name='AMIC_UL PDM Switch' 0"
                 cset "name='Sidetone Mixer Capture' 0"
                 cset "name='MUX_VX0' 0"
@@ -36,8 +34,8 @@ 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"
 	}
 }
 
@@ -45,7 +43,6 @@ SectionDevice."Headset".0 {
 	Comment "SDP4430 3.5mm Headset"
 	
 	EnableSequence [
-                cdev "hw:SDP4430"
                 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:SDP4430"
                 cset "name='Analog Left Capture Route' 3"
                 cset "name='Analog Right Capture Route' 3"
                 cset "name='Capture Preamplifier Volume' 0"