alsa-state: update alsa state for new omap3-touchbook kernel

diff --git a/recipes/alsa/alsa-state/omap3-touchbook/asound.state b/recipes/alsa/alsa-state/omap3-touchbook/asound.state
index d0e048d..77ae10c 100644 (file)
--- a/recipes/alsa/alsa-state/omap3-touchbook/asound.state
+++ b/recipes/alsa/alsa-state/omap3-touchbook/asound.state
@@ -1,5 +1,15 @@
 state.omap3beagle {
        control.1 {
+               comment.access 'read write'
+               comment.type ENUMERATED
+               comment.count 1
+               comment.item.0 'Option 2 (voice/audio)'
+               comment.item.1 'Option 1 (audio)'
+               iface MIXER
+               name 'Codec Operation Mode'
+               value 'Option 2 (voice/audio)'
+       }
+       control.2 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -8,10 +18,10 @@ state.omap3beagle {
                comment.dbmax 0
                iface MIXER
                name 'DAC1 Digital Fine Playback Volume'
-               value.0 0
-               value.1 0
+               value.0 63
+               value.1 63
        }
-       control.2 {
+       control.3 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -20,10 +30,10 @@ state.omap3beagle {
                comment.dbmax 0
                iface MIXER
                name 'DAC2 Digital Fine Playback Volume'
-               value.0 63
-               value.1 63
+               value.0 0
+               value.1 0
        }
-       control.3 {
+       control.4 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -32,10 +42,10 @@ state.omap3beagle {
                comment.dbmax 1200
                iface MIXER
                name 'DAC1 Digital Coarse Playback Volume'
-               value.0 0
-               value.1 0
+               value.0 2
+               value.1 2
        }
-       control.4 {
+       control.5 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -44,10 +54,10 @@ state.omap3beagle {
                comment.dbmax 1200
                iface MIXER
                name 'DAC2 Digital Coarse Playback Volume'
-               value.0 2
-               value.1 2
+               value.0 0
+               value.1 0
        }
-       control.5 {
+       control.6 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -56,10 +66,10 @@ state.omap3beagle {
                comment.dbmax 1200
                iface MIXER
                name 'DAC1 Analog Playback Volume'
-               value.0 0
-               value.1 0
+               value.0 15
+               value.1 15
        }
-       control.6 {
+       control.7 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -68,28 +78,58 @@ state.omap3beagle {
                comment.dbmax 1200
                iface MIXER
                name 'DAC2 Analog Playback Volume'
-               value.0 12
-               value.1 12
+               value.0 0
+               value.1 0
        }
-       control.7 {
+       control.8 {
                comment.access 'read write'
                comment.type BOOLEAN
                comment.count 2
                iface MIXER
                name 'DAC1 Analog Playback Switch'
-               value.0 false
-               value.1 false
+               value.0 true
+               value.1 true
        }
-       control.8 {
+       control.9 {
                comment.access 'read write'
                comment.type BOOLEAN
                comment.count 2
                iface MIXER
                name 'DAC2 Analog Playback Switch'
-               value.0 true
-               value.1 true
+               value.0 false
+               value.1 false
        }
-       control.9 {
+       control.10 {
+               comment.access 'read write'
+               comment.type INTEGER
+               comment.count 1
+               comment.range '0 - 49'
+               comment.dbmin -3700
+               comment.dbmax 1200
+               iface MIXER
+               name 'DAC Voice Digital Downlink Volume'
+               value 0
+       }
+       control.11 {
+               comment.access 'read write'
+               comment.type INTEGER
+               comment.count 1
+               comment.range '0 - 18'
+               comment.dbmin -2400
+               comment.dbmax 1200
+               iface MIXER
+               name 'DAC Voice Analog Downlink Volume'
+               value 0
+       }
+       control.12 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'DAC Voice Analog Downlink Switch'
+               value false
+       }
+       control.13 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -101,7 +141,7 @@ state.omap3beagle {
                value.0 0
                value.1 0
        }
-       control.10 {
+       control.14 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -113,7 +153,7 @@ state.omap3beagle {
                value.0 2
                value.1 2
        }
-       control.11 {
+       control.15 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -125,18 +165,18 @@ state.omap3beagle {
                value.0 0
                value.1 0
        }
-       control.12 {
+       control.16 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 1
                comment.range '0 - 3'
-               comment.dbmin -1200
-               comment.dbmax 600
+               comment.dbmin -600
+               comment.dbmax 1200
                iface MIXER
                name 'Earpiece Playback Volume'
                value 0
        }
-       control.13 {
+       control.17 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -145,10 +185,10 @@ state.omap3beagle {
                comment.dbmax 3100
                iface MIXER
                name 'TX1 Digital Capture Volume'
-               value.0 12
-               value.1 12
+               value.0 31
+               value.1 31
        }
-       control.14 {
+       control.18 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -160,7 +200,7 @@ state.omap3beagle {
                value.0 0
                value.1 0
        }
-       control.15 {
+       control.19 {
                comment.access 'read write'
                comment.type INTEGER
                comment.count 2
@@ -169,34 +209,104 @@ state.omap3beagle {
                comment.dbmax 3000
                iface MIXER
                name 'Analog Capture Volume'
-               value.0 0
-               value.1 0
+               value.0 4
+               value.1 4
        }
-       control.16 {
+       control.20 {
                comment.access 'read write'
                comment.type ENUMERATED
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 'Sub mic'
-               comment.item.2 AUXR
+               comment.item.0 'Voice high priority'
+               comment.item.1 'HiFi high priority'
                iface MIXER
-               name 'Analog Right Capture Route'
-               value AUXR
+               name 'AVADC Clock Priority'
+               value 'Voice high priority'
        }
-       control.17 {
+       control.21 {
                comment.access 'read write'
                comment.type ENUMERATED
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 'Main mic'
-               comment.item.2 'Headset mic'
-               comment.item.3 AUXL
-               comment.item.4 'Carkit mic'
+               comment.item.0 '27/20/14 ms'
+               comment.item.1 '55/40/27 ms'
+               comment.item.2 '109/81/55 ms'
+               comment.item.3 '218/161/109 ms'
+               comment.item.4 '437/323/218 ms'
+               comment.item.5 '874/645/437 ms'
+               comment.item.6 '1748/1291/874 ms'
+               comment.item.7 '3495/2581/1748 ms'
                iface MIXER
-               name 'Analog Left Capture Route'
-               value AUXL
+               name 'HS ramp delay'
+               value '27/20/14 ms'
        }
-       control.18 {
+       control.22 {
+               comment.access 'read write'
+               comment.type ENUMERATED
+               comment.count 1
+               comment.item.0 'Vibra H-bridge direction'
+               comment.item.1 'Audio data MSB'
+               iface MIXER
+               name 'Vibra H-bridge mode'
+               value 'Vibra H-bridge direction'
+       }
+       control.23 {
+               comment.access 'read write'
+               comment.type ENUMERATED
+               comment.count 1
+               comment.item.0 'Positive polarity'
+               comment.item.1 'Negative polarity'
+               iface MIXER
+               name 'Vibra H-bridge direction'
+               value 'Positive polarity'
+       }
+       control.24 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Analog Right Sub Mic Capture Switch'
+               value false
+       }
+       control.25 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Analog Right AUXR Capture Switch'
+               value false
+       }
+       control.26 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Analog Left Main Mic Capture Switch'
+               value false
+       }
+       control.27 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Analog Left Headset Mic Capture Switch'
+               value true
+       }
+       control.28 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Analog Left AUXL Capture Switch'
+               value false
+       }
+       control.29 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Analog Left Carkit Mic Capture Switch'
+               value false
+       }
+       control.30 {
                comment.access 'read write'
                comment.type ENUMERATED
                comment.count 1
@@ -204,9 +314,9 @@ state.omap3beagle {
                comment.item.1 Digimic1
                iface MIXER
                name 'TX2 Capture Route'
-               value Analog
+               value Digimic1
        }
-       control.19 {
+       control.31 {
                comment.access 'read write'
                comment.type ENUMERATED
                comment.count 1
@@ -216,108 +326,331 @@ state.omap3beagle {
                name 'TX1 Capture Route'
                value Analog
        }
-       control.20 {
+       control.32 {
+               comment.access 'read write'
+               comment.type ENUMERATED
+               comment.count 1
+               comment.item.0 'Local vibrator'
+               comment.item.1 Audio
+               iface MIXER
+               name 'Vibra Route'
+               value 'Local vibrator'
+       }
+       control.33 {
+               comment.access 'read write'
+               comment.type ENUMERATED
+               comment.count 1
+               comment.item.0 AudioL1
+               comment.item.1 AudioR1
+               comment.item.2 AudioL2
+               comment.item.3 AudioR2
+               iface MIXER
+               name 'Vibra Mux'
+               value AudioL1
+       }
+       control.34 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HandsfreeR Switch'
+               value true
+       }
+       control.35 {
                comment.access 'read write'
                comment.type ENUMERATED
                comment.count 1
                comment.item.0 Voice
-               comment.item.1 DACR1
-               comment.item.2 DACR2
-               comment.item.3 DACL2
+               comment.item.1 AudioR1
+               comment.item.2 AudioR2
+               comment.item.3 AudioL2
                iface MIXER
                name 'HandsfreeR Mux'
-               value DACR2
+               value AudioR1
        }
-       control.21 {
+       control.36 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HandsfreeL Switch'
+               value true
+       }
+       control.37 {
                comment.access 'read write'
                comment.type ENUMERATED
                comment.count 1
                comment.item.0 Voice
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               comment.item.3 DACR2
+               comment.item.1 AudioL1
+               comment.item.2 AudioL2
+               comment.item.3 AudioR2
                iface MIXER
                name 'HandsfreeL Mux'
-               value DACL2
+               value AudioL1
        }
-       control.22 {
+       control.38 {
                comment.access 'read write'
-               comment.type ENUMERATED
+               comment.type BOOLEAN
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACR1
-               comment.item.2 DACR2
                iface MIXER
-               name 'CarkitR Mux'
-               value Off
+               name 'CarkitR Mixer Voice'
+               value false
        }
-       control.23 {
+       control.39 {
                comment.access 'read write'
-               comment.type ENUMERATED
+               comment.type BOOLEAN
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
                iface MIXER
-               name 'CarkitL Mux'
-               value Off
+               name 'CarkitR Mixer AudioR1'
+               value false
        }
-       control.24 {
+       control.40 {
                comment.access 'read write'
-               comment.type ENUMERATED
+               comment.type BOOLEAN
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACR1
-               comment.item.2 DACR2
                iface MIXER
-               name 'HeadsetR Mux'
-               value DACR2
+               name 'CarkitR Mixer AudioR2'
+               value false
        }
-       control.25 {
+       control.41 {
                comment.access 'read write'
-               comment.type ENUMERATED
+               comment.type BOOLEAN
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
                iface MIXER
-               name 'HeadsetL Mux'
-               value DACL2
+               name 'CarkitL Mixer Voice'
+               value false
        }
-       control.26 {
+       control.42 {
                comment.access 'read write'
-               comment.type ENUMERATED
+               comment.type BOOLEAN
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACR1
-               comment.item.2 DACR2
-               comment.item.3 DACL2
                iface MIXER
-               name 'PredriveR Mux'
-               value Off
+               name 'CarkitL Mixer AudioL1'
+               value false
        }
-       control.27 {
+       control.43 {
                comment.access 'read write'
-               comment.type ENUMERATED
+               comment.type BOOLEAN
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               comment.item.3 DACR2
                iface MIXER
-               name 'PredriveL Mux'
-               value Off
+               name 'CarkitL Mixer AudioL2'
+               value false
        }
-       control.28 {
+       control.44 {
                comment.access 'read write'
-               comment.type ENUMERATED
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HeadsetR Mixer Voice'
+               value false
+       }
+       control.45 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HeadsetR Mixer AudioR1'
+               value true
+       }
+       control.46 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HeadsetR Mixer AudioR2'
+               value false
+       }
+       control.47 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HeadsetL Mixer Voice'
+               value false
+       }
+       control.48 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HeadsetL Mixer AudioL1'
+               value true
+       }
+       control.49 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'HeadsetL Mixer AudioL2'
+               value false
+       }
+       control.50 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveR Mixer Voice'
+               value false
+       }
+       control.51 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveR Mixer AudioR1'
+               value false
+       }
+       control.52 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveR Mixer AudioR2'
+               value false
+       }
+       control.53 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveR Mixer AudioL2'
+               value false
+       }
+       control.54 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveL Mixer Voice'
+               value false
+       }
+       control.55 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveL Mixer AudioL1'
+               value false
+       }
+       control.56 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveL Mixer AudioL2'
+               value false
+       }
+       control.57 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'PredriveL Mixer AudioR2'
+               value false
+       }
+       control.58 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Earpiece Mixer Voice'
+               value false
+       }
+       control.59 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Earpiece Mixer AudioL1'
+               value false
+       }
+       control.60 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Earpiece Mixer AudioL2'
+               value false
+       }
+       control.61 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Earpiece Mixer AudioR1'
+               value false
+       }
+       control.62 {
+               comment.access 'read write'
+               comment.type INTEGER
+               comment.count 1
+               comment.range '0 - 41'
+               comment.dbmin -5100
+               comment.dbmax -1000
+               iface MIXER
+               name 'Voice Digital Loopback Volume'
+               value 0
+       }
+       control.63 {
+               comment.access 'read write'
+               comment.type INTEGER
+               comment.count 1
+               comment.range '0 - 7'
+               comment.dbmin -2400
+               comment.dbmax 0
+               iface MIXER
+               name 'Right Digital Loopback Volume'
+               value 0
+       }
+       control.64 {
+               comment.access 'read write'
+               comment.type INTEGER
+               comment.count 1
+               comment.range '0 - 7'
+               comment.dbmin -2400
+               comment.dbmax 0
+               iface MIXER
+               name 'Left Digital Loopback Volume'
+               value 0
+       }
+       control.65 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Voice Analog Loopback Switch'
+               value false
+       }
+       control.66 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Left2 Analog Loopback Switch'
+               value false
+       }
+       control.67 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Right2 Analog Loopback Switch'
+               value false
+       }
+       control.68 {
+               comment.access 'read write'
+               comment.type BOOLEAN
+               comment.count 1
+               iface MIXER
+               name 'Left1 Analog Loopback Switch'
+               value false
+       }
+       control.69 {
+               comment.access 'read write'
+               comment.type BOOLEAN
                comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               comment.item.3 DACR1
                iface MIXER
-               name 'Earpiece Mux'
-               value Off
+               name 'Right1 Analog Loopback Switch'
+               value false
        }
 }