diff options
author | Chris Rattray <crattray@opensource.wolfsonmicro.com> | 2013-02-01 10:40:41 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-04 05:51:46 -0500 |
commit | 4c97e8fedf1a7ef52e23dc06ec7a15be54ed18a4 (patch) | |
tree | 5e5cdc413392e6374436ef4d7be5074cb87ac51f | |
parent | 0098389564fbdfbeb08181f772205d87a18f5b37 (diff) |
ASoC: wm2200: Add Rx ANC input select control
Signed-off-by: Chris Rattray <crattray@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/wm2200.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index fc05553cc9c1..fee1a18e309e 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c | |||
@@ -1112,6 +1112,16 @@ static int wm2200_mixer_values[] = { | |||
1112 | static WM2200_MUX_CTL_DECL(name##_aux5); \ | 1112 | static WM2200_MUX_CTL_DECL(name##_aux5); \ |
1113 | static WM2200_MUX_CTL_DECL(name##_aux6); | 1113 | static WM2200_MUX_CTL_DECL(name##_aux6); |
1114 | 1114 | ||
1115 | static const char *wm2200_rxanc_input_sel_texts[] = { | ||
1116 | "None", "IN1", "IN2", "IN3", | ||
1117 | }; | ||
1118 | |||
1119 | static const struct soc_enum wm2200_rxanc_input_sel = | ||
1120 | SOC_ENUM_SINGLE(WM2200_RXANC_SRC, | ||
1121 | WM2200_IN_RXANC_SEL_SHIFT, | ||
1122 | ARRAY_SIZE(wm2200_rxanc_input_sel_texts), | ||
1123 | wm2200_rxanc_input_sel_texts); | ||
1124 | |||
1115 | static const struct snd_kcontrol_new wm2200_snd_controls[] = { | 1125 | static const struct snd_kcontrol_new wm2200_snd_controls[] = { |
1116 | SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL, | 1126 | SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL, |
1117 | WM2200_IN1_OSR_SHIFT, 1, 0), | 1127 | WM2200_IN1_OSR_SHIFT, 1, 0), |
@@ -1171,6 +1181,7 @@ SOC_DOUBLE_R_TLV("OUT2 Digital Volume", WM2200_DAC_DIGITAL_VOLUME_2L, | |||
1171 | digital_tlv), | 1181 | digital_tlv), |
1172 | SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT, | 1182 | SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT, |
1173 | WM2200_SPK1R_MUTE_SHIFT, 1, 1), | 1183 | WM2200_SPK1R_MUTE_SHIFT, 1, 1), |
1184 | SOC_ENUM("RxANC Src", wm2200_rxanc_input_sel), | ||
1174 | }; | 1185 | }; |
1175 | 1186 | ||
1176 | WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE); | 1187 | WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE); |