Skip to content

L
linux-davinci
Commit bbb2b682 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/asoc' into for-linus 

* fix/asoc:
  ASoC: Fix errors in WM8990
parents b40814b8 97a775c4
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
sound/soc/codecs/wm8990.c
View file @ bbb2b682
...@@ -729,7 +729,7 @@ SND_SOC_DAPM_MIXER_E("INMIXL", WM8990_INTDRIVBITS, WM8990_INMIXL_PWR_BIT, 0, ...@@ -729,7 +729,7 @@ SND_SOC_DAPM_MIXER_E("INMIXL", WM8990_INTDRIVBITS, WM8990_INMIXL_PWR_BIT, 0,
inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
/* AINLMUX */ /* AINLMUX */
SND_SOC_DAPM_MUX_E("AILNMUX", WM8990_INTDRIVBITS, WM8990_AINLMUX_PWR_BIT, 0, SND_SOC_DAPM_MUX_E("AINLMUX", WM8990_INTDRIVBITS, WM8990_AINLMUX_PWR_BIT, 0,
&wm8990_dapm_ainlmux_controls, inmixer_event, &wm8990_dapm_ainlmux_controls, inmixer_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
...@@ -740,7 +740,7 @@ SND_SOC_DAPM_MIXER_E("INMIXR", WM8990_INTDRIVBITS, WM8990_INMIXR_PWR_BIT, 0, ...@@ -740,7 +740,7 @@ SND_SOC_DAPM_MIXER_E("INMIXR", WM8990_INTDRIVBITS, WM8990_INMIXR_PWR_BIT, 0,
inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
/* AINRMUX */ /* AINRMUX */
SND_SOC_DAPM_MUX_E("AIRNMUX", WM8990_INTDRIVBITS, WM8990_AINRMUX_PWR_BIT, 0, SND_SOC_DAPM_MUX_E("AINRMUX", WM8990_INTDRIVBITS, WM8990_AINRMUX_PWR_BIT, 0,
&wm8990_dapm_ainrmux_controls, inmixer_event, &wm8990_dapm_ainrmux_controls, inmixer_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
...@@ -848,40 +848,40 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -848,40 +848,40 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"LIN12 PGA", "LIN2 Switch", "LIN2"}, {"LIN12 PGA", "LIN2 Switch", "LIN2"},
/* LIN34 PGA */ /* LIN34 PGA */
{"LIN34 PGA", "LIN3 Switch", "LIN3"}, {"LIN34 PGA", "LIN3 Switch", "LIN3"},
{"LIN34 PGA", "LIN4 Switch", "LIN4"}, {"LIN34 PGA", "LIN4 Switch", "LIN4/RXN"},
/* INMIXL */ /* INMIXL */
{"INMIXL", "Record Left Volume", "LOMIX"}, {"INMIXL", "Record Left Volume", "LOMIX"},
{"INMIXL", "LIN2 Volume", "LIN2"}, {"INMIXL", "LIN2 Volume", "LIN2"},
{"INMIXL", "LINPGA12 Switch", "LIN12 PGA"}, {"INMIXL", "LINPGA12 Switch", "LIN12 PGA"},
{"INMIXL", "LINPGA34 Switch", "LIN34 PGA"}, {"INMIXL", "LINPGA34 Switch", "LIN34 PGA"},
/* AILNMUX */ /* AINLMUX */
{"AILNMUX", "INMIXL Mix", "INMIXL"}, {"AINLMUX", "INMIXL Mix", "INMIXL"},
{"AILNMUX", "DIFFINL Mix", "LIN12PGA"}, {"AINLMUX", "DIFFINL Mix", "LIN12 PGA"},
{"AILNMUX", "DIFFINL Mix", "LIN34PGA"}, {"AINLMUX", "DIFFINL Mix", "LIN34 PGA"},
{"AILNMUX", "RXVOICE Mix", "LIN4/RXN"}, {"AINLMUX", "RXVOICE Mix", "LIN4/RXN"},
{"AILNMUX", "RXVOICE Mix", "RIN4/RXP"}, {"AINLMUX", "RXVOICE Mix", "RIN4/RXP"},
/* ADC */ /* ADC */
{"Left ADC", NULL, "AILNMUX"}, {"Left ADC", NULL, "AINLMUX"},
/* RIN12 PGA */ /* RIN12 PGA */
{"RIN12 PGA", "RIN1 Switch", "RIN1"}, {"RIN12 PGA", "RIN1 Switch", "RIN1"},
{"RIN12 PGA", "RIN2 Switch", "RIN2"}, {"RIN12 PGA", "RIN2 Switch", "RIN2"},
/* RIN34 PGA */ /* RIN34 PGA */
{"RIN34 PGA", "RIN3 Switch", "RIN3"}, {"RIN34 PGA", "RIN3 Switch", "RIN3"},
{"RIN34 PGA", "RIN4 Switch", "RIN4"}, {"RIN34 PGA", "RIN4 Switch", "RIN4/RXP"},
/* INMIXL */ /* INMIXL */
{"INMIXR", "Record Right Volume", "ROMIX"}, {"INMIXR", "Record Right Volume", "ROMIX"},
{"INMIXR", "RIN2 Volume", "RIN2"}, {"INMIXR", "RIN2 Volume", "RIN2"},
{"INMIXR", "RINPGA12 Switch", "RIN12 PGA"}, {"INMIXR", "RINPGA12 Switch", "RIN12 PGA"},
{"INMIXR", "RINPGA34 Switch", "RIN34 PGA"}, {"INMIXR", "RINPGA34 Switch", "RIN34 PGA"},
/* AIRNMUX */ /* AINRMUX */
{"AIRNMUX", "INMIXR Mix", "INMIXR"}, {"AINRMUX", "INMIXR Mix", "INMIXR"},
{"AIRNMUX", "DIFFINR Mix", "RIN12PGA"}, {"AINRMUX", "DIFFINR Mix", "RIN12 PGA"},
{"AIRNMUX", "DIFFINR Mix", "RIN34PGA"}, {"AINRMUX", "DIFFINR Mix", "RIN34 PGA"},
{"AIRNMUX", "RXVOICE Mix", "RIN4/RXN"}, {"AINRMUX", "RXVOICE Mix", "LIN4/RXN"},
{"AIRNMUX", "RXVOICE Mix", "RIN4/RXP"}, {"AINRMUX", "RXVOICE Mix", "RIN4/RXP"},
/* ADC */ /* ADC */
{"Right ADC", NULL, "AIRNMUX"}, {"Right ADC", NULL, "AINRMUX"},
/* LOMIX */ /* LOMIX */
{"LOMIX", "LOMIX RIN3 Bypass Switch", "RIN3"}, {"LOMIX", "LOMIX RIN3 Bypass Switch", "RIN3"},
...@@ -922,7 +922,7 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -922,7 +922,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"LOPMIX", "LOPMIX Left Mixer PGA Switch", "LOPGA"}, {"LOPMIX", "LOPMIX Left Mixer PGA Switch", "LOPGA"},
/* OUT3MIX */ /* OUT3MIX */
{"OUT3MIX", "OUT3MIX LIN4/RXP Bypass Switch", "LIN4/RXP"}, {"OUT3MIX", "OUT3MIX LIN4/RXP Bypass Switch", "LIN4/RXN"},
{"OUT3MIX", "OUT3MIX Left Out PGA Switch", "LOPGA"}, {"OUT3MIX", "OUT3MIX Left Out PGA Switch", "LOPGA"},
/* OUT4MIX */ /* OUT4MIX */
...@@ -949,7 +949,7 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -949,7 +949,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
/* Output Pins */ /* Output Pins */
{"LON", NULL, "LONMIX"}, {"LON", NULL, "LONMIX"},
{"LOP", NULL, "LOPMIX"}, {"LOP", NULL, "LOPMIX"},
{"OUT", NULL, "OUT3MIX"}, {"OUT3", NULL, "OUT3MIX"},
{"LOUT", NULL, "LOUT PGA"}, {"LOUT", NULL, "LOUT PGA"},
{"SPKN", NULL, "SPKMIX"}, {"SPKN", NULL, "SPKMIX"},
{"ROUT", NULL, "ROUT PGA"}, {"ROUT", NULL, "ROUT PGA"},
......
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