2 files changed, 13 insertions, 14 deletions

diff --git a/sound/pci/hda/alc880_quirks.c b/sound/pci/hda/alc880_quirks.c
index c40f2446fcc4..59899f8b056f 100644
--- a/sound/pci/hda/alc880_quirks.c
+++ b/sound/pci/hda/alc880_quirks.c
@@ -17,7 +17,6 @@ enum {
         ALC880_ASUS_DIG,
         ALC880_ASUS_W1V,
         ALC880_ASUS_DIG2,
-        ALC880_UNIWILL_DIG,
 #ifdef CONFIG_SND_DEBUG
         ALC880_TEST,
 #endif
@@ -852,7 +851,6 @@ static const struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1509, 0x925d, "FIC P4M", ALC880_6ST_DIG),
         SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),
         SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
-        SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),
         SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG), /* broken BIOS */
@@ -1008,18 +1006,6 @@ static const struct alc_config_preset alc880_presets[] = {
                 .need_dac_fix = 1,
                 .input_mux = &alc880_capture_source,
         },
-        [ALC880_UNIWILL_DIG] = {
-                .mixers = { alc880_asus_mixer },
-                .init_verbs = { alc880_volume_init_verbs,
-                                alc880_pin_asus_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
-                .dac_nids = alc880_asus_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
-                .channel_mode = alc880_asus_modes,
-                .need_dac_fix = 1,
-                .input_mux = &alc880_capture_source,
-        },
 #ifdef CONFIG_SND_DEBUG
         [ALC880_TEST] = {
                 .mixers = { alc880_test_mixer },
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ff4410cf75a6..e88c753743dc 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4448,6 +4448,7 @@ enum {
         ALC880_FIXUP_FUJITSU,
         ALC880_FIXUP_F1734,
         ALC880_FIXUP_UNIWILL,
+        ALC880_FIXUP_UNIWILL_DIG,
 };
 
 /* enable the volume-knob widget support on NID 0x21 */
@@ -4567,11 +4568,23 @@ static const struct alc_fixup alc880_fixups[] = {
                         { }
                 },
         },
+        [ALC880_FIXUP_UNIWILL_DIG] = {
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        /* disable bogus unused pins */
+                        { 0x17, 0x411111f0 },
+                        { 0x19, 0x411111f0 },
+                        { 0x1b, 0x411111f0 },
+                        { 0x1f, 0x411111f0 },
+                        { }
+                }
+        },
 };
 
 static const struct snd_pci_quirk alc880_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_FIXUP_W810),
         SND_PCI_QUIRK_VENDOR(0x1558, "Clevo", ALC880_FIXUP_EAPD_COEF),
+        SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_FIXUP_UNIWILL_DIG),
         SND_PCI_QUIRK(0x1584, 0x9054, "Uniwill", ALC880_FIXUP_F1734),
         SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_FIXUP_UNIWILL),
         SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),