Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Ensure WM8958 gets all WM8994 late revision widgets
ASoC: Fix typo in late revision WM8994 DAC2R name
ASoC: Use the correct DAPM context when cleaning up final widget set
ASoC: Fix broken bitfield definitions in WM8978
ASoC: AM3517: Update codec name after multi-component update
+19
-9
+8
-6
sound/soc/codecs/wm8978.c
+8
-6
sound/soc/codecs/wm8978.c
···
145
145
SOC_SINGLE("DAC Playback Limiter Threshold",
146
146
WM8978_DAC_LIMITER_2, 4, 7, 0),
147
147
SOC_SINGLE("DAC Playback Limiter Boost",
148
-
WM8978_DAC_LIMITER_2, 0, 15, 0),
148
+
WM8978_DAC_LIMITER_2, 0, 12, 0),
149
149
150
150
SOC_ENUM("ALC Enable Switch", alc1),
151
151
SOC_SINGLE("ALC Capture Min Gain", WM8978_ALC_CONTROL_1, 0, 7, 0),
152
152
SOC_SINGLE("ALC Capture Max Gain", WM8978_ALC_CONTROL_1, 3, 7, 0),
153
153
154
-
SOC_SINGLE("ALC Capture Hold", WM8978_ALC_CONTROL_2, 4, 7, 0),
154
+
SOC_SINGLE("ALC Capture Hold", WM8978_ALC_CONTROL_2, 4, 10, 0),
155
155
SOC_SINGLE("ALC Capture Target", WM8978_ALC_CONTROL_2, 0, 15, 0),
156
156
157
157
SOC_ENUM("ALC Capture Mode", alc3),
158
-
SOC_SINGLE("ALC Capture Decay", WM8978_ALC_CONTROL_3, 4, 15, 0),
159
-
SOC_SINGLE("ALC Capture Attack", WM8978_ALC_CONTROL_3, 0, 15, 0),
158
+
SOC_SINGLE("ALC Capture Decay", WM8978_ALC_CONTROL_3, 4, 10, 0),
159
+
SOC_SINGLE("ALC Capture Attack", WM8978_ALC_CONTROL_3, 0, 10, 0),
160
160
161
161
SOC_SINGLE("ALC Capture Noise Gate Switch", WM8978_NOISE_GATE, 3, 1, 0),
162
162
SOC_SINGLE("ALC Capture Noise Gate Threshold",
···
211
211
WM8978_LOUT2_SPK_CONTROL, WM8978_ROUT2_SPK_CONTROL, 6, 1, 1),
212
212
213
213
/* DAC / ADC oversampling */
214
-
SOC_SINGLE("DAC 128x Oversampling Switch", WM8978_DAC_CONTROL, 8, 1, 0),
215
-
SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL, 8, 1, 0),
214
+
SOC_SINGLE("DAC 128x Oversampling Switch", WM8978_DAC_CONTROL,
215
+
5, 1, 0),
216
+
SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL,
217
+
5, 1, 0),
216
218
};
217
219
218
220
/* Mixer #1: Output (OUT1, OUT2) Mixer: mix AUX, Input mixer output and DAC */
+9
-1
sound/soc/codecs/wm8994.c
+9
-1
sound/soc/codecs/wm8994.c
···
1418
1418
1419
1419
static const struct snd_soc_dapm_widget wm8994_dac_widgets[] = {
1420
1420
SND_SOC_DAPM_DAC("DAC2L", NULL, WM8994_POWER_MANAGEMENT_5, 3, 0),
1421
-
SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),
1421
+
SND_SOC_DAPM_DAC("DAC2R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),
1422
1422
SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0),
1423
1423
SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
1424
1424
};
···
3325
3325
case WM8958:
3326
3326
snd_soc_add_controls(codec, wm8958_snd_controls,
3327
3327
ARRAY_SIZE(wm8958_snd_controls));
3328
+
snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets,
3329
+
ARRAY_SIZE(wm8994_lateclk_widgets));
3330
+
snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets,
3331
+
ARRAY_SIZE(wm8994_adc_widgets));
3332
+
snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets,
3333
+
ARRAY_SIZE(wm8994_dac_widgets));
3328
3334
snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets,
3329
3335
ARRAY_SIZE(wm8958_dapm_widgets));
3330
3336
break;
···
3356
3350
}
3357
3351
break;
3358
3352
case WM8958:
3353
+
snd_soc_dapm_add_routes(dapm, wm8994_lateclk_intercon,
3354
+
ARRAY_SIZE(wm8994_lateclk_intercon));
3359
3355
snd_soc_dapm_add_routes(dapm, wm8958_intercon,
3360
3356
ARRAY_SIZE(wm8958_intercon));
3361
3357
break;
+1
-1
sound/soc/omap/am3517evm.c
+1
-1
sound/soc/omap/am3517evm.c
···
139
139
.cpu_dai_name ="omap-mcbsp-dai.0",
140
140
.codec_dai_name = "tlv320aic23-hifi",
141
141
.platform_name = "omap-pcm-audio",
142
-
.codec_name = "tlv320aic23-codec",
142
+
.codec_name = "tlv320aic23-codec.2-001a",
143
143
.init = am3517evm_aic23_init,
144
144
.ops = &am3517evm_ops,
145
145
};