From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Dec 2018 08:26:19 +0000 (+0100)
Subject: Merge branch 'topic/huawei-leds' into for-next
X-Git-Tag: v5.0-rc1~180^2~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=576d28812d82e94e2836632ff7e2d093099a1139;p=linux.git

Merge branch 'topic/huawei-leds' into for-next

Pull Huawei LEDS and hotkey support.

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

576d28812d82e94e2836632ff7e2d093099a1139
diff --cc sound/pci/hda/patch_realtek.c
index dfaa6d3d6321,9766fd249bdf..129ebd857892
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -5572,15 -5490,9 +5572,16 @@@ enum 
  	ALC298_FIXUP_TPT470_DOCK,
  	ALC255_FIXUP_DUMMY_LINEOUT_VERB,
  	ALC255_FIXUP_DELL_HEADSET_MIC,
+ 	ALC256_FIXUP_HUAWEI_MBXP_PINS,
  	ALC295_FIXUP_HP_X360,
  	ALC221_FIXUP_HP_HEADSET_MIC,
 +	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[] = {