diff options
| author | Simon Glass <sjg@chromium.org> | 2019-12-29 21:19:18 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-01-07 16:02:38 -0700 |
| commit | 82de42fa14682d408da935adfb0f935354c5008f (patch) | |
| tree | 4c351dbb9bc85586f1277fe7d727172c22a143e1 /drivers/core | |
| parent | 29f7d05a347ab7a42577c67fdfb787ef91537302 (diff) | |
| download | u-boot-82de42fa14682d408da935adfb0f935354c5008f.zip u-boot-82de42fa14682d408da935adfb0f935354c5008f.tar.gz u-boot-82de42fa14682d408da935adfb0f935354c5008f.tar.bz2 | |
dm: core: Allocate parent data separate from probing parent
At present the parent is probed before the child's ofdata_to_platdata()
method is called. Adjust the logic slightly so that probing parents is
not done until afterwards.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 45754ea..f0c2305 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -346,7 +346,7 @@ int device_probe(struct udevice *dev) } } - /* Ensure all parents are probed */ + /* Allocate parent data for this child */ if (dev->parent) { size = dev->parent->driver->per_child_auto_alloc_size; if (!size) { @@ -360,7 +360,17 @@ int device_probe(struct udevice *dev) goto fail; } } + } + + if (drv->ofdata_to_platdata && + (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { + ret = drv->ofdata_to_platdata(dev); + if (ret) + goto fail; + } + /* Ensure all parents are probed */ + if (dev->parent) { ret = device_probe(dev->parent); if (ret) goto fail; @@ -375,13 +385,6 @@ int device_probe(struct udevice *dev) return 0; } - if (drv->ofdata_to_platdata && - (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { - ret = drv->ofdata_to_platdata(dev); - if (ret) - goto fail; - } - seq = uclass_resolve_seq(dev); if (seq < 0) { ret = seq; |