Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

diff --cc sound/pci/hda/patch_realtek.c
index b3406302d0697a673d6c6631c74d705c51b35eaa,6c26afcb82622d7b0e994f69c334cec8ef90bf33..e72b74efc6974c8041159bb40ea546073f9a9ecc
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -10803,10 -10549,15 +10803,11 @@@ static const char *alc262_models[ALC262
  static struct snd_pci_quirk alc262_cfg_tbl[] = {
        SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
        SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),
 -      SND_PCI_QUIRK(0x103c, 0x12fe, "HP xw9400", ALC262_HP_BPC),
 -      SND_PCI_QUIRK(0x103c, 0x12ff, "HP xw4550", ALC262_HP_BPC),
 -      SND_PCI_QUIRK(0x103c, 0x1306, "HP xw8600", ALC262_HP_BPC),
 -      SND_PCI_QUIRK(0x103c, 0x1307, "HP xw6600", ALC262_HP_BPC),
 -      SND_PCI_QUIRK(0x103c, 0x1308, "HP xw4600", ALC262_HP_BPC),
 -      SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),
 -      SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),
 -      SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),
 +      SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1200, "HP xw series",
 +                         ALC262_HP_BPC),
 +      SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",
 +                         ALC262_HP_BPC),
+       SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),
        SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
        SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
        SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),

diff --cc sound/pci/hda/patch_sigmatel.c
index 37ffd96a9ff20428299770a9e8a12ce5f18858d9,3bc427645da8ef1411400990b67c9fc181e4cece..13056429aa6439c03515ed729c0e0a2e0a8706f7
--- 1/sound/pci/hda/patch_sigmatel.c
--- 2/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -5066,12 -4989,12 +5066,12 @@@ again
        case STAC_DELL_M4_3:
                spec->num_dmics = 1;
                spec->num_smuxes = 0;
-               spec->num_dmuxes = 0;
+               spec->num_dmuxes = 1;
                break;
 -      default:
 -              spec->num_dmics = STAC92HD71BXX_NUM_DMICS;
 -              spec->num_smuxes = ARRAY_SIZE(stac92hd71bxx_smux_nids);
 -              spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
 +      case STAC_HP_DV5:
 +              snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);
 +              stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN);
 +              break;
        };
  
        spec->multiout.dac_nids = spec->dac_nids;