dm: fix logic of lists_bind_fdt()

If parameter drv of lists_bind_fdt() is specified, we shall bind only to
this very driver and to no other.

If the driver drv has an of_match property, we shall only bind to the
driver if it matches the compatible string of the device.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 93514a744d9d171e81769663e3edf07531779221..c49695b24f00fa41410c6c112b364bde251763d2 100644 (file)
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -223,10 +223,14 @@ int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp,
                          compat);
 
                for (entry = driver; entry != driver + n_ents; entry++) {
+                       if (drv) {
+                               if (drv != entry)
+                                       continue;
+                               if (!entry->of_match)
+                                       break;
+                       }
                        ret = driver_check_compatible(entry->of_match, &id,
                                                      compat);
-                       if ((drv) && (drv == entry))
-                               break;
                        if (!ret)
                                break;
                }