Patched in Tegra support.

1 files changed, 112 insertions, 39 deletions

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 9387533f70d..0378126e627 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -39,7 +39,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/firmware.h>
 #include <linux/input.h>
 #include <sound/core.h>
@@ -64,8 +64,8 @@ MODULE_FIRMWARE("ess/maestro3_assp_minisrc.fw");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* all enabled */
-static bool external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* all enabled */
+static int external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 static int amp_gpio[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
 
 module_param_array(index, int, NULL, 0444);
@@ -361,6 +361,74 @@ MODULE_PARM_DESC(amp_gpio, "GPIO pin number for external amp. (default = -1)");
 #define DSP2HOST_REQ_I2SRATE    0x02
 #define DSP2HOST_REQ_TIMER      0x04
 
+/* AC97 registers */
+/* XXX fix this crap up */
+/*#define AC97_RESET              0x00*/
+
+#define AC97_VOL_MUTE_B         0x8000
+#define AC97_VOL_M              0x1F
+#define AC97_LEFT_VOL_S         8
+
+#define AC97_MASTER_VOL         0x02
+#define AC97_LINE_LEVEL_VOL     0x04
+#define AC97_MASTER_MONO_VOL    0x06
+#define AC97_PC_BEEP_VOL        0x0A
+#define AC97_PC_BEEP_VOL_M      0x0F
+#define AC97_SROUND_MASTER_VOL  0x38
+#define AC97_PC_BEEP_VOL_S      1
+
+/*#define AC97_PHONE_VOL          0x0C
+#define AC97_MIC_VOL            0x0E*/
+#define AC97_MIC_20DB_ENABLE    0x40
+
+/*#define AC97_LINEIN_VOL         0x10
+#define AC97_CD_VOL             0x12
+#define AC97_VIDEO_VOL          0x14
+#define AC97_AUX_VOL            0x16*/
+#define AC97_PCM_OUT_VOL        0x18
+/*#define AC97_RECORD_SELECT      0x1A*/
+#define AC97_RECORD_MIC         0x00
+#define AC97_RECORD_CD          0x01
+#define AC97_RECORD_VIDEO       0x02
+#define AC97_RECORD_AUX         0x03
+#define AC97_RECORD_MONO_MUX    0x02
+#define AC97_RECORD_DIGITAL     0x03
+#define AC97_RECORD_LINE        0x04
+#define AC97_RECORD_STEREO      0x05
+#define AC97_RECORD_MONO        0x06
+#define AC97_RECORD_PHONE       0x07
+
+/*#define AC97_RECORD_GAIN        0x1C*/
+#define AC97_RECORD_VOL_M       0x0F
+
+/*#define AC97_GENERAL_PURPOSE    0x20*/
+#define AC97_POWER_DOWN_CTRL    0x26
+#define AC97_ADC_READY          0x0001
+#define AC97_DAC_READY          0x0002
+#define AC97_ANALOG_READY       0x0004
+#define AC97_VREF_ON            0x0008
+#define AC97_PR0                0x0100
+#define AC97_PR1                0x0200
+#define AC97_PR2                0x0400
+#define AC97_PR3                0x0800
+#define AC97_PR4                0x1000
+
+#define AC97_RESERVED1          0x28
+
+#define AC97_VENDOR_TEST        0x5A
+
+#define AC97_CLOCK_DELAY        0x5C
+#define AC97_LINEOUT_MUX_SEL    0x0001
+#define AC97_MONO_MUX_SEL       0x0002
+#define AC97_CLOCK_DELAY_SEL    0x1F
+#define AC97_DAC_CDS_SHIFT      6
+#define AC97_ADC_CDS_SHIFT      11
+
+#define AC97_MULTI_CHANNEL_SEL  0x74
+
+/*#define AC97_VENDOR_ID1         0x7C
+#define AC97_VENDOR_ID2         0x7E*/
+
 /*
  * ASSP control regs
  */
@@ -789,7 +857,7 @@ struct snd_m3 {
 
         unsigned int in_suspend;
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
         u16 *suspend_mem;
 #endif
 
@@ -822,7 +890,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_m3_ids) = {
 
 MODULE_DEVICE_TABLE(pci, snd_m3_ids);
 
-static struct snd_pci_quirk m3_amp_quirk_list[] = {
+static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = {
         SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c),
         SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d),
         SND_PCI_QUIRK(0x10f7, 0x833d, "Panasonic CF-72", 0x0d),
@@ -831,7 +899,7 @@ static struct snd_pci_quirk m3_amp_quirk_list[] = {
         { } /* END */
 };
 
-static struct snd_pci_quirk m3_irda_quirk_list[] = {
+static struct snd_pci_quirk m3_irda_quirk_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1028, 0x00b0, "Dell Inspiron 4000", 1),
         SND_PCI_QUIRK(0x1028, 0x00a4, "Dell Inspiron 8000", 1),
         SND_PCI_QUIRK(0x1028, 0x00e6, "Dell Inspiron 8100", 1),
@@ -839,7 +907,7 @@ static struct snd_pci_quirk m3_irda_quirk_list[] = {
 };
 
 /* hardware volume quirks */
-static struct snd_pci_quirk m3_hv_quirk_list[] = {
+static struct snd_pci_quirk m3_hv_quirk_list[] __devinitdata = {
         /* Allegro chips */
         SND_PCI_QUIRK(0x0E11, 0x002E, NULL, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD),
         SND_PCI_QUIRK(0x0E11, 0x0094, NULL, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD),
@@ -917,7 +985,7 @@ static struct snd_pci_quirk m3_hv_quirk_list[] = {
 };
 
 /* HP Omnibook quirks */
-static struct snd_pci_quirk m3_omnibook_quirk_list[] = {
+static struct snd_pci_quirk m3_omnibook_quirk_list[] __devinitdata = {
         SND_PCI_QUIRK_ID(0x103c, 0x0010), /* HP OmniBook 6000 */
         SND_PCI_QUIRK_ID(0x103c, 0x0011), /* HP OmniBook 500 */
         { } /* END */
@@ -1856,7 +1924,7 @@ static struct snd_pcm_ops snd_m3_capture_ops = {
         .pointer =      snd_m3_pcm_pointer,
 };
 
-static int
+static int __devinit
 snd_m3_pcm(struct snd_m3 * chip, int device)
 {
         struct snd_pcm *pcm;
@@ -2031,7 +2099,7 @@ static void snd_m3_ac97_reset(struct snd_m3 *chip)
 #endif
 }
 
-static int snd_m3_mixer(struct snd_m3 *chip)
+static int __devinit snd_m3_mixer(struct snd_m3 *chip)
 {
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
@@ -2173,7 +2241,7 @@ static void snd_m3_assp_init(struct snd_m3 *chip)
 }
 
 
-static int snd_m3_assp_client_init(struct snd_m3 *chip, struct m3_dma *s, int index)
+static int __devinit snd_m3_assp_client_init(struct snd_m3 *chip, struct m3_dma *s, int index)
 {
         int data_bytes = 2 * ( MINISRC_TMP_BUFFER_SIZE / 2 + 
                                MINISRC_IN_BUFFER_SIZE / 2 +
@@ -2368,7 +2436,7 @@ static int snd_m3_free(struct snd_m3 *chip)
                 outw(0, chip->iobase + HOST_INT_CTRL); /* disable ints */
         }
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
         vfree(chip->suspend_mem);
 #endif
 
@@ -2390,11 +2458,10 @@ static int snd_m3_free(struct snd_m3 *chip)
 /*
  * APM support
  */
-#ifdef CONFIG_PM_SLEEP
-static int m3_suspend(struct device *dev)
+#ifdef CONFIG_PM
+static int m3_suspend(struct pci_dev *pci, pm_message_t state)
 {
-        struct pci_dev *pci = to_pci_dev(dev);
-        struct snd_card *card = dev_get_drvdata(dev);
+        struct snd_card *card = pci_get_drvdata(pci);
         struct snd_m3 *chip = card->private_data;
         int i, dsp_index;
 
@@ -2422,14 +2489,13 @@ static int m3_suspend(struct device *dev)
 
         pci_disable_device(pci);
         pci_save_state(pci);
-        pci_set_power_state(pci, PCI_D3hot);
+        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
 
-static int m3_resume(struct device *dev)
+static int m3_resume(struct pci_dev *pci)
 {
-        struct pci_dev *pci = to_pci_dev(dev);
-        struct snd_card *card = dev_get_drvdata(dev);
+        struct snd_card *card = pci_get_drvdata(pci);
         struct snd_m3 *chip = card->private_data;
         int i, dsp_index;
 
@@ -2480,15 +2546,10 @@ static int m3_resume(struct device *dev)
         chip->in_suspend = 0;
         return 0;
 }
-
-static SIMPLE_DEV_PM_OPS(m3_pm, m3_suspend, m3_resume);
-#define M3_PM_OPS       &m3_pm
-#else
-#define M3_PM_OPS       NULL
-#endif /* CONFIG_PM_SLEEP */
+#endif /* CONFIG_PM */
 
 #ifdef CONFIG_SND_MAESTRO3_INPUT
-static int snd_m3_input_register(struct snd_m3 *chip)
+static int __devinit snd_m3_input_register(struct snd_m3 *chip)
 {
         struct input_dev *input_dev;
         int err;
@@ -2532,7 +2593,7 @@ static int snd_m3_dev_free(struct snd_device *device)
         return snd_m3_free(chip);
 }
 
-static int
+static int __devinit
 snd_m3_create(struct snd_card *card, struct pci_dev *pci,
               int enable_amp,
               int amp_gpio,
@@ -2656,7 +2717,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
         }
         chip->irq = pci->irq;
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
         chip->suspend_mem = vmalloc(sizeof(u16) * (REV_B_CODE_MEMORY_LENGTH + REV_B_DATA_MEMORY_LENGTH));
         if (chip->suspend_mem == NULL)
                 snd_printk(KERN_WARNING "can't allocate apm buffer\n");
@@ -2700,7 +2761,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
 
 /*
  */
-static int
+static int __devinit
 snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -2759,8 +2820,8 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
         /* TODO enable MIDI IRQ and I/O */
         err = snd_mpu401_uart_new(chip->card, 0, MPU401_HW_MPU401,
                                   chip->iobase + MPU401_DATA_PORT,
-                                  MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,
-                                  -1, &chip->rmidi);
+                                  MPU401_INFO_INTEGRATED,
+                                  chip->irq, 0, &chip->rmidi);
         if (err < 0)
                 printk(KERN_WARNING "maestro3: no MIDI support.\n");
 #endif
@@ -2770,20 +2831,32 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
         return 0;
 }
 
-static void snd_m3_remove(struct pci_dev *pci)
+static void __devexit snd_m3_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
         pci_set_drvdata(pci, NULL);
 }
 
-static struct pci_driver m3_driver = {
+static struct pci_driver driver = {
         .name = KBUILD_MODNAME,
         .id_table = snd_m3_ids,
         .probe = snd_m3_probe,
-        .remove = snd_m3_remove,
-        .driver = {
-                .pm = M3_PM_OPS,
-        },
+        .remove = __devexit_p(snd_m3_remove),
+#ifdef CONFIG_PM
+        .suspend = m3_suspend,
+        .resume = m3_resume,
+#endif
 };
         
-module_pci_driver(m3_driver);
+static int __init alsa_card_m3_init(void)
+{
+        return pci_register_driver(&driver);
+}
+
+static void __exit alsa_card_m3_exit(void)
+{
+        pci_unregister_driver(&driver);
+}
+
+module_init(alsa_card_m3_init)
+module_exit(alsa_card_m3_exit)