|
@@ -1,132 +1,13 @@
|
|
|
#include <linux/string.h>
|
|
|
#include <linux/kernel.h>
|
|
|
+#include <linux/of.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/mod_devicetable.h>
|
|
|
#include <linux/slab.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 &= of_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;
|
|
|
-}
|
|
|
+#include <linux/errno.h>
|
|
|
+#include <linux/of_device.h>
|
|
|
+#include <linux/of_platform.h>
|
|
|
|
|
|
void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name)
|
|
|
{
|
|
@@ -163,7 +44,7 @@ static int node_match(struct device *dev, void *data)
|
|
|
|
|
|
struct of_device *of_find_device_by_node(struct device_node *dp)
|
|
|
{
|
|
|
- struct device *dev = bus_find_device(&of_bus_type, NULL,
|
|
|
+ struct device *dev = bus_find_device(&of_platform_bus_type, NULL,
|
|
|
dp, node_match);
|
|
|
|
|
|
if (dev)
|
|
@@ -174,48 +55,20 @@ struct of_device *of_find_device_by_node(struct device_node *dp)
|
|
|
EXPORT_SYMBOL(of_find_device_by_node);
|
|
|
|
|
|
#ifdef CONFIG_PCI
|
|
|
-struct bus_type isa_bus_type = {
|
|
|
- .name = "isa",
|
|
|
- .match = of_platform_bus_match,
|
|
|
- .probe = of_device_probe,
|
|
|
- .remove = of_device_remove,
|
|
|
- .suspend = of_device_suspend,
|
|
|
- .resume = of_device_resume,
|
|
|
-};
|
|
|
+struct bus_type isa_bus_type;
|
|
|
EXPORT_SYMBOL(isa_bus_type);
|
|
|
|
|
|
-struct bus_type ebus_bus_type = {
|
|
|
- .name = "ebus",
|
|
|
- .match = of_platform_bus_match,
|
|
|
- .probe = of_device_probe,
|
|
|
- .remove = of_device_remove,
|
|
|
- .suspend = of_device_suspend,
|
|
|
- .resume = of_device_resume,
|
|
|
-};
|
|
|
+struct bus_type ebus_bus_type;
|
|
|
EXPORT_SYMBOL(ebus_bus_type);
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_SBUS
|
|
|
-struct bus_type sbus_bus_type = {
|
|
|
- .name = "sbus",
|
|
|
- .match = of_platform_bus_match,
|
|
|
- .probe = of_device_probe,
|
|
|
- .remove = of_device_remove,
|
|
|
- .suspend = of_device_suspend,
|
|
|
- .resume = of_device_resume,
|
|
|
-};
|
|
|
+struct bus_type sbus_bus_type;
|
|
|
EXPORT_SYMBOL(sbus_bus_type);
|
|
|
#endif
|
|
|
|
|
|
-struct bus_type of_bus_type = {
|
|
|
- .name = "of",
|
|
|
- .match = of_platform_bus_match,
|
|
|
- .probe = of_device_probe,
|
|
|
- .remove = of_device_remove,
|
|
|
- .suspend = of_device_suspend,
|
|
|
- .resume = of_device_resume,
|
|
|
-};
|
|
|
-EXPORT_SYMBOL(of_bus_type);
|
|
|
+struct bus_type of_platform_bus_type;
|
|
|
+EXPORT_SYMBOL(of_platform_bus_type);
|
|
|
|
|
|
static inline u64 of_read_addr(const u32 *cell, int size)
|
|
|
{
|
|
@@ -933,7 +786,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
|
|
|
op->irqs[i] = build_one_device_irq(op, parent, op->irqs[i]);
|
|
|
|
|
|
op->dev.parent = parent;
|
|
|
- op->dev.bus = &of_bus_type;
|
|
|
+ op->dev.bus = &of_platform_bus_type;
|
|
|
if (!parent)
|
|
|
strcpy(op->dev.bus_id, "root");
|
|
|
else
|
|
@@ -977,16 +830,16 @@ static int __init of_bus_driver_init(void)
|
|
|
{
|
|
|
int err;
|
|
|
|
|
|
- err = bus_register(&of_bus_type);
|
|
|
+ err = of_bus_type_init(&of_platform_bus_type, "of");
|
|
|
#ifdef CONFIG_PCI
|
|
|
if (!err)
|
|
|
- err = bus_register(&isa_bus_type);
|
|
|
+ err = of_bus_type_init(&isa_bus_type, "isa");
|
|
|
if (!err)
|
|
|
- err = bus_register(&ebus_bus_type);
|
|
|
+ err = of_bus_type_init(&ebus_bus_type, "ebus");
|
|
|
#endif
|
|
|
#ifdef CONFIG_SBUS
|
|
|
if (!err)
|
|
|
- err = bus_register(&sbus_bus_type);
|
|
|
+ err = of_bus_type_init(&sbus_bus_type, "sbus");
|
|
|
#endif
|
|
|
|
|
|
if (!err)
|
|
@@ -1020,61 +873,13 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
|
|
|
/* register with core */
|
|
|
return driver_register(&drv->driver);
|
|
|
}
|
|
|
+EXPORT_SYMBOL(of_register_driver);
|
|
|
|
|
|
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);
|
|
|
-
|
|
|
- kfree(ofdev);
|
|
|
-}
|
|
|
-
|
|
|
-int of_device_register(struct of_device *ofdev)
|
|
|
-{
|
|
|
- int rc;
|
|
|
-
|
|
|
- BUG_ON(ofdev->node == NULL);
|
|
|
-
|
|
|
- rc = device_register(&ofdev->dev);
|
|
|
- if (rc)
|
|
|
- return rc;
|
|
|
-
|
|
|
- rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
|
|
|
- if (rc)
|
|
|
- device_unregister(&ofdev->dev);
|
|
|
-
|
|
|
- return rc;
|
|
|
-}
|
|
|
-
|
|
|
-void of_device_unregister(struct of_device *ofdev)
|
|
|
-{
|
|
|
- device_remove_file(&ofdev->dev, &dev_attr_devspec);
|
|
|
- device_unregister(&ofdev->dev);
|
|
|
-}
|
|
|
+EXPORT_SYMBOL(of_unregister_driver);
|
|
|
|
|
|
struct of_device* of_platform_device_create(struct device_node *np,
|
|
|
const char *bus_id,
|
|
@@ -1100,13 +905,4 @@ struct of_device* of_platform_device_create(struct device_node *np,
|
|
|
|
|
|
return dev;
|
|
|
}
|
|
|
-
|
|
|
-EXPORT_SYMBOL(of_match_device);
|
|
|
-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);
|