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

[people/ms/u-boot.git] / drivers / core / lists.c

diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 6a634e695180cd35b35619ee6bdb10dbfa31ec08..b79f26dbe6c9bd5709a1fc989269fe6733630394 100644 (file)
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -74,11 +74,12 @@ int lists_bind_drivers(struct udevice *parent, bool pre_reloc_only)
 int device_bind_driver(struct udevice *parent, const char *drv_name,
                       const char *dev_name, struct udevice **devp)
 {
-       return device_bind_driver_to_node(parent, drv_name, dev_name, -1, devp);
+       return device_bind_driver_to_node(parent, drv_name, dev_name,
+                                         ofnode_null(), devp);
 }
 
 int device_bind_driver_to_node(struct udevice *parent, const char *drv_name,
-                              const char *dev_name, int node,
+                              const char *dev_name, ofnode node,
                               struct udevice **devp)
 {
        struct driver *drv;
@@ -89,48 +90,32 @@ int device_bind_driver_to_node(struct udevice *parent, const char *drv_name,
                debug("Cannot find driver '%s'\n", drv_name);
                return -ENOENT;
        }
-       ret = device_bind(parent, drv, dev_name, NULL, node, devp);
-       if (ret) {
-               debug("Cannot create device named '%s' (err=%d)\n",
-                     dev_name, ret);
-               return ret;
-       }
+       ret = device_bind_with_driver_data(parent, drv, dev_name, 0 /* data */,
+                                          node, devp);
 
-       return 0;
+       return ret;
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 /**
- * driver_check_compatible() - Check if a driver is compatible with this node
+ * driver_check_compatible() - Check if a driver matches a compatible string
  *
- * @param blob:                Device tree pointer
- * @param offset:      Offset of node in device tree
  * @param of_match:    List of compatible strings to match
  * @param of_idp:      Returns the match that was found
- * @return 0 if there is a match, -ENOENT if no match, -ENODEV if the node
- * does not have a compatible string, other error <0 if there is a device
- * tree error
+ * @param compat:      The compatible string to search for
+ * @return 0 if there is a match, -ENOENT if no match
  */
-static int driver_check_compatible(const void *blob, int offset,
-                                  const struct udevice_id *of_match,
-                                  const struct udevice_id **of_idp)
+static int driver_check_compatible(const struct udevice_id *of_match,
+                                  const struct udevice_id **of_idp,
+                                  const char *compat)
 {
-       int ret;
-
-       *of_idp = NULL;
        if (!of_match)
                return -ENOENT;
 
        while (of_match->compatible) {
-               ret = fdt_node_check_compatible(blob, offset,
-                                               of_match->compatible);
-               if (!ret) {
+               if (!strcmp(of_match->compatible, compat)) {
                        *of_idp = of_match;
                        return 0;
-               } else if (ret == -FDT_ERR_NOTFOUND) {
-                       return -ENODEV;
-               } else if (ret < 0) {
-                       return -EINVAL;
                }
                of_match++;
        }
@@ -138,8 +123,7 @@ static int driver_check_compatible(const void *blob, int offset,
        return -ENOENT;
 }
 
-int lists_bind_fdt(struct udevice *parent, const void *blob, int offset,
-                  struct udevice **devp)
+int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp)
 {
        struct driver *driver = ll_entry_start(struct driver, driver);
        const int n_ents = ll_entry_count(struct driver, driver);
@@ -147,31 +131,50 @@ int lists_bind_fdt(struct udevice *parent, const void *blob, int offset,
        struct driver *entry;
        struct udevice *dev;
        bool found = false;
-       const char *name;
+       const char *name, *compat_list, *compat;
+       int compat_length, i;
        int result = 0;
        int ret = 0;
 
-       dm_dbg("bind node %s\n", fdt_get_name(blob, offset, NULL));
        if (devp)
                *devp = NULL;
-       for (entry = driver; entry != driver + n_ents; entry++) {
-               ret = driver_check_compatible(blob, offset, entry->of_match,
-                                             &id);
-               name = fdt_get_name(blob, offset, NULL);
-               if (ret == -ENOENT) {
-                       continue;
-               } else if (ret == -ENODEV) {
+       name = ofnode_get_name(node);
+       dm_dbg("bind node %s\n", name);
+
+       compat_list = (const char *)ofnode_read_prop(node, "compatible",
+                                                    &compat_length);
+       if (!compat_list) {
+               if (compat_length == -FDT_ERR_NOTFOUND) {
                        dm_dbg("Device '%s' has no compatible string\n", name);
-                       break;
-               } else if (ret) {
-                       dm_warn("Device tree error at offset %d\n", offset);
-                       result = ret;
-                       break;
+                       return 0;
                }
 
+               dm_warn("Device tree error at node '%s'\n", name);
+               return compat_length;
+       }
+
+       /*
+        * Walk through the compatible string list, attempting to match each
+        * compatible string in order such that we match in order of priority
+        * from the first string to the last.
+        */
+       for (i = 0; i < compat_length; i += strlen(compat) + 1) {
+               compat = compat_list + i;
+               dm_dbg("   - attempt to match compatible string '%s'\n",
+                      compat);
+
+               for (entry = driver; entry != driver + n_ents; entry++) {
+                       ret = driver_check_compatible(entry->of_match, &id,
+                                                     compat);
+                       if (!ret)
+                               break;
+               }
+               if (entry == driver + n_ents)
+                       continue;
+
                dm_dbg("   - found match at '%s'\n", entry->name);
                ret = device_bind_with_driver_data(parent, entry, name,
-                                                  id->data, offset, &dev);
+                                                  id->data, node, &dev);
                if (ret == -ENODEV) {
                        dm_dbg("Driver '%s' refuses to bind\n", entry->name);
                        continue;
@@ -188,10 +191,8 @@ int lists_bind_fdt(struct udevice *parent, const void *blob, int offset,
                break;
        }
 
-       if (!found && !result && ret != -ENODEV) {
-               dm_dbg("No match for node '%s'\n",
-                      fdt_get_name(blob, offset, NULL));
-       }
+       if (!found && !result && ret != -ENODEV)
+               dm_dbg("No match for node '%s'\n", name);
 
        return result;
 }