projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: Adjust lists_bind_fdt() to return the bound device
[oweals/u-boot.git]
/
drivers
/
core
/
lists.c
diff --git
a/drivers/core/lists.c
b/drivers/core/lists.c
index 87164a5cf9a06449a3dfa0cce1a3701f2b7f4913..699f94b435f213a0e78e91e4d2e854ae45473e7b 100644
(file)
--- a/
drivers/core/lists.c
+++ b/
drivers/core/lists.c
@@
-62,7
+62,7
@@
struct uclass_driver *lists_uclass_lookup(enum uclass_id id)
return NULL;
}
return NULL;
}
-int lists_bind_drivers(struct udevice *parent)
+int lists_bind_drivers(struct udevice *parent
, bool pre_reloc_only
)
{
struct driver_info *info =
ll_entry_start(struct driver_info, driver_info);
{
struct driver_info *info =
ll_entry_start(struct driver_info, driver_info);
@@
-73,8
+73,8
@@
int lists_bind_drivers(struct udevice *parent)
int ret;
for (entry = info; entry != info + n_ents; entry++) {
int ret;
for (entry = info; entry != info + n_ents; entry++) {
- ret = device_bind_by_name(parent, entry, &dev);
- if (ret) {
+ ret = device_bind_by_name(parent,
pre_reloc_only,
entry, &dev);
+ if (ret
&& ret != -EPERM
) {
dm_warn("No match for driver '%s'\n", entry->name);
if (!result || ret != -ENOENT)
result = ret;
dm_warn("No match for driver '%s'\n", entry->name);
if (!result || ret != -ENOENT)
result = ret;
@@
-118,22
+118,28
@@
static int driver_check_compatible(const void *blob, int offset,
return -ENOENT;
}
return -ENOENT;
}
-int lists_bind_fdt(struct udevice *parent, const void *blob, int offset)
+int lists_bind_fdt(struct udevice *parent, const void *blob, int offset,
+ struct udevice **devp)
{
struct driver *driver = ll_entry_start(struct driver, driver);
const int n_ents = ll_entry_count(struct driver, driver);
struct driver *entry;
struct udevice *dev;
{
struct driver *driver = ll_entry_start(struct driver, driver);
const int n_ents = ll_entry_count(struct driver, driver);
struct driver *entry;
struct udevice *dev;
+ bool found = false;
const char *name;
int result = 0;
const char *name;
int result = 0;
- int ret;
+ int ret
= 0
;
dm_dbg("bind node %s\n", fdt_get_name(blob, offset, NULL));
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);
for (entry = driver; entry != driver + n_ents; entry++) {
ret = driver_check_compatible(blob, offset, entry->of_match);
+ name = fdt_get_name(blob, offset, NULL);
if (ret == -ENOENT) {
continue;
} else if (ret == -ENODEV) {
if (ret == -ENOENT) {
continue;
} else if (ret == -ENODEV) {
+ dm_dbg("Device '%s' has no compatible string\n", name);
break;
} else if (ret) {
dm_warn("Device tree error at offset %d\n", offset);
break;
} else if (ret) {
dm_warn("Device tree error at offset %d\n", offset);
@@
-142,14
+148,22
@@
int lists_bind_fdt(struct udevice *parent, const void *blob, int offset)
break;
}
break;
}
- name = fdt_get_name(blob, offset, NULL);
dm_dbg(" - found match at '%s'\n", entry->name);
ret = device_bind(parent, entry, name, NULL, offset, &dev);
if (ret) {
dm_dbg(" - found match at '%s'\n", entry->name);
ret = device_bind(parent, entry, name, NULL, offset, &dev);
if (ret) {
- dm_warn("No match for driver '%s'\n", entry->name);
- if (!result || ret != -ENOENT)
- result = ret;
+ dm_warn("Error binding driver '%s'\n", entry->name);
+ return ret;
+ } else {
+ found = true;
+ if (devp)
+ *devp = dev;
}
}
+ break;
+ }
+
+ if (!found && !result && ret != -ENODEV) {
+ dm_dbg("No match for node '%s'\n",
+ fdt_get_name(blob, offset, NULL));
}
return result;
}
return result;