cmd: bind: Fix driver binding on a device

Fix a regression brings by commit 84f8e36f03fa ("cmd: bind: allow to
bind driver with driver data")

As example, the following bind command doesn't work:

   bind /soc/usb-otg@49000000 usb_ether

As usb_ether driver has no compatible string, it can't be find by
lists_bind_fdt(). In bind_by_node_path(), which called lists_bind_fdt(),
the driver entry is known, pass it to lists_bind_fdt() to force the driver
entry selection.

For this, add a new parameter struct *driver to lists_bind_fdt().
Fix also all lists_bind_fdt() callers.

Fixes: 84f8e36f03fa ("cmd: bind: allow to bind driver with driver data")
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reported-by: Herbert Poetzl <herbert@13thfloor.at>
Cc: Marek Vasut <marex@denx.de>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/board/congatec/cgtqmx8/spl.c b/board/congatec/cgtqmx8/spl.c
index 2a5d4c1bcd594b7f3bc594406f460337b3831d02..37b7221c52a9b0ec41173b9d0dd64378fe4ff56d 100644 (file)
--- a/board/congatec/cgtqmx8/spl.c
+++ b/board/congatec/cgtqmx8/spl.c
@@ -32,7 +32,7 @@ void spl_board_init(void)
        offset = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "nxp,imx8-pd");
        while (offset != -FDT_ERR_NOTFOUND) {
                lists_bind_fdt(gd->dm_root, offset_to_ofnode(offset),
-                              NULL, true);
+                              NULL, NULL, true);
                offset = fdt_node_offset_by_compatible(gd->fdt_blob, offset,
                                                       "nxp,imx8-pd");
        }

diff --git a/cmd/bind.c b/cmd/bind.c
index 07c629eff7c7d9c00dd40b1b48e3a5195b44ca4e..4d1b7885e60a812efdb0592845f3b481ece70c4e 100644 (file)
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -152,7 +152,7 @@ static int bind_by_node_path(const char *path, const char *drv_name)
        }
 
        ofnode = ofnode_path(path);
-       ret = lists_bind_fdt(parent, ofnode, &dev, false);
+       ret = lists_bind_fdt(parent, ofnode, &dev, drv, false);
 
        if (!dev || ret) {
                printf("Unable to bind. err:%d\n", ret);

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 29668f6fb30e4eecd10308264e362bf5ef47c037..6f84762ebd7dd93955510c4376ddbe958acddaad 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -1135,7 +1135,7 @@ int dev_enable_by_path(const char *path)
        if (ret)
                return ret;
 
-       return lists_bind_fdt(parent, node, NULL, false);
+       return lists_bind_fdt(parent, node, NULL, NULL, false);
 }
 #endif
 

diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index e214306b904bc0032f333d7ad15a6ff74bde7ba3..c9cd74a484c14b5be3523df13cc839d4367fa6a9 100644 (file)
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -182,7 +182,7 @@ static int driver_check_compatible(const struct udevice_id *of_match,
 }
 
 int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp,
-                  bool pre_reloc_only)
+                  struct driver *drv, bool pre_reloc_only)
 {
        struct driver *driver = ll_entry_start(struct driver, driver);
        const int n_ents = ll_entry_count(struct driver, driver);
@@ -225,6 +225,8 @@ int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp,
                for (entry = driver; entry != driver + n_ents; entry++) {
                        ret = driver_check_compatible(entry->of_match, &id,
                                                      compat);
+                       if ((drv) && (drv == entry))
+                               break;
                        if (!ret)
                                break;
                }

diff --git a/drivers/core/root.c b/drivers/core/root.c
index 78eee082c95433243466d1bc776b22dbfce6a8cc..86f97767338f119c9df40a2360fc64040173b772 100644 (file)
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -276,7 +276,7 @@ static int dm_scan_fdt_node(struct udevice *parent, ofnode parent_node,
                        pr_debug("   - ignoring disabled device\n");
                        continue;
                }
-               err = lists_bind_fdt(parent, node, NULL, pre_reloc_only);
+               err = lists_bind_fdt(parent, node, NULL, NULL, pre_reloc_only);
                if (err && !ret) {
                        ret = err;
                        debug("%s: ret=%d\n", node_name, ret);

diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index 035a600f71cfdd0d5e46686b148f2d519dba28d9..4ab5cb4bf137a514813e528d2149bbacf83a8fc8 100644 (file)
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -219,7 +219,7 @@ static int imx8_scu_bind(struct udevice *dev)
 
        debug("%s(dev=%p)\n", __func__, dev);
        ofnode_for_each_subnode(node, dev_ofnode(dev)) {
-               ret = lists_bind_fdt(dev, node, &child, true);
+               ret = lists_bind_fdt(dev, node, &child, NULL, true);
                if (ret)
                        return ret;
                debug("bind child dev %s\n", child->name);

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 8171b17faf88ccba60deb759e16973ac8f089d45..01387c11192d1a8c1cff65c788c710c679504fad 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -69,7 +69,7 @@ static int serial_check_stdout(const void *blob, struct udevice **devp)
         * anyway.
         */
        if (node > 0 && !lists_bind_fdt(gd->dm_root, offset_to_ofnode(node),
-                                       devp, false)) {
+                                       devp, NULL, false)) {
                if (!device_probe(*devp))
                        return 0;
        }

diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index c8e8419b22e789a47bf218ef20310f4481c5616e..ebea1687894da4c5acf353935a7ed90e3302eb02 100644 (file)
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -146,7 +146,7 @@ int notrace dm_timer_init(void)
                 * If the timer is not marked to be bound before
                 * relocation, bind it anyway.
                 */
-               if (!lists_bind_fdt(dm_root(), node, &dev, false)) {
+               if (!lists_bind_fdt(dm_root(), node, &dev, NULL, false)) {
                        ret = device_probe(dev);
                        if (ret)
                                return ret;

diff --git a/include/dm/lists.h b/include/dm/lists.h
index 1a86552546169f11c465351774065f0ee764220d..5896ae36583b222e60fdd648c9e30e6a514e8700 100644 (file)
--- a/include/dm/lists.h
+++ b/include/dm/lists.h
@@ -53,13 +53,14 @@ int lists_bind_drivers(struct udevice *parent, bool pre_reloc_only);
  * @parent: parent device (root)
  * @node: device tree node to bind
  * @devp: if non-NULL, returns a pointer to the bound device
+ * @drv: if non-NULL, force this driver to be bound
  * @pre_reloc_only: If true, bind only nodes with special devicetree properties,
  * or drivers with the DM_FLAG_PRE_RELOC flag. If false bind all drivers.
  * @return 0 if device was bound, -EINVAL if the device tree is invalid,
  * other -ve value on error
  */
 int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp,
-                  bool pre_reloc_only);
+                  struct driver *drv, bool pre_reloc_only);
 
 /**
  * device_bind_driver() - bind a device to a driver

diff --git a/test/dm/nop.c b/test/dm/nop.c
index 2cd92c52402e099ee9ecc722e6e027525d5c53d2..75b9e7b6cc0b489e986412e52cfec476a1cea5a5 100644 (file)
--- a/test/dm/nop.c
+++ b/test/dm/nop.c
@@ -25,7 +25,7 @@ static int noptest_bind(struct udevice *parent)
                const char *bind_flag = ofnode_read_string(ofnode, "bind");
 
                if (bind_flag && (strcmp(bind_flag, "True") == 0))
-                       lists_bind_fdt(parent, ofnode, &dev, false);
+                       lists_bind_fdt(parent, ofnode, &dev, NULL, false);
                ofnode = dev_read_next_subnode(ofnode);
        }