Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 5239e79479be2791feb7702863a565d1929d3c9b..af17ac1b7a1cdc24bd40f30dd2e1a2b149a42936 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -24,8 +24,7 @@
 #include <libfdt.h>
 #include <fdtdec.h>
 
-/* we need the generic GPIO interface here */
-#include <asm-generic/gpio.h>
+#include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -38,6 +37,11 @@ DECLARE_GLOBAL_DATA_PTR;
 static const char * const compat_names[COMPAT_COUNT] = {
        COMPAT(UNKNOWN, "<none>"),
        COMPAT(NVIDIA_TEGRA20_USB, "nvidia,tegra20-ehci"),
+       COMPAT(NVIDIA_TEGRA20_I2C, "nvidia,tegra20-i2c"),
+       COMPAT(NVIDIA_TEGRA20_DVC, "nvidia,tegra20-i2c-dvc"),
+       COMPAT(NVIDIA_TEGRA20_EMC, "nvidia,tegra20-emc"),
+       COMPAT(NVIDIA_TEGRA20_EMC_TABLE, "nvidia,tegra20-emc-table"),
+       COMPAT(NVIDIA_TEGRA20_KBC, "nvidia,tegra20-kbc"),
 };
 
 const char *fdtdec_get_compatible(enum fdt_compat_id id)
@@ -131,6 +135,21 @@ int fdtdec_next_compatible(const void *blob, int node,
        return fdt_node_offset_by_compatible(blob, node, compat_names[id]);
 }
 
+int fdtdec_next_compatible_subnode(const void *blob, int node,
+               enum fdt_compat_id id, int *depthp)
+{
+       do {
+               node = fdt_next_node(blob, node, depthp);
+       } while (*depthp > 1);
+
+       /* If this is a direct subnode, and compatible, return it */
+       if (*depthp == 1 && 0 == fdt_node_check_compatible(
+                                               blob, node, compat_names[id]))
+               return node;
+
+       return -FDT_ERR_NOTFOUND;
+}
+
 int fdtdec_next_alias(const void *blob, const char *name,
                enum fdt_compat_id id, int *upto)
 {
@@ -153,9 +172,17 @@ int fdtdec_next_alias(const void *blob, const char *name,
        return node;
 }
 
-/* TODO: Can we tighten this code up a little? */
 int fdtdec_find_aliases_for_id(const void *blob, const char *name,
                        enum fdt_compat_id id, int *node_list, int maxcount)
+{
+       memset(node_list, '\0', sizeof(*node_list) * maxcount);
+
+       return fdtdec_add_aliases_for_id(blob, name, id, node_list, maxcount);
+}
+
+/* TODO: Can we tighten this code up a little? */
+int fdtdec_add_aliases_for_id(const void *blob, const char *name,
+                       enum fdt_compat_id id, int *node_list, int maxcount)
 {
        int name_len = strlen(name);
        int nodes[maxcount];
@@ -185,8 +212,6 @@ int fdtdec_find_aliases_for_id(const void *blob, const char *name,
                       __func__, name);
 
        /* Now find all the aliases */
-       memset(node_list, '\0', sizeof(*node_list) * maxcount);
-
        for (offset = fdt_first_property_offset(blob, alias_node);
                        offset > 0;
                        offset = fdt_next_property_offset(blob, offset)) {
@@ -233,11 +258,19 @@ int fdtdec_find_aliases_for_id(const void *blob, const char *name,
                 * it as done.
                 */
                if (fdtdec_get_is_enabled(blob, node)) {
+                       if (node_list[number]) {
+                               debug("%s: warning: alias '%s' requires that "
+                                     "a node be placed in the list in a "
+                                     "position which is already filled by "
+                                     "node '%s'\n", __func__, path,
+                                     fdt_get_name(blob, node, NULL));
+                               continue;
+                       }
                        node_list[number] = node;
                        if (number >= num_found)
                                num_found = number + 1;
                }
-               nodes[j] = 0;
+               nodes[found] = 0;
        }
 
        /* Add any nodes not mentioned by an alias */
@@ -347,6 +380,17 @@ int fdtdec_get_int_array(const void *blob, int node, const char *prop_name,
        return err;
 }
 
+const u32 *fdtdec_locate_array(const void *blob, int node,
+                              const char *prop_name, int count)
+{
+       const u32 *cell;
+       int err;
+
+       cell = get_prop_check_min_len(blob, node, prop_name,
+                                     sizeof(u32) * count, &err);
+       return err ? NULL : cell;
+}
+
 int fdtdec_get_bool(const void *blob, int node, const char *prop_name)
 {
        const s32 *cell;
@@ -432,3 +476,27 @@ int fdtdec_setup_gpio(struct fdt_gpio_state *gpio)
                return -1;
        return 0;
 }
+
+int fdtdec_get_byte_array(const void *blob, int node, const char *prop_name,
+               u8 *array, int count)
+{
+       const u8 *cell;
+       int err;
+
+       cell = get_prop_check_min_len(blob, node, prop_name, count, &err);
+       if (!err)
+               memcpy(array, cell, count);
+       return err;
+}
+
+const u8 *fdtdec_locate_byte_array(const void *blob, int node,
+                            const char *prop_name, int count)
+{
+       const u8 *cell;
+       int err;
+
+       cell = get_prop_check_min_len(blob, node, prop_name, count, &err);
+       if (err)
+               return NULL;
+       return cell;
+}