#define KMI_BASE (kmi->base)
struct amba_kmi_port {
- struct serio io;
+ struct serio *io;
struct clk *clk;
unsigned char *base;
unsigned int irq;
int handled = IRQ_NONE;
while (status & KMIIR_RXINTR) {
- serio_interrupt(&kmi->io, readb(KMIDATA), 0, regs);
+ serio_interrupt(kmi->io, readb(KMIDATA), 0, regs);
status = readb(KMIIR);
handled = IRQ_HANDLED;
}
static int amba_kmi_write(struct serio *io, unsigned char val)
{
- struct amba_kmi_port *kmi = io->driver;
+ struct amba_kmi_port *kmi = io->port_data;
unsigned int timeleft = 10000; /* timeout in 100ms */
while ((readb(KMISTAT) & KMISTAT_TXEMPTY) == 0 && timeleft--)
static int amba_kmi_open(struct serio *io)
{
- struct amba_kmi_port *kmi = io->driver;
+ struct amba_kmi_port *kmi = io->port_data;
unsigned int divisor;
int ret;
static void amba_kmi_close(struct serio *io)
{
- struct amba_kmi_port *kmi = io->driver;
+ struct amba_kmi_port *kmi = io->port_data;
writeb(0, KMICR);
static int amba_kmi_probe(struct amba_device *dev, void *id)
{
struct amba_kmi_port *kmi;
+ struct serio *io;
int ret;
ret = amba_request_regions(dev, NULL);
return ret;
kmi = kmalloc(sizeof(struct amba_kmi_port), GFP_KERNEL);
- if (!kmi) {
+ io = kmalloc(sizeof(struct serio), GFP_KERNEL);
+ if (!kmi || !io) {
ret = -ENOMEM;
goto out;
}
memset(kmi, 0, sizeof(struct amba_kmi_port));
-
- kmi->io.type = SERIO_8042;
- kmi->io.write = amba_kmi_write;
- kmi->io.open = amba_kmi_open;
- kmi->io.close = amba_kmi_close;
- kmi->io.name = dev->dev.bus_id;
- kmi->io.phys = dev->dev.bus_id;
- kmi->io.driver = kmi;
-
+ memset(io, 0, sizeof(struct serio));
+
+ io->type = SERIO_8042;
+ io->write = amba_kmi_write;
+ io->open = amba_kmi_open;
+ io->close = amba_kmi_close;
+ strlcpy(io->name, dev->dev.bus_id, sizeof(io->name));
+ strlcpy(io->phys, dev->dev.bus_id, sizeof(io->phys));
+ io->port_data = kmi;
+ io->dev.parent = &dev->dev;
+
+ kmi->io = io;
kmi->base = ioremap(dev->res.start, KMI_SIZE);
if (!kmi->base) {
ret = -ENOMEM;
kmi->irq = dev->irq[0];
amba_set_drvdata(dev, kmi);
- serio_register_port(&kmi->io);
+ serio_register_port(kmi->io);
return 0;
unmap:
iounmap(kmi->base);
out:
kfree(kmi);
+ kfree(io);
amba_release_regions(dev);
return ret;
}
amba_set_drvdata(dev, NULL);
- serio_unregister_port(&kmi->io);
+ serio_unregister_port(kmi->io);
clk_put(kmi->clk);
iounmap(kmi->base);
kfree(kmi);
struct amba_kmi_port *kmi = amba_get_drvdata(dev);
/* kick the serio layer to rescan this port */
- serio_rescan(&kmi->io);
+ serio_reconnect(kmi->io);
return 0;
}
static void __exit amba_kmi_exit(void)
{
- return amba_driver_unregister(&ambakmi_driver);
+ amba_driver_unregister(&ambakmi_driver);
}
module_init(amba_kmi_init);