e1000: fix no nvm build

[u-boot] / drivers / core / device.c

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 74bb5f0f8efb8b568885a2a10ba09f118f052a9f..32e80e82b59c99f9ac5734c8f3dadc7c3b0c5f28 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -106,13 +106,18 @@ 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 (!IS_ERR_VALUE(dev->req_seq))
+               dev->req_seq &= INT_MAX;
        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;
 
@@ -218,6 +223,13 @@ static void device_free(struct udevice *dev)
                free(dev->uclass_priv);
                dev->uclass_priv = NULL;
        }
+       if (dev->parent) {
+               size = dev->parent->driver->per_child_auto_alloc_size;
+               if (size) {
+                       free(dev->parent_priv);
+                       dev->parent_priv = NULL;
+               }
+       }
 }
 
 int device_probe(struct udevice *dev)
@@ -263,6 +275,15 @@ int device_probe(struct udevice *dev)
 
        /* Ensure all parents are probed */
        if (dev->parent) {
+               size = dev->parent->driver->per_child_auto_alloc_size;
+               if (size) {
+                       dev->parent_priv = calloc(1, size);
+                       if (!dev->parent_priv) {
+                               ret = -ENOMEM;
+                               goto fail;
+                       }
+               }
+
                ret = device_probe(dev->parent);
                if (ret)
                        goto fail;
@@ -275,6 +296,12 @@ int device_probe(struct udevice *dev)
        }
        dev->seq = seq;
 
+       if (dev->parent && dev->parent->driver->child_pre_probe) {
+               ret = dev->parent->driver->child_pre_probe(dev);
+               if (ret)
+                       goto fail;
+       }
+
        if (drv->ofdata_to_platdata && dev->of_offset >= 0) {
                ret = drv->ofdata_to_platdata(dev);
                if (ret)
@@ -336,12 +363,20 @@ int device_remove(struct udevice *dev)
                        goto err_remove;
        }
 
+       if (dev->parent && dev->parent->driver->child_post_remove) {
+               ret = dev->parent->driver->child_post_remove(dev);
+               if (ret) {
+                       dm_warn("%s: Device '%s' failed child_post_remove()",
+                               __func__, dev->name);
+               }
+       }
+
        device_free(dev);
 
        dev->seq = -1;
        dev->flags &= ~DM_FLAG_ACTIVATED;
 
-       return 0;
+       return ret;
 
 err_remove:
        /* We can't put the children back */
@@ -377,6 +412,16 @@ void *dev_get_priv(struct udevice *dev)
        return dev->priv;
 }
 
+void *dev_get_parentdata(struct udevice *dev)
+{
+       if (!dev) {
+               dm_warn("%s: null device", __func__);
+               return NULL;
+       }
+
+       return dev->parent_priv;
+}
+
 static int device_get_device_tail(struct udevice *dev, int ret,
                                  struct udevice **devp)
 {