From d97c0dfad60fc24c83a7f5f60776f4ed818e6ca8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 29 Dec 2019 21:19:17 -0700 Subject: [PATCH] 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. Change-Id: Ie851eb2bdfa99233b4b832c08617012c0d78d79c Signed-off-by: Simon Glass --- drivers/core/device.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/core/device.c b/drivers/core/device.c index 88f26b3..56bf475 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -370,6 +370,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; @@ -404,12 +411,6 @@ int device_probe(struct udevice *dev) goto fail; } - if (drv->ofdata_to_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)) { /* -- 2.7.4