/*
- * Driver for audio on multifunction CS5535/6 companion device
+ * Driver for audio on multifunction CS5535 companion device
* Copyright (C) Jaya Kumar
*
* Based on Jaroslav Kysela and Takashi Iwai's examples.
#define DRIVER_NAME "cs5535audio"
-static char *ac97_quirk;
-module_param(ac97_quirk, charp, 0444);
-MODULE_PARM_DESC(ac97_quirk, "AC'97 board specific workarounds.");
-
-static struct ac97_quirk ac97_quirks[] __devinitdata = {
-#if 0 /* Not yet confirmed if all 5536 boards are HP only */
- {
- .subvendor = PCI_VENDOR_ID_AMD,
- .subdevice = PCI_DEVICE_ID_AMD_CS5536_AUDIO,
- .name = "AMD RDK",
- .type = AC97_TUNE_HP_ONLY
- },
-#endif
- {}
-};
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
-module_param_array(index, int, NULL, 0444);
-MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME);
-module_param_array(id, charp, NULL, 0444);
-MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME);
-module_param_array(enable, bool, NULL, 0444);
-MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME);
-
static struct pci_device_id snd_cs5535audio_ids[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },
- { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) },
+ { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
+ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
{}
};
tmp = cs_readl(cs5535au, ACC_CODEC_CNTL);
if (!(tmp & CMD_NEW))
break;
- udelay(1);
+ msleep(10);
} while (--timeout);
if (!timeout)
snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
regdata |= CMD_NEW;
cs_writel(cs5535au, ACC_CODEC_CNTL, regdata);
- wait_till_cmd_acked(cs5535au, 50);
+ wait_till_cmd_acked(cs5535au, 500);
timeout = 50;
do {
val = cs_readl(cs5535au, ACC_CODEC_STATUS);
if ((val & STS_NEW) && reg == (val >> 24))
break;
- udelay(1);
+ msleep(10);
} while (--timeout);
if (!timeout)
- snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
- "Last value=0x%x\n", reg, val);
+ snd_printk(KERN_ERR "Failure reading cs5535 codec\n");
return (unsigned short) val;
}
return err;
}
- snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);
-
return 0;
}
cs5535au->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_cs5535audio_interrupt,
- IRQF_DISABLED|IRQF_SHARED, "CS5535 Audio", cs5535au)) {
+ SA_INTERRUPT|SA_SHIRQ, "CS5535 Audio", cs5535au)) {
snd_printk("unable to grab IRQ %d\n", pci->irq);
err = -EBUSY;
goto sndfail;
if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
goto probefail_out;
- card->private_data = cs5535au;
-
if ((err = snd_cs5535audio_mixer(cs5535au)) < 0)
goto probefail_out;
.id_table = snd_cs5535audio_ids,
.probe = snd_cs5535audio_probe,
.remove = __devexit_p(snd_cs5535audio_remove),
-#ifdef CONFIG_PM
- .suspend = snd_cs5535audio_suspend,
- .resume = snd_cs5535audio_resume,
-#endif
};
static int __init alsa_card_cs5535audio_init(void)