dm: core: Move ofdata_to_platdata() call earlier
authorSimon Glass <sjg@chromium.org>
Mon, 30 Dec 2019 04:19:17 +0000 (21:19 -0700)
committerSimon Glass <sjg@chromium.org>
Tue, 7 Jan 2020 23:02:38 +0000 (16:02 -0700)
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

index 2442b5834d57faa90a06c4a6edc91dad68afe85b..45754ead8f69347c4b9e375f16c26492781556e7 100644 (file)
@@ -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)) {
                /*