diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-25 21:52:34 +0900 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2015-08-06 07:44:29 -0600 |
commit | aed1a4dd88e94001b811b297c1ff734c3f8d22d9 (patch) | |
tree | de57a73634e7d1b673be8379d6893eaf62d03ee6 | |
parent | f33017716e5c430d84366ecc4476ba2b655f3fef (diff) | |
download | u-boot-imx-aed1a4dd88e94001b811b297c1ff734c3f8d22d9.zip u-boot-imx-aed1a4dd88e94001b811b297c1ff734c3f8d22d9.tar.gz u-boot-imx-aed1a4dd88e94001b811b297c1ff734c3f8d22d9.tar.bz2 |
dm: add DM_FLAG_BOUND flag
Currently, we only have DM_FLAG_ACTIVATED to indicate the device
status, but we still cannot know in which stage is in progress,
binding or probing.
This commit introduces a new flag, DM_FLAG_BOUND, which is set when
the device is really bound, and cleared when it is unbound.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | drivers/core/device-remove.c | 3 | ||||
-rw-r--r-- | drivers/core/device.c | 2 | ||||
-rw-r--r-- | include/dm/device.h | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 6b87f86..45d6543 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -61,6 +61,9 @@ int device_unbind(struct udevice *dev) if (dev->flags & DM_FLAG_ACTIVATED) return -EINVAL; + if (!(dev->flags & DM_FLAG_BOUND)) + return -EINVAL; + drv = dev->driver; assert(drv); diff --git a/drivers/core/device.c b/drivers/core/device.c index d65717d..bf6f271 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -132,6 +132,8 @@ int device_bind(struct udevice *parent, const struct driver *drv, dm_dbg("Bound device %s to %s\n", dev->name, parent->name); *devp = dev; + dev->flags |= DM_FLAG_BOUND; + return 0; fail_child_post_bind: diff --git a/include/dm/device.h b/include/dm/device.h index 12fd02d..4cd7ba3 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -36,6 +36,9 @@ struct driver_info; /* Allocate driver private data on a DMA boundary */ #define DM_FLAG_ALLOC_PRIV_DMA (1 << 5) +/* Device is bound */ +#define DM_FLAG_BOUND (1 << 6) + /** * struct udevice - An instance of a driver * |