leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: core: Move ofdata_to_platdata() call earlier

Browse Source 
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>
This commit is contained in:
Simon Glass 2019-12-29 21:19:17 -07:00
parent a41e6daf05
commit 29f7d05a34
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/core/device.c
View File

@ -375,6 +375,13 @@ int device_probe(struct udevice *dev)
return 0; 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); seq = uclass_resolve_seq(dev);
if (seq < 0) { if (seq < 0) {
ret = seq; ret = seq;
@ -411,13 +418,6 @@ int device_probe(struct udevice *dev)
goto fail; 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 */ /* Only handle devices that have a valid ofnode */
if (dev_of_valid(dev)) { if (dev_of_valid(dev)) {
/* /*