summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-17 09:02:38 -0600
committerSimon Glass <sjg@chromium.org>2014-09-23 12:44:30 -0600
commit91cbd792c46c916ef196c5b7cd16ff592d2f3632 (patch)
tree0bbc6b1ee9085f4ec1279b6143902dd1e56f372e /drivers
parentbf1a86fca0111067021f3d263242767d3709d7be (diff)
downloadu-boot-imx-91cbd792c46c916ef196c5b7cd16ff592d2f3632.zip
u-boot-imx-91cbd792c46c916ef196c5b7cd16ff592d2f3632.tar.gz
u-boot-imx-91cbd792c46c916ef196c5b7cd16ff592d2f3632.tar.bz2
dm: core: Allow device_bind() to used without CONFIG_OF_CONTROL
The sequence number support in driver model requires device tree control. It should be skipped if CONFIG_OF_CONTROL is not defined, and should not require functions from fdtdec. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/core/device.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 166b073..ef41a9b 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -106,13 +106,16 @@ int device_bind(struct udevice *parent, struct driver *drv, const char *name,
* a 'requested' sequence, and will be resolved (and ->seq updated)
* when the device is probed.
*/
- dev->req_seq = fdtdec_get_int(gd->fdt_blob, of_offset, "reg", -1);
dev->seq = -1;
+#ifdef CONFIG_OF_CONTROL
+ dev->req_seq = fdtdec_get_int(gd->fdt_blob, of_offset, "reg", -1);
if (uc->uc_drv->name && of_offset != -1) {
fdtdec_get_alias_seq(gd->fdt_blob, uc->uc_drv->name, of_offset,
&dev->req_seq);
}
-
+#else
+ dev->req_seq = -1;
+#endif
if (!dev->platdata && drv->platdata_auto_alloc_size)
dev->flags |= DM_FLAG_ALLOC_PDATA;