driver_check_compatible() can be useful in particular case, give access to this primitive

Signed-off-by: Patrice Chotard patrice.chotard@st.com Cc: Jean-Jacques Hiblot jjhiblot@ti.com ---

drivers/core/lists.c | 6 +++--- include/dm/lists.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/core/lists.c b/drivers/core/lists.c index 68204c303f..c807cf8698 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -106,9 +106,9 @@ int device_bind_driver_to_node(struct udevice *parent, const char *drv_name, * @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 struct udevice_id *of_match, - const struct udevice_id **of_idp, - const char *compat) +int driver_check_compatible(const struct udevice_id *of_match, + const struct udevice_id **of_idp, + const char *compat) { if (!of_match) return -ENOENT; diff --git a/include/dm/lists.h b/include/dm/lists.h index 810e244d9e..7615f0ab38 100644 --- a/include/dm/lists.h +++ b/include/dm/lists.h @@ -44,6 +44,18 @@ struct uclass_driver *lists_uclass_lookup(enum uclass_id id); */ int lists_bind_drivers(struct udevice *parent, bool pre_reloc_only);

+/** + * driver_check_compatible() - Check if a driver matches a compatible string + * + * @param of_match: List of compatible strings to match + * @param of_idp: Returns the match that was found + * @param compat: The compatible string to search for + * @return 0 if there is a match, -ENOENT if no match + */ +int driver_check_compatible(const struct udevice_id *of_match, + const struct udevice_id **of_idp, + const char *compat); + /** * lists_bind_fdt() - bind a device tree node *

Initial implementation invokes device_bind_with_driver_data() with driver_data parameter equal to 0. For driver with driver data, the bind command can't bind correctly this driver or even worse causes data abort.

Add find_udevice_id() to parse the driver's of_match list and return the entry corresponding to the driver compatible string. This allows to get access to driver_data and to use it as parameters of device_bind_with_driver_data().

Signed-off-by: Patrice Chotard patrice.chotard@st.com Cc: Jean-Jacques Hiblot jjhiblot@ti.com

---

cmd/bind.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/cmd/bind.c b/cmd/bind.c index 44a5f17f0d..ab1844c855 100644 --- a/cmd/bind.c +++ b/cmd/bind.c @@ -118,6 +118,29 @@ static int unbind_child_by_class_index(const char *uclass, int index, return ret; }

+static const struct udevice_id *find_udevice_id(struct driver *drv, + ofnode ofnode) +{ + const char *compat_list, *compat; + const struct udevice_id *id; + int ret, compat_length, i; + + compat_list = ofnode_get_property(ofnode, "compatible", &compat_length); + /* + * Walk through the compatible string list and find the corresponding + * udevice_id entry + */ + for (i = 0; i < compat_length; i += strlen(compat) + 1) { + compat = compat_list + i; + + ret = driver_check_compatible(drv->of_match, &id, compat); + if (!ret) + break; + } + + return id; +} + static int bind_by_node_path(const char *path, const char *drv_name) { struct udevice *dev; @@ -125,6 +148,7 @@ static int bind_by_node_path(const char *path, const char *drv_name) int ret; ofnode ofnode; struct driver *drv; + const struct udevice_id *id;

drv = lists_driver_lookup_name(drv_name); if (!drv) { @@ -150,8 +174,11 @@ static int bind_by_node_path(const char *path, const char *drv_name) }

ofnode = ofnode_path(path); + id = find_udevice_id(drv, ofnode); + ret = device_bind_with_driver_data(parent, drv, ofnode_get_name(ofnode), - 0, ofnode, &dev); + id->data, ofnode, &dev); + if (!dev || ret) { printf("Unable to bind. err:%d\n", ret); return ret;