Add a new internal function, device_ofdata_to_platdata() to handle allocating private space associated with each device and reading the platform data from the device tree.
Call this new function from device_probe().
Signed-off-by: Simon Glass sjg@chromium.org ---
drivers/core/device.c | 29 +++++++++++++++++++++++++++-- include/dm/device-internal.h | 16 ++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/core/device.c b/drivers/core/device.c index f0c23053eb..9506c7df8d 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -311,12 +311,11 @@ static void *alloc_priv(int size, uint flags) return priv; }
-int device_probe(struct udevice *dev) +int device_ofdata_to_platdata(struct udevice *dev) { const struct driver *drv; int size = 0; int ret; - int seq;
if (!dev) return -EINVAL; @@ -369,6 +368,32 @@ int device_probe(struct udevice *dev) goto fail; }
+ return 0; +fail: + device_free(dev); + + return ret; +} + +int device_probe(struct udevice *dev) +{ + const struct driver *drv; + int ret; + int seq; + + if (!dev) + return -EINVAL; + + if (dev->flags & DM_FLAG_ACTIVATED) + return 0; + + 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); diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index ee2b24a62a..294d6c1810 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -83,6 +83,22 @@ int device_bind_with_driver_data(struct udevice *parent, int device_bind_by_name(struct udevice *parent, bool pre_reloc_only, const struct driver_info *info, struct udevice **devp);
+/** + * device_ofdata_to_platdata() - Read platform data for a device + * + * Read platform data for a device (typically from the device tree) so that + * the information needed to probe the device is present. + * + * This may cause some others devices to be probed if this one depends on them, + * e.g. a GPIO line will cause a GPIO device to be probed. + * + * All private data associated with the device is allocated. + * + * @dev: Pointer to device to process + * @return 0 if OK, -ve on error + */ +int device_ofdata_to_platdata(struct udevice *dev); + /** * device_probe() - Probe a device, activating it *