From patchwork Wed Apr 1 13:57:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 237093 List-Id: U-Boot discussion From: andriy.shevchenko at linux.intel.com (Andy Shevchenko) Date: Wed, 1 Apr 2020 16:57:59 +0300 Subject: [PATCH v2 2/2] dm: core: Partial revert of "Allocate parent data separate from probing parent" In-Reply-To: <20200401135759.13197-1-andriy.shevchenko@linux.intel.com> References: <20200401135759.13197-1-andriy.shevchenko@linux.intel.com> Message-ID: <20200401135759.13197-2-andriy.shevchenko@linux.intel.com> This reverts commit 82de42fa1468 ("dm: core: Allocate parent data separate from probing parent") as a being a culprit for Apollo Lake breakage. Suggested-by: Wolfgang Wallner Signed-off-by: Andy Shevchenko --- drivers/core/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/core/device.c b/drivers/core/device.c index 89ea820d48..400767d9bd 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -392,10 +392,6 @@ int device_probe(struct udevice *dev) drv = dev->driver; assert(drv); - ret = device_ofdata_to_platdata(dev); - if (ret) - goto fail; - /* Ensure all parents are probed */ if (dev->parent) { ret = device_probe(dev->parent); @@ -412,6 +408,10 @@ int device_probe(struct udevice *dev) return 0; } + ret = device_ofdata_to_platdata(dev); + if (ret) + goto fail; + seq = uclass_resolve_seq(dev); if (seq < 0) { ret = seq;