|
@@ -2,7 +2,7 @@
|
|
|
* 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>
|
|
@@ -13,21 +13,23 @@
|
|
|
|
|
|
#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_AUTHOR("David S. Miller <davem@davemloft.net>");
|
|
|
MODULE_DESCRIPTION("Sparc Speaker beeper driver");
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
-const char *beep_name;
|
|
|
-static unsigned long beep_iobase;
|
|
|
-static int (*beep_event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
|
|
|
-static DEFINE_SPINLOCK(beep_lock);
|
|
|
+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;
|
|
|
|
|
@@ -43,24 +45,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 (beep_iobase & 0x2UL)
|
|
|
- outb(!!count, beep_iobase);
|
|
|
+ if (state->iobase & 0x2UL)
|
|
|
+ outb(!!count, state->iobase);
|
|
|
else
|
|
|
- outl(!!count, beep_iobase);
|
|
|
+ outl(!!count, state->iobase);
|
|
|
|
|
|
- spin_unlock_irqrestore(&beep_lock, flags);
|
|
|
+ spin_unlock_irqrestore(&state->lock, flags);
|
|
|
|
|
|
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;
|
|
|
|
|
@@ -76,29 +78,29 @@ 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;
|
|
|
}
|
|
|
-#endif
|
|
|
|
|
|
-static int __devinit sparcspkr_probe(struct platform_device *dev)
|
|
|
+static int __devinit sparcspkr_probe(struct device *dev)
|
|
|
{
|
|
|
+ struct sparcspkr_state *state = dev_get_drvdata(dev);
|
|
|
struct input_dev *input_dev;
|
|
|
int error;
|
|
|
|
|
@@ -106,18 +108,18 @@ static int __devinit sparcspkr_probe(struct platform_device *dev)
|
|
|
if (!input_dev)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- input_dev->name = beep_name;
|
|
|
+ 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->dev;
|
|
|
+ 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 = beep_event;
|
|
|
+ input_dev->event = state->event;
|
|
|
|
|
|
error = input_register_device(input_dev);
|
|
|
if (error) {
|
|
@@ -125,111 +127,137 @@ static int __devinit sparcspkr_probe(struct platform_device *dev)
|
|
|
return error;
|
|
|
}
|
|
|
|
|
|
- platform_set_drvdata(dev, input_dev);
|
|
|
+ state->input_dev = input_dev;
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int __devexit sparcspkr_remove(struct platform_device *dev)
|
|
|
+static int __devexit sparcspkr_remove(struct of_device *dev)
|
|
|
{
|
|
|
- struct input_dev *input_dev = platform_get_drvdata(dev);
|
|
|
+ struct sparcspkr_state *state = dev_get_drvdata(&dev->dev);
|
|
|
+ struct input_dev *input_dev = state->input_dev;
|
|
|
|
|
|
- input_unregister_device(input_dev);
|
|
|
- platform_set_drvdata(dev, NULL);
|
|
|
/* turn off the speaker */
|
|
|
- beep_event(NULL, EV_SND, SND_BELL, 0);
|
|
|
+ state->event(input_dev, EV_SND, SND_BELL, 0);
|
|
|
+
|
|
|
+ input_unregister_device(input_dev);
|
|
|
+
|
|
|
+ dev_set_drvdata(&dev->dev, NULL);
|
|
|
+ kfree(state);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void sparcspkr_shutdown(struct platform_device *dev)
|
|
|
+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 */
|
|
|
- beep_event(NULL, EV_SND, SND_BELL, 0);
|
|
|
+ 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 platform_driver sparcspkr_platform_driver = {
|
|
|
- .driver = {
|
|
|
- .name = "sparcspkr",
|
|
|
- .owner = THIS_MODULE,
|
|
|
+static struct of_device_id ebus_beep_match[] = {
|
|
|
+ {
|
|
|
+ .name = "beep",
|
|
|
},
|
|
|
- .probe = sparcspkr_probe,
|
|
|
- .remove = __devexit_p(sparcspkr_remove),
|
|
|
- .shutdown = sparcspkr_shutdown,
|
|
|
+ {},
|
|
|
};
|
|
|
|
|
|
-static struct platform_device *sparcspkr_platform_device;
|
|
|
+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 __init sparcspkr_drv_init(void)
|
|
|
+static int __devinit isa_beep_probe(struct of_device *dev, const struct of_device_id *match)
|
|
|
{
|
|
|
- int error;
|
|
|
+ struct sparc_isa_device *idev = to_isa_device(&dev->dev);
|
|
|
+ struct sparcspkr_state *state;
|
|
|
+ int err;
|
|
|
|
|
|
- error = platform_driver_register(&sparcspkr_platform_driver);
|
|
|
- if (error)
|
|
|
- return error;
|
|
|
+ state = kzalloc(sizeof(*state), GFP_KERNEL);
|
|
|
+ if (!state)
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
- sparcspkr_platform_device = platform_device_alloc("sparcspkr", -1);
|
|
|
- if (!sparcspkr_platform_device) {
|
|
|
- error = -ENOMEM;
|
|
|
- goto err_unregister_driver;
|
|
|
- }
|
|
|
+ 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);
|
|
|
|
|
|
- error = platform_device_add(sparcspkr_platform_device);
|
|
|
- if (error)
|
|
|
- goto err_free_device;
|
|
|
+ err = sparcspkr_probe(&dev->dev);
|
|
|
+ if (err) {
|
|
|
+ dev_set_drvdata(&dev->dev, NULL);
|
|
|
+ kfree(state);
|
|
|
+ }
|
|
|
|
|
|
return 0;
|
|
|
+}
|
|
|
|
|
|
- err_free_device:
|
|
|
- platform_device_put(sparcspkr_platform_device);
|
|
|
- err_unregister_driver:
|
|
|
- platform_driver_unregister(&sparcspkr_platform_driver);
|
|
|
+static struct of_device_id isa_beep_match[] = {
|
|
|
+ {
|
|
|
+ .name = "dma",
|
|
|
+ },
|
|
|
+ {},
|
|
|
+};
|
|
|
|
|
|
- return error;
|
|
|
-}
|
|
|
+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)
|
|
|
{
|
|
|
- struct linux_ebus *ebus;
|
|
|
- struct linux_ebus_device *edev;
|
|
|
-#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_node->name, "beep")) {
|
|
|
- beep_name = "Sparc EBUS Speaker";
|
|
|
- beep_event = ebus_spkr_event;
|
|
|
- beep_iobase = edev->resource[0].start;
|
|
|
- return sparcspkr_drv_init();
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-#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_node->name, "dma")) {
|
|
|
- beep_name = "Sparc ISA Speaker";
|
|
|
- beep_event = isa_spkr_event,
|
|
|
- beep_iobase = isa_dev->resource.start;
|
|
|
- return sparcspkr_drv_init();
|
|
|
- }
|
|
|
- }
|
|
|
+ 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)
|
|
|
{
|
|
|
- platform_device_unregister(sparcspkr_platform_device);
|
|
|
- platform_driver_unregister(&sparcspkr_platform_driver);
|
|
|
+ of_unregister_driver(&ebus_beep_driver);
|
|
|
+ of_unregister_driver(&isa_beep_driver);
|
|
|
}
|
|
|
|
|
|
module_init(sparcspkr_init);
|