mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
ALSA: hda - Line In for Acer Inspire 6530G model
The Line In connector is set up as PIN_IN by default, using VREF_HIZ. It is connected to both ADCs, so add it to both input selectors. Also add the ability to use the input mix (on a SoundBlaster one would call this "What You Hear"). Signed-off-by: Tony Vroon <tony@linx.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
dde6535686
commit
684a88429c
1 changed files with 8 additions and 2 deletions
|
@ -1569,18 +1569,22 @@ static struct hda_input_mux alc888_2_capture_sources[2] = {
|
||||||
static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = {
|
static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = {
|
||||||
/* Interal mic only available on one ADC */
|
/* Interal mic only available on one ADC */
|
||||||
{
|
{
|
||||||
.num_items = 3,
|
.num_items = 5,
|
||||||
.items = {
|
.items = {
|
||||||
{ "Ext Mic", 0x0 },
|
{ "Ext Mic", 0x0 },
|
||||||
|
{ "Line In", 0x2 },
|
||||||
{ "CD", 0x4 },
|
{ "CD", 0x4 },
|
||||||
|
{ "Input Mix", 0xa },
|
||||||
{ "Int Mic", 0xb },
|
{ "Int Mic", 0xb },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.num_items = 2,
|
.num_items = 4,
|
||||||
.items = {
|
.items = {
|
||||||
{ "Ext Mic", 0x0 },
|
{ "Ext Mic", 0x0 },
|
||||||
|
{ "Line In", 0x2 },
|
||||||
{ "CD", 0x4 },
|
{ "CD", 0x4 },
|
||||||
|
{ "Input Mix", 0xa },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -8209,6 +8213,8 @@ static struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = {
|
||||||
HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
||||||
HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
|
HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
|
||||||
HDA_BIND_MUTE("LFE Playback Switch", 0x0f, 2, HDA_INPUT),
|
HDA_BIND_MUTE("LFE Playback Switch", 0x0f, 2, HDA_INPUT),
|
||||||
|
HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
|
||||||
|
HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
|
||||||
HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
|
HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
|
||||||
HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
||||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||||
|
|
Loading…
Reference in a new issue