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

ALSA: hda - Remove the rest of ALC662 quirks 



The rest of ALC662 quirks are only for desktops, and they should work
with the auto-parser.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a9b36153

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

+0 −5
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ ALC269 


ALC662/663/272

==============

  3stack-dig	3-stack (2-channel) with SPDIF

  3stack-6ch	 3-stack (6-channel)

  3stack-6ch-dig 3-stack (6-channel) with SPDIF

  5stack-dig	 5-stack with SPDIF

  asus-mode1	ASUS

  asus-mode2	ASUS

  asus-mode3	ASUS
@@ -79,7 +75,6 @@ ALC662/663/272 
  asus-mode6	ASUS

  asus-mode7	ASUS

  asus-mode8	ASUS

  auto		auto-config reading BIOS (default)



ALC680

======

sound/pci/hda/alc662_quirks.c

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

 * ALC662/ALC663/ALC665/ALC670 quirk models

 * included by patch_realtek.c

 */



/* ALC662 models */

enum {

	ALC662_AUTO,

	ALC662_3ST_2ch_DIG,

	ALC662_3ST_6ch_DIG,

	ALC662_3ST_6ch,

	ALC662_5ST_DIG,

	ALC662_MODEL_LAST,

};



#define ALC662_DIGOUT_NID	0x06

#define ALC662_DIGIN_NID	0x0a



static const hda_nid_t alc662_dac_nids[3] = {

	/* front, rear, clfe */

	0x02, 0x03, 0x04

};



static const hda_nid_t alc272_dac_nids[2] = {

	0x02, 0x03

};



static const hda_nid_t alc662_adc_nids[2] = {

	/* ADC1-2 */

	0x09, 0x08

};



static const hda_nid_t alc272_adc_nids[1] = {

	/* ADC1-2 */

	0x08,

};



static const hda_nid_t alc662_capsrc_nids[2] = { 0x22, 0x23 };

static const hda_nid_t alc272_capsrc_nids[1] = { 0x23 };





/* input MUX */

/* FIXME: should be a matrix-type input source selection */

static const struct hda_input_mux alc662_capture_source = {

	.num_items = 4,

	.items = {

		{ "Mic", 0x0 },

		{ "Front Mic", 0x1 },

		{ "Line", 0x2 },

		{ "CD", 0x4 },

	},

};



static const struct hda_input_mux alc662_lenovo_101e_capture_source = {

	.num_items = 2,

	.items = {

		{ "Mic", 0x1 },

		{ "Line", 0x2 },

	},

};



static const struct hda_input_mux alc663_capture_source = {

	.num_items = 3,

	.items = {

		{ "Mic", 0x0 },

		{ "Front Mic", 0x1 },

		{ "Line", 0x2 },

	},

};



/*

 * 2ch mode

 */

static const struct hda_channel_mode alc662_3ST_2ch_modes[1] = {

	{ 2, NULL }

};



/*

 * 2ch mode

 */

static const struct hda_verb alc662_3ST_ch2_init[] = {

	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },

	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },

	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },

	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },

	{ } /* end */

};



/*

 * 6ch mode

 */

static const struct hda_verb alc662_3ST_ch6_init[] = {

	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },

	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },

	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },

	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },

	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },

	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },

	{ } /* end */

};



static const struct hda_channel_mode alc662_3ST_6ch_modes[2] = {

	{ 2, alc662_3ST_ch2_init },

	{ 6, alc662_3ST_ch6_init },

};



/*

 * 2ch mode

 */

static const struct hda_verb alc662_sixstack_ch6_init[] = {

	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },

	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },

	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },

	{ } /* end */

};



/*

 * 6ch mode

 */

static const struct hda_verb alc662_sixstack_ch8_init[] = {

	{ 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 alc662_5stack_modes[2] = {

	{ 2, alc662_sixstack_ch6_init },

	{ 6, alc662_sixstack_ch8_init },

};



/* 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 alc662_base_mixer[] = {

	/* output mixer control */

	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Surround Playback Volume", 0x3, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Surround Playback Switch", 0x0d, 0x0, 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_CODEC_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),



	/*Input mixer control */

	HDA_CODEC_VOLUME("CD Playback Volume", 0xb, 0x4, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0xb, 0x4, HDA_INPUT),

	HDA_CODEC_VOLUME("Line Playback Volume", 0xb, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Line Playback Switch", 0xb, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Playback Volume", 0xb, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0xb, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0xb, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Front Mic Playback Switch", 0xb, 0x01, HDA_INPUT),

	{ } /* end */

};



static const struct snd_kcontrol_new alc662_3ST_2ch_mixer[] = {

	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, 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("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),

	{ } /* end */

};



static const struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {

	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Surround Playback Switch", 0x0d, 0x0, 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_CODEC_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, 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("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),

	{ } /* end */

};



static const struct snd_kcontrol_new alc662_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 */

};



static const struct hda_verb alc662_init_verbs[] = {

	/* ADC: mute amp left and right */

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},



	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},



	/* Front Pin: output 0 (0x0c) */

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},



	/* Rear Pin: output 1 (0x0d) */

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},



	/* CLFE Pin: output 2 (0x0e) */

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},



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



	/* FIXME: use matrix-type input source selection */

	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */

	/* Input mixer */

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},



	{ }

};



static const struct hda_verb alc662_eapd_init_verbs[] = {

	/* always trun on EAPD */

	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},

	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},

	{ }

};



/*

 * configuration and preset

 */

static const char * const alc662_models[ALC662_MODEL_LAST] = {

	[ALC662_3ST_2ch_DIG]	= "3stack-dig",

	[ALC662_3ST_6ch_DIG]	= "3stack-6ch-dig",

	[ALC662_3ST_6ch]	= "3stack-6ch",

	[ALC662_5ST_DIG]	= "5stack-dig",

	[ALC662_AUTO]		= "auto",

};



static const struct snd_pci_quirk alc662_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG),

	SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K",

		      ALC662_3ST_6ch_DIG),

	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",

		      ALC662_3ST_6ch_DIG),

	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),

	SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",

					ALC662_3ST_6ch_DIG),

	{}

};



static const struct alc_config_preset alc662_presets[] = {

	[ALC662_3ST_2ch_DIG] = {

		.mixers = { alc662_3ST_2ch_mixer },

		.init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },

		.num_dacs = ARRAY_SIZE(alc662_dac_nids),

		.dac_nids = alc662_dac_nids,

		.dig_out_nid = ALC662_DIGOUT_NID,

		.dig_in_nid = ALC662_DIGIN_NID,

		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),

		.channel_mode = alc662_3ST_2ch_modes,

		.input_mux = &alc662_capture_source,

	},

	[ALC662_3ST_6ch_DIG] = {

		.mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },

		.init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },

		.num_dacs = ARRAY_SIZE(alc662_dac_nids),

		.dac_nids = alc662_dac_nids,

		.dig_out_nid = ALC662_DIGOUT_NID,

		.dig_in_nid = ALC662_DIGIN_NID,

		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),

		.channel_mode = alc662_3ST_6ch_modes,

		.need_dac_fix = 1,

		.input_mux = &alc662_capture_source,

	},

	[ALC662_3ST_6ch] = {

		.mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },

		.init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },

		.num_dacs = ARRAY_SIZE(alc662_dac_nids),

		.dac_nids = alc662_dac_nids,

		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),

		.channel_mode = alc662_3ST_6ch_modes,

		.need_dac_fix = 1,

		.input_mux = &alc662_capture_source,

	},

	[ALC662_5ST_DIG] = {

		.mixers = { alc662_base_mixer, alc662_chmode_mixer },

		.init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },

		.num_dacs = ARRAY_SIZE(alc662_dac_nids),

		.dac_nids = alc662_dac_nids,

		.dig_out_nid = ALC662_DIGOUT_NID,

		.dig_in_nid = ALC662_DIGIN_NID,

		.num_channel_mode = ARRAY_SIZE(alc662_5stack_modes),

		.channel_mode = alc662_5stack_modes,

		.input_mux = &alc662_capture_source,

	},

};

sound/pci/hda/patch_realtek.c

+10 −36
Original line number Diff line number Diff line
@@ -5553,14 +5553,10 @@ static const struct alc_model_fixup alc662_fixup_models[] = { 


/*

 */

#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS

#include "alc662_quirks.c"

#endif



static int patch_alc662(struct hda_codec *codec)

{

	struct alc_spec *spec;

	int err, board_config;

	int err;

	int coef;



	spec = kzalloc(sizeof(*spec), GFP_KERNEL);
@@ -5588,15 +5584,6 @@ static int patch_alc662(struct hda_codec *codec) 
	else if (coef == 0x4011)

		alc_codec_rename(codec, "ALC656");



	board_config = alc_board_config(codec, ALC662_MODEL_LAST,

					alc662_models, alc662_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, alc662_fixup_models,

		       alc662_fixup_tbl, alc662_fixups);

	alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
@@ -5606,18 +5593,6 @@ static int patch_alc662(struct hda_codec *codec) 
		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 = ALC662_3ST_2ch_DIG;

		}

#endif

	}



	if (board_config != ALC_MODEL_AUTO)

		setup_preset(codec, &alc662_presets[board_config]);



	if (!spec->no_analog && !spec->adc_nids) {

		alc_auto_fill_adc_caps(codec);
@@ -5653,7 +5628,6 @@ static int patch_alc662(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;

	spec->shutup = alc_eapd_shutup;