Use names instead of integer indexes for mux inputs

During codec drivers development in mainline there were some
updates which changed meaning of ASoC mux control indexes
of arizona class codecs, e.g. of the wm5110 codec which is
used on Draco board.

Since in the alsaucm files, found in /usr/share/alsa/ucm/wm511/
directory, hard coded indexes are used these files required
an update after moving to a more recent kernel version.

For example, in 'HPOUT2L Input 1' control the input indexes
and the corresponding names look like this:

root@localhost:~# amixer cget iface=MIXER,name='HPOUT2L Input 1'
numid=591,iface=MIXER,name='HPOUT2L Input 1'
  ; type=ENUMERATED,access=rw------,values=1,items=104
  ; Item #0 'None'
  ; Item #1 'Tone Generator 1'
  ; Item #2 'Tone Generator 2'
  ; Item #3 'Haptics'
  ; Item #4 'AEC'
  ; Item #5 'AEC2'
  ; Item #6 'Mic Mute Mixer'
  ; Item #7 'Noise Generator'
  ; Item #8 'IN1L'
  ; Item #9 'IN1R'
  ; Item #10 'IN2L'
  ; Item #11 'IN2R'
  ; Item #12 'IN3L'
  ; Item #13 'IN3R'
  ; Item #14 'IN4L'
  ; Item #15 'IN4R'
  ; Item #16 'AIF1RX1'
  ; Item #17 'AIF1RX2'
  ; Item #18 'AIF1RX3'
  ; Item #19 'AIF1RX4'
	...

In commit 6ebbce0a6e15fd52 "ASoC: wm8998: Initial WM8998 codec
driver" "AEC2" entry was added, which caused shift of indexes
for all subsequent inputs starting from 'Mic Mute Mixer'. And
this made alsaucm configuration files for Draco board invalid.

In order to make common configuration files independent of the
kernel version use names instead of indices for the mux inputs.

Change-Id: Ib85e8e0619d99e227358433d1eb81bf5de8a3322
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

diff --git a/wm5110/hifi b/wm5110/hifi
index 2334ce0..b9f5832 100644 (file)
--- a/wm5110/hifi
+++ b/wm5110/hifi
@@ -23,16 +23,16 @@ SectionDevice."Headphones" {
     cset "name='HPOUT1R Input 1 Volume' 15"
 # Path
     cset "name='HP Switch' 1"
-    cset "name='HPOUT1L Input 1' 15"
-    cset "name='HPOUT1R Input 1' 16"
+    cset "name='HPOUT1L Input 1' AIF1RX1"
+    cset "name='HPOUT1R Input 1' AIF1RX2"
     cset "name='HPOUT1 Digital Switch' 1,1"
   ]
 
   DisableSequence [
 # Path
     cset "name='HP Switch' 0"
-    cset "name='HPOUT1L Input 1' 0"
-    cset "name='HPOUT1R Input 1' 0"
+    cset "name='HPOUT1L Input 1' None"
+    cset "name='HPOUT1R Input 1' None"
     cset "name='HPOUT1 Digital Switch' 0,0"
   ]
 
@@ -50,16 +50,16 @@ SectionDevice."Speaker" {
     cset "name='HPOUT2R Input 1 Volume' 32"
 # Path
     cset "name='SPK Switch' 1"
-    cset "name='HPOUT2L Input 1' 15"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' AIF1RX1"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 1,1"
   ]
 
   DisableSequence [
 # Path
     cset "name='SPK Switch' 0"
-    cset "name='HPOUT2L Input 1' 0"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' None"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 0,0"
   ]
 
@@ -77,16 +77,16 @@ SectionDevice."Earpiece" {
     cset "name='HPOUT3R Input 1 Volume' 40"
 # Path
     cset "name='RCV Switch' 1"
-    cset "name='HPOUT3L Input 1' 15"
-    cset "name='HPOUT3R Input 1' 16"
+    cset "name='HPOUT3L Input 1' AIF1RX1"
+    cset "name='HPOUT3R Input 1' AIF1RX2"
     cset "name='HPOUT3 Digital Switch' 1,1"
   ]
 
   DisableSequence [
 # Path
     cset "name='RCV Switch' 0"
-    cset "name='HPOUT3L Input 1' 0"
-    cset "name='HPOUT3R Input 1' 0"
+    cset "name='HPOUT3L Input 1' None"
+    cset "name='HPOUT3R Input 1' None"
     cset "name='HPOUT3 Digital Switch' 0,0"
   ]
 
@@ -102,16 +102,16 @@ SectionDevice."Line" {
   EnableSequence [
 # Path
     cset "name='VPS Switch' 1"
-    cset "name='HPOUT2L Input 1' 15"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' AIF1RX1"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 1,1"
   ]
 
   DisableSequence [
 # Path
     cset "name='VPS Switch' 0"
-    cset "name='HPOUT2L Input 1' 0"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' None"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 0,0"
   ]
   Value {
@@ -125,13 +125,13 @@ SectionDevice."HDMI" {
   EnableSequence [
 # Path
     cset "name='HDMI Switch' 1"
-    cset "name='SPKOUTL Input 1' 15"
+    cset "name='SPKOUTL Input 1' AIF1RX1"
   ]
 
   DisableSequence [
 # Path
     cset "name='HDMI Switch' 0"
-    cset "name='SPKOUTL Input 1' 0"
+    cset "name='SPKOUTL Input 1' None"
   ]
 
   Value {
@@ -147,13 +147,13 @@ SectionDevice."Bluetooth" {
     cset "name='AIF3TX1 Input 1 Volume' 32"
     cset "name='AIF1TX1 Input 1 Volume' 32"
 # Path
-    cset "name='AIF3TX1 Input 1' 15"
-    cset "name='AIF1TX1 Input 1' 29"
+    cset "name='AIF3TX1 Input 1' AIF1RX1"
+    cset "name='AIF1TX1 Input 1' AIF3RX1"
   ]
 
   DisableSequence [
-    cset "name='AIF3TX1 Input 1' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='AIF3TX1 Input 1' None"
+    cset "name='AIF1TX1 Input 1' None"
   ]
 
   Value {
@@ -173,7 +173,7 @@ SectionDevice."MainMic" {
     cset "name='Main Mic Switch' 1"
     cset "name='IN1 OSR' 0"
     cset "name='IN1R HPF Switch' 1"
-    cset "name='AIF1TX1 Input 1' 8"
+    cset "name='AIF1TX1 Input 1' IN1R"
   ]
 
   DisableSequence [
@@ -181,7 +181,7 @@ SectionDevice."MainMic" {
     cset "name='Main Mic Switch' 0"
     cset "name='IN1 OSR' 1"
     cset "name='IN1R HPF Switch' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='AIF1TX1 Input 1' None"
   ]
 
   Value {
@@ -200,7 +200,7 @@ SectionDevice."SubMic" {
     cset "name='Sub Mic Switch' 1"
     cset "name='IN3 OSR' 0"
     cset "name='IN3L HPF Switch' 1"
-    cset "name='AIF1TX1 Input 1' 11"
+    cset "name='AIF1TX1 Input 1' IN3L"
   ]
 
   DisableSequence [
@@ -208,7 +208,7 @@ SectionDevice."SubMic" {
     cset "name='Sub Mic Switch' 0"
     cset "name='IN3 OSR' 1"
     cset "name='IN3L HPF Switch' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='AIF1TX1 Input 1' None"
   ]
 
   Value {
@@ -227,7 +227,7 @@ SectionDevice."ThirdMic" {
     cset "name='Third Mic Switch' 1"
     cset "name='IN3 OSR' 0"
     cset "name='IN3R HPF Switch' 1"
-    cset "name='AIF1TX1 Input 1' 12"
+    cset "name='AIF1TX1 Input 1' IN3R"
   ]
 
   DisableSequence [
@@ -235,7 +235,7 @@ SectionDevice."ThirdMic" {
     cset "name='Third Mic Switch' 0"
     cset "name='IN3 OSR' 1"
     cset "name='IN3R HPF Switch' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='AIF1TX1 Input 1' None"
   ]
 
   Value {
@@ -252,13 +252,13 @@ SectionDevice."HeadsetMic" {
     cset "name='IN2R Volume' 32"
 # Path
     cset "name='Headset Mic Switch' 1"
-    cset "name='AIF1TX1 Input 1' 10"
+    cset "name='AIF1TX1 Input 1' IN2R"
   ]
 
   DisableSequence [
 # Path
     cset "name='Headset Mic Switch' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='AIF1TX1 Input 1' None"
   ]
 
   Value {

diff --git a/wm5110/inactive b/wm5110/inactive
index d9add4a..02b5ab3 100644 (file)
--- a/wm5110/inactive
+++ b/wm5110/inactive
@@ -4,23 +4,23 @@
 SectionVerb {
   EnableSequence [
     cset "name='HP Switch' 0"
-    cset "name='HPOUT1L Input 1' 0"
-    cset "name='HPOUT1R Input 1' 0"
+    cset "name='HPOUT1L Input 1' None"
+    cset "name='HPOUT1R Input 1' None"
     cset "name='HPOUT1 Digital Switch' 0,0"
     cset "name='SPK Switch' 0"
-    cset "name='HPOUT2L Input 1' 0"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' None"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 0,0"
     cset "name='RCV Switch' 0"
-    cset "name='HPOUT3L Input 1' 0"
-    cset "name='HPOUT3R Input 1' 0"
+    cset "name='HPOUT3L Input 1' None"
+    cset "name='HPOUT3R Input 1' None"
     cset "name='HPOUT3 Digital Switch' 0,0"
-    cset "name='AIF3TX1 Input 1' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF3TX1 Input 1' None"
+    cset "name='AIF2TX1 Input 1' None"
     cset "name='VPS Switch' 0"
     cset "name='HDMI Switch' 0"
-    cset "name='SPKOUTL Input 1' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='SPKOUTL Input 1' None"
+    cset "name='AIF1TX1 Input 1' None"
     cset "name='Main Mic Switch' 0"
     cset "name='IN1 OSR' 1"
     cset "name='IN1R HPF Switch' 0"
@@ -56,23 +56,23 @@ SectionDevice."Playback" {
 
   EnableSequence [
     cset "name='HP Switch' 0"
-    cset "name='HPOUT1L Input 1' 0"
-    cset "name='HPOUT1R Input 1' 0"
+    cset "name='HPOUT1L Input 1' None"
+    cset "name='HPOUT1R Input 1' None"
     cset "name='HPOUT1 Digital Switch' 0,0"
     cset "name='SPK Switch' 0"
-    cset "name='HPOUT2L Input 1' 0"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' None"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 0,0"
     cset "name='RCV Switch' 0"
-    cset "name='HPOUT3L Input 1' 0"
-    cset "name='HPOUT3R Input 1' 0"
+    cset "name='HPOUT3L Input 1' None"
+    cset "name='HPOUT3R Input 1' None"
     cset "name='HPOUT3 Digital Switch' 0,0"
-    cset "name='AIF3TX1 Input 1' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF3TX1 Input 1' None"
+    cset "name='AIF2TX1 Input 1' None"
     cset "name='VPS Switch' 0"
     cset "name='HDMI Switch' 0"
-    cset "name='SPKOUTL Input 1' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='SPKOUTL Input 1' None"
+    cset "name='AIF1TX1 Input 1' None"
   ]
 
   DisableSequence [
@@ -86,14 +86,14 @@ SectionDevice."Capture" {
     cset "name='Main Mic Switch' 0"
     cset "name='IN1 OSR' 1"
     cset "name='IN1R HPF Switch' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF2TX1 Input 1' None"
     cset "name='Sub Mic Switch' 0"
     cset "name='IN3 OSR' 1"
     cset "name='IN3L HPF Switch' 0"
     cset "name='Third Mic Switch' 0"
     cset "name='IN3R HPF Switch' 0"
     cset "name='Headset Mic Switch' 0"
-    cset "name='AIF1TX1 Input 1' 0"
+    cset "name='AIF1TX1 Input 1' None"
   ]
 
   DisableSequence [

diff --git a/wm5110/voicecall b/wm5110/voicecall
index 95e4520..5da31a2 100644 (file)
--- a/wm5110/voicecall
+++ b/wm5110/voicecall
@@ -23,8 +23,8 @@ SectionDevice."Headphones" {
     cset "name='HPOUT1R Input 1 Volume' 15"
 # Path
     cset "name='HP Switch' 1"
-    cset "name='HPOUT1L Input 1' 23"
-    cset "name='HPOUT1R Input 1' 24"
+    cset "name='HPOUT1L Input 1' AIF2RX1"
+    cset "name='HPOUT1R Input 1' AIF2RX2"
     cset "name='HPOUT1 Digital Switch' 1,1"
   ]
 
@@ -49,16 +49,16 @@ SectionDevice."Speaker" {
     cset "name='HPOUT2L Input 1 Volume' 15"
 # Path
     cset "name='SPK Switch' 1"
-    cset "name='HPOUT2L Input 1' 23"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' AIF2RX1"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 1,1"
   ]
 
   DisableSequence [
 # Path
     cset "name='SPK Switch' 0"
-    cset "name='HPOUT2L Input 1' 0"
-    cset "name='HPOUT2R Input 1' 0"
+    cset "name='HPOUT2L Input 1' None"
+    cset "name='HPOUT2R Input 1' None"
     cset "name='HPOUT2 Digital Switch' 0,0"
   ]
 
@@ -76,16 +76,16 @@ SectionDevice."Earpiece" {
     cset "name='HPOUT3R Input 1 Volume' 40"
 # Path
     cset "name='RCV Switch' 1"
-    cset "name='HPOUT3L Input 1' 23"
-    cset "name='HPOUT3R Input 1' 24"
+    cset "name='HPOUT3L Input 1' AIF2RX1"
+    cset "name='HPOUT3R Input 1' AIF2RX2"
     cset "name='HPOUT3 Digital Switch' 1,1"
   ]
 
   DisableSequence [
 # Path
     cset "name='RCV Switch' 0"
-    cset "name='HPOUT3L Input 1' 0"
-    cset "name='HPOUT3R Input 1' 0"
+    cset "name='HPOUT3L Input 1' None"
+    cset "name='HPOUT3R Input 1' None"
     cset "name='HPOUT3 Digital Switch' 0,0"
   ]
 
@@ -102,13 +102,13 @@ SectionDevice."Bluetooth" {
     cset "name='AIF3TX1 Input 1 Volume' 32"
     cset "name='AIF2TX1 Input 1 Volume' 32"
 # Path
-    cset "name='AIF3TX1 Input 1' 23"
-    cset "name='AIF2TX1 Input 1' 29"
+    cset "name='AIF3TX1 Input 1' AIF2RX1"
+    cset "name='AIF2TX1 Input 1' AIF3RX1"
   ]
 
   DisableSequence [
-    cset "name='AIF3TX1 Input 1' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF3TX1 Input 1' None"
+    cset "name='AIF2TX1 Input 1' None"
   ]
 
   Value {
@@ -128,7 +128,7 @@ SectionDevice."MainMic" {
     cset "name='Main Mic Switch' 1"
     cset "name='IN1 OSR' 0"
     cset "name='IN1R HPF Switch' 1"
-    cset "name='AIF2TX1 Input 1' 8"
+    cset "name='AIF2TX1 Input 1' IN1R"
   ]
 
   DisableSequence [
@@ -136,7 +136,7 @@ SectionDevice."MainMic" {
     cset "name='Main Mic Switch' 0"
     cset "name='IN1 OSR' 1"
     cset "name='IN1R HPF Switch' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF2TX1 Input 1' None"
   ]
 
   Value {
@@ -155,7 +155,7 @@ SectionDevice."SubMic" {
     cset "name='Sub Mic Switch' 1"
     cset "name='IN3 OSR' 0"
     cset "name='IN3L HPF Switch' 1"
-    cset "name='AIF2TX1 Input 1' 11"
+    cset "name='AIF2TX1 Input 1' IN3L"
   ]
 
   DisableSequence [
@@ -163,7 +163,7 @@ SectionDevice."SubMic" {
     cset "name='Sub Mic Switch' 0"
     cset "name='IN3 OSR' 1"
     cset "name='IN3L HPF Switch' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF2TX1 Input 1' None"
   ]
 
   Value {
@@ -182,7 +182,7 @@ SectionDevice."ThirdMic" {
     cset "name='Third Mic Switch' 1"
     cset "name='IN3 OSR' 0"
     cset "name='IN3R HPF Switch' 1"
-    cset "name='AIF2TX1 Input 1' 12"
+    cset "name='AIF2TX1 Input 1' IN3R"
   ]
 
   DisableSequence [
@@ -190,7 +190,7 @@ SectionDevice."ThirdMic" {
     cset "name='Third Mic Switch' 0"
     cset "name='IN3 OSR' 1"
     cset "name='IN3R HPF Switch' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF2TX1 Input 1' None"
   ]
 
   Value {
@@ -207,13 +207,13 @@ SectionDevice."HeadsetMic" {
     cset "name='IN2R Volume' 32"
 # Path
     cset "name='Headset Mic Switch' 1"
-    cset "name='AIF2TX1 Input 1' 10"
+    cset "name='AIF2TX1 Input 1' IN2R"
   ]
 
   DisableSequence [
 # Path
     cset "name='Headset Mic Switch' 0"
-    cset "name='AIF2TX1 Input 1' 0"
+    cset "name='AIF2TX1 Input 1' None"
   ]
 
   Value {