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

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

Merge branch 'fix/cxt-stable' into fix/hda 

Merge fixes for Thinkpad docking-station regressions for 3.3 kernels
back to 3.4.  These were committed in that branch to make the stable
merging easier.

Conflicts:
	sound/pci/hda/patch_conexant.c
parents 590b4775 d70f3632

sound/pci/hda/patch_conexant.c

+30 −5
Original line number Diff line number Diff line
@@ -3971,9 +3971,14 @@ static void cx_auto_init_output(struct hda_codec *codec) 
	int i;



	mute_outputs(codec, spec->multiout.num_dacs, spec->multiout.dac_nids);

	for (i = 0; i < cfg->hp_outs; i++)

	for (i = 0; i < cfg->hp_outs; i++) {

		unsigned int val = PIN_OUT;

		if (snd_hda_query_pin_caps(codec, cfg->hp_pins[i]) &

		    AC_PINCAP_HP_DRV)

			val |= AC_PINCTL_HP_EN;

		snd_hda_codec_write(codec, cfg->hp_pins[i], 0,

				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);

				    AC_VERB_SET_PIN_WIDGET_CONTROL, val);

	}

	mute_outputs(codec, cfg->hp_outs, cfg->hp_pins);

	mute_outputs(codec, cfg->line_outs, cfg->line_out_pins);

	mute_outputs(codec, cfg->speaker_outs, cfg->speaker_pins);
@@ -4391,8 +4396,10 @@ static void apply_pin_fixup(struct hda_codec *codec, 


enum {

	CXT_PINCFG_LENOVO_X200,

	CXT_PINCFG_LENOVO_TP410,

};



/* ThinkPad X200 & co with cxt5051 */

static const struct cxt_pincfg cxt_pincfg_lenovo_x200[] = {

	{ 0x16, 0x042140ff }, /* HP (seq# overridden) */

	{ 0x17, 0x21a11000 }, /* dock-mic */
@@ -4401,15 +4408,33 @@ static const struct cxt_pincfg cxt_pincfg_lenovo_x200[] = { 
	{}

};



/* ThinkPad 410/420/510/520, X201 & co with cxt5066 */

static const struct cxt_pincfg cxt_pincfg_lenovo_tp410[] = {

	{ 0x19, 0x042110ff }, /* HP (seq# overridden) */

	{ 0x1a, 0x21a190f0 }, /* dock-mic */

	{ 0x1c, 0x212140ff }, /* dock-HP */

	{}

};



static const struct cxt_pincfg *cxt_pincfg_tbl[] = {

	[CXT_PINCFG_LENOVO_X200] = cxt_pincfg_lenovo_x200,

	[CXT_PINCFG_LENOVO_TP410] = cxt_pincfg_lenovo_tp410,

};



static const struct snd_pci_quirk cxt_fixups[] = {

static const struct snd_pci_quirk cxt5051_fixups[] = {

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT_PINCFG_LENOVO_X200),

	{}

};



static const struct snd_pci_quirk cxt5066_fixups[] = {

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T410", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),

	{}

};



/* add "fake" mute amp-caps to DACs on cx5051 so that mixer mute switches

 * can be created (bko#42825)

 */
@@ -4446,13 +4471,13 @@ static int patch_conexant_auto(struct hda_codec *codec) 
	case 0x14f15051:

		add_cx5051_fake_mutes(codec);

		codec->pin_amp_workaround = 1;

		apply_pin_fixup(codec, cxt5051_fixups, cxt_pincfg_tbl);

		break;

	default:

		codec->pin_amp_workaround = 1;

		apply_pin_fixup(codec, cxt5066_fixups, cxt_pincfg_tbl);

	}



	apply_pin_fixup(codec, cxt_fixups, cxt_pincfg_tbl);



	/* Show mute-led control only on HP laptops

	 * This is a sort of white-list: on HP laptops, EAPD corresponds

	 * only to the mute-LED without actualy amp function.  Meanwhile,