Merge branch 'for-2.6.38' into for-2.6.39
This commit is contained in:
commit
4955f631a4
|
@ -145,18 +145,18 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = {
|
|||
SOC_SINGLE("DAC Playback Limiter Threshold",
|
||||
WM8978_DAC_LIMITER_2, 4, 7, 0),
|
||||
SOC_SINGLE("DAC Playback Limiter Boost",
|
||||
WM8978_DAC_LIMITER_2, 0, 15, 0),
|
||||
WM8978_DAC_LIMITER_2, 0, 12, 0),
|
||||
|
||||
SOC_ENUM("ALC Enable Switch", alc1),
|
||||
SOC_SINGLE("ALC Capture Min Gain", WM8978_ALC_CONTROL_1, 0, 7, 0),
|
||||
SOC_SINGLE("ALC Capture Max Gain", WM8978_ALC_CONTROL_1, 3, 7, 0),
|
||||
|
||||
SOC_SINGLE("ALC Capture Hold", WM8978_ALC_CONTROL_2, 4, 7, 0),
|
||||
SOC_SINGLE("ALC Capture Hold", WM8978_ALC_CONTROL_2, 4, 10, 0),
|
||||
SOC_SINGLE("ALC Capture Target", WM8978_ALC_CONTROL_2, 0, 15, 0),
|
||||
|
||||
SOC_ENUM("ALC Capture Mode", alc3),
|
||||
SOC_SINGLE("ALC Capture Decay", WM8978_ALC_CONTROL_3, 4, 15, 0),
|
||||
SOC_SINGLE("ALC Capture Attack", WM8978_ALC_CONTROL_3, 0, 15, 0),
|
||||
SOC_SINGLE("ALC Capture Decay", WM8978_ALC_CONTROL_3, 4, 10, 0),
|
||||
SOC_SINGLE("ALC Capture Attack", WM8978_ALC_CONTROL_3, 0, 10, 0),
|
||||
|
||||
SOC_SINGLE("ALC Capture Noise Gate Switch", WM8978_NOISE_GATE, 3, 1, 0),
|
||||
SOC_SINGLE("ALC Capture Noise Gate Threshold",
|
||||
|
@ -211,8 +211,10 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = {
|
|||
WM8978_LOUT2_SPK_CONTROL, WM8978_ROUT2_SPK_CONTROL, 6, 1, 1),
|
||||
|
||||
/* DAC / ADC oversampling */
|
||||
SOC_SINGLE("DAC 128x Oversampling Switch", WM8978_DAC_CONTROL, 8, 1, 0),
|
||||
SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL, 8, 1, 0),
|
||||
SOC_SINGLE("DAC 128x Oversampling Switch", WM8978_DAC_CONTROL,
|
||||
5, 1, 0),
|
||||
SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL,
|
||||
5, 1, 0),
|
||||
};
|
||||
|
||||
/* Mixer #1: Output (OUT1, OUT2) Mixer: mix AUX, Input mixer output and DAC */
|
||||
|
|
Loading…
Reference in a new issue