|
|
@@ -885,10 +885,10 @@ static const char *adc_mux_text[] = {
|
|
|
static SOC_ENUM_SINGLE_VIRT_DECL(adc_enum, adc_mux_text);
|
|
|
|
|
|
static const struct snd_kcontrol_new adcl_mux =
|
|
|
- SOC_DAPM_ENUM_VIRT("ADCL Mux", adc_enum);
|
|
|
+ SOC_DAPM_ENUM("ADCL Mux", adc_enum);
|
|
|
|
|
|
static const struct snd_kcontrol_new adcr_mux =
|
|
|
- SOC_DAPM_ENUM_VIRT("ADCR Mux", adc_enum);
|
|
|
+ SOC_DAPM_ENUM("ADCR Mux", adc_enum);
|
|
|
|
|
|
static const char *spk_src_text[] = {
|
|
|
"DAC1L", "DAC1R", "DAC2L", "DAC2R"
|
|
|
@@ -948,10 +948,8 @@ static const struct snd_soc_dapm_widget wm8995_dapm_widgets[] = {
|
|
|
SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", "AIF1 Capture",
|
|
|
0, WM8995_POWER_MANAGEMENT_3, 10, 0),
|
|
|
|
|
|
- SND_SOC_DAPM_VIRT_MUX("ADCL Mux", SND_SOC_NOPM, 1, 0,
|
|
|
- &adcl_mux),
|
|
|
- SND_SOC_DAPM_VIRT_MUX("ADCR Mux", SND_SOC_NOPM, 0, 0,
|
|
|
- &adcr_mux),
|
|
|
+ SND_SOC_DAPM_MUX("ADCL Mux", SND_SOC_NOPM, 1, 0, &adcl_mux),
|
|
|
+ SND_SOC_DAPM_MUX("ADCR Mux", SND_SOC_NOPM, 0, 0, &adcr_mux),
|
|
|
|
|
|
SND_SOC_DAPM_ADC("DMIC2L", NULL, WM8995_POWER_MANAGEMENT_3, 5, 0),
|
|
|
SND_SOC_DAPM_ADC("DMIC2R", NULL, WM8995_POWER_MANAGEMENT_3, 4, 0),
|