4 files changed, 66 insertions, 13 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 75c602b5b132..351654cf7b09 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -570,6 +570,7 @@ config SND_ICE1712
         tristate "ICEnsemble ICE1712 (Envy24)"
         select SND_MPU401_UART
         select SND_AC97_CODEC
+        select BITREVERSE
         help
           Say Y here to include support for soundcards based on the
           ICE1712 (Envy24) chip.
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 60cdb9e0b68d..83508b3964fb 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -55,7 +55,7 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card *
  *    1 = MediaForte 256-PCS
  *    2 = MediaForte 256-PCPR
  *    3 = MediaForte 64-PCR
- *   16 = setup tuner only (this is additional bit), i.e. SF-64-PCR FM card
+ *   16 = setup tuner only (this is additional bit), i.e. SF64-PCR FM card
  *  High 16-bits are video (radio) device number + 1
  */
 static int tea575x_tuner[SNDRV_CARDS];
@@ -67,7 +67,10 @@ MODULE_PARM_DESC(id, "ID string for the FM801 soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable FM801 soundcard.");
 module_param_array(tea575x_tuner, int, NULL, 0444);
-MODULE_PARM_DESC(tea575x_tuner, "Enable TEA575x tuner.");
+MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (1 = SF256-PCS, 2=SF256-PCPR, 3=SF64-PCR, +16=tuner-only).");
+
+#define TUNER_ONLY              (1<<4)
+#define TUNER_TYPE_MASK         (~TUNER_ONLY & 0xFFFF)
 
 /*
  *  Direct registers
@@ -160,7 +163,7 @@ struct fm801 {
         unsigned int multichannel: 1,   /* multichannel support */
                      secondary: 1;      /* secondary codec */
         unsigned char secondary_addr;   /* address of the secondary codec */
-        unsigned int tea575x_tuner;     /* tuner flags */
+        unsigned int tea575x_tuner;     /* tuner access method & flags */
 
         unsigned short ply_ctrl; /* playback control */
         unsigned short cap_ctrl; /* capture control */
@@ -1287,7 +1290,7 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
 {
         unsigned short cmdw;
 
-        if (chip->tea575x_tuner & 0x0010)
+        if (chip->tea575x_tuner & TUNER_ONLY)
                 goto __ac97_ok;
 
         /* codec cold reset + AC'97 warm reset */
@@ -1296,11 +1299,13 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
         udelay(100);
         outw(0, FM801_REG(chip, CODEC_CTRL));
 
-        if (wait_for_codec(chip, 0, AC97_RESET, msecs_to_jiffies(750)) < 0) {
-                snd_printk(KERN_ERR "Primary AC'97 codec not found\n");
-                if (! resume)
-                        return -EIO;
-        }
+        if (wait_for_codec(chip, 0, AC97_RESET, msecs_to_jiffies(750)) < 0)
+                if (!resume) {
+                        snd_printk(KERN_INFO "Primary AC'97 codec not found, "
+                                            "assume SF64-PCR (tuner-only)\n");
+                        chip->tea575x_tuner = 3 | TUNER_ONLY;
+                        goto __ac97_ok;
+                }
 
         if (chip->multichannel) {
                 if (chip->secondary_addr) {
@@ -1414,7 +1419,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                 return err;
         }
         chip->port = pci_resource_start(pci, 0);
-        if ((tea575x_tuner & 0x0010) == 0) {
+        if ((tea575x_tuner & TUNER_ONLY) == 0) {
                 if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED,
                                 "FM801", chip)) {
                         snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
@@ -1429,6 +1434,14 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                 chip->multichannel = 1;
 
         snd_fm801_chip_init(chip, 0);
+        /* init might set tuner access method */
+        tea575x_tuner = chip->tea575x_tuner;
+
+        if (chip->irq >= 0 && (tea575x_tuner & TUNER_ONLY)) {
+                pci_clear_master(pci);
+                free_irq(chip->irq, chip);
+                chip->irq = -1;
+        }
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
                 snd_fm801_free(chip);
@@ -1438,12 +1451,13 @@ static int __devinit snd_fm801_create(struct snd_card *card,
         snd_card_set_dev(card, &pci->dev);
 
 #ifdef TEA575X_RADIO
-        if (tea575x_tuner > 0 && (tea575x_tuner & 0x000f) < 4) {
+        if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
+            (tea575x_tuner & TUNER_TYPE_MASK) < 4) {
                 chip->tea.dev_nr = tea575x_tuner >> 16;
                 chip->tea.card = card;
                 chip->tea.freq_fixup = 10700;
                 chip->tea.private_data = chip;
-                chip->tea.ops = &snd_fm801_tea_ops[(tea575x_tuner & 0x000f) - 1];
+                chip->tea.ops = &snd_fm801_tea_ops[(tea575x_tuner & TUNER_TYPE_MASK) - 1];
                 snd_tea575x_init(&chip->tea);
         }
 #endif
@@ -1483,7 +1497,7 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
         sprintf(card->longname, "%s at 0x%lx, irq %i",
                 card->shortname, chip->port, chip->irq);
 
-        if (tea575x_tuner[dev] & 0x0010)
+        if (chip->tea575x_tuner & TUNER_ONLY)
                 goto __fm801_tuner_only;
 
         if ((err = snd_fm801_pcm(chip, 0, NULL)) < 0) {
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index fd948bfd9aef..f5020ad99a10 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -504,6 +504,31 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)
 }
 
 /*
+ * suspend/resume
+ * */
+
+#ifdef CONFIG_PM
+static int juli_resume(struct snd_ice1712 *ice)
+{
+        struct snd_akm4xxx *ak = ice->akm;
+        struct juli_spec *spec = ice->spec;
+        /* akm4358 un-reset, un-mute */
+        snd_akm4xxx_reset(ak, 0);
+        /* reinit ak4114 */
+        snd_ak4114_reinit(spec->ak4114);
+        return 0;
+}
+
+static int juli_suspend(struct snd_ice1712 *ice)
+{
+        struct snd_akm4xxx *ak = ice->akm;
+        /* akm4358 reset and soft-mute */
+        snd_akm4xxx_reset(ak, 1);
+        return 0;
+}
+#endif
+
+/*
  * initialize the chip
  */
 
@@ -646,6 +671,13 @@ static int __devinit juli_init(struct snd_ice1712 *ice)
         ice->set_spdif_clock = juli_set_spdif_clock;
 
         ice->spdif.ops.open = juli_spdif_in_open;
+
+#ifdef CONFIG_PM
+        ice->pm_resume = juli_resume;
+        ice->pm_suspend = juli_suspend;
+        ice->pm_suspend_enabled = 1;
+#endif
+
         return 0;
 }
 
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index aac20fb4aad2..b990143636f1 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2063,6 +2063,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
                 .type = AC97_TUNE_HP_ONLY
         },
         {
+                .subvendor = 0x161f,
+                .subdevice = 0x203a,
+                .name = "Gateway 4525GZ",               /* AD1981B */
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
                 .subvendor = 0x1734,
                 .subdevice = 0x0088,
                 .name = "Fujitsu-Siemens D1522",        /* AD1981 */