From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 10 Dec 2018 10:26:53 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=46079bacb469c2eff15802fcccc88b0bd56b1e6e;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' into for-next

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

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

46079bacb469c2eff15802fcccc88b0bd56b1e6e
diff --cc sound/pci/hda/patch_realtek.c
index 56882d9b1e43,15021c839372..dfaa6d3d6321
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -5577,7 -5520,9 +5577,10 @@@ 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,
  };
  
  static const struct hda_fixup alc269_fixups[] = {
@@@ -6464,10 -6411,36 +6469,40 @@@
  		.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,
 +	},
  };
  
  static const struct snd_pci_quirk alc269_fixup_tbl[] = {