From: Simon Glass <sjg@chromium.org>
Date: Mon, 30 Dec 2019 04:19:18 +0000 (-0700)
Subject: dm: core: Allocate parent data separate from probing parent
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=82de42fa1468;p=u-boot.git

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>
---

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 45754ead8f..f0c23053eb 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;