powerpc: Merge of_device.c and of_device.h
authorPaul Mackerras <paulus@samba.org>
Thu, 6 Oct 2005 03:22:17 +0000 (13:22 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 6 Oct 2005 03:22:17 +0000 (13:22 +1000)
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/of_device.c [new file with mode: 0644]
include/asm-powerpc/of_device.h [new file with mode: 0644]
include/asm-ppc/of_device.h [deleted file]
include/asm-ppc64/of_device.h [deleted file]

diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
new file mode 100644 (file)
index 0000000..7667188
--- /dev/null
@@ -0,0 +1,274 @@
+#include <linux/config.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <asm/errno.h>
+#include <asm/of_device.h>
+
+/**
+ * of_match_device - Tell if an of_device structure has a matching
+ * of_match structure
+ * @ids: array of of device match structures to search in
+ * @dev: the of device structure to match against
+ *
+ * Used by a driver to check whether an of_device present in the
+ * system is in its list of supported devices.
+ */
+const struct of_device_id *of_match_device(const struct of_device_id *matches,
+                                       const struct of_device *dev)
+{
+       if (!dev->node)
+               return NULL;
+       while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
+               int match = 1;
+               if (matches->name[0])
+                       match &= dev->node->name
+                               && !strcmp(matches->name, dev->node->name);
+               if (matches->type[0])
+                       match &= dev->node->type
+                               && !strcmp(matches->type, dev->node->type);
+               if (matches->compatible[0])
+                       match &= device_is_compatible(dev->node,
+                               matches->compatible);
+               if (match)
+                       return matches;
+               matches++;
+       }
+       return NULL;
+}
+
+static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
+{
+       struct of_device * of_dev = to_of_device(dev);
+       struct of_platform_driver * of_drv = to_of_platform_driver(drv);
+       const struct of_device_id * matches = of_drv->match_table;
+
+       if (!matches)
+               return 0;
+
+       return of_match_device(matches, of_dev) != NULL;
+}
+
+struct of_device *of_dev_get(struct of_device *dev)
+{
+       struct device *tmp;
+
+       if (!dev)
+               return NULL;
+       tmp = get_device(&dev->dev);
+       if (tmp)
+               return to_of_device(tmp);
+       else
+               return NULL;
+}
+
+void of_dev_put(struct of_device *dev)
+{
+       if (dev)
+               put_device(&dev->dev);
+}
+
+
+static int of_device_probe(struct device *dev)
+{
+       int error = -ENODEV;
+       struct of_platform_driver *drv;
+       struct of_device *of_dev;
+       const struct of_device_id *match;
+
+       drv = to_of_platform_driver(dev->driver);
+       of_dev = to_of_device(dev);
+
+       if (!drv->probe)
+               return error;
+
+       of_dev_get(of_dev);
+
+       match = of_match_device(drv->match_table, of_dev);
+       if (match)
+               error = drv->probe(of_dev, match);
+       if (error)
+               of_dev_put(of_dev);
+
+       return error;
+}
+
+static int of_device_remove(struct device *dev)
+{
+       struct of_device * of_dev = to_of_device(dev);
+       struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
+
+       if (dev->driver && drv->remove)
+               drv->remove(of_dev);
+       return 0;
+}
+
+static int of_device_suspend(struct device *dev, pm_message_t state)
+{
+       struct of_device * of_dev = to_of_device(dev);
+       struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
+       int error = 0;
+
+       if (dev->driver && drv->suspend)
+               error = drv->suspend(of_dev, state);
+       return error;
+}
+
+static int of_device_resume(struct device * dev)
+{
+       struct of_device * of_dev = to_of_device(dev);
+       struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
+       int error = 0;
+
+       if (dev->driver && drv->resume)
+               error = drv->resume(of_dev);
+       return error;
+}
+
+struct bus_type of_platform_bus_type = {
+       .name   = "of_platform",
+       .match  = of_platform_bus_match,
+       .suspend        = of_device_suspend,
+       .resume = of_device_resume,
+};
+
+static int __init of_bus_driver_init(void)
+{
+       return bus_register(&of_platform_bus_type);
+}
+
+postcore_initcall(of_bus_driver_init);
+
+int of_register_driver(struct of_platform_driver *drv)
+{
+       int count = 0;
+
+       /* initialize common driver fields */
+       drv->driver.name = drv->name;
+       drv->driver.bus = &of_platform_bus_type;
+       drv->driver.probe = of_device_probe;
+       drv->driver.remove = of_device_remove;
+
+       /* register with core */
+       count = driver_register(&drv->driver);
+       return count ? count : 1;
+}
+
+void of_unregister_driver(struct of_platform_driver *drv)
+{
+       driver_unregister(&drv->driver);
+}
+
+
+static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       struct of_device *ofdev;
+
+       ofdev = to_of_device(dev);
+       return sprintf(buf, "%s", ofdev->node->full_name);
+}
+
+static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);
+
+/**
+ * of_release_dev - free an of device structure when all users of it are finished.
+ * @dev: device that's been disconnected
+ *
+ * Will be called only by the device core when all users of this of device are
+ * done.
+ */
+void of_release_dev(struct device *dev)
+{
+       struct of_device *ofdev;
+
+        ofdev = to_of_device(dev);
+       of_node_put(ofdev->node);
+       kfree(ofdev);
+}
+
+int of_device_register(struct of_device *ofdev)
+{
+       int rc;
+       struct of_device **odprop;
+
+       BUG_ON(ofdev->node == NULL);
+
+       odprop = (struct of_device **)get_property(ofdev->node, "linux,device", NULL);
+       if (!odprop) {
+               struct property *new_prop;
+       
+               new_prop = kmalloc(sizeof(struct property) + sizeof(struct of_device *),
+                       GFP_KERNEL);
+               if (new_prop == NULL)
+                       return -ENOMEM;
+               new_prop->name = "linux,device";
+               new_prop->length = sizeof(sizeof(struct of_device *));
+               new_prop->value = (unsigned char *)&new_prop[1];
+               odprop = (struct of_device **)new_prop->value;
+               *odprop = NULL;
+               prom_add_property(ofdev->node, new_prop);
+       }
+       *odprop = ofdev;
+
+       rc = device_register(&ofdev->dev);
+       if (rc)
+               return rc;
+
+       device_create_file(&ofdev->dev, &dev_attr_devspec);
+
+       return 0;
+}
+
+void of_device_unregister(struct of_device *ofdev)
+{
+       struct of_device **odprop;
+
+       device_remove_file(&ofdev->dev, &dev_attr_devspec);
+
+       odprop = (struct of_device **)get_property(ofdev->node, "linux,device", NULL);
+       if (odprop)
+               *odprop = NULL;
+
+       device_unregister(&ofdev->dev);
+}
+
+struct of_device* of_platform_device_create(struct device_node *np,
+                                           const char *bus_id,
+                                           struct device *parent)
+{
+       struct of_device *dev;
+
+       dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+       if (!dev)
+               return NULL;
+       memset(dev, 0, sizeof(*dev));
+
+       dev->node = of_node_get(np);
+       dev->dma_mask = 0xffffffffUL;
+       dev->dev.dma_mask = &dev->dma_mask;
+       dev->dev.parent = parent;
+       dev->dev.bus = &of_platform_bus_type;
+       dev->dev.release = of_release_dev;
+
+       strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
+
+       if (of_device_register(dev) != 0) {
+               kfree(dev);
+               return NULL;
+       }
+
+       return dev;
+}
+
+EXPORT_SYMBOL(of_match_device);
+EXPORT_SYMBOL(of_platform_bus_type);
+EXPORT_SYMBOL(of_register_driver);
+EXPORT_SYMBOL(of_unregister_driver);
+EXPORT_SYMBOL(of_device_register);
+EXPORT_SYMBOL(of_device_unregister);
+EXPORT_SYMBOL(of_dev_get);
+EXPORT_SYMBOL(of_dev_put);
+EXPORT_SYMBOL(of_platform_device_create);
+EXPORT_SYMBOL(of_release_dev);
diff --git a/include/asm-powerpc/of_device.h b/include/asm-powerpc/of_device.h
new file mode 100644 (file)
index 0000000..ddb16aa
--- /dev/null
@@ -0,0 +1,64 @@
+#ifndef _ASM_POWERPC_OF_DEVICE_H
+#define _ASM_POWERPC_OF_DEVICE_H
+
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+#include <asm/prom.h>
+
+/*
+ * The of_platform_bus_type is a bus type used by drivers that do not
+ * attach to a macio or similar bus but still use OF probing
+ * mecanism
+ */
+extern struct bus_type of_platform_bus_type;
+
+/*
+ * The of_device is a kind of "base class" that is a superset of
+ * struct device for use by devices attached to an OF node and
+ * probed using OF properties
+ */
+struct of_device
+{
+       struct device_node      *node;          /* OF device node */
+       u64                     dma_mask;       /* DMA mask */
+       struct device           dev;            /* Generic device interface */
+};
+#define        to_of_device(d) container_of(d, struct of_device, dev)
+
+extern const struct of_device_id *of_match_device(
+       const struct of_device_id *matches, const struct of_device *dev);
+
+extern struct of_device *of_dev_get(struct of_device *dev);
+extern void of_dev_put(struct of_device *dev);
+
+/*
+ * An of_platform_driver driver is attached to a basic of_device on
+ * the "platform bus" (of_platform_bus_type)
+ */
+struct of_platform_driver
+{
+       char                    *name;
+       struct of_device_id     *match_table;
+       struct module           *owner;
+
+       int     (*probe)(struct of_device* dev, const struct of_device_id *match);
+       int     (*remove)(struct of_device* dev);
+
+       int     (*suspend)(struct of_device* dev, pm_message_t state);
+       int     (*resume)(struct of_device* dev);
+       int     (*shutdown)(struct of_device* dev);
+
+       struct device_driver    driver;
+};
+#define        to_of_platform_driver(drv) container_of(drv,struct of_platform_driver, driver)
+
+extern int of_register_driver(struct of_platform_driver *drv);
+extern void of_unregister_driver(struct of_platform_driver *drv);
+extern int of_device_register(struct of_device *ofdev);
+extern void of_device_unregister(struct of_device *ofdev);
+extern struct of_device *of_platform_device_create(struct device_node *np,
+                                                  const char *bus_id,
+                                                  struct device *parent);
+extern void of_release_dev(struct device *dev);
+
+#endif /* _ASM_POWERPC_OF_DEVICE_H */
diff --git a/include/asm-ppc/of_device.h b/include/asm-ppc/of_device.h
deleted file mode 100644 (file)
index 575bce4..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef __OF_DEVICE_H__
-#define __OF_DEVICE_H__
-
-#include <linux/device.h>
-#include <linux/mod_devicetable.h>
-#include <asm/prom.h>
-
-/*
- * The of_platform_bus_type is a bus type used by drivers that do not
- * attach to a macio or similar bus but still use OF probing
- * mecanism
- */
-extern struct bus_type of_platform_bus_type;
-
-/*
- * The of_device is a kind of "base class" that is a superset of
- * struct device for use by devices attached to an OF node and
- * probed using OF properties
- */
-struct of_device
-{
-       struct device_node      *node;          /* OF device node */
-       u64                     dma_mask;       /* DMA mask */
-       struct device           dev;            /* Generic device interface */
-};
-#define        to_of_device(d) container_of(d, struct of_device, dev)
-
-extern const struct of_device_id *of_match_device(
-       const struct of_device_id *matches, const struct of_device *dev);
-
-extern struct of_device *of_dev_get(struct of_device *dev);
-extern void of_dev_put(struct of_device *dev);
-
-/*
- * An of_platform_driver driver is attached to a basic of_device on
- * the "platform bus" (of_platform_bus_type)
- */
-struct of_platform_driver
-{
-       char                    *name;
-       struct of_device_id     *match_table;
-       struct module           *owner;
-
-       int     (*probe)(struct of_device* dev, const struct of_device_id *match);
-       int     (*remove)(struct of_device* dev);
-
-       int     (*suspend)(struct of_device* dev, pm_message_t state);
-       int     (*resume)(struct of_device* dev);
-       int     (*shutdown)(struct of_device* dev);
-
-       struct device_driver    driver;
-};
-#define        to_of_platform_driver(drv) container_of(drv,struct of_platform_driver, driver)
-
-extern int of_register_driver(struct of_platform_driver *drv);
-extern void of_unregister_driver(struct of_platform_driver *drv);
-extern int of_device_register(struct of_device *ofdev);
-extern void of_device_unregister(struct of_device *ofdev);
-extern struct of_device *of_platform_device_create(struct device_node *np,
-                                                  const char *bus_id,
-                                                  struct device *parent);
-extern void of_release_dev(struct device *dev);
-
-#endif /* __OF_DEVICE_H__ */
-
diff --git a/include/asm-ppc64/of_device.h b/include/asm-ppc64/of_device.h
deleted file mode 100644 (file)
index 7bc136e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/of_device.h>
-