22 files changed, 61 insertions, 36 deletions

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index d1f242bd0ac5..8f5098f92c37 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -909,8 +909,8 @@ snd_ad1889_create(struct snd_card *card,
                 return err;
 
         /* check PCI availability (32bit DMA) */
-        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
                 printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 4edf270a7809..c551006e2920 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2186,8 +2186,8 @@ static int __devinit snd_ali_create(struct snd_card *card,
         if (err < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 31 bits */
-        if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support "
                            "31bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 009b4c8225a5..3aa35af7ca91 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -689,8 +689,8 @@ static int __devinit snd_als300_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
-                pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
+                pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
                 printk(KERN_ERR "error setting 28bit DMA mask\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 542a0c65a92c..3dbacde1a5af 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -872,8 +872,8 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
                 return err;
         }
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 9ec122383eef..7b72c88e449d 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -151,8 +151,8 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
         // check PCI availability (DMA).
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
                 printk(KERN_ERR "error to set DMA mask\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 8eea29fc42fe..4d34bb0d99d3 100644
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -279,8 +279,8 @@ static int __devinit snd_aw2_create(struct snd_card *card,
         pci_set_master(pci);
 
         /* check PCI availability (32bit DMA) */
-        if ((pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) ||
-            (pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0)) {
+        if ((pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) ||
+            (pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0)) {
                 printk(KERN_ERR "aw2: Impossible to set 32bit mask DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index e9e9b5821d41..f290bc56178f 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -2125,8 +2125,8 @@ snd_azf3328_create(struct snd_card *card,
         chip->irq = -1;
 
         /* check if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support "
                                         "24bit PCI busmaster DMA\n"
                 );
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index df757575798a..bfac30f7929f 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1589,8 +1589,8 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
         err = pci_enable_device(pci);
         if (err < 0)
                 return err;
-        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
                 printk(KERN_ERR "error to set 32bit mask DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index c89ed1f5bc2b..05f56e04849b 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -285,8 +285,8 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
                 printk(KERN_WARNING "unable to get 32bit dma\n");
                 err = -ENXIO;
                 goto pcifail;
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 31542adc6b7e..1970f0e70f37 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -897,8 +897,8 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
 
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
                 snd_printk(KERN_ERR "error to set 28bit mask DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index dd63b132fb8e..fbd2ac09aa34 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1608,8 +1608,8 @@ static int __devinit snd_es1938_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index dc97e8116141..a11f453a6b6d 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2539,8 +2539,8 @@ static int __devinit snd_es1968_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 5bb48ee8b6c6..38ad3f7b040f 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -3256,7 +3256,7 @@ static const char *ad1884_slave_vols[] = {
         "Mic Playback Volume",
         "CD Playback Volume",
         "Internal Mic Playback Volume",
-        "Docking Mic Playback Volume"
+        "Docking Mic Playback Volume",
         /* "Beep Playback Volume", */
         "IEC958 Playback Volume",
         NULL
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 82097790f6f3..f35e58a2d921 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8764,6 +8764,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         {}
 };
 
+static hda_nid_t alc883_slave_dig_outs[] = {
+        ALC1200_DIGOUT_NID, 0,
+};
+
 static hda_nid_t alc1200_slave_dig_outs[] = {
         ALC883_DIGOUT_NID, 0,
 };
@@ -8809,6 +8813,7 @@ static struct alc_config_preset alc883_presets[] = {
                 .dac_nids = alc883_dac_nids,
                 .dig_out_nid = ALC883_DIGOUT_NID,
                 .dig_in_nid = ALC883_DIGIN_NID,
+                .slave_dig_outs = alc883_slave_dig_outs,
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_intel_modes),
                 .channel_mode = alc883_3ST_6ch_intel_modes,
                 .need_dac_fix = 1,
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index b5e108aa8f63..61996a2f45df 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4413,6 +4413,24 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
                 if (spec->num_pwrs > 0)
                         stac92xx_pin_sense(codec, event->nid);
                 stac92xx_report_jack(codec, event->nid);
+
+                switch (codec->subsystem_id) {
+                case 0x103c308f:
+                        if (event->nid == 0xb) {
+                                int pin = AC_PINCTL_IN_EN;
+
+                                if (get_pin_presence(codec, 0xa)
+                                                && get_pin_presence(codec, 0xb))
+                                        pin |= AC_PINCTL_VREF_80;
+                                if (!get_pin_presence(codec, 0xb))
+                                        pin |= AC_PINCTL_VREF_80;
+
+                                /* toggle VREF state based on mic + hp pin
+                                 * status
+                                 */
+                                stac92xx_auto_set_pinctl(codec, 0x0a, pin);
+                        }
+                }
                 break;
         case STAC_VREF_EVENT:
                 data = snd_hda_codec_read(codec, codec->afg, 0,
@@ -4895,6 +4913,7 @@ again:
         switch (codec->vendor_id) {
         case 0x111d7604:
         case 0x111d7605:
+        case 0x111d76d5:
                 if (spec->board_config == STAC_92HD83XXX_PWR_REF)
                         break;
                 spec->num_pwrs = 0;
@@ -5707,6 +5726,7 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = {
         { .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx},
         { .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx},
         { .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d76d5, .name = "92HD81B1C5", .patch = patch_stac92hd83xxx},
         { .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx},
         { .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx },
         { .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx },
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 3dd63f1cda53..0d0cdbdb4486 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2533,8 +2533,8 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
         if (err < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 70141548f251..75283fbb4b3f 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2530,8 +2530,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
                 return -EIO;
 
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index c1eb84a14c42..82bc5b9e7629 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1291,7 +1291,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
         pci_set_master(pci);
 
         /* check if we can restrict PCI DMA transfers to 32 bits */
-        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 80e064a3efff..833e9c7b27c7 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1449,7 +1449,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci,
         pci_set_master(pci);
 
         /* check if we can restrict PCI DMA transfers to 32 bits */
-        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support "
                            "32bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index baf6d8e3dabc..1a5ff0611072 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -1300,7 +1300,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
         if (rc)
                 goto error_out;
 
-        if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
                 printk(KERN_ERR "sis7019: architecture does not support "
                                         "30-bit PCI busmaster DMA");
                 goto error_out_enabled;
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index d989215f3556..7dc60ad4772e 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1264,8 +1264,8 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index a9da9c184660..6d943f6f6b70 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3559,8 +3559,8 @@ int __devinit snd_trident_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 30 bits */
-        if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_30BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;