summaryrefslogtreecommitdiff
path: root/drivers/core
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2017-04-24 07:48:02 (GMT)
committerBin Meng <bmeng.cn@gmail.com>2017-05-17 09:13:06 (GMT)
commit426f99fa98c3725fe0ca1eb8438d1215a2c6bd6b (patch)
tree6efd5bcaf65a045220083f6c6ff96fb79f10adaa /drivers/core
parente98856fcff5adc64689c3d5597b0a36d867eec8f (diff)
downloadu-boot-fsl-qoriq-426f99fa98c3725fe0ca1eb8438d1215a2c6bd6b.tar.xz
dm: core: Add DM_FLAG_OS_PREPARE flag
This new flag can be added to DM device drivers, which need to do some final configuration before U-Boot exits and the OS (e.g. Linux) is started. The remove functions of those drivers will get called at this stage to do these last-stage configuration steps. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers/core')
-rw-r--r--drivers/core/device-remove.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index cc0043b..3c6ab42 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -152,6 +152,15 @@ void device_free(struct udevice *dev)
devres_release_probe(dev);
}
+static bool flags_remove(uint flags, uint drv_flags)
+{
+ if ((flags & DM_REMOVE_NORMAL) ||
+ (flags & (drv_flags & (DM_FLAG_ACTIVE_DMA | DM_FLAG_OS_PREPARE))))
+ return true;
+
+ return false;
+}
+
int device_remove(struct udevice *dev, uint flags)
{
const struct driver *drv;
@@ -178,9 +187,7 @@ int device_remove(struct udevice *dev, uint flags)
* Remove the device if called with the "normal" remove flag set,
* or if the remove flag matches any of the drivers remove flags
*/
- if (drv->remove &&
- ((flags & DM_REMOVE_NORMAL) ||
- (flags & (drv->flags & DM_FLAG_ACTIVE_DMA)))) {
+ if (drv->remove && flags_remove(flags, drv->flags)) {
ret = drv->remove(dev);
if (ret)
goto err_remove;
@@ -194,8 +201,7 @@ int device_remove(struct udevice *dev, uint flags)
}
}
- if ((flags & DM_REMOVE_NORMAL) ||
- (flags & (drv->flags & DM_FLAG_ACTIVE_DMA))) {
+ if (flags_remove(flags, drv->flags)) {
device_free(dev);
dev->seq = -1;