DB410c: adapt to ucm2

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

diff --git a/ucm/DB410c/DB410c.conf b/ucm2/DB410c/DB410c.conf
similarity index 93%
rename from ucm/DB410c/DB410c.conf
rename to ucm2/DB410c/DB410c.conf
index b69bac11a5aea26e78b625dd8b75d7946b144f40..45931800f479b4004ffb1fe8e8816472812368db 100644 (file)
--- a/ucm/DB410c/DB410c.conf
+++ b/ucm2/DB410c/DB410c.conf
@@ -1,3 +1,5 @@
+Syntax 2
+
 SectionUseCase."HiFi" {
        File "HiFi.conf"
        Comment "Play HiFi quality Music"

diff --git a/ucm/DB410c/HDMI.conf b/ucm2/DB410c/HDMI.conf
similarity index 57%
rename from ucm/DB410c/HDMI.conf
rename to ucm2/DB410c/HDMI.conf
index 8112bc0a7110927e8b193934d11c4c1e52a23921..d08a50b9aa42c857189bb4b83f54a4a44cb9803d 100644 (file)
--- a/ucm/DB410c/HDMI.conf
+++ b/ucm2/DB410c/HDMI.conf
@@ -2,30 +2,14 @@
 # Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 
 SectionVerb {
-       EnableSequence [
-       ]
-
-       DisableSequence [
-       ]
        Value {
                TQ "HiFi"
-               PlaybackPCM "plughw:0,0"
+               PlaybackPCM "plughw:${CardId},0"
+               PlaybackChannels "2"
        }
 }
 
 SectionDevice."HDMI-stereo" {
-       #Name "HDMI-stereo"
+       # Name "HDMI-stereo"
        Comment "HDMI Digital Stereo Output"
-
-       EnableSequence [
-               cdev "hw:0"
-       ]
-
-       DisableSequence [
-               cdev "hw:0"
-       ]
-
-       Value {
-               PlaybackChannels "2"
-       }
 }

diff --git a/ucm/DB410c/HiFi.conf b/ucm2/DB410c/HiFi.conf
similarity index 78%
rename from ucm/DB410c/HiFi.conf
rename to ucm2/DB410c/HiFi.conf
index dcb7ac986848482c9a65efd0878138b21c8eed9a..848d02fd78f174058165fb3cc1390621b6b0db83 100644 (file)
--- a/ucm/DB410c/HiFi.conf
+++ b/ucm2/DB410c/HiFi.conf
@@ -3,17 +3,13 @@
 
 SectionVerb {
 
-       EnableSequence [
-       ]
-
-       DisableSequence [
-       ]
-
        # ALSA PCM
        Value {
                # ALSA PCM device for HiFi
-               PlaybackPCM "plughw:0,1"
-               CapturePCM "plughw:0,2"
+               PlaybackPCM "plughw:${CardId},1"
+               CapturePCM "plughw:${CardId},2"
+               PlaybackChannels "2"
+               CaptureChannels "2"
        }
 }
 
@@ -27,7 +23,6 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:0"
                cset "name='SPK DAC Switch' 1"
                cset "name='RX3 MIX1 INP1' RX1"
                ## gain to  0dB
@@ -35,14 +30,9 @@ SectionDevice."Speaker" {
        ]
 
        DisableSequence [
-               cdev "hw:0"
                cset "name='SPK DAC Switch' 0"
                cset "name='RX3 MIX1 INP1' ZERO"
        ]
-
-       Value {
-               PlaybackChannels "2"
-       }
 }
 
 
@@ -54,7 +44,6 @@ SectionDevice."Headphones" {
                "Earpiece"
        ]
        EnableSequence [
-               cdev "hw:0"
                cset "name='RX1 MIX1 INP1' RX1"
                cset "name='RX2 MIX1 INP1' RX2"
                cset "name='RDAC2 MUX' RX2"
@@ -67,7 +56,6 @@ SectionDevice."Headphones" {
        ]
 
        DisableSequence [
-               cdev "hw:0"
                cset "name='RX1 Digital Volume' 0"
                cset "name='RX2 Digital Volume' 0"
                cset "name='HPHL' 0"
@@ -76,10 +64,6 @@ SectionDevice."Headphones" {
                cset "name='RX1 MIX1 INP1' ZERO"
                cset "name='RX2 MIX1 INP1' ZERO"
        ]
-
-       Value {
-               PlaybackChannels "2"
-       }
 }
 
 SectionDevice."Earpiece" {
@@ -89,24 +73,12 @@ SectionDevice."Earpiece" {
                "Speaker"
                "Headphones"
        ]
-       EnableSequence [
-               cdev "hw:0"
-       ]
-
-       DisableSequence [
-               cdev "hw:0"
-       ]
-
-       Value {
-               PlaybackChannels "2"
-       }
 }
 
 SectionDevice."Handset" {
        Comment "Headset Microphone"
 
        EnableSequence [
-               cdev "hw:0"
                cset "name='DEC1 MUX' ADC2"
                cset "name='CIC1 MUX' AMIC"
                cset "name='ADC2 Volume' 8"
@@ -114,43 +86,31 @@ SectionDevice."Handset" {
        ]
 
        DisableSequence [
-               cdev "hw:0"
                cset "name='ADC2 MUX' ZERO"
                cset "name='ADC2 Volume' 0"
                cset "name='DEC1 MUX' ZERO"
        ]
-
-       Value {
-               CaptureChannels "2"
-       }
 }
 
-SectionDevice."Primarymic" {
+SectionDevice."PrimaryMic" {
        Comment "Primary Microphone"
 
        EnableSequence [
-               cdev "hw:0"
                cset "name='DEC1 MUX' ADC1"
                cset "name='CIC1 MUX' AMIC"
                cset "name='ADC1 Volume' 8"
        ]
 
        DisableSequence [
-               cdev "hw:0"
                cset "name='DEC1 MUX' ZERO"
                cset "name='ADC1 Volume' 0"
        ]
-
-       Value {
-               CaptureChannels "2"
-       }
 }
 
-SectionDevice."Secondarymic" {
+SectionDevice."SecondaryMic" {
        Comment "Secondary Microphone"
 
        EnableSequence [
-               cdev "hw:0"
                cset "name='DEC1 MUX' ADC2"
                cset "name='CIC1 MUX' AMIC"
                cset "name='ADC2 Volume' 8"
@@ -158,32 +118,21 @@ SectionDevice."Secondarymic" {
        ]
 
        DisableSequence [
-               cdev "hw:0"
                cset "name='DEC1 MUX' ZERO"
                cset "name='ADC2 Volume' 0"
                cset "name='ADC2 MUX' ZERO"
        ]
-
-       Value {
-               CaptureChannels "2"
-       }
 }
 
-SectionDevice."DMIC" {
+SectionDevice."DigitalMic" {
        Comment "Digital Microphone"
 
        EnableSequence [
-               cdev "hw:0"
                cset "name='DEC1 MUX' DMIC1"
                cset "name='CIC1 MUX' DMIC"
        ]
 
        DisableSequence [
-               cdev "hw:0"
                cset "name='DEC1 MUX' ZERO"
        ]
-
-       Value {
-               CaptureChannels "2"
-       }
 }