Merge git://git.denx.de/u-boot-sunxi

[platform/kernel/u-boot.git] / lib / fdtdec.c

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index bf5e0f6..b1b3925 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -15,6 +15,7 @@
 #include <serial.h>
 #include <asm/sections.h>
 #include <linux/ctype.h>
+#include <linux/ioport.h>
 #include <linux/lzo.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -921,28 +922,6 @@ char *fdtdec_get_config_string(const void *blob, const char *prop_name)
        return (char *)nodep;
 }
 
-int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
-                        fdt_addr_t *basep, fdt_size_t *sizep)
-{
-       const fdt_addr_t *cell;
-       int len;
-
-       debug("%s: %s: %s\n", __func__, fdt_get_name(blob, node, NULL),
-             prop_name);
-       cell = fdt_getprop(blob, node, prop_name, &len);
-       if (!cell || (len < sizeof(fdt_addr_t) * 2)) {
-               debug("cell=%p, len=%d\n", cell, len);
-               return -1;
-       }
-
-       *basep = fdt_addr_to_cpu(*cell);
-       *sizep = fdt_size_to_cpu(cell[1]);
-       debug("%s: base=%08lx, size=%lx\n", __func__, (ulong)*basep,
-             (ulong)*sizep);
-
-       return 0;
-}
-
 u64 fdtdec_get_number(const fdt32_t *ptr, unsigned int cells)
 {
        u64 number = 0;
@@ -1001,67 +980,6 @@ int fdt_get_named_resource(const void *fdt, int node, const char *property,
        return fdt_get_resource(fdt, node, property, index, res);
 }
 
-int fdtdec_decode_memory_region(const void *blob, int config_node,
-                               const char *mem_type, const char *suffix,
-                               fdt_addr_t *basep, fdt_size_t *sizep)
-{
-       char prop_name[50];
-       const char *mem;
-       fdt_size_t size, offset_size;
-       fdt_addr_t base, offset;
-       int node;
-
-       if (config_node == -1) {
-               config_node = fdt_path_offset(blob, "/config");
-               if (config_node < 0) {
-                       debug("%s: Cannot find /config node\n", __func__);
-                       return -ENOENT;
-               }
-       }
-       if (!suffix)
-               suffix = "";
-
-       snprintf(prop_name, sizeof(prop_name), "%s-memory%s", mem_type,
-                suffix);
-       mem = fdt_getprop(blob, config_node, prop_name, NULL);
-       if (!mem) {
-               debug("%s: No memory type for '%s', using /memory\n", __func__,
-                     prop_name);
-               mem = "/memory";
-       }
-
-       node = fdt_path_offset(blob, mem);
-       if (node < 0) {
-               debug("%s: Failed to find node '%s': %s\n", __func__, mem,
-                     fdt_strerror(node));
-               return -ENOENT;
-       }
-
-       /*
-        * Not strictly correct - the memory may have multiple banks. We just
-        * use the first
-        */
-       if (fdtdec_decode_region(blob, node, "reg", &base, &size)) {
-               debug("%s: Failed to decode memory region %s\n", __func__,
-                     mem);
-               return -EINVAL;
-       }
-
-       snprintf(prop_name, sizeof(prop_name), "%s-offset%s", mem_type,
-                suffix);
-       if (fdtdec_decode_region(blob, config_node, prop_name, &offset,
-                                &offset_size)) {
-               debug("%s: Failed to decode memory region '%s'\n", __func__,
-                     prop_name);
-               return -EINVAL;
-       }
-
-       *basep = base + offset;
-       *sizep = offset_size;
-
-       return 0;
-}
-
 static int decode_timing_property(const void *blob, int node, const char *name,
                                  struct timing_entry *result)
 {
@@ -1181,41 +1099,34 @@ int fdtdec_setup_mem_size_base(void)
 
 #if defined(CONFIG_NR_DRAM_BANKS)
 
-static int get_next_memory_node(const void *blob, int mem)
+static ofnode get_next_memory_node(ofnode mem)
 {
        do {
-               mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem,
-                                                   "device_type", "memory", 7);
-       } while (!fdtdec_get_is_enabled(blob, mem));
+               mem = ofnode_by_prop_value(mem, "device_type", "memory", 7);
+       } while (ofnode_valid(mem) && !ofnode_is_available(mem));
 
        return mem;
 }
 
 int fdtdec_setup_memory_banksize(void)
 {
-       int bank, ret, mem, reg = 0;
-       struct fdt_resource res;
+       int bank, reg = 0;
+       struct resource res;
+       ofnode mem;
 
-       mem = get_next_memory_node(gd->fdt_blob, -1);
-       if (mem < 0) {
-               debug("%s: Missing /memory node\n", __func__);
-               return -EINVAL;
-       }
+       mem = get_next_memory_node(ofnode_null());
+       if (!ofnode_valid(mem))
+               goto missing_node;
 
        for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
-               ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
-               if (ret == -FDT_ERR_NOTFOUND) {
+               while (ofnode_read_resource(mem, reg++, &res)) {
                        reg = 0;
-                       mem = get_next_memory_node(gd->fdt_blob, mem);
-                       if (mem == -FDT_ERR_NOTFOUND)
-                               break;
-
-                       ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
-                       if (ret == -FDT_ERR_NOTFOUND)
-                               break;
-               }
-               if (ret != 0) {
-                       return -EINVAL;
+                       mem = get_next_memory_node(mem);
+                       if (!ofnode_valid(mem)) {
+                               if (bank)
+                                       return 0;
+                               goto missing_node;
+                       }
                }
 
                gd->bd->bi_dram[bank].start = (phys_addr_t)res.start;
@@ -1229,6 +1140,10 @@ int fdtdec_setup_memory_banksize(void)
        }
 
        return 0;
+
+missing_node:
+       debug("%s: Missing /memory node\n", __func__);
+       return -EINVAL;
 }
 #endif