Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
33e57f221a
1 changed files with 6 additions and 6 deletions
|
@ -1465,15 +1465,15 @@ SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
|
|||
};
|
||||
|
||||
static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {
|
||||
SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
|
||||
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
||||
SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
|
||||
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
||||
SND_SOC_DAPM_VIRT_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
|
||||
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
||||
SND_SOC_DAPM_VIRT_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
|
||||
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {
|
||||
SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
|
||||
SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
|
||||
SND_SOC_DAPM_VIRT_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
|
||||
SND_SOC_DAPM_VIRT_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {
|
||||
|
|
Reference in a new issue