dm: core: support reading a single indexed u32 value

[oweals/u-boot.git] / drivers / core / ofnode.c

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 011b43bc02de4f77f50f6220faf0ee35fc92566b..5bc3b02996ebf972d2575804830b5829f9a8af61 100644 (file)
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
+#include <malloc.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
@@ -47,6 +48,46 @@ u32 ofnode_read_u32_default(ofnode node, const char *propname, u32 def)
        return def;
 }
 
+int ofnode_read_u32_index(ofnode node, const char *propname, int index,
+                         u32 *outp)
+{
+       const fdt32_t *cell;
+       int len;
+
+       assert(ofnode_valid(node));
+       debug("%s: %s: ", __func__, propname);
+
+       if (ofnode_is_np(node))
+               return of_read_u32_index(ofnode_to_np(node), propname, index,
+                                        outp);
+
+       cell = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node), propname,
+                          &len);
+       if (!cell) {
+               debug("(not found)\n");
+               return -EINVAL;
+       }
+
+       if (len < (sizeof(int) * (index + 1))) {
+               debug("(not large enough)\n");
+               return -EOVERFLOW;
+       }
+
+       *outp = fdt32_to_cpu(cell[index]);
+       debug("%#x (%d)\n", *outp, *outp);
+
+       return 0;
+}
+
+u32 ofnode_read_u32_index_default(ofnode node, const char *propname, int index,
+                                 u32 def)
+{
+       assert(ofnode_valid(node));
+       ofnode_read_u32_index(node, propname, index, &def);
+
+       return def;
+}
+
 int ofnode_read_s32_default(ofnode node, const char *propname, s32 def)
 {
        assert(ofnode_valid(node));
@@ -101,30 +142,47 @@ bool ofnode_read_bool(ofnode node, const char *propname)
        return prop ? true : false;
 }
 
-const char *ofnode_read_string(ofnode node, const char *propname)
+const void *ofnode_read_prop(ofnode node, const char *propname, int *sizep)
 {
-       const char *str = NULL;
-       int len = -1;
+       const char *val = NULL;
+       int len;
 
        assert(ofnode_valid(node));
        debug("%s: %s: ", __func__, propname);
 
        if (ofnode_is_np(node)) {
                struct property *prop = of_find_property(
-                               ofnode_to_np(node), propname, NULL);
+                               ofnode_to_np(node), propname, &len);
 
                if (prop) {
-                       str = prop->value;
+                       val = prop->value;
                        len = prop->length;
                }
        } else {
-               str = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node),
+               val = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node),
                                  propname, &len);
        }
-       if (!str) {
+       if (!val) {
                debug("<not found>\n");
+               if (sizep)
+                       *sizep = -FDT_ERR_NOTFOUND;
                return NULL;
        }
+       if (sizep)
+               *sizep = len;
+
+       return val;
+}
+
+const char *ofnode_read_string(ofnode node, const char *propname)
+{
+       const char *str;
+       int len;
+
+       str = ofnode_read_prop(node, propname, &len);
+       if (!str)
+               return NULL;
+
        if (strnlen(str, len) >= len) {
                debug("<invalid>\n");
                return NULL;
@@ -134,6 +192,16 @@ const char *ofnode_read_string(ofnode node, const char *propname)
        return str;
 }
 
+int ofnode_read_size(ofnode node, const char *propname)
+{
+       int len;
+
+       if (!ofnode_read_prop(node, propname, &len))
+               return -EINVAL;
+
+       return len;
+}
+
 ofnode ofnode_find_subnode(ofnode node, const char *subnode_name)
 {
        ofnode subnode;
@@ -236,25 +304,6 @@ ofnode ofnode_get_by_phandle(uint phandle)
        return node;
 }
 
-int ofnode_read_size(ofnode node, const char *propname)
-{
-       int len;
-
-       if (ofnode_is_np(node)) {
-               struct property *prop = of_find_property(
-                               ofnode_to_np(node), propname, NULL);
-
-               if (prop)
-                       return prop->length;
-       } else {
-               if (fdt_getprop(gd->fdt_blob, ofnode_to_offset(node), propname,
-                               &len))
-                       return len;
-       }
-
-       return -EINVAL;
-}
-
 fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size)
 {
        int na, ns;
@@ -419,20 +468,25 @@ ofnode ofnode_path(const char *path)
                return offset_to_ofnode(fdt_path_offset(gd->fdt_blob, path));
 }
 
-const char *ofnode_read_chosen_string(const char *name)
+const void *ofnode_read_chosen_prop(const char *propname, int *sizep)
 {
        ofnode chosen_node;
 
        chosen_node = ofnode_path("/chosen");
 
-       return ofnode_read_string(chosen_node, name);
+       return ofnode_read_prop(chosen_node, propname, sizep);
+}
+
+const char *ofnode_read_chosen_string(const char *propname)
+{
+       return ofnode_read_chosen_prop(propname, NULL);
 }
 
 ofnode ofnode_get_chosen_node(const char *name)
 {
        const char *prop;
 
-       prop = ofnode_read_chosen_string(name);
+       prop = ofnode_read_chosen_prop(name, NULL);
        if (!prop)
                return ofnode_null();