dm: core: Allow device_bind() to used without CONFIG_OF_CONTROL
authorSimon Glass <sjg@chromium.org>
Wed, 17 Sep 2014 15:02:38 +0000 (09:02 -0600)
committerSimon Glass <sjg@chromium.org>
Tue, 23 Sep 2014 18:44:30 +0000 (12:44 -0600)
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>
drivers/core/device.c

index 166b0732ab9e2ece25c292e42dec8ffc63102500..ef41a9be3edc3d9cb20247f5026bd720a265d5a7 100644 (file)
@@ -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;