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 e3a42dc928f0cc311863c3e356fd0cee5a870fb8..01f664796d82e5df72ff993d0de78204e6e6eded 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -47,7 +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;
@@ -57,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.
@@ -138,7 +140,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
        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);
@@ -146,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);
@@ -224,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;
@@ -249,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;
@@ -262,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);
@@ -559,11 +570,11 @@ const char *dev_get_uclass_name(struct udevice *dev)
 
 fdt_addr_t dev_get_addr(struct udevice *dev)
 {
-#ifdef CONFIG_OF_CONTROL
+#if CONFIG_IS_ENABLED(OF_CONTROL)
        fdt_addr_t addr;
 
        addr = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
-       if (addr != FDT_ADDR_T_NONE) {
+       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);
        }
@@ -601,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;
+}