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 ---
drivers/core/device.c | 14 +++++++------- 1 file 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)) { /*