drivers: of: add return value to of_reserved_mem_device_init()

[sfrench/cifs-2.6.git] / drivers / of / of_reserved_mem.c

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 632aae8613756b6d1c433485e6ad0d075f11af66..dc566b38645f6fcd3a296aa5e82419c857b81bcc 100644 (file)
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -206,8 +206,16 @@ void __init fdt_init_reserved_mem(void)
        for (i = 0; i < reserved_mem_count; i++) {
                struct reserved_mem *rmem = &reserved_mem[i];
                unsigned long node = rmem->fdt_node;
+               int len;
+               const __be32 *prop;
                int err = 0;
 
+               prop = of_get_flat_dt_prop(node, "phandle", &len);
+               if (!prop)
+                       prop = of_get_flat_dt_prop(node, "linux,phandle", &len);
+               if (prop)
+                       rmem->phandle = of_read_number(prop, len/4);
+
                if (rmem->size == 0)
                        err = __reserved_mem_alloc_size(node, rmem->name,
                                                 &rmem->base, &rmem->size);
@@ -215,3 +223,69 @@ void __init fdt_init_reserved_mem(void)
                        __reserved_mem_init_node(rmem);
        }
 }
+
+static inline struct reserved_mem *__find_rmem(struct device_node *node)
+{
+       unsigned int i;
+
+       if (!node->phandle)
+               return NULL;
+
+       for (i = 0; i < reserved_mem_count; i++)
+               if (reserved_mem[i].phandle == node->phandle)
+                       return &reserved_mem[i];
+       return NULL;
+}
+
+/**
+ * of_reserved_mem_device_init() - assign reserved memory region to given device
+ *
+ * This function assign memory region pointed by "memory-region" device tree
+ * property to the given device.
+ */
+int of_reserved_mem_device_init(struct device *dev)
+{
+       struct reserved_mem *rmem;
+       struct device_node *np;
+       int ret;
+
+       np = of_parse_phandle(dev->of_node, "memory-region", 0);
+       if (!np)
+               return -ENODEV;
+
+       rmem = __find_rmem(np);
+       of_node_put(np);
+
+       if (!rmem || !rmem->ops || !rmem->ops->device_init)
+               return -EINVAL;
+
+       ret = rmem->ops->device_init(rmem, dev);
+       if (ret == 0)
+               dev_info(dev, "assigned reserved memory node %s\n", rmem->name);
+
+       return ret;
+}
+
+/**
+ * of_reserved_mem_device_release() - release reserved memory device structures
+ *
+ * This function releases structures allocated for memory region handling for
+ * the given device.
+ */
+void of_reserved_mem_device_release(struct device *dev)
+{
+       struct reserved_mem *rmem;
+       struct device_node *np;
+
+       np = of_parse_phandle(dev->of_node, "memory-region", 0);
+       if (!np)
+               return;
+
+       rmem = __find_rmem(np);
+       of_node_put(np);
+
+       if (!rmem || !rmem->ops || !rmem->ops->device_release)
+               return;
+
+       rmem->ops->device_release(rmem, dev);
+}