fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / input / misc / sparcspkr.c
index 6d793ad..106c94f 100644 (file)
@@ -2,47 +2,33 @@
  *  Driver for PC-speaker like devices found on various Sparc systems.
  *
  *  Copyright (c) 2002 Vojtech Pavlik
- *  Copyright (c) 2002 David S. Miller (davem@redhat.com)
+ *  Copyright (c) 2002, 2006 David S. Miller (davem@davemloft.net)
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
+#include <linux/platform_device.h>
 
 #include <asm/io.h>
 #include <asm/ebus.h>
-#ifdef CONFIG_SPARC64
 #include <asm/isa.h>
-#endif
 
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
-MODULE_DESCRIPTION("PC Speaker beeper driver");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_DESCRIPTION("Sparc Speaker beeper driver");
 MODULE_LICENSE("GPL");
 
-static unsigned long beep_iobase;
-
-static char *sparcspkr_isa_name = "Sparc ISA Speaker";
-static char *sparcspkr_ebus_name = "Sparc EBUS Speaker";
-static char *sparcspkr_phys = "sparc/input0";
-static struct input_dev sparcspkr_dev;
-
-spinlock_t beep_lock = SPIN_LOCK_UNLOCKED;
-
-static void __init init_sparcspkr_struct(void)
-{
-       sparcspkr_dev.evbit[0] = BIT(EV_SND);
-       sparcspkr_dev.sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
-
-       sparcspkr_dev.phys = sparcspkr_phys;
-       sparcspkr_dev.id.bustype = BUS_ISA;
-       sparcspkr_dev.id.vendor = 0x001f;
-       sparcspkr_dev.id.product = 0x0001;
-       sparcspkr_dev.id.version = 0x0100;
-}
+struct sparcspkr_state {
+       const char              *name;
+       unsigned long           iobase;
+       int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
+       spinlock_t              lock;
+       struct input_dev        *input_dev;
+};
 
 static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
+       struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev);
        unsigned int count = 0;
        unsigned long flags;
 
@@ -58,46 +44,24 @@ static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned in
        if (value > 20 && value < 32767)
                count = 1193182 / value;
 
-       spin_lock_irqsave(&beep_lock, flags);
+       spin_lock_irqsave(&state->lock, flags);
 
        /* EBUS speaker only has on/off state, the frequency does not
         * appear to be programmable.
         */
-       if (count) {
-               if (beep_iobase & 0x2UL)
-                       outb(1, beep_iobase);
-               else
-                       outl(1, beep_iobase);
-       } else {
-               if (beep_iobase & 0x2UL)
-                       outb(0, beep_iobase);
-               else
-                       outl(0, beep_iobase);
-       }
-
-       spin_unlock_irqrestore(&beep_lock, flags);
-
-       return 0;
-}
-
-static int __init init_ebus_beep(struct linux_ebus_device *edev)
-{
-       beep_iobase = edev->resource[0].start;
-
-       init_sparcspkr_struct();
+       if (state->iobase & 0x2UL)
+               outb(!!count, state->iobase);
+       else
+               outl(!!count, state->iobase);
 
-       sparcspkr_dev.name = sparcspkr_ebus_name;
-       sparcspkr_dev.event = ebus_spkr_event;
+       spin_unlock_irqrestore(&state->lock, flags);
 
-       input_register_device(&sparcspkr_dev);
-
-        printk(KERN_INFO "input: %s\n", sparcspkr_ebus_name);
        return 0;
 }
 
-#ifdef CONFIG_SPARC64
 static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
+       struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev);
        unsigned int count = 0;
        unsigned long flags;
 
@@ -113,76 +77,186 @@ static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int
        if (value > 20 && value < 32767)
                count = 1193182 / value;
 
-       spin_lock_irqsave(&beep_lock, flags);
+       spin_lock_irqsave(&state->lock, flags);
 
        if (count) {
                /* enable counter 2 */
-               outb(inb(beep_iobase + 0x61) | 3, beep_iobase + 0x61);
+               outb(inb(state->iobase + 0x61) | 3, state->iobase + 0x61);
                /* set command for counter 2, 2 byte write */
-               outb(0xB6, beep_iobase + 0x43);
+               outb(0xB6, state->iobase + 0x43);
                /* select desired HZ */
-               outb(count & 0xff, beep_iobase + 0x42);
-               outb((count >> 8) & 0xff, beep_iobase + 0x42);
+               outb(count & 0xff, state->iobase + 0x42);
+               outb((count >> 8) & 0xff, state->iobase + 0x42);
        } else {
                /* disable counter 2 */
-               outb(inb_p(beep_iobase + 0x61) & 0xFC, beep_iobase + 0x61);
+               outb(inb_p(state->iobase + 0x61) & 0xFC, state->iobase + 0x61);
        }
 
-       spin_unlock_irqrestore(&beep_lock, flags);
+       spin_unlock_irqrestore(&state->lock, flags);
 
        return 0;
 }
 
-static int __init init_isa_beep(struct sparc_isa_device *isa_dev)
+static int __devinit sparcspkr_probe(struct device *dev)
 {
-       beep_iobase = isa_dev->resource.start;
+       struct sparcspkr_state *state = dev_get_drvdata(dev);
+       struct input_dev *input_dev;
+       int error;
+
+       input_dev = input_allocate_device();
+       if (!input_dev)
+               return -ENOMEM;
+
+       input_dev->name = state->name;
+       input_dev->phys = "sparc/input0";
+       input_dev->id.bustype = BUS_ISA;
+       input_dev->id.vendor = 0x001f;
+       input_dev->id.product = 0x0001;
+       input_dev->id.version = 0x0100;
+       input_dev->cdev.dev = dev;
+
+       input_dev->evbit[0] = BIT(EV_SND);
+       input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+
+       input_dev->event = state->event;
+
+       error = input_register_device(input_dev);
+       if (error) {
+               input_free_device(input_dev);
+               return error;
+       }
 
-       init_sparcspkr_struct();
+       state->input_dev = input_dev;
 
-       sparcspkr_dev.name = sparcspkr_isa_name;
-       sparcspkr_dev.event = isa_spkr_event;
-       sparcspkr_dev.id.bustype = BUS_ISA;
+       return 0;
+}
 
-       input_register_device(&sparcspkr_dev);
+static int __devexit sparcspkr_remove(struct of_device *dev)
+{
+       struct sparcspkr_state *state = dev_get_drvdata(&dev->dev);
+       struct input_dev *input_dev = state->input_dev;
+
+       /* turn off the speaker */
+       state->event(input_dev, EV_SND, SND_BELL, 0);
+
+       input_unregister_device(input_dev);
+
+       dev_set_drvdata(&dev->dev, NULL);
+       kfree(state);
 
-        printk(KERN_INFO "input: %s\n", sparcspkr_isa_name);
        return 0;
 }
-#endif
 
-static int __init sparcspkr_init(void)
+static int sparcspkr_shutdown(struct of_device *dev)
+{
+       struct sparcspkr_state *state = dev_get_drvdata(&dev->dev);
+       struct input_dev *input_dev = state->input_dev;
+
+       /* turn off the speaker */
+       state->event(input_dev, EV_SND, SND_BELL, 0);
+
+       return 0;
+}
+
+static int __devinit ebus_beep_probe(struct of_device *dev, const struct of_device_id *match)
+{
+       struct linux_ebus_device *edev = to_ebus_device(&dev->dev);
+       struct sparcspkr_state *state;
+       int err;
+
+       state = kzalloc(sizeof(*state), GFP_KERNEL);
+       if (!state)
+               return -ENOMEM;
+
+       state->name = "Sparc EBUS Speaker";
+       state->iobase = edev->resource[0].start;
+       state->event = ebus_spkr_event;
+       spin_lock_init(&state->lock);
+
+       dev_set_drvdata(&dev->dev, state);
+
+       err = sparcspkr_probe(&dev->dev);
+       if (err) {
+               dev_set_drvdata(&dev->dev, NULL);
+               kfree(state);
+       }
+
+       return 0;
+}
+
+static struct of_device_id ebus_beep_match[] = {
+       {
+               .name = "beep",
+       },
+       {},
+};
+
+static struct of_platform_driver ebus_beep_driver = {
+       .name           = "beep",
+       .match_table    = ebus_beep_match,
+       .probe          = ebus_beep_probe,
+       .remove         = sparcspkr_remove,
+       .shutdown       = sparcspkr_shutdown,
+};
+
+static int __devinit isa_beep_probe(struct of_device *dev, const struct of_device_id *match)
 {
-       struct linux_ebus *ebus;
-       struct linux_ebus_device *edev = NULL;
-#ifdef CONFIG_SPARC64
-       struct sparc_isa_bridge *isa_br;
-       struct sparc_isa_device *isa_dev;
-#endif
-
-       for_each_ebus(ebus) {
-               for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_name, "beep"))
-                               return init_ebus_beep(edev);
-               }
+       struct sparc_isa_device *idev = to_isa_device(&dev->dev);
+       struct sparcspkr_state *state;
+       int err;
+
+       state = kzalloc(sizeof(*state), GFP_KERNEL);
+       if (!state)
+               return -ENOMEM;
+
+       state->name = "Sparc ISA Speaker";
+       state->iobase = idev->resource.start;
+       state->event = isa_spkr_event;
+       spin_lock_init(&state->lock);
+
+       dev_set_drvdata(&dev->dev, state);
+
+       err = sparcspkr_probe(&dev->dev);
+       if (err) {
+               dev_set_drvdata(&dev->dev, NULL);
+               kfree(state);
        }
-#ifdef CONFIG_SPARC64
-       for_each_isa(isa_br) {
-               for_each_isadev(isa_dev, isa_br) {
-                       /* A hack, the beep device's base lives in
-                        * the DMA isa node.
-                        */
-                       if (!strcmp(isa_dev->prom_name, "dma"))
-                               return init_isa_beep(isa_dev);
-               }
+
+       return 0;
+}
+
+static struct of_device_id isa_beep_match[] = {
+       {
+               .name = "dma",
+       },
+       {},
+};
+
+static struct of_platform_driver isa_beep_driver = {
+       .name           = "beep",
+       .match_table    = isa_beep_match,
+       .probe          = isa_beep_probe,
+       .remove         = sparcspkr_remove,
+       .shutdown       = sparcspkr_shutdown,
+};
+
+static int __init sparcspkr_init(void)
+{
+       int err = of_register_driver(&ebus_beep_driver, &ebus_bus_type);
+
+       if (!err) {
+               err = of_register_driver(&isa_beep_driver, &isa_bus_type);
+               if (err)
+                       of_unregister_driver(&ebus_beep_driver);
        }
-#endif
 
-       return -ENODEV;
+       return err;
 }
 
 static void __exit sparcspkr_exit(void)
 {
-       input_unregister_device(&sparcspkr_dev);
+       of_unregister_driver(&ebus_beep_driver);
+       of_unregister_driver(&isa_beep_driver);
 }
 
 module_init(sparcspkr_init);