dm: core: Add Kconfig for simple bus driver

[karo-tx-uboot.git] / drivers / core / device.c

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 43aff5405977718163f6b08b20bf7f17799eb650..01f664796d82e5df72ff993d0de78204e6e6eded 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -47,6 +47,9 @@ int device_bind(struct udevice *parent, const struct driver *drv,
        INIT_LIST_HEAD(&dev->sibling_node);
        INIT_LIST_HEAD(&dev->child_head);
        INIT_LIST_HEAD(&dev->uclass_node);
+#ifdef CONFIG_DEVRES
+       INIT_LIST_HEAD(&dev->devres_head);
+#endif
        dev->platdata = platdata;
        dev->name = name;
        dev->of_offset = of_offset;
@@ -56,7 +59,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
 
        dev->seq = -1;
        dev->req_seq = -1;
-       if (IS_ENABLED(CONFIG_OF_CONTROL) && IS_ENABLED(CONFIG_DM_SEQ_ALIAS)) {
+       if (CONFIG_IS_ENABLED(OF_CONTROL) && IS_ENABLED(CONFIG_DM_SEQ_ALIAS)) {
                /*
                * Some devices, such as a SPI bus, I2C bus and serial ports
                * are numbered using aliases.
@@ -132,10 +135,12 @@ 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:
-       if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
+       if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                if (drv->unbind && drv->unbind(dev)) {
                        dm_warn("unbind() method failed on dev '%s' on error path\n",
                                dev->name);
@@ -143,14 +148,14 @@ fail_child_post_bind:
        }
 
 fail_bind:
-       if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
+       if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                if (uclass_unbind_device(dev)) {
                        dm_warn("Failed to unbind dev '%s' on error path\n",
                                dev->name);
                }
        }
 fail_uclass_bind:
-       if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
+       if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                list_del(&dev->sibling_node);
                if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
                        free(dev->parent_platdata);
@@ -168,6 +173,8 @@ fail_alloc2:
                dev->platdata = NULL;
        }
 fail_alloc1:
+       devres_release_all(dev);
+
        free(dev);
 
        return ret;
@@ -219,17 +226,17 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
        drv = dev->driver;
        assert(drv);
 
-       /* Allocate private data if requested */
-       if (drv->priv_auto_alloc_size) {
+       /* Allocate private data if requested and not reentered */
+       if (drv->priv_auto_alloc_size && !dev->priv) {
                dev->priv = alloc_priv(drv->priv_auto_alloc_size, drv->flags);
                if (!dev->priv) {
                        ret = -ENOMEM;
                        goto fail;
                }
        }
-       /* Allocate private data if requested */
+       /* Allocate private data if requested and not reentered */
        size = dev->uclass->uc_drv->per_device_auto_alloc_size;
-       if (size) {
+       if (size && !dev->uclass_priv) {
                dev->uclass_priv = calloc(1, size);
                if (!dev->uclass_priv) {
                        ret = -ENOMEM;
@@ -244,7 +251,7 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
                        size = dev->parent->uclass->uc_drv->
                                        per_child_auto_alloc_size;
                }
-               if (size) {
+               if (size && !dev->parent_priv) {
                        dev->parent_priv = alloc_priv(size, drv->flags);
                        if (!dev->parent_priv) {
                                ret = -ENOMEM;
@@ -257,6 +264,15 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
                ret = device_probe(dev->parent);
                if (ret)
                        goto fail;
+
+               /*
+                * The device might have already been probed during
+                * the call to device_probe() on its parent device
+                * (e.g. PCI bridge devices). Test the flags again
+                * so that we don't mess up the device.
+                */
+               if (dev->flags & DM_FLAG_ACTIVATED)
+                       return 0;
        }
 
        seq = uclass_resolve_seq(dev);
@@ -284,7 +300,6 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
                        goto fail;
        }
 
-       dev->flags |= DM_FLAG_ACTIVATED;
        if (drv->probe) {
                ret = drv->probe(dev);
                if (ret) {
@@ -330,7 +345,7 @@ void *dev_get_platdata(struct udevice *dev)
 void *dev_get_parent_platdata(struct udevice *dev)
 {
        if (!dev) {
-               dm_warn("%s: null device", __func__);
+               dm_warn("%s: null device\n", __func__);
                return NULL;
        }
 
@@ -340,7 +355,7 @@ void *dev_get_parent_platdata(struct udevice *dev)
 void *dev_get_uclass_platdata(struct udevice *dev)
 {
        if (!dev) {
-               dm_warn("%s: null device", __func__);
+               dm_warn("%s: null device\n", __func__);
                return NULL;
        }
 
@@ -459,14 +474,14 @@ int device_find_child_by_of_offset(struct udevice *parent, int of_offset,
        return -ENODEV;
 }
 
-int device_get_child_by_of_offset(struct udevice *parent, int seq,
+int device_get_child_by_of_offset(struct udevice *parent, int node,
                                  struct udevice **devp)
 {
        struct udevice *dev;
        int ret;
 
        *devp = NULL;
-       ret = device_find_child_by_of_offset(parent, seq, &dev);
+       ret = device_find_child_by_of_offset(parent, node, &dev);
        return device_get_device_tail(dev, ret, devp);
 }
 
@@ -553,17 +568,22 @@ const char *dev_get_uclass_name(struct udevice *dev)
        return dev->uclass->uc_drv->name;
 }
 
-#ifdef CONFIG_OF_CONTROL
 fdt_addr_t dev_get_addr(struct udevice *dev)
 {
-       return fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
-}
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+       fdt_addr_t addr;
+
+       addr = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
+       if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) {
+               if (device_get_uclass_id(dev->parent) == UCLASS_SIMPLE_BUS)
+                       addr = simple_bus_translate(dev->parent, addr);
+       }
+
+       return addr;
 #else
-fdt_addr_t dev_get_addr(struct udevice *dev)
-{
        return FDT_ADDR_T_NONE;
-}
 #endif
+}
 
 bool device_has_children(struct udevice *dev)
 {
@@ -592,3 +612,13 @@ bool device_is_last_sibling(struct udevice *dev)
                return false;
        return list_is_last(&dev->sibling_node, &parent->child_head);
 }
+
+int device_set_name(struct udevice *dev, const char *name)
+{
+       name = strdup(name);
+       if (!name)
+               return -ENOMEM;
+       dev->name = name;
+
+       return 0;
+}