fdt: Export fdtdec_lookup() and fix the name

[karo-tx-uboot.git] / lib / fdtdec.c

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index af17ac1b7a1cdc24bd40f30dd2e1a2b149a42936..96f3e7bccf41dd8cdc31efcbeebaad491806b7ce 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -42,6 +42,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
        COMPAT(NVIDIA_TEGRA20_EMC, "nvidia,tegra20-emc"),
        COMPAT(NVIDIA_TEGRA20_EMC_TABLE, "nvidia,tegra20-emc-table"),
        COMPAT(NVIDIA_TEGRA20_KBC, "nvidia,tegra20-kbc"),
+       COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"),
 };
 
 const char *fdtdec_get_compatible(enum fdt_compat_id id)
@@ -79,11 +80,16 @@ fdt_addr_t fdtdec_get_addr(const void *blob, int node,
        const fdt_addr_t *cell;
        int len;
 
-       debug("get_addr: %s\n", prop_name);
+       debug("%s: %s: ", __func__, prop_name);
        cell = fdt_getprop(blob, node, prop_name, &len);
        if (cell && (len == sizeof(fdt_addr_t) ||
-                       len == sizeof(fdt_addr_t) * 2))
-               return fdt_addr_to_cpu(*cell);
+                       len == sizeof(fdt_addr_t) * 2)) {
+               fdt_addr_t addr = fdt_addr_to_cpu(*cell);
+
+               debug("%p\n", (void *)addr);
+               return addr;
+       }
+       debug("(not found)\n");
        return FDT_ADDR_T_NONE;
 }
 
@@ -93,10 +99,15 @@ s32 fdtdec_get_int(const void *blob, int node, const char *prop_name,
        const s32 *cell;
        int len;
 
-       debug("get_size: %s\n", prop_name);
+       debug("%s: %s: ", __func__, prop_name);
        cell = fdt_getprop(blob, node, prop_name, &len);
-       if (cell && len >= sizeof(s32))
-               return fdt32_to_cpu(cell[0]);
+       if (cell && len >= sizeof(s32)) {
+               s32 val = fdt32_to_cpu(cell[0]);
+
+               debug("%#x (%d)\n", val, val);
+               return val;
+       }
+       debug("(not found)\n");
        return default_val;
 }
 
@@ -117,7 +128,7 @@ int fdtdec_get_is_enabled(const void *blob, int node)
        return 1;
 }
 
-enum fdt_compat_id fd_dec_lookup(const void *blob, int node)
+enum fdt_compat_id fdtdec_lookup(const void *blob, int node)
 {
        enum fdt_compat_id id;
 
@@ -328,6 +339,7 @@ int fdtdec_lookup_phandle(const void *blob, int node, const char *prop_name)
        const u32 *phandle;
        int lookup;
 
+       debug("%s: %s\n", __func__, prop_name);
        phandle = fdt_getprop(blob, node, prop_name, NULL);
        if (!phandle)
                return -FDT_ERR_NOTFOUND;
@@ -414,9 +426,8 @@ int fdtdec_get_bool(const void *blob, int node, const char *prop_name)
  * @return number of GPIOs read if ok, -FDT_ERR_BADLAYOUT if max_count would
  * be exceeded, or -FDT_ERR_NOTFOUND if the property is missing.
  */
-static int fdtdec_decode_gpios(const void *blob, int node,
-               const char *prop_name, struct fdt_gpio_state *gpio,
-               int max_count)
+int fdtdec_decode_gpios(const void *blob, int node, const char *prop_name,
+               struct fdt_gpio_state *gpio, int max_count)
 {
        const struct fdt_property *prop;
        const u32 *cell;
@@ -427,7 +438,7 @@ static int fdtdec_decode_gpios(const void *blob, int node,
        assert(max_count > 0);
        prop = fdt_get_property(blob, node, prop_name, &len);
        if (!prop) {
-               debug("FDT: %s: property '%s' missing\n", __func__, prop_name);
+               debug("%s: property '%s' missing\n", __func__, prop_name);
                return -FDT_ERR_NOTFOUND;
        }
 
@@ -436,7 +447,7 @@ static int fdtdec_decode_gpios(const void *blob, int node,
        cell = (u32 *)prop->data;
        len /= sizeof(u32) * 3;         /* 3 cells per GPIO record */
        if (len > max_count) {
-               debug("FDT: %s: too many GPIOs / cells for "
+               debug(" %s: too many GPIOs / cells for "
                        "property '%s'\n", __func__, prop_name);
                return -FDT_ERR_BADLAYOUT;
        }
@@ -500,3 +511,50 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node,
                return NULL;
        return cell;
 }
+
+int fdtdec_get_config_int(const void *blob, const char *prop_name,
+               int default_val)
+{
+       int config_node;
+
+       debug("%s: %s\n", __func__, prop_name);
+       config_node = fdt_path_offset(blob, "/config");
+       if (config_node < 0)
+               return default_val;
+       return fdtdec_get_int(blob, config_node, prop_name, default_val);
+}
+
+char *fdtdec_get_config_string(const void *blob, const char *prop_name)
+{
+       const char *nodep;
+       int nodeoffset;
+       int len;
+
+       debug("%s: %s\n", __func__, prop_name);
+       nodeoffset = fdt_path_offset(blob, "/config");
+       if (nodeoffset < 0)
+               return NULL;
+
+       nodep = fdt_getprop(blob, nodeoffset, prop_name, &len);
+       if (!nodep)
+               return NULL;
+
+       return (char *)nodep;
+}
+
+int fdtdec_decode_region(const void *blob, int node,
+               const char *prop_name, void **ptrp, size_t *size)
+{
+       const fdt_addr_t *cell;
+       int len;
+
+       debug("%s: %s\n", __func__, prop_name);
+       cell = fdt_getprop(blob, node, prop_name, &len);
+       if (!cell || (len != sizeof(fdt_addr_t) * 2))
+               return -1;
+
+       *ptrp = (void *)fdt_addr_to_cpu(*cell);
+       *size = fdt_size_to_cpu(cell[1]);
+       debug("%s: size=%zx\n", __func__, *size);
+       return 0;
+}