USB: S5P: Add ehci support

[u-boot] / lib / fdtdec.c

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 5239e79479be2791feb7702863a565d1929d3c9b..bdec1a0d962b1ce256b60f65e12774a42dde376c 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -38,6 +38,8 @@ 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"),
 };
 
 const char *fdtdec_get_compatible(enum fdt_compat_id id)
@@ -153,9 +155,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 +195,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 +241,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 */