Merge branch 'for-linus' into for-next

5 files changed, 57 insertions, 29 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index bffaaeb0b4ba..2cc07c184d31 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -3683,6 +3683,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
         /* Teradici */
         { PCI_DEVICE(0x6549, 0x1200),
           .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
+        { PCI_DEVICE(0x6549, 0x2200),
+          .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
         /* Creative X-Fi (CA0110-IBG) */
         /* CTHDA chips */
         { PCI_DEVICE(0x1102, 0x0010),
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index cdd43eadbc67..1eeba7386666 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -545,6 +545,7 @@ static int ad198x_build_pcms(struct hda_codec *codec)
         if (spec->multiout.dig_out_nid) {
                 info++;
                 codec->num_pcms++;
+                codec->spdif_status_reset = 1;
                 info->name = "AD198x Digital";
                 info->pcm_type = HDA_PCM_TYPE_SPDIF;
                 info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_digital_playback;
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index a7f8790ae885..b9039dbd704d 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -101,8 +101,8 @@ enum {
 #define CS420X_VENDOR_NID       0x11
 #define CS_DIG_OUT1_PIN_NID     0x10
 #define CS_DIG_OUT2_PIN_NID     0x15
-#define CS_DMIC1_PIN_NID        0x12
-#define CS_DMIC2_PIN_NID        0x0e
+#define CS_DMIC1_PIN_NID        0x0e
+#define CS_DMIC2_PIN_NID        0x12
 
 /* coef indices */
 #define IDX_SPDIF_STAT          0x0000
@@ -1080,14 +1080,18 @@ static void init_input(struct hda_codec *codec)
                         cs_automic(codec, NULL);
 
                 coef = 0x000a; /* ADC1/2 - Digital and Analog Soft Ramp */
+                cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);
+
+                coef = cs_vendor_coef_get(codec, IDX_BEEP_CFG);
                 if (is_active_pin(codec, CS_DMIC2_PIN_NID))
-                        coef |= 0x0500; /* DMIC2 2 chan on, GPIO1 off */
+                        coef |= 1 << 4; /* DMIC2 2 chan on, GPIO1 off */
                 if (is_active_pin(codec, CS_DMIC1_PIN_NID))
-                        coef |= 0x1800; /* DMIC1 2 chan on, GPIO0 off
+                        coef |= 1 << 3; /* DMIC1 2 chan on, GPIO0 off
                                          * No effect if SPDIF_OUT2 is
                                          * selected in IDX_SPDIF_CTL.
                                         */
-                cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);
+
+                cs_vendor_coef_set(codec, IDX_BEEP_CFG, coef);
         } else {
                 if (spec->mic_detect)
                         cs_automic(codec, NULL);
@@ -1108,7 +1112,7 @@ static const struct hda_verb cs_coef_init_verbs[] = {
           | 0x0400 /* Disable Coefficient Auto increment */
           )},
         /* Beep */
-        {0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG},
+        {0x11, AC_VERB_SET_COEF_INDEX, IDX_BEEP_CFG},
         {0x11, AC_VERB_SET_PROC_COEF, 0x0007}, /* Enable Beep thru DAC1/2/3 */
 
         {} /* terminator */
@@ -1729,8 +1733,7 @@ static int cs421x_mux_enum_put(struct snd_kcontrol *kcontrol,
 
 }
 
-static struct snd_kcontrol_new cs421x_capture_source = {
-
+static const struct snd_kcontrol_new cs421x_capture_source = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Capture Source",
         .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -1947,7 +1950,7 @@ static int cs421x_suspend(struct hda_codec *codec)
 }
 #endif
 
-static struct hda_codec_ops cs421x_patch_ops = {
+static const struct hda_codec_ops cs421x_patch_ops = {
         .build_controls = cs421x_build_controls,
         .build_pcms = cs_build_pcms,
         .init = cs421x_init,
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 96c08792d210..bc71be32232e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5841,7 +5841,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         return alc_parse_auto_config(codec, alc269_ignore, ssids);
 }
 
-static void alc269_toggle_power_output(struct hda_codec *codec, int power_up)
+static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up)
 {
         int val = alc_read_coef_idx(codec, 0x04);
         if (power_up)
@@ -5858,10 +5858,10 @@ static void alc269_shutup(struct hda_codec *codec)
         if (spec->codec_variant != ALC269_TYPE_ALC269VB)
                 return;
 
-        if ((alc_get_coef0(codec) & 0x00ff) == 0x017)
-                alc269_toggle_power_output(codec, 0);
-        if ((alc_get_coef0(codec) & 0x00ff) == 0x018) {
-                alc269_toggle_power_output(codec, 0);
+        if (spec->codec_variant == ALC269_TYPE_ALC269VB)
+                alc269vb_toggle_power_output(codec, 0);
+        if (spec->codec_variant == ALC269_TYPE_ALC269VB &&
+                        (alc_get_coef0(codec) & 0x00ff) == 0x018) {
                 msleep(150);
         }
 }
@@ -5871,24 +5871,22 @@ static int alc269_resume(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
-        if (spec->codec_variant == ALC269_TYPE_ALC269VB ||
+        if (spec->codec_variant == ALC269_TYPE_ALC269VB)
+                alc269vb_toggle_power_output(codec, 0);
+        if (spec->codec_variant == ALC269_TYPE_ALC269VB &&
                         (alc_get_coef0(codec) & 0x00ff) == 0x018) {
-                alc269_toggle_power_output(codec, 0);
                 msleep(150);
         }
 
         codec->patch_ops.init(codec);
 
-        if (spec->codec_variant == ALC269_TYPE_ALC269VB ||
+        if (spec->codec_variant == ALC269_TYPE_ALC269VB)
+                alc269vb_toggle_power_output(codec, 1);
+        if (spec->codec_variant == ALC269_TYPE_ALC269VB &&
                         (alc_get_coef0(codec) & 0x00ff) == 0x017) {
-                alc269_toggle_power_output(codec, 1);
                 msleep(200);
         }
 
-        if (spec->codec_variant == ALC269_TYPE_ALC269VB ||
-                        (alc_get_coef0(codec) & 0x00ff) == 0x018)
-                alc269_toggle_power_output(codec, 1);
-
         snd_hda_codec_resume_amp(codec);
         snd_hda_codec_resume_cache(codec);
         hda_call_check_power_status(codec, 0x01);
@@ -7080,6 +7078,7 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = {
           .patch = patch_alc662 },
         { .id = 0x10ec0663, .name = "ALC663", .patch = patch_alc662 },
         { .id = 0x10ec0665, .name = "ALC665", .patch = patch_alc662 },
+        { .id = 0x10ec0668, .name = "ALC668", .patch = patch_alc662 },
         { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 },
         { .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 },
         { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
@@ -7097,6 +7096,7 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc882 },
         { .id = 0x10ec0892, .name = "ALC892", .patch = patch_alc662 },
         { .id = 0x10ec0899, .name = "ALC898", .patch = patch_alc882 },
+        { .id = 0x10ec0900, .name = "ALC1150", .patch = patch_alc882 },
         {} /* terminator */
 };
 
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 72a2f60b087c..019e1a00414a 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1809,11 +1809,11 @@ static int via_auto_fill_dac_nids(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
         const struct auto_pin_cfg *cfg = &spec->autocfg;
-        int i, dac_num;
+        int i;
         hda_nid_t nid;
 
+        spec->multiout.num_dacs = 0;
         spec->multiout.dac_nids = spec->private_dac_nids;
-        dac_num = 0;
         for (i = 0; i < cfg->line_outs; i++) {
                 hda_nid_t dac = 0;
                 nid = cfg->line_out_pins[i];
@@ -1824,16 +1824,13 @@ static int via_auto_fill_dac_nids(struct hda_codec *codec)
                 if (!i && parse_output_path(codec, nid, dac, 1,
                                             &spec->out_mix_path))
                         dac = spec->out_mix_path.path[0];
-                if (dac) {
-                        spec->private_dac_nids[i] = dac;
-                        dac_num++;
-                }
+                if (dac)
+                        spec->private_dac_nids[spec->multiout.num_dacs++] = dac;
         }
         if (!spec->out_path[0].depth && spec->out_mix_path.depth) {
                 spec->out_path[0] = spec->out_mix_path;
                 spec->out_mix_path.depth = 0;
         }
-        spec->multiout.num_dacs = dac_num;
         return 0;
 }
 
@@ -3628,6 +3625,7 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
  */
 enum {
         VIA_FIXUP_INTMIC_BOOST,
+        VIA_FIXUP_ASUS_G75,
 };
 
 static void via_fixup_intmic_boost(struct hda_codec *codec,
@@ -3642,13 +3640,35 @@ static const struct hda_fixup via_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = via_fixup_intmic_boost,
         },
+        [VIA_FIXUP_ASUS_G75] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        /* set 0x24 and 0x33 as speakers */
+                        { 0x24, 0x991301f0 },
+                        { 0x33, 0x991301f1 }, /* subwoofer */
+                        { }
+                }
+        },
 };
 
 static const struct snd_pci_quirk vt2002p_fixups[] = {
+        SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75),
         SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST),
         {}
 };
 
+/* NIDs 0x24 and 0x33 on VT1802 have connections to non-existing NID 0x3e
+ * Replace this with mixer NID 0x1c
+ */
+static void fix_vt1802_connections(struct hda_codec *codec)
+{
+        static hda_nid_t conn_24[] = { 0x14, 0x1c };
+        static hda_nid_t conn_33[] = { 0x1c };
+
+        snd_hda_override_conn_list(codec, 0x24, ARRAY_SIZE(conn_24), conn_24);
+        snd_hda_override_conn_list(codec, 0x33, ARRAY_SIZE(conn_33), conn_33);
+}
+
 /* patch for vt2002P */
 static int patch_vt2002P(struct hda_codec *codec)
 {
@@ -3663,6 +3683,8 @@ static int patch_vt2002P(struct hda_codec *codec)
         spec->aa_mix_nid = 0x21;
         override_mic_boost(codec, 0x2b, 0, 3, 40);
         override_mic_boost(codec, 0x29, 0, 3, 40);
+        if (spec->codec_type == VT1802)
+                fix_vt1802_connections(codec);
         add_secret_dac_path(codec);
 
         snd_hda_pick_fixup(codec, NULL, vt2002p_fixups, via_fixups);