alsa-state: Update MX6 settings for use with FSL 3.10.17-1.0.0 kernel

This configuration is made for use with the 3.10.17-1.0.0 kernel and
won't work with previous 3.0.35-4.1.0 one.

Change-Id: Iceef47befdf1e09a364bcf992b7631dd163718c7
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 248 insertions, 138 deletions

diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state.bbappend
index 22b0e60b1..6bc024674 100644
--- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,4 +1,4 @@
-# Append path for freescale layer to include alsa-state asound.conf 
+# Append path for freescale layer to include alsa-state asound.conf
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.conf b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.conf
index aff332e8d..3f4e04828 100755..100644
--- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.conf
+++ b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.conf
@@ -6,8 +6,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 320000
 format S16_LE
 rate 48000
 }
@@ -19,8 +19,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 44100
 }
@@ -32,8 +32,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 32000
 }
@@ -45,8 +45,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 24000
 }
@@ -58,8 +58,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 22050
 }
@@ -71,8 +71,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 16000
 }
@@ -84,8 +84,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 240000
 format S16_LE
 rate 12000
 }
@@ -97,8 +97,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 240000
 format S16_LE
 rate 11025
 }
@@ -110,8 +110,8 @@ ipc_key 5678293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 8000
 }
@@ -123,8 +123,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 320000
 format S16_LE
 rate 48000
 }
@@ -136,8 +136,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 44100
 }
@@ -149,8 +149,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 32000
 }
@@ -162,8 +162,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 24000
 }
@@ -175,8 +175,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 22050
 }
@@ -188,8 +188,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 16000
 }
@@ -201,8 +201,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 240000
 format S16_LE
 rate 12000
 }
@@ -214,8 +214,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 240000
 format S16_LE
 rate 11025
 }
@@ -227,8 +227,8 @@ ipc_key 5778293
 ipc_key_add_uid yes
 slave{
 pcm "hw:0,0"
-period_time 10000
-buffer_time 450000
+period_time 40000
+buffer_time 360000
 format S16_LE
 rate 8000
 }
diff --git a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.state b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.state
index 4dcbc4c66..552f763de 100644
--- a/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.state
+++ b/meta-fsl-arm/recipes-bsp/alsa-state/alsa-state/mx6/asound.state
@@ -113,8 +113,8 @@ state.wm8962audio {
         control.9 {
                 iface MIXER
                 name 'Capture Volume'
-                value.0 47
-                value.1 47
+                value.0 63
+                value.1 63
                 comment {
                         access 'read write'
                         type INTEGER
@@ -122,15 +122,15 @@ state.wm8962audio {
                         range '0 - 63'
                         dbmin -2325
                         dbmax 2400
-                        dbvalue.0 1200
-                        dbvalue.1 1200
+                        dbvalue.0 2400
+                        dbvalue.1 2400
                 }
         }
         control.10 {
                 iface MIXER
                 name 'Capture Switch'
-                value.0 true
-                value.1 true
+                value.0 false
+                value.1 false
                 comment {
                         access 'read write'
                         type BOOLEAN
@@ -247,6 +247,26 @@ state.wm8962audio {
         }
         control.20 {
                 iface MIXER
+                name 'DAC L/R Swap Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.21 {
+                iface MIXER
+                name 'ADC L/R Swap Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.22 {
+                iface MIXER
                 name 'ADC High Performance Switch'
                 value true
                 comment {
@@ -255,7 +275,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.21 {
+        control.23 {
                 iface MIXER
                 name 'Beep Volume'
                 value 0
@@ -269,11 +289,11 @@ state.wm8962audio {
                         dbvalue.0 -9999999
                 }
         }
-        control.22 {
+        control.24 {
                 iface MIXER
                 name 'Headphone Volume'
-                value.0 118
-                value.1 118
+                value.0 93
+                value.1 93
                 comment {
                         access 'read write'
                         type INTEGER
@@ -281,11 +301,11 @@ state.wm8962audio {
                         range '0 - 127'
                         dbmin -9999999
                         dbmax 600
-                        dbvalue.0 -300
-                        dbvalue.1 -300
+                        dbvalue.0 -2800
+                        dbvalue.1 -2800
                 }
         }
-        control.23 {
+        control.25 {
                 iface MIXER
                 name 'Headphone Switch'
                 value.0 true
@@ -296,7 +316,7 @@ state.wm8962audio {
                         count 2
                 }
         }
-        control.24 {
+        control.26 {
                 iface MIXER
                 name 'Headphone ZC Switch'
                 value.0 false
@@ -307,7 +327,7 @@ state.wm8962audio {
                         count 2
                 }
         }
-        control.25 {
+        control.27 {
                 iface MIXER
                 name 'Headphone Aux Volume'
                 value.0 7
@@ -323,7 +343,7 @@ state.wm8962audio {
                         dbvalue.1 0
                 }
         }
-        control.26 {
+        control.28 {
                 iface MIXER
                 name 'Headphone Mixer Switch'
                 value.0 false
@@ -334,7 +354,7 @@ state.wm8962audio {
                         count 2
                 }
         }
-        control.27 {
+        control.29 {
                 iface MIXER
                 name 'HPMIXL IN4L Volume'
                 value 7
@@ -348,7 +368,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.28 {
+        control.30 {
                 iface MIXER
                 name 'HPMIXL IN4R Volume'
                 value 7
@@ -362,7 +382,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.29 {
+        control.31 {
                 iface MIXER
                 name 'HPMIXL MIXINL Volume'
                 value 1
@@ -376,7 +396,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.30 {
+        control.32 {
                 iface MIXER
                 name 'HPMIXL MIXINR Volume'
                 value 1
@@ -390,7 +410,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.31 {
+        control.33 {
                 iface MIXER
                 name 'HPMIXR IN4L Volume'
                 value 7
@@ -404,7 +424,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.32 {
+        control.34 {
                 iface MIXER
                 name 'HPMIXR IN4R Volume'
                 value 7
@@ -418,7 +438,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.33 {
+        control.35 {
                 iface MIXER
                 name 'HPMIXR MIXINL Volume'
                 value 1
@@ -432,7 +452,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.34 {
+        control.36 {
                 iface MIXER
                 name 'HPMIXR MIXINR Volume'
                 value 1
@@ -446,7 +466,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.35 {
+        control.37 {
                 iface MIXER
                 name 'Speaker Boost Volume'
                 value 3
@@ -460,7 +480,7 @@ state.wm8962audio {
                         dbvalue.0 450
                 }
         }
-        control.36 {
+        control.38 {
                 iface MIXER
                 name 'EQ Switch'
                 value false
@@ -470,7 +490,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.37 {
+        control.39 {
                 iface MIXER
                 name 'EQ1 Volume'
                 value.0 12
@@ -486,7 +506,7 @@ state.wm8962audio {
                         dbvalue.1 0
                 }
         }
-        control.38 {
+        control.40 {
                 iface MIXER
                 name 'EQ2 Volume'
                 value.0 12
@@ -502,7 +522,7 @@ state.wm8962audio {
                         dbvalue.1 0
                 }
         }
-        control.39 {
+        control.41 {
                 iface MIXER
                 name 'EQ3 Volume'
                 value.0 12
@@ -518,7 +538,7 @@ state.wm8962audio {
                         dbvalue.1 0
                 }
         }
-        control.40 {
+        control.42 {
                 iface MIXER
                 name 'EQ4 Volume'
                 value.0 12
@@ -534,7 +554,7 @@ state.wm8962audio {
                         dbvalue.1 0
                 }
         }
-        control.41 {
+        control.43 {
                 iface MIXER
                 name 'EQ5 Volume'
                 value.0 12
@@ -550,7 +570,67 @@ state.wm8962audio {
                         dbvalue.1 0
                 }
         }
-        control.42 {
+        control.44 {
+                iface MIXER
+                name '3D Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.45 {
+                iface MIXER
+                name '3D Coefficients'
+                value '0040000000000000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 8
+                }
+        }
+        control.46 {
+                iface MIXER
+                name 'DF1 Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.47 {
+                iface MIXER
+                name 'DF1 Coefficients'
+                value '0000000000000000000000000000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 14
+                }
+        }
+        control.48 {
+                iface MIXER
+                name 'DRC Switch'
+                value false
+                comment {
+                        access 'read write'
+                        type BOOLEAN
+                        count 1
+                }
+        }
+        control.49 {
+                iface MIXER
+                name 'DRC Coefficients'
+                value '000c0925000000000000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 10
+                }
+        }
+        control.50 {
                 iface MIXER
                 name 'VSS Switch'
                 value false
@@ -560,7 +640,17 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.43 {
+        control.51 {
+                iface MIXER
+                name 'VSS Coefficients'
+                value '008c020000350700003a4100008b7d00003a4100008cfee800780000003fb260002d18180020000000f1834000fb830000eeaec000fbac4000f17f8000f43b4000f5fb0000ea10c000fcc58000e275c00004b48000d4f9800004914000d8a48000023dc000cf7a8000dc060000f2dac000baf340000a7940001c068000fd2d00001ce840000ddc4000fc9d000009558000fe7e80000eab4000f99880000987c000fd2c400009480000035f400000870000fae4c000000b400004e18000011f4000f8b00000fbcbc00004f3800007df4000ff070000efd70000fbaf4000108a80001107c000e0080000d276000020cf400030234000fd69c0002835000006330000d9f6c000f33340000f420000040c8000fb3f8000f757c0000354000000c6c0000312c000fd8580'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 296
+                }
+        }
+        control.52 {
                 iface MIXER
                 name 'HPF1 Switch'
                 value false
@@ -570,7 +660,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.44 {
+        control.53 {
                 iface MIXER
                 name 'HPF2 Switch'
                 value false
@@ -580,7 +670,17 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.45 {
+        control.54 {
+                iface MIXER
+                name 'HPF Coefficients'
+                value '0000'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 2
+                }
+        }
+        control.55 {
                 iface MIXER
                 name 'HD Bass Switch'
                 value false
@@ -590,7 +690,17 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.46 {
+        control.56 {
+                iface MIXER
+                name 'HD Bass Coefficients'
+                value '0002bd12007c586c00538121003f8bd80032f52d0065ac8c006be08700721483007214830043352500066a4a0043607900080000000100000059999a'
+                comment {
+                        access 'read write'
+                        type BYTES
+                        count 60
+                }
+        }
+        control.57 {
                 iface MIXER
                 name 'Speaker Volume'
                 value.0 114
@@ -606,18 +716,18 @@ state.wm8962audio {
                         dbvalue.1 -700
                 }
         }
-        control.47 {
+        control.58 {
                 iface MIXER
                 name 'Speaker Switch'
-                value.0 true
-                value.1 true
+                value.0 false
+                value.1 false
                 comment {
                         access 'read write'
                         type BOOLEAN
                         count 2
                 }
         }
-        control.48 {
+        control.59 {
                 iface MIXER
                 name 'Speaker ZC Switch'
                 value.0 false
@@ -628,7 +738,7 @@ state.wm8962audio {
                         count 2
                 }
         }
-        control.49 {
+        control.60 {
                 iface MIXER
                 name 'Speaker Mixer Switch'
                 value.0 false
@@ -639,7 +749,7 @@ state.wm8962audio {
                         count 2
                 }
         }
-        control.50 {
+        control.61 {
                 iface MIXER
                 name 'SPKOUTL Mixer IN4L Volume'
                 value 7
@@ -653,7 +763,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.51 {
+        control.62 {
                 iface MIXER
                 name 'SPKOUTL Mixer IN4R Volume'
                 value 7
@@ -667,7 +777,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.52 {
+        control.63 {
                 iface MIXER
                 name 'SPKOUTL Mixer MIXINL Volume'
                 value 1
@@ -681,7 +791,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.53 {
+        control.64 {
                 iface MIXER
                 name 'SPKOUTL Mixer MIXINR Volume'
                 value 1
@@ -695,7 +805,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.54 {
+        control.65 {
                 iface MIXER
                 name 'SPKOUTL Mixer DACL Volume'
                 value 0
@@ -709,7 +819,7 @@ state.wm8962audio {
                         dbvalue.0 -600
                 }
         }
-        control.55 {
+        control.66 {
                 iface MIXER
                 name 'SPKOUTL Mixer DACR Volume'
                 value 0
@@ -723,7 +833,7 @@ state.wm8962audio {
                         dbvalue.0 -600
                 }
         }
-        control.56 {
+        control.67 {
                 iface MIXER
                 name 'SPKOUTR Mixer IN4L Volume'
                 value 7
@@ -737,7 +847,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.57 {
+        control.68 {
                 iface MIXER
                 name 'SPKOUTR Mixer IN4R Volume'
                 value 7
@@ -751,7 +861,7 @@ state.wm8962audio {
                         dbvalue.0 600
                 }
         }
-        control.58 {
+        control.69 {
                 iface MIXER
                 name 'SPKOUTR Mixer MIXINL Volume'
                 value 1
@@ -765,7 +875,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.59 {
+        control.70 {
                 iface MIXER
                 name 'SPKOUTR Mixer MIXINR Volume'
                 value 1
@@ -779,7 +889,7 @@ state.wm8962audio {
                         dbvalue.0 0
                 }
         }
-        control.60 {
+        control.71 {
                 iface MIXER
                 name 'SPKOUTR Mixer DACL Volume'
                 value 0
@@ -793,7 +903,7 @@ state.wm8962audio {
                         dbvalue.0 -600
                 }
         }
-        control.61 {
+        control.72 {
                 iface MIXER
                 name 'SPKOUTR Mixer DACR Volume'
                 value 0
@@ -807,7 +917,7 @@ state.wm8962audio {
                         dbvalue.0 -600
                 }
         }
-        control.62 {
+        control.73 {
                 iface MIXER
                 name 'SPKOUTR PGA'
                 value DAC
@@ -819,7 +929,7 @@ state.wm8962audio {
                         item.1 Mixer
                 }
         }
-        control.63 {
+        control.74 {
                 iface MIXER
                 name 'SPKOUTL PGA'
                 value DAC
@@ -831,7 +941,7 @@ state.wm8962audio {
                         item.1 Mixer
                 }
         }
-        control.64 {
+        control.75 {
                 iface MIXER
                 name 'SPKOUTR Mixer DACL Switch'
                 value false
@@ -841,7 +951,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.65 {
+        control.76 {
                 iface MIXER
                 name 'SPKOUTR Mixer DACR Switch'
                 value false
@@ -851,7 +961,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.66 {
+        control.77 {
                 iface MIXER
                 name 'SPKOUTR Mixer MIXINL Switch'
                 value false
@@ -861,7 +971,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.67 {
+        control.78 {
                 iface MIXER
                 name 'SPKOUTR Mixer MIXINR Switch'
                 value false
@@ -871,7 +981,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.68 {
+        control.79 {
                 iface MIXER
                 name 'SPKOUTR Mixer IN4L Switch'
                 value false
@@ -881,7 +991,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.69 {
+        control.80 {
                 iface MIXER
                 name 'SPKOUTR Mixer IN4R Switch'
                 value false
@@ -891,7 +1001,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.70 {
+        control.81 {
                 iface MIXER
                 name 'SPKOUTL Mixer DACL Switch'
                 value false
@@ -901,7 +1011,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.71 {
+        control.82 {
                 iface MIXER
                 name 'SPKOUTL Mixer DACR Switch'
                 value false
@@ -911,7 +1021,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.72 {
+        control.83 {
                 iface MIXER
                 name 'SPKOUTL Mixer MIXINL Switch'
                 value false
@@ -921,7 +1031,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.73 {
+        control.84 {
                 iface MIXER
                 name 'SPKOUTL Mixer MIXINR Switch'
                 value false
@@ -931,7 +1041,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.74 {
+        control.85 {
                 iface MIXER
                 name 'SPKOUTL Mixer IN4L Switch'
                 value false
@@ -941,7 +1051,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.75 {
+        control.86 {
                 iface MIXER
                 name 'SPKOUTL Mixer IN4R Switch'
                 value false
@@ -951,7 +1061,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.76 {
+        control.87 {
                 iface MIXER
                 name 'HPOUTR PGA'
                 value DAC
@@ -963,7 +1073,7 @@ state.wm8962audio {
                         item.1 Mixer
                 }
         }
-        control.77 {
+        control.88 {
                 iface MIXER
                 name 'HPOUTL PGA'
                 value DAC
@@ -975,7 +1085,7 @@ state.wm8962audio {
                         item.1 Mixer
                 }
         }
-        control.78 {
+        control.89 {
                 iface MIXER
                 name 'HPMIXR DACL Switch'
                 value false
@@ -985,7 +1095,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.79 {
+        control.90 {
                 iface MIXER
                 name 'HPMIXR DACR Switch'
                 value false
@@ -995,7 +1105,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.80 {
+        control.91 {
                 iface MIXER
                 name 'HPMIXR MIXINL Switch'
                 value false
@@ -1005,7 +1115,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.81 {
+        control.92 {
                 iface MIXER
                 name 'HPMIXR MIXINR Switch'
                 value false
@@ -1015,7 +1125,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.82 {
+        control.93 {
                 iface MIXER
                 name 'HPMIXR IN4L Switch'
                 value false
@@ -1025,7 +1135,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.83 {
+        control.94 {
                 iface MIXER
                 name 'HPMIXR IN4R Switch'
                 value false
@@ -1035,7 +1145,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.84 {
+        control.95 {
                 iface MIXER
                 name 'HPMIXL DACL Switch'
                 value false
@@ -1045,7 +1155,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.85 {
+        control.96 {
                 iface MIXER
                 name 'HPMIXL DACR Switch'
                 value false
@@ -1055,7 +1165,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.86 {
+        control.97 {
                 iface MIXER
                 name 'HPMIXL MIXINL Switch'
                 value false
@@ -1065,7 +1175,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.87 {
+        control.98 {
                 iface MIXER
                 name 'HPMIXL MIXINR Switch'
                 value false
@@ -1075,7 +1185,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.88 {
+        control.99 {
                 iface MIXER
                 name 'HPMIXL IN4L Switch'
                 value false
@@ -1085,7 +1195,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.89 {
+        control.100 {
                 iface MIXER
                 name 'HPMIXL IN4R Switch'
                 value false
@@ -1095,7 +1205,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.90 {
+        control.101 {
                 iface MIXER
                 name STR
                 value None
@@ -1104,11 +1214,11 @@ state.wm8962audio {
                         type ENUMERATED
                         count 1
                         item.0 None
-                        item.1 Right
-                        item.2 Left
+                        item.1 Left
+                        item.2 Right
                 }
         }
-        control.91 {
+        control.102 {
                 iface MIXER
                 name STL
                 value None
@@ -1117,11 +1227,11 @@ state.wm8962audio {
                         type ENUMERATED
                         count 1
                         item.0 None
-                        item.1 Right
-                        item.2 Left
+                        item.1 Left
+                        item.2 Right
                 }
         }
-        control.92 {
+        control.103 {
                 iface MIXER
                 name 'MIXINR IN2R Switch'
                 value false
@@ -1131,7 +1241,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.93 {
+        control.104 {
                 iface MIXER
                 name 'MIXINR IN3R Switch'
                 value false
@@ -1141,7 +1251,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.94 {
+        control.105 {
                 iface MIXER
                 name 'MIXINR PGA Switch'
                 value true
@@ -1151,7 +1261,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.95 {
+        control.106 {
                 iface MIXER
                 name 'MIXINL IN2L Switch'
                 value false
@@ -1161,7 +1271,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.96 {
+        control.107 {
                 iface MIXER
                 name 'MIXINL IN3L Switch'
                 value false
@@ -1171,7 +1281,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.97 {
+        control.108 {
                 iface MIXER
                 name 'MIXINL PGA Switch'
                 value true
@@ -1181,7 +1291,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.98 {
+        control.109 {
                 iface MIXER
                 name 'INPGAR IN1R Switch'
                 value true
@@ -1191,7 +1301,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.99 {
+        control.110 {
                 iface MIXER
                 name 'INPGAR IN2R Switch'
                 value false
@@ -1201,7 +1311,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.100 {
+        control.111 {
                 iface MIXER
                 name 'INPGAR IN3R Switch'
                 value false
@@ -1211,7 +1321,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.101 {
+        control.112 {
                 iface MIXER
                 name 'INPGAR IN4R Switch'
                 value false
@@ -1221,7 +1331,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.102 {
+        control.113 {
                 iface MIXER
                 name 'INPGAL IN1L Switch'
                 value true
@@ -1231,7 +1341,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.103 {
+        control.114 {
                 iface MIXER
                 name 'INPGAL IN2L Switch'
                 value false
@@ -1241,7 +1351,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.104 {
+        control.115 {
                 iface MIXER
                 name 'INPGAL IN3L Switch'
                 value false
@@ -1251,7 +1361,7 @@ state.wm8962audio {
                         count 1
                 }
         }
-        control.105 {
+        control.116 {
                 iface MIXER
                 name 'INPGAL IN4L Switch'
                 value false