linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / input / serio / i8042-sparcio.h

diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index 54adba2..ed9446f 100644 (file)
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -1,10 +1,13 @@
 #ifndef _I8042_SPARCIO_H
 #define _I8042_SPARCIO_H
 
+#include <linux/config.h>
 #include <asm/io.h>
+
+#ifdef CONFIG_PCI
 #include <asm/oplib.h>
-#include <asm/prom.h>
-#include <asm/of_device.h>
+#include <asm/ebus.h>
+#endif
 
 static int i8042_kbd_irq = -1;
 static int i8042_aux_irq = -1;
@@ -45,83 +48,54 @@ static inline void i8042_write_command(int val)
 #define OBP_PS2MS_NAME1                "kdmouse"
 #define OBP_PS2MS_NAME2                "mouse"
 
-static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_device_id *match)
-{
-       struct device_node *dp = op->node;
-
-       dp = dp->child;
-       while (dp) {
-               if (!strcmp(dp->name, OBP_PS2KBD_NAME1) ||
-                   !strcmp(dp->name, OBP_PS2KBD_NAME2)) {
-                       struct of_device *kbd = of_find_device_by_node(dp);
-                       unsigned int irq = kbd->irqs[0];
-                       if (irq == 0xffffffff)
-                               irq = op->irqs[0];
-                       i8042_kbd_irq = irq;
-                       kbd_iobase = of_ioremap(&kbd->resource[0],
-                                               0, 8, "kbd");
-               } else if (!strcmp(dp->name, OBP_PS2MS_NAME1) ||
-                          !strcmp(dp->name, OBP_PS2MS_NAME2)) {
-                       struct of_device *ms = of_find_device_by_node(dp);
-                       unsigned int irq = ms->irqs[0];
-                       if (irq == 0xffffffff)
-                               irq = op->irqs[0];
-                       i8042_aux_irq = irq;
-               }
-
-               dp = dp->sibling;
-       }
-
-       return 0;
-}
-
-static int __devexit sparc_i8042_remove(struct of_device *op)
-{
-       of_iounmap(kbd_iobase, 8);
-
-       return 0;
-}
-
-static struct of_device_id sparc_i8042_match[] = {
-       {
-               .name = "8042",
-       },
-       {},
-};
-MODULE_DEVICE_TABLE(of, sparc_i8042_match);
-
-static struct of_platform_driver sparc_i8042_driver = {
-       .name           = "i8042",
-       .match_table    = sparc_i8042_match,
-       .probe          = sparc_i8042_probe,
-       .remove         = __devexit_p(sparc_i8042_remove),
-};
-
 static int __init i8042_platform_init(void)
 {
 #ifndef CONFIG_PCI
        return -ENODEV;
 #else
-       struct device_node *root = of_find_node_by_path("/");
+       char prop[128];
+       int len;
 
-       if (!strcmp(root->name, "SUNW,JavaStation-1")) {
+       len = prom_getproperty(prom_root_node, "name", prop, sizeof(prop));
+       if (len < 0) {
+               printk("i8042: Cannot get name property of root OBP node.\n");
+               return -ENODEV;
+       }
+       if (strncmp(prop, "SUNW,JavaStation-1", len) == 0) {
                /* Hardcoded values for MrCoffee.  */
                i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;
                kbd_iobase = ioremap(0x71300060, 8);
                if (!kbd_iobase)
                        return -ENODEV;
        } else {
-               int err = of_register_driver(&sparc_i8042_driver,
-                                            &of_bus_type);
-               if (err)
-                       return err;
-
+               struct linux_ebus *ebus;
+               struct linux_ebus_device *edev;
+               struct linux_ebus_child *child;
+
+               for_each_ebus(ebus) {
+                       for_each_ebusdev(edev, ebus) {
+                               if (!strcmp(edev->prom_name, "8042"))
+                                       goto edev_found;
+                       }
+               }
+               return -ENODEV;
+
+       edev_found:
+               for_each_edevchild(edev, child) {
+                       if (!strcmp(child->prom_name, OBP_PS2KBD_NAME1) ||
+                           !strcmp(child->prom_name, OBP_PS2KBD_NAME2)) {
+                               i8042_kbd_irq = child->irqs[0];
+                               kbd_iobase =
+                                       ioremap(child->resource[0].start, 8);
+                       }
+                       if (!strcmp(child->prom_name, OBP_PS2MS_NAME1) ||
+                           !strcmp(child->prom_name, OBP_PS2MS_NAME2))
+                               i8042_aux_irq = child->irqs[0];
+               }
                if (i8042_kbd_irq == -1 ||
                    i8042_aux_irq == -1) {
-                       if (kbd_iobase) {
-                               of_iounmap(kbd_iobase, 8);
-                               kbd_iobase = (void __iomem *) NULL;
-                       }
+                       printk("i8042: Error, 8042 device lacks both kbd and "
+                              "mouse nodes.\n");
                        return -ENODEV;
                }
        }
@@ -135,10 +109,7 @@ static int __init i8042_platform_init(void)
 static inline void i8042_platform_exit(void)
 {
 #ifdef CONFIG_PCI
-       struct device_node *root = of_find_node_by_path("/");
-
-       if (strcmp(root->name, "SUNW,JavaStation-1"))
-               of_unregister_driver(&sparc_i8042_driver);
+       iounmap(kbd_iobase);
 #endif
 }