/*
* Driver for generic MPU-401 boards (UART mode only)
* Copyright (c) by Jaroslav Kysela <perex@suse.cz>
- *
- * ACPI PnP Copyright (c) 2004 by Clemens Ladisch <clemens@ladisch.de>
- * based on 8250_acpi.c
- * Copyright (c) 2002-2003 Matthew Wilcox for Hewlett-Packard
- * Copyright (C) 2004 Hewlett-Packard Co
- * Bjorn Helgaas <bjorn.helgaas@hp.com>
+ * Copyright (c) 2004 by Castet Matthieu <castet.matthieu@free.fr>
*
*
* This program is free software; you can redistribute it and/or modify
#include <sound/driver.h>
#include <linux/init.h>
-#ifdef CONFIG_ACPI_BUS
-#include <acpi/acpi_bus.h>
-#endif
+#include <linux/pnp.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
#include <linux/moduleparam.h>
#include <sound/core.h>
#include <sound/mpu401.h>
#include <sound/initval.h>
-#ifdef CONFIG_ACPI_BUS
-#define USE_ACPI_PNP
-#endif
-
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("MPU-401 UART");
MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
+static int index[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -2}; /* exclude the first card */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
-#ifdef USE_ACPI_PNP
-static int acpipnp[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 1 };
+#ifdef CONFIG_PNP
+static int pnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
#endif
static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* MPU-401 port number */
static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* MPU-401 IRQ */
-static int boot_devs;
-module_param_array(index, int, boot_devs, 0444);
+module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for MPU-401 device.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-module_param_array(id, charp, boot_devs, 0444);
+module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for MPU-401 device.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-module_param_array(enable, bool, boot_devs, 0444);
+module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable MPU-401 device.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-#ifdef USE_ACPI_PNP
-module_param_array(acpipnp, bool, boot_devs, 0444);
-MODULE_PARM_DESC(acpipnp, "ACPI PnP detection for MPU-401 device.");
-MODULE_PARM_SYNTAX(acpipnp, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
+#ifdef CONFIG_PNP
+module_param_array(pnp, bool, NULL, 0444);
+MODULE_PARM_DESC(pnp, "PnP detection for MPU-401 device.");
#endif
-module_param_array(port, long, boot_devs, 0444);
+module_param_array(port, long, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for MPU-401 device.");
-MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
-module_param_array(irq, int, boot_devs, 0444);
+module_param_array(irq, int, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");
-MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
-#ifndef CONFIG_ACPI_BUS
-struct acpi_device;
-#endif
+static struct platform_device *platform_devices[SNDRV_CARDS];
+static int pnp_registered = 0;
-static snd_card_t *snd_mpu401_legacy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-static int cards;
+static int snd_mpu401_create(int dev, struct snd_card **rcard)
+{
+ struct snd_card *card;
+ int err;
+
+ *rcard = NULL;
+ card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+ if (card == NULL)
+ return -ENOMEM;
+ strcpy(card->driver, "MPU-401 UART");
+ strcpy(card->shortname, card->driver);
+ sprintf(card->longname, "%s at %#lx, ", card->shortname, port[dev]);
+ if (irq[dev] >= 0) {
+ sprintf(card->longname + strlen(card->longname), "irq %d", irq[dev]);
+ } else {
+ strcat(card->longname, "polled");
+ }
-#ifdef USE_ACPI_PNP
+ if ((err = snd_mpu401_uart_new(card, 0,
+ MPU401_HW_MPU401,
+ port[dev], 0,
+ irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) {
+ printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
+ goto _err;
+ }
-static int acpi_driver_registered;
+ *rcard = card;
+ return 0;
-struct mpu401_resources {
- unsigned long port;
- int irq;
-};
+ _err:
+ snd_card_free(card);
+ return err;
+}
-static acpi_status __devinit snd_mpu401_acpi_resource(struct acpi_resource *res,
- void *data)
+static int __devinit snd_mpu401_probe(struct platform_device *devptr)
{
- struct mpu401_resources *resources = (struct mpu401_resources *)data;
-
- if (res->id == ACPI_RSTYPE_IRQ) {
- if (res->data.irq.number_of_interrupts > 0) {
-#ifdef CONFIG_IA64
- resources->irq = acpi_register_irq(res->data.irq.interrupts[0],
- res->data.irq.active_high_low,
- res->data.irq.edge_level);
-#else
- resources->irq = res->data.irq.interrupts[0];
-#endif
- }
- } else if (res->id == ACPI_RSTYPE_IO) {
- if (res->data.io.range_length >= 2) {
- resources->port = res->data.io.min_base_address;
- }
+ int dev = devptr->id;
+ int err;
+ struct snd_card *card;
+
+ if (port[dev] == SNDRV_AUTO_PORT) {
+ snd_printk(KERN_ERR "specify port\n");
+ return -EINVAL;
}
- return AE_OK;
+ if (irq[dev] == SNDRV_AUTO_IRQ) {
+ snd_printk(KERN_ERR "specify or disable IRQ\n");
+ return -EINVAL;
+ }
+ err = snd_mpu401_create(dev, &card);
+ if (err < 0)
+ return err;
+ snd_card_set_dev(card, &devptr->dev);
+ if ((err = snd_card_register(card)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ platform_set_drvdata(devptr, card);
+ return 0;
}
-static int __devinit snd_mpu401_acpi_pnp(int dev, struct acpi_device *device)
+static int __devexit snd_mpu401_remove(struct platform_device *devptr)
{
- struct mpu401_resources res;
- acpi_status status;
-
- res.port = SNDRV_AUTO_PORT;
- res.irq = SNDRV_AUTO_IRQ;
- status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
- snd_mpu401_acpi_resource, &res);
- if (ACPI_FAILURE(status))
- return -ENODEV;
- if (res.port == SNDRV_AUTO_PORT || res.irq == SNDRV_AUTO_IRQ) {
- snd_printk(KERN_ERR "no port or irq in %s _CRS\n",
- acpi_device_bid(device));
- return -ENODEV;
- }
- port[dev] = res.port;
- irq[dev] = res.irq;
+ snd_card_free(platform_get_drvdata(devptr));
+ platform_set_drvdata(devptr, NULL);
return 0;
}
-#endif /* USE_ACPI_PNP */
+#define SND_MPU401_DRIVER "snd_mpu401"
-static int __devinit snd_card_mpu401_probe(int dev, struct acpi_device *device)
-{
- snd_card_t *card;
- int err;
+static struct platform_driver snd_mpu401_driver = {
+ .probe = snd_mpu401_probe,
+ .remove = __devexit_p(snd_mpu401_remove),
+ .driver = {
+ .name = SND_MPU401_DRIVER
+ },
+};
-#ifdef USE_ACPI_PNP
- if (!device) {
-#endif
- if (port[dev] == SNDRV_AUTO_PORT) {
- snd_printk(KERN_ERR "specify port\n");
- return -EINVAL;
- }
- if (irq[dev] == SNDRV_AUTO_IRQ) {
- snd_printk(KERN_ERR "specify or disable IRQ port\n");
- return -EINVAL;
- }
-#ifdef USE_ACPI_PNP
- }
-#endif
-#ifdef USE_ACPI_PNP
- if (device && (err = snd_mpu401_acpi_pnp(dev, device)) < 0)
- return err;
-#endif
+#ifdef CONFIG_PNP
- card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
- if (card == NULL)
- return -ENOMEM;
- strcpy(card->driver, "MPU-401 UART");
- strcpy(card->shortname, card->driver);
- sprintf(card->longname, "%s at 0x%lx, ", card->shortname, port[dev]);
- if (irq[dev] >= 0) {
- sprintf(card->longname + strlen(card->longname), "IRQ %d", irq[dev]);
- } else {
- strcat(card->longname, "polled");
- }
-#ifdef USE_ACPI_PNP
- if (device) {
- strcat(card->longname, ", bus id ");
- strlcat(card->longname, acpi_device_bid(device), sizeof(card->longname));
+#define IO_EXTENT 2
+
+static struct pnp_device_id snd_mpu401_pnpids[] = {
+ { .id = "PNPb006" },
+ { .id = "" }
+};
+
+MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids);
+
+static int __init snd_mpu401_pnp(int dev, struct pnp_dev *device,
+ const struct pnp_device_id *id)
+{
+ if (!pnp_port_valid(device, 0) ||
+ pnp_port_flags(device, 0) & IORESOURCE_DISABLED) {
+ snd_printk(KERN_ERR "no PnP port\n");
+ return -ENODEV;
}
-#endif
- if (snd_mpu401_uart_new(card, 0,
- MPU401_HW_MPU401,
- port[dev], 0,
- irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0) {
- printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
- snd_card_free(card);
+ if (pnp_port_len(device, 0) < IO_EXTENT) {
+ snd_printk(KERN_ERR "PnP port length is %ld, expected %d\n",
+ pnp_port_len(device, 0), IO_EXTENT);
return -ENODEV;
}
- if ((err = snd_card_register(card)) < 0) {
- snd_card_free(card);
- return err;
+ port[dev] = pnp_port_start(device, 0);
+
+ if (!pnp_irq_valid(device, 0) ||
+ pnp_irq_flags(device, 0) & IORESOURCE_DISABLED) {
+ snd_printk(KERN_WARNING "no PnP irq, using polling\n");
+ irq[dev] = -1;
+ } else {
+ irq[dev] = pnp_irq(device, 0);
}
-#ifdef USE_ACPI_PNP
- if (device)
- acpi_driver_data(device) = card;
- else
-#endif
- snd_mpu401_legacy_cards[dev] = card;
- ++cards;
return 0;
}
-#ifdef USE_ACPI_PNP
-
-static int __devinit snd_mpu401_acpi_add(struct acpi_device *device)
+static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
+ const struct pnp_device_id *id)
{
static int dev;
+ struct snd_card *card;
int err;
for ( ; dev < SNDRV_CARDS; ++dev) {
- if (!enable[dev] || !acpipnp[dev])
+ if (!enable[dev] || !pnp[dev])
continue;
- err = snd_card_mpu401_probe(dev, device);
+ err = snd_mpu401_pnp(dev, pnp_dev, id);
if (err < 0)
return err;
+ err = snd_mpu401_create(dev, &card);
+ if (err < 0)
+ return err;
+ if ((err = snd_card_register(card)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ snd_card_set_dev(card, &pnp_dev->dev);
+ pnp_set_drvdata(pnp_dev, card);
++dev;
return 0;
}
return -ENODEV;
}
-static int __devexit snd_mpu401_acpi_remove(struct acpi_device *device,
- int type)
+static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev)
{
- snd_card_t *card;
-
- if (!device)
- return -EINVAL;
- card = (snd_card_t *)acpi_driver_data(device);
- if (!card)
- return -EINVAL;
+ struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
snd_card_disconnect(card);
snd_card_free_in_thread(card);
- acpi_driver_data(device) = NULL;
- return 0;
}
-static struct acpi_driver snd_mpu401_acpi_driver = {
- .name = "MPU-401 Driver",
- .class = "mpu401",
- .ids = "PNPB006",
- .ops = {
- .add = snd_mpu401_acpi_add,
- .remove = __devexit_p(snd_mpu401_acpi_remove),
- },
+static struct pnp_driver snd_mpu401_pnp_driver = {
+ .name = "mpu401",
+ .id_table = snd_mpu401_pnpids,
+ .probe = snd_mpu401_pnp_probe,
+ .remove = __devexit_p(snd_mpu401_pnp_remove),
};
+#else
+static struct pnp_driver snd_mpu401_pnp_driver;
+#endif
-#endif /* USE_ACPI_PNP */
+static void __init_or_module snd_mpu401_unregister_all(void)
+{
+ int i;
+
+ if (pnp_registered)
+ pnp_unregister_driver(&snd_mpu401_pnp_driver);
+ for (i = 0; i < ARRAY_SIZE(platform_devices); ++i)
+ platform_device_unregister(platform_devices[i]);
+ platform_driver_unregister(&snd_mpu401_driver);
+}
static int __init alsa_card_mpu401_init(void)
{
- int dev;
+ int i, err, devices;
-#ifdef USE_ACPI_PNP
- if (acpi_bus_register_driver(&snd_mpu401_acpi_driver) >= 0)
- acpi_driver_registered = 1;
-#endif
- for (dev = 0; dev < SNDRV_CARDS; dev++) {
- if (!enable[dev])
- continue;
-#ifdef USE_ACPI_PNP
- if (acpipnp[dev] && acpi_driver_registered)
+ if ((err = platform_driver_register(&snd_mpu401_driver)) < 0)
+ return err;
+
+ devices = 0;
+ for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+ struct platform_device *device;
+#ifdef CONFIG_PNP
+ if (pnp[i])
continue;
#endif
- snd_card_mpu401_probe(dev, NULL);
+ device = platform_device_register_simple(SND_MPU401_DRIVER,
+ i, NULL, 0);
+ if (IS_ERR(device)) {
+ err = PTR_ERR(device);
+ goto errout;
+ }
+ platform_devices[i] = device;
+ devices++;
+ }
+ if ((err = pnp_register_driver(&snd_mpu401_pnp_driver)) >= 0) {
+ pnp_registered = 1;
+ devices += err;
}
- if (!cards) {
+
+ if (!devices) {
#ifdef MODULE
printk(KERN_ERR "MPU-401 device not found or device busy\n");
#endif
-#ifdef USE_ACPI_PNP
- if (acpi_driver_registered)
- acpi_bus_unregister_driver(&snd_mpu401_acpi_driver);
-#endif
- return -ENODEV;
+ err = -ENODEV;
+ goto errout;
}
return 0;
+
+ errout:
+ snd_mpu401_unregister_all();
+ return err;
}
static void __exit alsa_card_mpu401_exit(void)
{
- int idx;
-
-#ifdef USE_ACPI_PNP
- if (acpi_driver_registered)
- acpi_bus_unregister_driver(&snd_mpu401_acpi_driver);
-#endif
- for (idx = 0; idx < SNDRV_CARDS; idx++)
- snd_card_free(snd_mpu401_legacy_cards[idx]);
+ snd_mpu401_unregister_all();
}
module_init(alsa_card_mpu401_init)