Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb4e4824 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 8fdcb6fe

Documentation/sound/alsa/HD-Audio-Models.txt

+2 −11
Original line number Diff line number Diff line
@@ -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

=======

sound/pci/hda/alc861_quirks.c

deleted100644 → 0
+0 −396
Original line number Diff line number Diff line 
/*

 * 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,

	},

};

sound/pci/hda/alc861vd_quirks.c

deleted100644 → 0
+0 −362

File deleted.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/patch_realtek.c

+18 −80
Original line number Diff line number Diff line
@@ -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