]> err.no Git - linux-2.6/blobdiff - sound/pci/oxygen/oxygen_lib.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
[linux-2.6] / sound / pci / oxygen / oxygen_lib.c
index 858e6d4c9194163c237f6be98e267589c9049608..22f37851045e9639032b55960abcd3edb88c973e 100644 (file)
@@ -32,7 +32,7 @@
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 helper library");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 
 
 static irqreturn_t oxygen_interrupt(int dummy, void *dev_id)
@@ -173,7 +173,7 @@ static void oxygen_proc_read(struct snd_info_entry *entry,
        int i, j;
 
        snd_iprintf(buffer, "CMI8788\n\n");
-       for (i = 0; i < 0x100; i += 0x10) {
+       for (i = 0; i < OXYGEN_IO_SIZE; i += 0x10) {
                snd_iprintf(buffer, "%02x:", i);
                for (j = 0; j < 0x10; ++j)
                        snd_iprintf(buffer, " %02x", oxygen_read8(chip, i + j));
@@ -221,7 +221,8 @@ static void oxygen_init(struct oxygen *chip)
 
        chip->dac_routing = 1;
        for (i = 0; i < 8; ++i)
-               chip->dac_volume[i] = 0xff;
+               chip->dac_volume[i] = chip->model->dac_volume_min;
+       chip->dac_mute = 1;
        chip->spdif_playback_enable = 1;
        chip->spdif_bits = OXYGEN_SPDIF_C | OXYGEN_SPDIF_ORIGINAL |
                (IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT);
@@ -291,21 +292,32 @@ static void oxygen_init(struct oxygen *chip)
                               OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);
        oxygen_write16(chip, OXYGEN_I2S_C_FORMAT,
                       OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);
-       oxygen_write32_masked(chip, OXYGEN_SPDIF_CONTROL,
-                             OXYGEN_SPDIF_SENSE_MASK |
-                             OXYGEN_SPDIF_LOCK_MASK |
-                             OXYGEN_SPDIF_RATE_MASK |
-                             OXYGEN_SPDIF_LOCK_PAR |
-                             OXYGEN_SPDIF_IN_CLOCK_96,
-                             OXYGEN_SPDIF_OUT_ENABLE |
-                             OXYGEN_SPDIF_LOOPBACK |
-                             OXYGEN_SPDIF_SENSE_MASK |
-                             OXYGEN_SPDIF_LOCK_MASK |
-                             OXYGEN_SPDIF_RATE_MASK |
-                             OXYGEN_SPDIF_SENSE_PAR |
-                             OXYGEN_SPDIF_LOCK_PAR |
-                             OXYGEN_SPDIF_IN_CLOCK_MASK);
+       oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL,
+                           OXYGEN_SPDIF_OUT_ENABLE |
+                           OXYGEN_SPDIF_LOOPBACK);
+       if (chip->model->pcm_dev_cfg & CAPTURE_1_FROM_SPDIF)
+               oxygen_write32_masked(chip, OXYGEN_SPDIF_CONTROL,
+                                     OXYGEN_SPDIF_SENSE_MASK |
+                                     OXYGEN_SPDIF_LOCK_MASK |
+                                     OXYGEN_SPDIF_RATE_MASK |
+                                     OXYGEN_SPDIF_LOCK_PAR |
+                                     OXYGEN_SPDIF_IN_CLOCK_96,
+                                     OXYGEN_SPDIF_SENSE_MASK |
+                                     OXYGEN_SPDIF_LOCK_MASK |
+                                     OXYGEN_SPDIF_RATE_MASK |
+                                     OXYGEN_SPDIF_SENSE_PAR |
+                                     OXYGEN_SPDIF_LOCK_PAR |
+                                     OXYGEN_SPDIF_IN_CLOCK_MASK);
+       else
+               oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL,
+                                   OXYGEN_SPDIF_SENSE_MASK |
+                                   OXYGEN_SPDIF_LOCK_MASK |
+                                   OXYGEN_SPDIF_RATE_MASK);
        oxygen_write32(chip, OXYGEN_SPDIF_OUTPUT_BITS, chip->spdif_bits);
+       oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
+                      OXYGEN_2WIRE_LENGTH_8 |
+                      OXYGEN_2WIRE_INTERRUPT_MASK |
+                      OXYGEN_2WIRE_SPEED_STANDARD);
        oxygen_clear_bits8(chip, OXYGEN_MPU401_CONTROL, OXYGEN_MPU401_LOOPBACK);
        oxygen_write8(chip, OXYGEN_GPI_INTERRUPT_MASK, 0);
        oxygen_write16(chip, OXYGEN_GPIO_INTERRUPT_MASK, 0);
@@ -327,9 +339,12 @@ static void oxygen_init(struct oxygen *chip)
                      (2 << OXYGEN_A_MONITOR_ROUTE_2_SHIFT) |
                      (3 << OXYGEN_A_MONITOR_ROUTE_3_SHIFT));
 
-       oxygen_write8(chip, OXYGEN_AC97_INTERRUPT_MASK,
-                     OXYGEN_AC97_INT_READ_DONE |
-                     OXYGEN_AC97_INT_WRITE_DONE);
+       if (chip->has_ac97_0 | chip->has_ac97_1)
+               oxygen_write8(chip, OXYGEN_AC97_INTERRUPT_MASK,
+                             OXYGEN_AC97_INT_READ_DONE |
+                             OXYGEN_AC97_INT_WRITE_DONE);
+       else
+               oxygen_write8(chip, OXYGEN_AC97_INTERRUPT_MASK, 0);
        oxygen_write32(chip, OXYGEN_AC97_OUT_CONFIG, 0);
        oxygen_write32(chip, OXYGEN_AC97_IN_CONFIG, 0);
        if (!(chip->has_ac97_0 | chip->has_ac97_1))
@@ -360,6 +375,8 @@ static void oxygen_init(struct oxygen *chip)
                oxygen_write_ac97(chip, 0, AC97_REC_GAIN, 0x8000);
                oxygen_write_ac97(chip, 0, AC97_CENTER_LFE_MASTER, 0x8080);
                oxygen_write_ac97(chip, 0, AC97_SURROUND_MASTER, 0x8080);
+               oxygen_ac97_clear_bits(chip, 0, CM9780_GPIO_STATUS,
+                                      CM9780_GPO0);
                /* power down unused ADCs and DACs */
                oxygen_ac97_set_bits(chip, 0, AC97_POWERDOWN,
                                     AC97_PD_PR0 | AC97_PD_PR1);
@@ -397,10 +414,8 @@ static void oxygen_card_free(struct snd_card *card)
        oxygen_write16(chip, OXYGEN_DMA_STATUS, 0);
        oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0);
        spin_unlock_irq(&chip->reg_lock);
-       if (chip->irq >= 0) {
+       if (chip->irq >= 0)
                free_irq(chip->irq, chip);
-               synchronize_irq(chip->irq);
-       }
        flush_scheduled_work();
        chip->model->cleanup(chip);
        mutex_destroy(&chip->mutex);
@@ -444,7 +459,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
        }
 
        if (!(pci_resource_flags(pci, 0) & IORESOURCE_IO) ||
-           pci_resource_len(pci, 0) < 0x100) {
+           pci_resource_len(pci, 0) < OXYGEN_IO_SIZE) {
                snd_printk(KERN_ERR "invalid PCI I/O range\n");
                err = -ENXIO;
                goto err_pci_regions;
@@ -493,7 +508,10 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
        oxygen_proc_init(chip);
 
        spin_lock_irq(&chip->reg_lock);
-       chip->interrupt_mask |= OXYGEN_INT_SPDIF_IN_DETECT | OXYGEN_INT_AC97;
+       if (chip->model->pcm_dev_cfg & CAPTURE_1_FROM_SPDIF)
+               chip->interrupt_mask |= OXYGEN_INT_SPDIF_IN_DETECT;
+       if (chip->has_ac97_0 | chip->has_ac97_1)
+               chip->interrupt_mask |= OXYGEN_INT_AC97;
        oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, chip->interrupt_mask);
        spin_unlock_irq(&chip->reg_lock);
 
@@ -520,3 +538,99 @@ void oxygen_pci_remove(struct pci_dev *pci)
        pci_set_drvdata(pci, NULL);
 }
 EXPORT_SYMBOL(oxygen_pci_remove);
+
+#ifdef CONFIG_PM
+int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state)
+{
+       struct snd_card *card = pci_get_drvdata(pci);
+       struct oxygen *chip = card->private_data;
+       unsigned int i, saved_interrupt_mask;
+
+       snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+
+       for (i = 0; i < PCM_COUNT; ++i)
+               if (chip->streams[i])
+                       snd_pcm_suspend(chip->streams[i]);
+
+       if (chip->model->suspend)
+               chip->model->suspend(chip);
+
+       spin_lock_irq(&chip->reg_lock);
+       saved_interrupt_mask = chip->interrupt_mask;
+       chip->interrupt_mask = 0;
+       oxygen_write16(chip, OXYGEN_DMA_STATUS, 0);
+       oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0);
+       spin_unlock_irq(&chip->reg_lock);
+
+       synchronize_irq(chip->irq);
+       flush_scheduled_work();
+       chip->interrupt_mask = saved_interrupt_mask;
+
+       pci_disable_device(pci);
+       pci_save_state(pci);
+       pci_set_power_state(pci, pci_choose_state(pci, state));
+       return 0;
+}
+EXPORT_SYMBOL(oxygen_pci_suspend);
+
+static const u32 registers_to_restore[OXYGEN_IO_SIZE / 32] = {
+       0xffffffff, 0x00ff077f, 0x00011d08, 0x007f00ff,
+       0x00300000, 0x00000fe4, 0x0ff7001f, 0x00000000
+};
+static const u32 ac97_registers_to_restore[2][0x40 / 32] = {
+       { 0x18284fa2, 0x03060000 },
+       { 0x00007fa6, 0x00200000 }
+};
+
+static inline int is_bit_set(const u32 *bitmap, unsigned int bit)
+{
+       return bitmap[bit / 32] & (1 << (bit & 31));
+}
+
+static void oxygen_restore_ac97(struct oxygen *chip, unsigned int codec)
+{
+       unsigned int i;
+
+       oxygen_write_ac97(chip, codec, AC97_RESET, 0);
+       msleep(1);
+       for (i = 1; i < 0x40; ++i)
+               if (is_bit_set(ac97_registers_to_restore[codec], i))
+                       oxygen_write_ac97(chip, codec, i * 2,
+                                         chip->saved_ac97_registers[codec][i]);
+}
+
+int oxygen_pci_resume(struct pci_dev *pci)
+{
+       struct snd_card *card = pci_get_drvdata(pci);
+       struct oxygen *chip = card->private_data;
+       unsigned int i;
+
+       pci_set_power_state(pci, PCI_D0);
+       pci_restore_state(pci);
+       if (pci_enable_device(pci) < 0) {
+               snd_printk(KERN_ERR "cannot reenable device");
+               snd_card_disconnect(card);
+               return -EIO;
+       }
+       pci_set_master(pci);
+
+       oxygen_write16(chip, OXYGEN_DMA_STATUS, 0);
+       oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0);
+       for (i = 0; i < OXYGEN_IO_SIZE; ++i)
+               if (is_bit_set(registers_to_restore, i))
+                       oxygen_write8(chip, i, chip->saved_registers._8[i]);
+       if (chip->has_ac97_0)
+               oxygen_restore_ac97(chip, 0);
+       if (chip->has_ac97_1)
+               oxygen_restore_ac97(chip, 1);
+
+       if (chip->model->resume)
+               chip->model->resume(chip);
+
+       oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, chip->interrupt_mask);
+
+       snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+       return 0;
+}
+EXPORT_SYMBOL(oxygen_pci_resume);
+#endif /* CONFIG_PM */