From: Rob Herring <[email protected]>

Add a function to create amba bus devices (i.e. primecell peripherals) from
device tree nodes. The device tree scanning is done by
of_platform_probe/populate functions which can call of_amba_device_create
based on a match table entry.

Nodes with a "arm,amba-deviceid" property can override the h/w peripheral id
value.

Based on the original work by Jeremy Kerr.

Cc: Jeremy Kerr <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Linus Walleij <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
---
 drivers/amba/bus.c       |   51 ++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/amba/bus.h |    5 ++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 7025593..6438ffd 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -13,6 +13,11 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/amba/bus.h>
@@ -780,3 +785,49 @@ EXPORT_SYMBOL(amba_device_unregister);
 EXPORT_SYMBOL(amba_find_device);
 EXPORT_SYMBOL(amba_request_regions);
 EXPORT_SYMBOL(amba_release_regions);
+
+#ifdef CONFIG_OF
+int of_amba_device_create(struct device_node *node, struct device *parent)
+{
+       struct amba_device *dev;
+       const void *prop;
+       int i, ret;
+
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (!dev)
+               return -ENOMEM;
+
+       /* setup generic device info */
+       dev->dev.coherent_dma_mask = ~0;
+       dev->dev.of_node = node;
+       dev->dev.parent = parent;
+       of_device_make_bus_id(&dev->dev);
+
+       /* setup amba-specific device info */
+       dev->dma_mask = ~0;
+
+       /* Allow the arm,amba-deviceid value to override the h/w value */
+       prop = of_get_property(node, "arm,amba-deviceid", NULL);
+       if (prop)
+               dev->periphid = of_read_ulong(prop, 1);
+
+       /* Decode the IRQs and address ranges */
+       for (i = 0; i < AMBA_NR_IRQS; i++)
+               dev->irq[i] = irq_of_parse_and_map(node, i);
+
+       ret = of_address_to_resource(node, 0, &dev->res);
+       if (ret)
+               goto err_free;
+
+       ret = amba_device_register(dev, &iomem_resource);
+       if (ret)
+               goto err_free;
+
+       return 0;
+
+err_free:
+       kfree(dev);
+       return ret;
+}
+
+#endif /* CONFIG_OF */
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index fcbbe71..08349c3 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -94,4 +94,9 @@ void amba_release_regions(struct amba_device *);
 #define amba_manf(d)   AMBA_MANF_BITS((d)->periphid)
 #define amba_part(d)   AMBA_PART_BITS((d)->periphid)
 
+#ifdef CONFIG_OF
+struct device_node;
+int of_amba_device_create(struct device_node *node, struct device *parent);
+#endif
+
 #endif
-- 
1.7.4.1

_______________________________________________
devicetree-discuss mailing list
[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss

Reply via email to