diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-12 17:05:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-12 17:05:41 -0500 |
| commit | 87c9e117bf57d6bb42c5521a3f6ec9ca7d97e5fa (patch) | |
| tree | 9a2a90d475abd35c8945bb3af7aa0c14bfc149f7 /drivers/core/root.c | |
| parent | f58885d002302b8047446a6a15f7376bb7b1ea32 (diff) | |
| parent | 48b3ecbedf8208845ac5956a3fb8817269fafedd (diff) | |
Merge branch '2023-01-12-further-assorted-general-updates'
- Bring in a number of assorted updates, some of which have been waiting
around for a bit. Make silent console really be silent, get rid of
gpio_hog_probe_all, add RNG for imx6, make net/fm use fs_loader, get
rid of a bad __weak usage and set distro_bootpart_uuid in another case.
Diffstat (limited to 'drivers/core/root.c')
| -rw-r--r-- | drivers/core/root.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index f24ddfa5218..c4fb48548bb 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -363,20 +363,22 @@ void *dm_priv_to_rw(void *priv) static int dm_probe_devices(struct udevice *dev, bool pre_reloc_only) { - u32 mask = DM_FLAG_PROBE_AFTER_BIND; - u32 flags = dev_get_flags(dev); + ofnode node = dev_ofnode(dev); struct udevice *child; int ret; - if (pre_reloc_only) - mask |= DM_FLAG_PRE_RELOC; + if (pre_reloc_only && + (!ofnode_valid(node) || !ofnode_pre_reloc(node)) && + !(dev->driver->flags & DM_FLAG_PRE_RELOC)) + goto probe_children; - if ((flags & mask) == mask) { + if (dev_get_flags(dev) & DM_FLAG_PROBE_AFTER_BIND) { ret = device_probe(dev); if (ret) return ret; } +probe_children: list_for_each_entry(child, &dev->child_head, sibling_node) dm_probe_devices(child, pre_reloc_only); |