Commit 6588fa90 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-next

parents d4cb542a 26d04ca8
...@@ -213,14 +213,12 @@ static const char *lm49453_adcl_mux_text[] = { "MIC1", "Aux_L" }; ...@@ -213,14 +213,12 @@ static const char *lm49453_adcl_mux_text[] = { "MIC1", "Aux_L" };
static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" }; static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" };
static const struct soc_enum lm49453_adcl_enum = static SOC_ENUM_SINGLE_DECL(lm49453_adcl_enum,
SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 0, LM49453_P0_ANALOG_MIXER_ADC_REG, 0,
ARRAY_SIZE(lm49453_adcl_mux_text),
lm49453_adcl_mux_text); lm49453_adcl_mux_text);
static const struct soc_enum lm49453_adcr_enum = static SOC_ENUM_SINGLE_DECL(lm49453_adcr_enum,
SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 1, LM49453_P0_ANALOG_MIXER_ADC_REG, 1,
ARRAY_SIZE(lm49453_adcr_mux_text),
lm49453_adcr_mux_text); lm49453_adcr_mux_text);
static const struct snd_kcontrol_new lm49453_adcl_mux_control = static const struct snd_kcontrol_new lm49453_adcl_mux_control =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment