Back-merge tag 'v4.7-rc5' into drm-next

Linux 4.7-rc5

The fsl-dcu pull needs -rc3 so go to -rc5 for now.

5 files changed, 97 insertions, 18 deletions

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index c0f8f613f1f1..172dacd925f5 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -420,6 +420,7 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream)
 
 static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)
 {
+        hrtimer_cancel(&dpcm->timer);
         tasklet_kill(&dpcm->tasklet);
 }
 
diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c
index 87041ddd29cb..47a358fab132 100644
--- a/sound/hda/hdac_regmap.c
+++ b/sound/hda/hdac_regmap.c
@@ -444,7 +444,7 @@ int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg,
         err = reg_raw_write(codec, reg, val);
         if (err == -EAGAIN) {
                 err = snd_hdac_power_up_pm(codec);
-                if (!err)
+                if (err >= 0)
                         err = reg_raw_write(codec, reg, val);
                 snd_hdac_power_down_pm(codec);
         }
@@ -470,7 +470,7 @@ static int __snd_hdac_regmap_read_raw(struct hdac_device *codec,
         err = reg_raw_read(codec, reg, val, uncached);
         if (err == -EAGAIN) {
                 err = snd_hdac_power_up_pm(codec);
-                if (!err)
+                if (err >= 0)
                         err = reg_raw_read(codec, reg, val, uncached);
                 snd_hdac_power_down_pm(codec);
         }
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 9a0d1445ca5c..94089fc71884 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -365,8 +365,11 @@ enum {
 
 #define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170)
 #define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)
+#define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)
+#define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
-#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci))
+#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \
+                        IS_KBL(pci) || IS_KBL_LP(pci)
 
 static char *driver_short_names[] = {
         [AZX_DRIVER_ICH] = "HDA Intel",
@@ -2181,6 +2184,12 @@ static const struct pci_device_id azx_ids[] = {
         /* Sunrise Point-LP */
         { PCI_DEVICE(0x8086, 0x9d70),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+        /* Kabylake */
+        { PCI_DEVICE(0x8086, 0xa171),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+        /* Kabylake-LP */
+        { PCI_DEVICE(0x8086, 0x9d71),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
         /* Broxton-P(Apollolake) */
         { PCI_DEVICE(0x8086, 0x5a98),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index 17fd81736d3d..0621920f7617 100644
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -115,20 +115,20 @@ static int substream_free_pages(struct azx *chip,
 /*
  * Register access ops. Tegra HDA register access is DWORD only.
  */
-static void hda_tegra_writel(u32 value, u32 *addr)
+static void hda_tegra_writel(u32 value, u32 __iomem *addr)
 {
         writel(value, addr);
 }
 
-static u32 hda_tegra_readl(u32 *addr)
+static u32 hda_tegra_readl(u32 __iomem *addr)
 {
         return readl(addr);
 }
 
-static void hda_tegra_writew(u16 value, u16 *addr)
+static void hda_tegra_writew(u16 value, u16 __iomem  *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
@@ -137,20 +137,20 @@ static void hda_tegra_writew(u16 value, u16 *addr)
         writel(v, dword_addr);
 }
 
-static u16 hda_tegra_readw(u16 *addr)
+static u16 hda_tegra_readw(u16 __iomem *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
         return (v >> shift) & 0xffff;
 }
 
-static void hda_tegra_writeb(u8 value, u8 *addr)
+static void hda_tegra_writeb(u8 value, u8 __iomem *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
@@ -159,10 +159,10 @@ static void hda_tegra_writeb(u8 value, u8 *addr)
         writel(v, dword_addr);
 }
 
-static u8 hda_tegra_readb(u8 *addr)
+static u8 hda_tegra_readb(u8 __iomem *addr)
 {
         unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
-        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
         u32 v;
 
         v = readl(dword_addr);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index d53c25e7a1c1..900bfbc3368c 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -346,6 +346,9 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
         case 0x10ec0234:
         case 0x10ec0274:
         case 0x10ec0294:
+        case 0x10ec0700:
+        case 0x10ec0701:
+        case 0x10ec0703:
                 alc_update_coef_idx(codec, 0x10, 1<<15, 0);
                 break;
         case 0x10ec0662:
@@ -2655,6 +2658,7 @@ enum {
         ALC269_TYPE_ALC256,
         ALC269_TYPE_ALC225,
         ALC269_TYPE_ALC294,
+        ALC269_TYPE_ALC700,
 };
 
 /*
@@ -2686,6 +2690,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         case ALC269_TYPE_ALC256:
         case ALC269_TYPE_ALC225:
         case ALC269_TYPE_ALC294:
+        case ALC269_TYPE_ALC700:
                 ssids = alc269_ssids;
                 break;
         default:
@@ -3618,13 +3623,20 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,
 static void alc_headset_mode_unplugged(struct hda_codec *codec)
 {
         static struct coef_fw coef0255[] = {
-                WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */
                 WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */
                 UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), /* Direct Drive HP Amp control(Set to verb control)*/
                 WRITE_COEF(0x06, 0x6104), /* Set MIC2 Vref gate with HP */
                 WRITE_COEFEX(0x57, 0x03, 0x8aa6), /* Direct Drive HP Amp control */
                 {}
         };
+        static struct coef_fw coef0255_1[] = {
+                WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */
+                {}
+        };
+        static struct coef_fw coef0256[] = {
+                WRITE_COEF(0x1b, 0x0c4b), /* LDO and MISC control */
+                {}
+        };
         static struct coef_fw coef0233[] = {
                 WRITE_COEF(0x1b, 0x0c0b),
                 WRITE_COEF(0x45, 0xc429),
@@ -3677,7 +3689,11 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
 
         switch (codec->core.vendor_id) {
         case 0x10ec0255:
+                alc_process_coef_fw(codec, coef0255_1);
+                alc_process_coef_fw(codec, coef0255);
+                break;
         case 0x10ec0256:
+                alc_process_coef_fw(codec, coef0256);
                 alc_process_coef_fw(codec, coef0255);
                 break;
         case 0x10ec0233:
@@ -3896,6 +3912,12 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
                 WRITE_COEFEX(0x57, 0x03, 0x8ea6),
                 {}
         };
+        static struct coef_fw coef0256[] = {
+                WRITE_COEF(0x45, 0xd489), /* Set to CTIA type */
+                WRITE_COEF(0x1b, 0x0c6b),
+                WRITE_COEFEX(0x57, 0x03, 0x8ea6),
+                {}
+        };
         static struct coef_fw coef0233[] = {
                 WRITE_COEF(0x45, 0xd429),
                 WRITE_COEF(0x1b, 0x0c2b),
@@ -3936,9 +3958,11 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
 
         switch (codec->core.vendor_id) {
         case 0x10ec0255:
-        case 0x10ec0256:
                 alc_process_coef_fw(codec, coef0255);
                 break;
+        case 0x10ec0256:
+                alc_process_coef_fw(codec, coef0256);
+                break;
         case 0x10ec0233:
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
@@ -3978,6 +4002,12 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
                 WRITE_COEFEX(0x57, 0x03, 0x8ea6),
                 {}
         };
+        static struct coef_fw coef0256[] = {
+                WRITE_COEF(0x45, 0xe489), /* Set to OMTP Type */
+                WRITE_COEF(0x1b, 0x0c6b),
+                WRITE_COEFEX(0x57, 0x03, 0x8ea6),
+                {}
+        };
         static struct coef_fw coef0233[] = {
                 WRITE_COEF(0x45, 0xe429),
                 WRITE_COEF(0x1b, 0x0c2b),
@@ -4018,9 +4048,11 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
 
         switch (codec->core.vendor_id) {
         case 0x10ec0255:
-        case 0x10ec0256:
                 alc_process_coef_fw(codec, coef0255);
                 break;
+        case 0x10ec0256:
+                alc_process_coef_fw(codec, coef0256);
+                break;
         case 0x10ec0233:
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
@@ -4266,7 +4298,7 @@ static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,
 static void alc255_set_default_jack_type(struct hda_codec *codec)
 {
         /* Set to iphone type */
-        static struct coef_fw fw[] = {
+        static struct coef_fw alc255fw[] = {
                 WRITE_COEF(0x1b, 0x880b),
                 WRITE_COEF(0x45, 0xd089),
                 WRITE_COEF(0x1b, 0x080b),
@@ -4274,7 +4306,22 @@ static void alc255_set_default_jack_type(struct hda_codec *codec)
                 WRITE_COEF(0x1b, 0x0c0b),
                 {}
         };
-        alc_process_coef_fw(codec, fw);
+        static struct coef_fw alc256fw[] = {
+                WRITE_COEF(0x1b, 0x884b),
+                WRITE_COEF(0x45, 0xd089),
+                WRITE_COEF(0x1b, 0x084b),
+                WRITE_COEF(0x46, 0x0004),
+                WRITE_COEF(0x1b, 0x0c4b),
+                {}
+        };
+        switch (codec->core.vendor_id) {
+        case 0x10ec0255:
+                alc_process_coef_fw(codec, alc255fw);
+                break;
+        case 0x10ec0256:
+                alc_process_coef_fw(codec, alc256fw);
+                break;
+        }
         msleep(30);
 }
 
@@ -5587,6 +5634,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK),
+        SND_PCI_QUIRK(0x17aa, 0x2231, "Thinkpad T560", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
         SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
@@ -5602,6 +5650,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),
+        SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460),
+        SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
         SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
@@ -5775,11 +5825,19 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                 {0x12, 0x90a60180},
                 {0x14, 0x90170130},
                 {0x21, 0x02211040}),
+        SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell Inspiron 5565", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+                {0x12, 0x90a60180},
+                {0x14, 0x90170120},
+                {0x21, 0x02211030}),
         SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
                 {0x12, 0x90a60160},
                 {0x14, 0x90170120},
                 {0x21, 0x02211030}),
         SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+                {0x12, 0x90a60170},
+                {0x14, 0x90170120},
+                {0x21, 0x02211030}),
+        SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
                 ALC256_STANDARD_PINS),
         SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
                 {0x12, 0x90a60130},
@@ -6053,6 +6111,14 @@ static int patch_alc269(struct hda_codec *codec)
         case 0x10ec0294:
                 spec->codec_variant = ALC269_TYPE_ALC294;
                 break;
+        case 0x10ec0700:
+        case 0x10ec0701:
+        case 0x10ec0703:
+                spec->codec_variant = ALC269_TYPE_ALC700;
+                spec->gen.mixer_nid = 0; /* ALC700 does not have any loopback mixer path */
+                alc_update_coef_idx(codec, 0x4a, 0, 1 << 15); /* Combo jack auto trigger control */
+                break;
+
         }
 
         if (snd_hda_codec_read(codec, 0x51, 0, AC_VERB_PARAMETERS, 0) == 0x10ec5505) {
@@ -7008,6 +7074,9 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
         HDA_CODEC_ENTRY(0x10ec0670, "ALC670", patch_alc662),
         HDA_CODEC_ENTRY(0x10ec0671, "ALC671", patch_alc662),
         HDA_CODEC_ENTRY(0x10ec0680, "ALC680", patch_alc680),
+        HDA_CODEC_ENTRY(0x10ec0700, "ALC700", patch_alc269),
+        HDA_CODEC_ENTRY(0x10ec0701, "ALC701", patch_alc269),
+        HDA_CODEC_ENTRY(0x10ec0703, "ALC703", patch_alc269),
         HDA_CODEC_ENTRY(0x10ec0867, "ALC891", patch_alc882),
         HDA_CODEC_ENTRY(0x10ec0880, "ALC880", patch_alc880),
         HDA_CODEC_ENTRY(0x10ec0882, "ALC882", patch_alc882),