diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:36 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:36 -0400 |
| commit | 6588fa9058f9df0687f8c3914696c40a0f235fd7 (patch) | |
| tree | b4c9f0c3cef4134c6bf29acbfd8c8551af8d6fb8 | |
| parent | d4cb542ac253e6cc910da8c0bc381ca072358604 (diff) | |
| parent | 26d04ca8c46e3af510f0bbbe4d0b1aca8e18b393 (diff) | |
Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-next
| -rw-r--r-- | sound/soc/codecs/lm49453.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c index d237dd610985..275b3f72f3f4 100644 --- a/sound/soc/codecs/lm49453.c +++ b/sound/soc/codecs/lm49453.c | |||
| @@ -213,15 +213,13 @@ static const char *lm49453_adcl_mux_text[] = { "MIC1", "Aux_L" }; | |||
| 213 | 213 | ||
| 214 | static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" }; | 214 | static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" }; |
| 215 | 215 | ||
| 216 | static const struct soc_enum lm49453_adcl_enum = | 216 | static SOC_ENUM_SINGLE_DECL(lm49453_adcl_enum, |
| 217 | SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 0, | 217 | LM49453_P0_ANALOG_MIXER_ADC_REG, 0, |
| 218 | ARRAY_SIZE(lm49453_adcl_mux_text), | 218 | lm49453_adcl_mux_text); |
| 219 | lm49453_adcl_mux_text); | 219 | |
| 220 | 220 | static SOC_ENUM_SINGLE_DECL(lm49453_adcr_enum, | |
| 221 | static const struct soc_enum lm49453_adcr_enum = | 221 | LM49453_P0_ANALOG_MIXER_ADC_REG, 1, |
| 222 | SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 1, | 222 | lm49453_adcr_mux_text); |
| 223 | ARRAY_SIZE(lm49453_adcr_mux_text), | ||
| 224 | lm49453_adcr_mux_text); | ||
| 225 | 223 | ||
| 226 | static const struct snd_kcontrol_new lm49453_adcl_mux_control = | 224 | static const struct snd_kcontrol_new lm49453_adcl_mux_control = |
| 227 | SOC_DAPM_ENUM("ADC Left Mux", lm49453_adcl_enum); | 225 | SOC_DAPM_ENUM("ADC Left Mux", lm49453_adcl_enum); |