git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'asoc-v3.15' into asoc-next
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
codecs
/
cs42l52.c
diff --git
a/sound/soc/codecs/cs42l52.c
b/sound/soc/codecs/cs42l52.c
index be455ea5f2fed27b2a22489e26c5ae013fd9f804..ea7938d9e13adc3a8b7eb2cf316a16a55d2f3a31 100644
(file)
--- a/
sound/soc/codecs/cs42l52.c
+++ b/
sound/soc/codecs/cs42l52.c
@@
-341,7
+341,7
@@
static const char * const right_swap_text[] = {
static const unsigned int swap_values[] = { 0, 1, 3 };
static const struct soc_enum adca_swap_enum =
static const unsigned int swap_values[] = { 0, 1, 3 };
static const struct soc_enum adca_swap_enum =
- SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 2,
1
,
+ SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 2,
3
,
ARRAY_SIZE(left_swap_text),
left_swap_text,
swap_values);
ARRAY_SIZE(left_swap_text),
left_swap_text,
swap_values);
@@
-350,7
+350,7
@@
static const struct snd_kcontrol_new adca_mixer =
SOC_DAPM_ENUM("Route", adca_swap_enum);
static const struct soc_enum pcma_swap_enum =
SOC_DAPM_ENUM("Route", adca_swap_enum);
static const struct soc_enum pcma_swap_enum =
- SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 6,
1
,
+ SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 6,
3
,
ARRAY_SIZE(left_swap_text),
left_swap_text,
swap_values);
ARRAY_SIZE(left_swap_text),
left_swap_text,
swap_values);
@@
-359,7
+359,7
@@
static const struct snd_kcontrol_new pcma_mixer =
SOC_DAPM_ENUM("Route", pcma_swap_enum);
static const struct soc_enum adcb_swap_enum =
SOC_DAPM_ENUM("Route", pcma_swap_enum);
static const struct soc_enum adcb_swap_enum =
- SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 0,
1
,
+ SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 0,
3
,
ARRAY_SIZE(right_swap_text),
right_swap_text,
swap_values);
ARRAY_SIZE(right_swap_text),
right_swap_text,
swap_values);
@@
-368,7
+368,7
@@
static const struct snd_kcontrol_new adcb_mixer =
SOC_DAPM_ENUM("Route", adcb_swap_enum);
static const struct soc_enum pcmb_swap_enum =
SOC_DAPM_ENUM("Route", adcb_swap_enum);
static const struct soc_enum pcmb_swap_enum =
- SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 4,
1
,
+ SOC_VALUE_ENUM_SINGLE(CS42L52_ADC_PCM_MIXER, 4,
3
,
ARRAY_SIZE(right_swap_text),
right_swap_text,
swap_values);
ARRAY_SIZE(right_swap_text),
right_swap_text,
swap_values);