Commit 5c0ebfbe authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/realtek - Rewrite ALC882 model=vaio-tt with auto-parser 



Providing a pincfg fix for VAIO-TT with ALC889 codec to work with the
auto-parser, and drop the static configuration.

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

sound/pci/hda/alc882_quirks.c

+0 −46
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ enum { 
	ALC888_ASUS_EEE1601,

	ALC889A_MB31,

	ALC1200_ASUS_P5Q,

	ALC883_SONY_VAIO_TT,

	ALC882_MODEL_LAST,

};
@@ -2255,16 +2254,6 @@ static const struct snd_kcontrol_new alc889A_mb31_mixer[] = { 
	{ } /* end */

};



static const struct snd_kcontrol_new alc883_vaiott_mixer[] = {

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

	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),

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

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

	HDA_CODEC_VOLUME("Mic Boost Volume", 0x19, 0, HDA_INPUT),

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

	{ } /* end */

};



static const struct hda_bind_ctls alc883_bind_cap_vol = {

	.ops = &snd_hda_bind_vol,

	.values = {
@@ -2475,17 +2464,6 @@ static const struct hda_verb alc888_6st_dell_verbs[] = { 
	{ }

};



static const struct hda_verb alc883_vaiott_verbs[] = {

	/* HP */

	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},



	/* enable unsolicited event */

	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},



	{ } /* end */

};



static void alc888_3st_hp_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;
@@ -2682,16 +2660,6 @@ static void alc888_lenovo_sky_setup(struct hda_codec *codec) 
	alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP);

}



static void alc883_vaiott_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	spec->autocfg.hp_pins[0] = 0x15;

	spec->autocfg.speaker_pins[0] = 0x14;

	spec->autocfg.speaker_pins[1] = 0x17;

	alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP);

}



static const struct hda_verb alc888_asus_m90v_verbs[] = {

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

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
@@ -2832,7 +2800,6 @@ static const char * const alc882_models[ALC882_MODEL_LAST] = { 
	[ALC889_INTEL]		= "intel-x58",

	[ALC1200_ASUS_P5Q]	= "asus-p5q",

	[ALC889A_MB31]		= "mb31",

	[ALC883_SONY_VAIO_TT]	= "sony-vaio-tt",

	[ALC882_AUTO]		= "auto",

};
@@ -2887,7 +2854,6 @@ static const struct snd_pci_quirk alc882_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q),

	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),



	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC883_SONY_VAIO_TT),

	SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG),

	SND_PCI_QUIRK(0x1071, 0x8227, "Mitac 82801H", ALC883_MITAC),
@@ -3711,18 +3677,6 @@ static const struct alc_config_preset alc882_presets[] = { 
		.unsol_event = alc889A_mb31_unsol_event,

		.init_hook = alc889A_mb31_automute,

	},

	[ALC883_SONY_VAIO_TT] = {

		.mixers = { alc883_vaiott_mixer },

		.init_verbs = { alc883_init_verbs, alc883_vaiott_verbs },

		.num_dacs = ARRAY_SIZE(alc883_dac_nids),

		.dac_nids = alc883_dac_nids,

		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),

		.channel_mode = alc883_3ST_2ch_modes,

		.input_mux = &alc883_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc883_vaiott_setup,

		.init_hook = alc_hp_automute,

	},

};

sound/pci/hda/patch_realtek.c

+24 −15
Original line number Diff line number Diff line
@@ -4214,15 +4214,16 @@ static int patch_alc260(struct hda_codec *codec) 
 * Pin config fixes

 */

enum {

	PINFIX_ABIT_AW9D_MAX,

	PINFIX_LENOVO_Y530,

	PINFIX_PB_M5210,

	PINFIX_ACER_ASPIRE_7736,

	PINFIX_ASUS_W90V,

	ALC882_FIXUP_ABIT_AW9D_MAX,

	ALC882_FIXUP_LENOVO_Y530,

	ALC882_FIXUP_PB_M5210,

	ALC882_FIXUP_ACER_ASPIRE_7736,

	ALC882_FIXUP_ASUS_W90V,

	ALC889_FIXUP_VAIO_TT,

};



static const struct alc_fixup alc882_fixups[] = {

	[PINFIX_ABIT_AW9D_MAX] = {

	[ALC882_FIXUP_ABIT_AW9D_MAX] = {

		.type = ALC_FIXUP_PINS,

		.v.pins = (const struct alc_pincfg[]) {

			{ 0x15, 0x01080104 }, /* side */
@@ -4231,7 +4232,7 @@ static const struct alc_fixup alc882_fixups[] = { 
			{ }

		}

	},

	[PINFIX_LENOVO_Y530] = {

	[ALC882_FIXUP_LENOVO_Y530] = {

		.type = ALC_FIXUP_PINS,

		.v.pins = (const struct alc_pincfg[]) {

			{ 0x15, 0x99130112 }, /* rear int speakers */
@@ -4239,32 +4240,40 @@ static const struct alc_fixup alc882_fixups[] = { 
			{ }

		}

	},

	[PINFIX_PB_M5210] = {

	[ALC882_FIXUP_PB_M5210] = {

		.type = ALC_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {

			{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },

			{}

		}

	},

	[PINFIX_ACER_ASPIRE_7736] = {

	[ALC882_FIXUP_ACER_ASPIRE_7736] = {

		.type = ALC_FIXUP_SKU,

		.v.sku = ALC_FIXUP_SKU_IGNORE,

	},

	[PINFIX_ASUS_W90V] = {

	[ALC882_FIXUP_ASUS_W90V] = {

		.type = ALC_FIXUP_PINS,

		.v.pins = (const struct alc_pincfg[]) {

			{ 0x16, 0x99130110 }, /* fix sequence for CLFE */

			{ }

		}

	},

	[ALC889_FIXUP_VAIO_TT] = {

		.type = ALC_FIXUP_PINS,

		.v.pins = (const struct alc_pincfg[]) {

			{ 0x17, 0x90170111 }, /* hidden surround speaker */

			{ }

		}

	},

};



static const struct snd_pci_quirk alc882_fixup_tbl[] = {

	SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", PINFIX_PB_M5210),

	SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", PINFIX_ASUS_W90V),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", PINFIX_LENOVO_Y530),

	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),

	SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),

	SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210),

	SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),

	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),

	SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", ALC882_FIXUP_ACER_ASPIRE_7736),

	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),

	{}

};