time: move PIT_TICK_RATE to linux/timex.h
[linux-2.6.git] / drivers / input / misc / pcspkr.c
index 3013194..6d67af5 100644 (file)
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
-#include <asm/8253pit.h>
+#include <linux/platform_device.h>
+#include <linux/timex.h>
 #include <asm/io.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("PC Speaker beeper driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcspkr");
 
-static char pcspkr_name[] = "PC Speaker";
-static char pcspkr_phys[] = "isa0061/input0";
-static struct input_dev pcspkr_dev;
-
-static DEFINE_SPINLOCK(i8253_beep_lock);
+#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
+/* Use the global PIT lock ! */
+#include <asm/i8253.h>
+#else
+#include <asm/8253pit.h>
+static DEFINE_SPINLOCK(i8253_lock);
+#endif
 
 static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
@@ -46,52 +50,104 @@ static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int c
        if (value > 20 && value < 32767)
                count = PIT_TICK_RATE / value;
 
-       spin_lock_irqsave(&i8253_beep_lock, flags);
+       spin_lock_irqsave(&i8253_lock, flags);
 
        if (count) {
-               /* enable counter 2 */
-               outb_p(inb_p(0x61) | 3, 0x61);
                /* set command for counter 2, 2 byte write */
                outb_p(0xB6, 0x43);
                /* select desired HZ */
                outb_p(count & 0xff, 0x42);
                outb((count >> 8) & 0xff, 0x42);
+               /* enable counter 2 */
+               outb_p(inb_p(0x61) | 3, 0x61);
        } else {
                /* disable counter 2 */
                outb(inb_p(0x61) & 0xFC, 0x61);
        }
 
-       spin_unlock_irqrestore(&i8253_beep_lock, flags);
+       spin_unlock_irqrestore(&i8253_lock, flags);
 
        return 0;
 }
 
-static int __init pcspkr_init(void)
+static int __devinit pcspkr_probe(struct platform_device *dev)
 {
-       pcspkr_dev.evbit[0] = BIT(EV_SND);
-       pcspkr_dev.sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
-       pcspkr_dev.event = pcspkr_event;
+       struct input_dev *pcspkr_dev;
+       int err;
+
+       pcspkr_dev = input_allocate_device();
+       if (!pcspkr_dev)
+               return -ENOMEM;
+
+       pcspkr_dev->name = "PC Speaker";
+       pcspkr_dev->phys = "isa0061/input0";
+       pcspkr_dev->id.bustype = BUS_ISA;
+       pcspkr_dev->id.vendor = 0x001f;
+       pcspkr_dev->id.product = 0x0001;
+       pcspkr_dev->id.version = 0x0100;
+       pcspkr_dev->dev.parent = &dev->dev;
+
+       pcspkr_dev->evbit[0] = BIT_MASK(EV_SND);
+       pcspkr_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
+       pcspkr_dev->event = pcspkr_event;
+
+       err = input_register_device(pcspkr_dev);
+       if (err) {
+               input_free_device(pcspkr_dev);
+               return err;
+       }
+
+       platform_set_drvdata(dev, pcspkr_dev);
 
-       pcspkr_dev.name = pcspkr_name;
-       pcspkr_dev.phys = pcspkr_phys;
-       pcspkr_dev.id.bustype = BUS_ISA;
-       pcspkr_dev.id.vendor = 0x001f;
-       pcspkr_dev.id.product = 0x0001;
-       pcspkr_dev.id.version = 0x0100;
+       return 0;
+}
 
-       input_register_device(&pcspkr_dev);
+static int __devexit pcspkr_remove(struct platform_device *dev)
+{
+       struct input_dev *pcspkr_dev = platform_get_drvdata(dev);
 
-        printk(KERN_INFO "input: %s\n", pcspkr_name);
+       input_unregister_device(pcspkr_dev);
+       platform_set_drvdata(dev, NULL);
+       /* turn off the speaker */
+       pcspkr_event(NULL, EV_SND, SND_BELL, 0);
 
        return 0;
 }
 
-static void __exit pcspkr_exit(void)
+static int pcspkr_suspend(struct platform_device *dev, pm_message_t state)
+{
+       pcspkr_event(NULL, EV_SND, SND_BELL, 0);
+
+       return 0;
+}
+
+static void pcspkr_shutdown(struct platform_device *dev)
 {
-        input_unregister_device(&pcspkr_dev);
        /* turn off the speaker */
        pcspkr_event(NULL, EV_SND, SND_BELL, 0);
 }
 
+static struct platform_driver pcspkr_platform_driver = {
+       .driver         = {
+               .name   = "pcspkr",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = pcspkr_probe,
+       .remove         = __devexit_p(pcspkr_remove),
+       .suspend        = pcspkr_suspend,
+       .shutdown       = pcspkr_shutdown,
+};
+
+
+static int __init pcspkr_init(void)
+{
+       return platform_driver_register(&pcspkr_platform_driver);
+}
+
+static void __exit pcspkr_exit(void)
+{
+       platform_driver_unregister(&pcspkr_platform_driver);
+}
+
 module_init(pcspkr_init);
 module_exit(pcspkr_exit);