diff options
| author | Simon Glass <sjg@chromium.org> | 2019-12-30 07:19:17 +0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-01-08 02:02:38 +0300 |
| commit | 29f7d05a347ab7a42577c67fdfb787ef91537302 (patch) | |
| tree | 96fa4d0d718d722e9848f5104d9a19fa299fa4fe /drivers/core | |
| parent | a41e6daf0555b2461b3a3ae457bf9b9626e2d855 (diff) | |
| download | u-boot-29f7d05a347ab7a42577c67fdfb787ef91537302.tar.xz | |
dm: core: Move ofdata_to_platdata() call earlier
This method is supposed to extract platform data from the device tree. It
should be done before the device itself is probed. Move it earlier in the
device_probe() function.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 2442b5834d..45754ead8f 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -375,6 +375,13 @@ 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; @@ -411,13 +418,6 @@ 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; - } - /* Only handle devices that have a valid ofnode */ if (dev_of_valid(dev)) { /* |