core: ofnode: Fix ofnode_get_addr_index function
authorKeerthy <j-keerthy@ti.com>
Mon, 19 Nov 2018 06:14:47 +0000 (11:44 +0530)
committerSimon Glass <sjg@chromium.org>
Thu, 29 Nov 2018 16:30:06 +0000 (09:30 -0700)
Currently the else part of ofnode_get_addr_index function
does not fetch addresses based on the index but rather just
returns the base address. Fix that.

Signed-off-by: Keerthy <j-keerthy@ti.com>
drivers/core/ofnode.c

index d9b5280b2d4f163fea8b7cd34e17e7d47db36586..0e584c12dc88323d60273780f48b7fc83521d1d1 100644 (file)
@@ -253,15 +253,15 @@ int ofnode_read_size(ofnode node, const char *propname)
 
 fdt_addr_t ofnode_get_addr_index(ofnode node, int index)
 {
+       int na, ns;
+       fdt_size_t size;
+
        if (ofnode_is_np(node)) {
                const __be32 *prop_val;
                uint flags;
-               u64 size;
-               int na;
-               int ns;
 
-               prop_val = of_get_address(ofnode_to_np(node), index, &size,
-                                         &flags);
+               prop_val = of_get_address(ofnode_to_np(node), index,
+                                         (u64 *)&size, &flags);
                if (!prop_val)
                        return FDT_ADDR_T_NONE;
 
@@ -274,8 +274,11 @@ fdt_addr_t ofnode_get_addr_index(ofnode node, int index)
                        return of_read_number(prop_val, na);
                }
        } else {
-               return fdt_get_base_address(gd->fdt_blob,
-                                           ofnode_to_offset(node));
+               na = ofnode_read_simple_addr_cells(ofnode_get_parent(node));
+               ns = ofnode_read_simple_size_cells(ofnode_get_parent(node));
+               return fdtdec_get_addr_size_fixed(gd->fdt_blob,
+                                                 ofnode_to_offset(node), "reg",
+                                                 index, na, ns, &size, true);
        }
 
        return FDT_ADDR_T_NONE;