diff options
| -rw-r--r-- | drivers/core/device.c | 29 | ||||
| -rw-r--r-- | 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 f0c23053ebb..9506c7df8d1 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 ee2b24a62a2..294d6c18105 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -84,6 +84,22 @@ 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 * * Activate a device so that it is ready for use. All its parents are probed |