forked from Minki/linux
ALSA: hda - Remove all ALC861 and ALC861-VD quirks
Let's remove the rest of ALC861 and ALC861-VD quirks. If any breakage is found, it can be fixed easily via the pin-config table update. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
parent
8fdcb6fe42
commit
cb4e482415
@ -146,20 +146,11 @@ ALC882/883/885/888/889
|
||||
|
||||
ALC861/660
|
||||
==========
|
||||
3stack 3-jack
|
||||
3stack-dig 3-jack with SPDIF I/O
|
||||
6stack-dig 6-jack with SPDIF I/O
|
||||
3stack-660 3-jack (for ALC660)
|
||||
auto auto-config reading BIOS (default)
|
||||
N/A
|
||||
|
||||
ALC861VD/660VD
|
||||
==============
|
||||
3stack 3-jack
|
||||
3stack-dig 3-jack with SPDIF OUT
|
||||
6stack-dig 6-jack with SPDIF OUT
|
||||
3stack-660 3-jack (for ALC660VD)
|
||||
3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)
|
||||
auto auto-config reading BIOS (default)
|
||||
N/A
|
||||
|
||||
CMI9880
|
||||
=======
|
||||
|
||||
@ -1,396 +0,0 @@
|
||||
/*
|
||||
* ALC660/ALC861 quirk models
|
||||
* included by patch_realtek.c
|
||||
*/
|
||||
|
||||
/* ALC861 models */
|
||||
enum {
|
||||
ALC861_AUTO,
|
||||
ALC861_3ST,
|
||||
ALC660_3ST,
|
||||
ALC861_3ST_DIG,
|
||||
ALC861_6ST_DIG,
|
||||
ALC861_ASUS,
|
||||
ALC861_MODEL_LAST,
|
||||
};
|
||||
|
||||
/*
|
||||
* ALC861 channel source setting (2/6 channel selection for 3-stack)
|
||||
*/
|
||||
|
||||
/*
|
||||
* set the path ways for 2 channel output
|
||||
* need to set the codec line out and mic 1 pin widgets to inputs
|
||||
*/
|
||||
static const struct hda_verb alc861_threestack_ch2_init[] = {
|
||||
/* set pin widget 1Ah (line in) for input */
|
||||
{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
|
||||
/* set pin widget 18h (mic1/2) for input, for mic also enable
|
||||
* the vref
|
||||
*/
|
||||
{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
|
||||
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c },
|
||||
#if 0
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8)) }, /*mic*/
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8)) }, /*line-in*/
|
||||
#endif
|
||||
{ } /* end */
|
||||
};
|
||||
/*
|
||||
* 6ch mode
|
||||
* need to set the codec line out and mic 1 pin widgets to outputs
|
||||
*/
|
||||
static const struct hda_verb alc861_threestack_ch6_init[] = {
|
||||
/* set pin widget 1Ah (line in) for output (Back Surround)*/
|
||||
{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
/* set pin widget 18h (mic1) for output (CLFE)*/
|
||||
{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
|
||||
{ 0x0c, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
|
||||
#if 0
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8)) }, /*mic*/
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8)) }, /*line in*/
|
||||
#endif
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static const struct hda_channel_mode alc861_threestack_modes[2] = {
|
||||
{ 2, alc861_threestack_ch2_init },
|
||||
{ 6, alc861_threestack_ch6_init },
|
||||
};
|
||||
|
||||
/* Set mic1 and line-in as input and unmute the mixer */
|
||||
static const struct hda_verb alc861_asus_ch2_init[] = {
|
||||
/* set pin widget 1Ah (line in) for input */
|
||||
{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
|
||||
/* set pin widget 18h (mic1/2) for input, for mic also enable
|
||||
* the vref
|
||||
*/
|
||||
{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
|
||||
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c },
|
||||
#if 0
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8)) }, /*mic*/
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8)) }, /*line-in*/
|
||||
#endif
|
||||
{ } /* end */
|
||||
};
|
||||
/* Set mic1 nad line-in as output and mute mixer */
|
||||
static const struct hda_verb alc861_asus_ch6_init[] = {
|
||||
/* set pin widget 1Ah (line in) for output (Back Surround)*/
|
||||
{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
/* { 0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, */
|
||||
/* set pin widget 18h (mic1) for output (CLFE)*/
|
||||
{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
/* { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, */
|
||||
{ 0x0c, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
|
||||
#if 0
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8)) }, /*mic*/
|
||||
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8)) }, /*line in*/
|
||||
#endif
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static const struct hda_channel_mode alc861_asus_modes[2] = {
|
||||
{ 2, alc861_asus_ch2_init },
|
||||
{ 6, alc861_asus_ch6_init },
|
||||
};
|
||||
|
||||
/* patch-ALC861 */
|
||||
|
||||
static const struct snd_kcontrol_new alc861_base_mixer[] = {
|
||||
/* output mixer control */
|
||||
HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT),
|
||||
|
||||
/*Input mixer control */
|
||||
/* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
|
||||
HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
|
||||
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new alc861_3ST_mixer[] = {
|
||||
/* output mixer control */
|
||||
HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
|
||||
/*HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT), */
|
||||
|
||||
/* Input mixer control */
|
||||
/* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
|
||||
HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
|
||||
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Channel Mode",
|
||||
.info = alc_ch_mode_info,
|
||||
.get = alc_ch_mode_get,
|
||||
.put = alc_ch_mode_put,
|
||||
.private_value = ARRAY_SIZE(alc861_threestack_modes),
|
||||
},
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/*
|
||||
* generic initialization of ADC, input mixers and output mixers
|
||||
*/
|
||||
static const struct hda_verb alc861_base_init_verbs[] = {
|
||||
/*
|
||||
* Unmute ADC0 and set the default input to mic-in
|
||||
*/
|
||||
/* port-A for surround (rear panel) */
|
||||
{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
{ 0x0e, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
/* port-B for mic-in (rear panel) with vref */
|
||||
{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
|
||||
/* port-C for line-in (rear panel) */
|
||||
{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
|
||||
/* port-D for Front */
|
||||
{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
/* port-E for HP out (front panel) */
|
||||
{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
|
||||
/* route front PCM to HP */
|
||||
{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
/* port-F for mic-in (front panel) with vref */
|
||||
{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
|
||||
/* port-G for CLFE (rear panel) */
|
||||
{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
{ 0x1f, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
/* port-H for side (rear panel) */
|
||||
{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
/* CD-in */
|
||||
{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
|
||||
/* route front mic to ADC1*/
|
||||
{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
|
||||
/* Unmute DAC0~3 & spdif out*/
|
||||
{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
|
||||
/* Unmute Mixer 14 (mic) 1c (Line in)*/
|
||||
{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
|
||||
/* Unmute Stereo Mixer 15 */
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c}, /* Output 0~12 step */
|
||||
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
/* hp used DAC 3 (Front) */
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
|
||||
|
||||
{ }
|
||||
};
|
||||
|
||||
static const struct hda_verb alc861_threestack_init_verbs[] = {
|
||||
/*
|
||||
* Unmute ADC0 and set the default input to mic-in
|
||||
*/
|
||||
/* port-A for surround (rear panel) */
|
||||
{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
|
||||
/* port-B for mic-in (rear panel) with vref */
|
||||
{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
|
||||
/* port-C for line-in (rear panel) */
|
||||
{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
|
||||
/* port-D for Front */
|
||||
{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
|
||||
{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
/* port-E for HP out (front panel) */
|
||||
{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
|
||||
/* route front PCM to HP */
|
||||
{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
/* port-F for mic-in (front panel) with vref */
|
||||
{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
|
||||
/* port-G for CLFE (rear panel) */
|
||||
{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
|
||||
/* port-H for side (rear panel) */
|
||||
{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
|
||||
/* CD-in */
|
||||
{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
|
||||
/* route front mic to ADC1*/
|
||||
{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
/* Unmute DAC0~3 & spdif out*/
|
||||
{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
|
||||
/* Unmute Mixer 14 (mic) 1c (Line in)*/
|
||||
{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
|
||||
/* Unmute Stereo Mixer 15 */
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c}, /* Output 0~12 step */
|
||||
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
/* hp used DAC 3 (Front) */
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
|
||||
{ }
|
||||
};
|
||||
|
||||
#define ALC861_DIGOUT_NID 0x07
|
||||
|
||||
static const struct hda_channel_mode alc861_8ch_modes[1] = {
|
||||
{ 8, NULL }
|
||||
};
|
||||
|
||||
static const hda_nid_t alc861_dac_nids[4] = {
|
||||
/* front, surround, clfe, side */
|
||||
0x03, 0x06, 0x05, 0x04
|
||||
};
|
||||
|
||||
static const hda_nid_t alc660_dac_nids[3] = {
|
||||
/* front, clfe, surround */
|
||||
0x03, 0x05, 0x06
|
||||
};
|
||||
|
||||
static const hda_nid_t alc861_adc_nids[1] = {
|
||||
/* ADC0-2 */
|
||||
0x08,
|
||||
};
|
||||
|
||||
static const struct hda_input_mux alc861_capture_source = {
|
||||
.num_items = 5,
|
||||
.items = {
|
||||
{ "Mic", 0x0 },
|
||||
{ "Front Mic", 0x3 },
|
||||
{ "Line", 0x1 },
|
||||
{ "CD", 0x4 },
|
||||
{ "Mixer", 0x5 },
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
* configuration and preset
|
||||
*/
|
||||
static const char * const alc861_models[ALC861_MODEL_LAST] = {
|
||||
[ALC861_3ST] = "3stack",
|
||||
[ALC660_3ST] = "3stack-660",
|
||||
[ALC861_3ST_DIG] = "3stack-dig",
|
||||
[ALC861_6ST_DIG] = "6stack-dig",
|
||||
[ALC861_AUTO] = "auto",
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc861_cfg_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC861_3ST),
|
||||
SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS P1-AH2", ALC861_3ST_DIG),
|
||||
SND_PCI_QUIRK(0x1462, 0x7254, "HP dx2200 (MSI MS-7254)", ALC861_3ST),
|
||||
SND_PCI_QUIRK(0x1462, 0x7297, "HP dx2250 (MSI MS-7297)", ALC861_3ST),
|
||||
SND_PCI_QUIRK(0x1849, 0x0660, "Asrock 939SLI32", ALC660_3ST),
|
||||
SND_PCI_QUIRK(0x8086, 0xd600, "Intel", ALC861_3ST),
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct alc_config_preset alc861_presets[] = {
|
||||
[ALC861_3ST] = {
|
||||
.mixers = { alc861_3ST_mixer },
|
||||
.init_verbs = { alc861_threestack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc861_dac_nids),
|
||||
.dac_nids = alc861_dac_nids,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
|
||||
.channel_mode = alc861_threestack_modes,
|
||||
.need_dac_fix = 1,
|
||||
.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
|
||||
.adc_nids = alc861_adc_nids,
|
||||
.input_mux = &alc861_capture_source,
|
||||
},
|
||||
[ALC861_3ST_DIG] = {
|
||||
.mixers = { alc861_base_mixer },
|
||||
.init_verbs = { alc861_threestack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc861_dac_nids),
|
||||
.dac_nids = alc861_dac_nids,
|
||||
.dig_out_nid = ALC861_DIGOUT_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
|
||||
.channel_mode = alc861_threestack_modes,
|
||||
.need_dac_fix = 1,
|
||||
.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
|
||||
.adc_nids = alc861_adc_nids,
|
||||
.input_mux = &alc861_capture_source,
|
||||
},
|
||||
[ALC861_6ST_DIG] = {
|
||||
.mixers = { alc861_base_mixer },
|
||||
.init_verbs = { alc861_base_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc861_dac_nids),
|
||||
.dac_nids = alc861_dac_nids,
|
||||
.dig_out_nid = ALC861_DIGOUT_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861_8ch_modes),
|
||||
.channel_mode = alc861_8ch_modes,
|
||||
.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
|
||||
.adc_nids = alc861_adc_nids,
|
||||
.input_mux = &alc861_capture_source,
|
||||
},
|
||||
[ALC660_3ST] = {
|
||||
.mixers = { alc861_3ST_mixer },
|
||||
.init_verbs = { alc861_threestack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc660_dac_nids),
|
||||
.dac_nids = alc660_dac_nids,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
|
||||
.channel_mode = alc861_threestack_modes,
|
||||
.need_dac_fix = 1,
|
||||
.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
|
||||
.adc_nids = alc861_adc_nids,
|
||||
.input_mux = &alc861_capture_source,
|
||||
},
|
||||
};
|
||||
|
||||
@ -1,362 +0,0 @@
|
||||
/*
|
||||
* ALC660-VD/ALC861-VD quirk models
|
||||
* included by patch_realtek.c
|
||||
*/
|
||||
|
||||
/* ALC861-VD models */
|
||||
enum {
|
||||
ALC861VD_AUTO,
|
||||
ALC660VD_3ST,
|
||||
ALC660VD_3ST_DIG,
|
||||
ALC861VD_3ST,
|
||||
ALC861VD_3ST_DIG,
|
||||
ALC861VD_6ST_DIG,
|
||||
ALC861VD_MODEL_LAST,
|
||||
};
|
||||
|
||||
#define ALC861VD_DIGOUT_NID 0x06
|
||||
|
||||
static const hda_nid_t alc861vd_dac_nids[4] = {
|
||||
/* front, surr, clfe, side surr */
|
||||
0x02, 0x03, 0x04, 0x05
|
||||
};
|
||||
|
||||
/* dac_nids for ALC660vd are in a different order - according to
|
||||
* Realtek's driver.
|
||||
* This should probably result in a different mixer for 6stack models
|
||||
* of ALC660vd codecs, but for now there is only 3stack mixer
|
||||
* - and it is the same as in 861vd.
|
||||
* adc_nids in ALC660vd are (is) the same as in 861vd
|
||||
*/
|
||||
static const hda_nid_t alc660vd_dac_nids[3] = {
|
||||
/* front, rear, clfe, rear_surr */
|
||||
0x02, 0x04, 0x03
|
||||
};
|
||||
|
||||
static const hda_nid_t alc861vd_adc_nids[1] = {
|
||||
/* ADC0 */
|
||||
0x09,
|
||||
};
|
||||
|
||||
static const hda_nid_t alc861vd_capsrc_nids[1] = { 0x22 };
|
||||
|
||||
/* input MUX */
|
||||
/* FIXME: should be a matrix-type input source selection */
|
||||
static const struct hda_input_mux alc861vd_capture_source = {
|
||||
.num_items = 4,
|
||||
.items = {
|
||||
{ "Mic", 0x0 },
|
||||
{ "Front Mic", 0x1 },
|
||||
{ "Line", 0x2 },
|
||||
{ "CD", 0x4 },
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
* 2ch mode
|
||||
*/
|
||||
static const struct hda_channel_mode alc861vd_3stack_2ch_modes[1] = {
|
||||
{ 2, NULL }
|
||||
};
|
||||
|
||||
/*
|
||||
* 6ch mode
|
||||
*/
|
||||
static const struct hda_verb alc861vd_6stack_ch6_init[] = {
|
||||
{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
|
||||
{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/*
|
||||
* 8ch mode
|
||||
*/
|
||||
static const struct hda_verb alc861vd_6stack_ch8_init[] = {
|
||||
{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static const struct hda_channel_mode alc861vd_6stack_modes[2] = {
|
||||
{ 6, alc861vd_6stack_ch6_init },
|
||||
{ 8, alc861vd_6stack_ch8_init },
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new alc861vd_chmode_mixer[] = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Channel Mode",
|
||||
.info = alc_ch_mode_info,
|
||||
.get = alc_ch_mode_get,
|
||||
.put = alc_ch_mode_put,
|
||||
},
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
|
||||
* Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
|
||||
*/
|
||||
static const struct snd_kcontrol_new alc861vd_6st_mixer[] = {
|
||||
HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
||||
|
||||
HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
|
||||
|
||||
HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0,
|
||||
HDA_OUTPUT),
|
||||
HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0,
|
||||
HDA_OUTPUT),
|
||||
HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
|
||||
HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
|
||||
|
||||
HDA_CODEC_VOLUME("Side Playback Volume", 0x05, 0x0, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
|
||||
|
||||
HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
|
||||
|
||||
HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
|
||||
HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, 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_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
||||
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static const struct snd_kcontrol_new alc861vd_3st_mixer[] = {
|
||||
HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
||||
|
||||
HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
|
||||
|
||||
HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
|
||||
HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, 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_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
||||
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/*
|
||||
* generic initialization of ADC, input mixers and output mixers
|
||||
*/
|
||||
static const struct hda_verb alc861vd_volume_init_verbs[] = {
|
||||
/*
|
||||
* Unmute ADC0 and set the default input to mic-in
|
||||
*/
|
||||
{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
|
||||
/* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of
|
||||
* the analog-loopback mixer widget
|
||||
*/
|
||||
/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
|
||||
|
||||
/* Capture mixer: unmute Mic, F-Mic, Line, CD inputs */
|
||||
{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
|
||||
{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
|
||||
|
||||
/*
|
||||
* Set up output mixers (0x02 - 0x05)
|
||||
*/
|
||||
/* set vol=0 to output mixers */
|
||||
{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
||||
{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
||||
{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
||||
{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
||||
|
||||
/* set up input amps for analog loopback */
|
||||
/* Amp Indices: DAC = 0, mixer = 1 */
|
||||
{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
||||
{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
|
||||
{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
||||
{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
|
||||
{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
||||
{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
|
||||
{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
||||
{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
|
||||
|
||||
{ }
|
||||
};
|
||||
|
||||
/*
|
||||
* 3-stack pin configuration:
|
||||
* front = 0x14, mic/clfe = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b
|
||||
*/
|
||||
static const struct hda_verb alc861vd_3stack_init_verbs[] = {
|
||||
/*
|
||||
* Set pin mode and muting
|
||||
*/
|
||||
/* set front pin widgets 0x14 for output */
|
||||
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
|
||||
/* Mic (rear) pin: input vref at 80% */
|
||||
{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
/* Front Mic pin: input vref at 80% */
|
||||
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
/* Line In pin: input */
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
/* Line-2 In: Headphone output (output 0 - 0x0c) */
|
||||
{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
/* CD pin widget for input */
|
||||
{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
|
||||
{ }
|
||||
};
|
||||
|
||||
/*
|
||||
* 6-stack pin configuration:
|
||||
*/
|
||||
static const struct hda_verb alc861vd_6stack_init_verbs[] = {
|
||||
/*
|
||||
* Set pin mode and muting
|
||||
*/
|
||||
/* set front pin widgets 0x14 for output */
|
||||
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
|
||||
/* Rear Pin: output 1 (0x0d) */
|
||||
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
/* CLFE Pin: output 2 (0x0e) */
|
||||
{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x16, AC_VERB_SET_CONNECT_SEL, 0x02},
|
||||
/* Side Pin: output 3 (0x0f) */
|
||||
{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
|
||||
/* Mic (rear) pin: input vref at 80% */
|
||||
{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
/* Front Mic pin: input vref at 80% */
|
||||
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
/* Line In pin: input */
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
/* Line-2 In: Headphone output (output 0 - 0x0c) */
|
||||
{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
/* CD pin widget for input */
|
||||
{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
|
||||
{ }
|
||||
};
|
||||
|
||||
/*
|
||||
* configuration and preset
|
||||
*/
|
||||
static const char * const alc861vd_models[ALC861VD_MODEL_LAST] = {
|
||||
[ALC660VD_3ST] = "3stack-660",
|
||||
[ALC660VD_3ST_DIG] = "3stack-660-digout",
|
||||
[ALC861VD_3ST] = "3stack",
|
||||
[ALC861VD_3ST_DIG] = "3stack-digout",
|
||||
[ALC861VD_6ST_DIG] = "6stack-digout",
|
||||
[ALC861VD_AUTO] = "auto",
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc861vd_cfg_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),
|
||||
SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),
|
||||
SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x1849, 0x0862, "ASRock K8NF6G-VSTA", ALC861VD_6ST_DIG),
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct alc_config_preset alc861vd_presets[] = {
|
||||
[ALC660VD_3ST] = {
|
||||
.mixers = { alc861vd_3st_mixer },
|
||||
.init_verbs = { alc861vd_volume_init_verbs,
|
||||
alc861vd_3stack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),
|
||||
.dac_nids = alc660vd_dac_nids,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
|
||||
.channel_mode = alc861vd_3stack_2ch_modes,
|
||||
.input_mux = &alc861vd_capture_source,
|
||||
},
|
||||
[ALC660VD_3ST_DIG] = {
|
||||
.mixers = { alc861vd_3st_mixer },
|
||||
.init_verbs = { alc861vd_volume_init_verbs,
|
||||
alc861vd_3stack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),
|
||||
.dac_nids = alc660vd_dac_nids,
|
||||
.dig_out_nid = ALC861VD_DIGOUT_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
|
||||
.channel_mode = alc861vd_3stack_2ch_modes,
|
||||
.input_mux = &alc861vd_capture_source,
|
||||
},
|
||||
[ALC861VD_3ST] = {
|
||||
.mixers = { alc861vd_3st_mixer },
|
||||
.init_verbs = { alc861vd_volume_init_verbs,
|
||||
alc861vd_3stack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),
|
||||
.dac_nids = alc861vd_dac_nids,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
|
||||
.channel_mode = alc861vd_3stack_2ch_modes,
|
||||
.input_mux = &alc861vd_capture_source,
|
||||
},
|
||||
[ALC861VD_3ST_DIG] = {
|
||||
.mixers = { alc861vd_3st_mixer },
|
||||
.init_verbs = { alc861vd_volume_init_verbs,
|
||||
alc861vd_3stack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),
|
||||
.dac_nids = alc861vd_dac_nids,
|
||||
.dig_out_nid = ALC861VD_DIGOUT_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
|
||||
.channel_mode = alc861vd_3stack_2ch_modes,
|
||||
.input_mux = &alc861vd_capture_source,
|
||||
},
|
||||
[ALC861VD_6ST_DIG] = {
|
||||
.mixers = { alc861vd_6st_mixer, alc861vd_chmode_mixer },
|
||||
.init_verbs = { alc861vd_volume_init_verbs,
|
||||
alc861vd_6stack_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),
|
||||
.dac_nids = alc861vd_dac_nids,
|
||||
.dig_out_nid = ALC861VD_DIGOUT_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc861vd_6stack_modes),
|
||||
.channel_mode = alc861vd_6stack_modes,
|
||||
.input_mux = &alc861vd_capture_source,
|
||||
},
|
||||
};
|
||||
|
||||
@ -4987,14 +4987,9 @@ static const struct snd_pci_quirk alc861_fixup_tbl[] = {
|
||||
|
||||
/*
|
||||
*/
|
||||
#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
|
||||
#include "alc861_quirks.c"
|
||||
#endif
|
||||
|
||||
static int patch_alc861(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec;
|
||||
int board_config;
|
||||
int err;
|
||||
|
||||
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
|
||||
@ -5005,39 +5000,15 @@ static int patch_alc861(struct hda_codec *codec)
|
||||
|
||||
spec->mixer_nid = 0x15;
|
||||
|
||||
board_config = alc_board_config(codec, ALC861_MODEL_LAST,
|
||||
alc861_models, alc861_cfg_tbl);
|
||||
|
||||
if (board_config < 0) {
|
||||
printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
|
||||
codec->chip_name);
|
||||
board_config = ALC_MODEL_AUTO;
|
||||
}
|
||||
|
||||
if (board_config == ALC_MODEL_AUTO) {
|
||||
alc_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
|
||||
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
|
||||
}
|
||||
|
||||
if (board_config == ALC_MODEL_AUTO) {
|
||||
/* automatic parse from the BIOS config */
|
||||
err = alc861_parse_auto_config(codec);
|
||||
if (err < 0) {
|
||||
alc_free(codec);
|
||||
return err;
|
||||
}
|
||||
#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
|
||||
else if (!err) {
|
||||
printk(KERN_INFO
|
||||
"hda_codec: Cannot set up configuration "
|
||||
"from BIOS. Using base mode...\n");
|
||||
board_config = ALC861_3ST_DIG;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (board_config != ALC_MODEL_AUTO)
|
||||
setup_preset(codec, &alc861_presets[board_config]);
|
||||
|
||||
if (!spec->no_analog && !spec->adc_nids) {
|
||||
alc_auto_fill_adc_caps(codec);
|
||||
@ -5062,13 +5033,9 @@ static int patch_alc861(struct hda_codec *codec)
|
||||
alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
|
||||
|
||||
codec->patch_ops = alc_patch_ops;
|
||||
if (board_config == ALC_MODEL_AUTO) {
|
||||
spec->init_hook = alc_auto_init_std;
|
||||
#ifdef CONFIG_SND_HDA_POWER_SAVE
|
||||
spec->power_hook = alc_power_eapd;
|
||||
#endif
|
||||
}
|
||||
#ifdef CONFIG_SND_HDA_POWER_SAVE
|
||||
if (!spec->loopback.amplist)
|
||||
spec->loopback.amplist = alc861_loopbacks;
|
||||
#endif
|
||||
@ -5141,14 +5108,10 @@ static const struct hda_verb alc660vd_eapd_verbs[] = {
|
||||
|
||||
/*
|
||||
*/
|
||||
#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
|
||||
#include "alc861vd_quirks.c"
|
||||
#endif
|
||||
|
||||
static int patch_alc861vd(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec;
|
||||
int err, board_config;
|
||||
int err;
|
||||
|
||||
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
|
||||
if (spec == NULL)
|
||||
@ -5158,39 +5121,15 @@ static int patch_alc861vd(struct hda_codec *codec)
|
||||
|
||||
spec->mixer_nid = 0x0b;
|
||||
|
||||
board_config = alc_board_config(codec, ALC861VD_MODEL_LAST,
|
||||
alc861vd_models, alc861vd_cfg_tbl);
|
||||
|
||||
if (board_config < 0) {
|
||||
printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
|
||||
codec->chip_name);
|
||||
board_config = ALC_MODEL_AUTO;
|
||||
}
|
||||
|
||||
if (board_config == ALC_MODEL_AUTO) {
|
||||
alc_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
|
||||
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
|
||||
}
|
||||
|
||||
if (board_config == ALC_MODEL_AUTO) {
|
||||
/* automatic parse from the BIOS config */
|
||||
err = alc861vd_parse_auto_config(codec);
|
||||
if (err < 0) {
|
||||
alc_free(codec);
|
||||
return err;
|
||||
}
|
||||
#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
|
||||
else if (!err) {
|
||||
printk(KERN_INFO
|
||||
"hda_codec: Cannot set up configuration "
|
||||
"from BIOS. Using base mode...\n");
|
||||
board_config = ALC861VD_3ST;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (board_config != ALC_MODEL_AUTO)
|
||||
setup_preset(codec, &alc861vd_presets[board_config]);
|
||||
|
||||
if (codec->vendor_id == 0x10ec0660) {
|
||||
/* always turn on EAPD */
|
||||
@ -5221,7 +5160,6 @@ static int patch_alc861vd(struct hda_codec *codec)
|
||||
|
||||
codec->patch_ops = alc_patch_ops;
|
||||
|
||||
if (board_config == ALC_MODEL_AUTO)
|
||||
spec->init_hook = alc_auto_init_std;
|
||||
spec->shutup = alc_eapd_shutup;
|
||||
#ifdef CONFIG_SND_HDA_POWER_SAVE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user