diff options
-rw-r--r-- | sound/soc/codecs/wm8960.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 328bde09d5bf..9e90b8e2b86e 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
@@ -153,6 +153,7 @@ static const char *wm8960_adc_data_output_sel[] = { | |||
153 | "Left Data = Right ADC; Right Data = Right ADC", | 153 | "Left Data = Right ADC; Right Data = Right ADC", |
154 | "Left Data = Right ADC; Right Data = Left ADC", | 154 | "Left Data = Right ADC; Right Data = Left ADC", |
155 | }; | 155 | }; |
156 | static const char *wm8960_dmonomix[] = {"Stereo", "Mono"}; | ||
156 | 157 | ||
157 | static const struct soc_enum wm8960_enum[] = { | 158 | static const struct soc_enum wm8960_enum[] = { |
158 | SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity), | 159 | SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity), |
@@ -162,6 +163,7 @@ static const struct soc_enum wm8960_enum[] = { | |||
162 | SOC_ENUM_SINGLE(WM8960_ALC1, 7, 4, wm8960_alcfunc), | 163 | SOC_ENUM_SINGLE(WM8960_ALC1, 7, 4, wm8960_alcfunc), |
163 | SOC_ENUM_SINGLE(WM8960_ALC3, 8, 2, wm8960_alcmode), | 164 | SOC_ENUM_SINGLE(WM8960_ALC3, 8, 2, wm8960_alcmode), |
164 | SOC_ENUM_SINGLE(WM8960_ADDCTL1, 2, 4, wm8960_adc_data_output_sel), | 165 | SOC_ENUM_SINGLE(WM8960_ADDCTL1, 2, 4, wm8960_adc_data_output_sel), |
166 | SOC_ENUM_SINGLE(WM8960_ADDCTL1, 4, 2, wm8960_dmonomix), | ||
165 | }; | 167 | }; |
166 | 168 | ||
167 | static const int deemph_settings[] = { 0, 32000, 44100, 48000 }; | 169 | static const int deemph_settings[] = { 0, 32000, 44100, 48000 }; |
@@ -304,6 +306,7 @@ SOC_SINGLE_TLV("Right Output Mixer RINPUT3 Volume", | |||
304 | WM8960_ROUTMIX, 4, 7, 1, bypass_tlv), | 306 | WM8960_ROUTMIX, 4, 7, 1, bypass_tlv), |
305 | 307 | ||
306 | SOC_ENUM("ADC Data Output Select", wm8960_enum[6]), | 308 | SOC_ENUM("ADC Data Output Select", wm8960_enum[6]), |
309 | SOC_ENUM("DAC Mono Mix", wm8960_enum[7]), | ||
307 | }; | 310 | }; |
308 | 311 | ||
309 | static const struct snd_kcontrol_new wm8960_lin_boost[] = { | 312 | static const struct snd_kcontrol_new wm8960_lin_boost[] = { |