From 1d625c03f00f2ea59e1dc5e178ad9cf510e5d75f Mon Sep 17 00:00:00 2001 From: Yuqing Zhu Date: Mon, 9 May 2016 16:53:00 +0800 Subject: [PATCH] asound.state: Update to 4.1.15-1.1.0 --Update wm8960audio configuration for mx6ul/mx7 1."Capture Switch" has been enabled, and 'Capture Volume' will make sense. The current 'Capture Volume' value is the max value 63. So need to modify the capture volume. 2.Add ADC data output select. 3.Remove amixer control 'Headset Jack' as mx7d-sdb doesn't have it. --Adding sii902xaudio configuration for mx7 Signed-off-by: Yuqing Zhu Signed-off-by: Otavio Salvador --- .../alsa-state/alsa-state/imx/asound.state | 106 ++++++++++-------- 1 file changed, 62 insertions(+), 44 deletions(-) diff --git a/recipes-bsp/alsa-state/alsa-state/imx/asound.state b/recipes-bsp/alsa-state/alsa-state/imx/asound.state index 326a57b9..4984a56c 100755 --- a/recipes-bsp/alsa-state/alsa-state/imx/asound.state +++ b/recipes-bsp/alsa-state/alsa-state/imx/asound.state @@ -1457,8 +1457,8 @@ state.wm8960audio { control.1 { iface MIXER name 'Capture Volume' - value.0 63 - value.1 63 + value.0 35 + value.1 35 comment { access 'read write' type INTEGER @@ -1466,8 +1466,8 @@ state.wm8960audio { range '0 - 63' dbmin -1725 dbmax 3000 - dbvalue.0 3000 - dbvalue.1 3000 + dbvalue.0 900 + dbvalue.1 900 } } control.2 { @@ -1496,7 +1496,7 @@ state.wm8960audio { control.4 { iface MIXER name 'Right Input Boost Mixer RINPUT3 Volume' - value 7 + value 0 comment { access 'read write' type INTEGER @@ -1504,13 +1504,13 @@ state.wm8960audio { range '0 - 7' dbmin -9999999 dbmax 600 - dbvalue.0 600 + dbvalue.0 -9999999 } } control.5 { iface MIXER name 'Right Input Boost Mixer RINPUT2 Volume' - value 7 + value 0 comment { access 'read write' type INTEGER @@ -1518,13 +1518,13 @@ state.wm8960audio { range '0 - 7' dbmin -9999999 dbmax 600 - dbvalue.0 600 + dbvalue.0 -9999999 } } control.6 { iface MIXER name 'Left Input Boost Mixer LINPUT3 Volume' - value 7 + value 0 comment { access 'read write' type INTEGER @@ -1532,13 +1532,13 @@ state.wm8960audio { range '0 - 7' dbmin -9999999 dbmax 600 - dbvalue.0 600 + dbvalue.0 -9999999 } } control.7 { iface MIXER name 'Left Input Boost Mixer LINPUT2 Volume' - value 7 + value 0 comment { access 'read write' type INTEGER @@ -1546,35 +1546,35 @@ state.wm8960audio { range '0 - 7' dbmin -9999999 dbmax 600 - dbvalue.0 600 + dbvalue.0 -9999999 } } control.8 { iface MIXER name 'Right Input Boost Mixer RINPUT1 Volume' - value 2 + value 0 comment { access 'read write' type INTEGER count 1 - range '0 - 4' + range '0 - 3' dbmin 0 dbmax 2900 - dbvalue.0 2000 + dbvalue.0 0 } } control.9 { iface MIXER name 'Left Input Boost Mixer LINPUT1 Volume' - value 2 + value 0 comment { access 'read write' type INTEGER count 1 - range '0 - 4' + range '0 - 3' dbmin 0 dbmax 2900 - dbvalue.0 2000 + dbvalue.0 0 } } control.10 { @@ -1888,8 +1888,8 @@ state.wm8960audio { control.36 { iface MIXER name 'ADC PCM Capture Volume' - value.0 235 - value.1 235 + value.0 195 + value.1 195 comment { access 'read write' type INTEGER @@ -1897,8 +1897,8 @@ state.wm8960audio { range '0 - 255' dbmin -9999999 dbmax 3000 - dbvalue.0 2000 - dbvalue.1 2000 + dbvalue.0 0 + dbvalue.1 0 } } control.37 { @@ -1958,6 +1958,20 @@ state.wm8960audio { } } control.41 { + iface MIXER + name 'ADC Data Output Select' + value 'Left Data = Left ADC; Right Data = Left ADC' + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 'Left Data = Left ADC; Right Data = Right ADC' + item.1 'Left Data = Left ADC; Right Data = Left ADC' + item.2 'Left Data = Right ADC; Right Data = Right ADC' + item.3 'Left Data = Right ADC; Right Data = Left ADC' + } + } + control.42 { iface MIXER name 'Mono Output Mixer Left Switch' value false @@ -1967,7 +1981,7 @@ state.wm8960audio { count 1 } } - control.42 { + control.43 { iface MIXER name 'Mono Output Mixer Right Switch' value false @@ -1977,7 +1991,7 @@ state.wm8960audio { count 1 } } - control.43 { + control.44 { iface MIXER name 'Right Output Mixer PCM Playback Switch' value true @@ -1987,7 +2001,7 @@ state.wm8960audio { count 1 } } - control.44 { + control.45 { iface MIXER name 'Right Output Mixer RINPUT3 Switch' value false @@ -1997,7 +2011,7 @@ state.wm8960audio { count 1 } } - control.45 { + control.46 { iface MIXER name 'Right Output Mixer Boost Bypass Switch' value false @@ -2007,7 +2021,7 @@ state.wm8960audio { count 1 } } - control.46 { + control.47 { iface MIXER name 'Left Output Mixer PCM Playback Switch' value true @@ -2017,7 +2031,7 @@ state.wm8960audio { count 1 } } - control.47 { + control.48 { iface MIXER name 'Left Output Mixer LINPUT3 Switch' value false @@ -2027,7 +2041,7 @@ state.wm8960audio { count 1 } } - control.48 { + control.49 { iface MIXER name 'Left Output Mixer Boost Bypass Switch' value false @@ -2037,17 +2051,17 @@ state.wm8960audio { count 1 } } - control.49 { + control.50 { iface MIXER name 'Right Input Mixer Boost Switch' - value true + value false comment { access 'read write' type BOOLEAN count 1 } } - control.50 { + control.51 { iface MIXER name 'Left Input Mixer Boost Switch' value true @@ -2057,17 +2071,17 @@ state.wm8960audio { count 1 } } - control.51 { + control.52 { iface MIXER name 'Right Boost Mixer RINPUT2 Switch' - value true + value false comment { access 'read write' type BOOLEAN count 1 } } - control.52 { + control.53 { iface MIXER name 'Right Boost Mixer RINPUT3 Switch' value false @@ -2077,37 +2091,37 @@ state.wm8960audio { count 1 } } - control.53 { + control.54 { iface MIXER name 'Right Boost Mixer RINPUT1 Switch' - value true + value false comment { access 'read write' type BOOLEAN count 1 } } - control.54 { + control.55 { iface MIXER name 'Left Boost Mixer LINPUT2 Switch' - value true + value false comment { access 'read write' type BOOLEAN count 1 } } - control.55 { + control.56 { iface MIXER name 'Left Boost Mixer LINPUT3 Switch' - value true + value false comment { access 'read write' type BOOLEAN count 1 } } - control.56 { + control.57 { iface MIXER name 'Left Boost Mixer LINPUT1 Switch' value true @@ -2117,9 +2131,9 @@ state.wm8960audio { count 1 } } - control.57 { + control.58 { iface CARD - name 'Headset Jack' + name 'Headphone Jack' value true comment { access read @@ -5526,3 +5540,7 @@ state.imxhdmisoc { } } } +state.sii902xaudio { + control { + } +} -- 2.40.1