Commit 46079bac authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge for resolving the conflict of fixup entries added in both
branches.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents e854747d 0bea4cc8

sound/firewire/fireface/ff-protocol-ff400.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int ff400_get_clock(struct snd_ff *ff, unsigned int *rate, 
	int err;



	err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST,

				 FF400_SYNC_STATUS, &reg, sizeof(reg), 0);

				 FF400_CLOCK_CONFIG, &reg, sizeof(reg), 0);

	if (err < 0)

		return err;

	data = le32_to_cpu(reg);

sound/pci/hda/patch_realtek.c

+44 −0
Original line number Diff line number Diff line
@@ -5577,6 +5577,9 @@ enum { 
	ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,

	ALC295_FIXUP_HP_AUTO_MUTE,

	ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,

	ALC294_FIXUP_ASUS_MIC,

	ALC294_FIXUP_ASUS_HEADSET_MIC,

	ALC294_FIXUP_ASUS_SPK,

	ALC225_FIXUP_HEADSET_JACK,

};
@@ -6450,6 +6453,8 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC285_FIXUP_LENOVO_HEADPHONE_NOISE] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_invalidate_dacs,

		.chained = true,

		.chain_id = ALC269_FIXUP_THINKPAD_ACPI

	},

	[ALC295_FIXUP_HP_AUTO_MUTE] = {

		.type = HDA_FIXUP_FUNC,
@@ -6464,6 +6469,36 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MIC

	},

	[ALC294_FIXUP_ASUS_MIC] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x13, 0x90a60160 }, /* use as internal mic */

			{ 0x19, 0x04a11120 }, /* use as headset mic, without its own jack detect */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC

	},

	[ALC294_FIXUP_ASUS_HEADSET_MIC] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x19, 0x01a1113c }, /* use as headset mic, without its own jack detect */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC

	},

	[ALC294_FIXUP_ASUS_SPK] = {

		.type = HDA_FIXUP_VERBS,

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

			/* Set EAPD high */

			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x40 },

			{ 0x20, AC_VERB_SET_PROC_COEF, 0x8800 },

			{ }

		},

		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC

	},

	[ALC225_FIXUP_HEADSET_JACK] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_jack,
@@ -6610,6 +6645,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),

	SND_PCI_QUIRK(0x1043, 0x14a1, "ASUS UX533FD", ALC294_FIXUP_ASUS_SPK),

	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),

	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
@@ -7218,6 +7254,14 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
	SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,

		ALC292_STANDARD_PINS,

		{0x13, 0x90a60140}),

	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_MIC,

		{0x14, 0x90170110},

		{0x1b, 0x90a70130},

		{0x21, 0x04211020}),

	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK,

		{0x12, 0x90a60130},

		{0x17, 0x90170110},

		{0x21, 0x04211020}),

	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,

		ALC295_STANDARD_PINS,

		{0x17, 0x21014020},