microblaze: Remove CONSOLE_ARG

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

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 7a02a931edf49da80c0f4596ec5506830618b490..f5def35b5b67c9a9d279b3e7de4c588c0a5a7b94 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -64,7 +64,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
 
        dev->seq = -1;
        dev->req_seq = -1;
-       if (CONFIG_IS_ENABLED(OF_CONTROL) && IS_ENABLED(CONFIG_DM_SEQ_ALIAS)) {
+       if (CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(DM_SEQ_ALIAS)) {
                /*
                * Some devices, such as a SPI bus, I2C bus and serial ports
                * are numbered using aliases.
@@ -135,6 +135,11 @@ int device_bind(struct udevice *parent, const struct driver *drv,
                if (ret)
                        goto fail_child_post_bind;
        }
+       if (uc->uc_drv->post_bind) {
+               ret = uc->uc_drv->post_bind(dev);
+               if (ret)
+                       goto fail_uclass_post_bind;
+       }
 
        if (parent)
                dm_dbg("Bound device %s to %s\n", dev->name, parent->name);
@@ -145,6 +150,8 @@ int device_bind(struct udevice *parent, const struct driver *drv,
 
        return 0;
 
+fail_uclass_post_bind:
+       /* There is no child unbind() method, so no clean-up required */
 fail_child_post_bind:
        if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                if (drv->unbind && drv->unbind(dev)) {
@@ -292,9 +299,11 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
 
        /*
         * Process pinctrl for everything except the root device, and
-        * continue regardless of the result of pinctrl.
+        * continue regardless of the result of pinctrl. Don't process pinctrl
+        * settings for pinctrl devices since the device may not yet be
+        * probed.
         */
-       if (dev->parent)
+       if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL)
                pinctrl_select_state(dev, "default");
 
        ret = uclass_pre_probe_device(dev);
@@ -581,17 +590,35 @@ const char *dev_get_uclass_name(struct udevice *dev)
        return dev->uclass->uc_drv->name;
 }
 
-fdt_addr_t dev_get_addr(struct udevice *dev)
+fdt_addr_t dev_get_addr_index(struct udevice *dev, int index)
 {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
        fdt_addr_t addr;
 
        if (CONFIG_IS_ENABLED(OF_TRANSLATE)) {
                const fdt32_t *reg;
+               int len = 0;
+               int na, ns;
+
+               na = fdt_address_cells(gd->fdt_blob, dev->parent->of_offset);
+               if (na < 1) {
+                       debug("bad #address-cells\n");
+                       return FDT_ADDR_T_NONE;
+               }
 
-               reg = fdt_getprop(gd->fdt_blob, dev->of_offset, "reg", NULL);
-               if (!reg)
+               ns = fdt_size_cells(gd->fdt_blob, dev->parent->of_offset);
+               if (ns < 0) {
+                       debug("bad #size-cells\n");
                        return FDT_ADDR_T_NONE;
+               }
+
+               reg = fdt_getprop(gd->fdt_blob, dev->of_offset, "reg", &len);
+               if (!reg || (len <= (index * sizeof(fdt32_t) * (na + ns)))) {
+                       debug("Req index out of range\n");
+                       return FDT_ADDR_T_NONE;
+               }
+
+               reg += index * (na + ns);
 
                /*
                 * Use the full-fledged translate function for complex
@@ -607,7 +634,7 @@ fdt_addr_t dev_get_addr(struct udevice *dev)
                addr = fdtdec_get_addr_size_auto_parent(gd->fdt_blob,
                                                        dev->parent->of_offset,
                                                        dev->of_offset, "reg",
-                                                       0, NULL);
+                                                       index, NULL);
                if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) {
                        if (device_get_uclass_id(dev->parent) ==
                            UCLASS_SIMPLE_BUS)
@@ -629,6 +656,11 @@ fdt_addr_t dev_get_addr(struct udevice *dev)
 #endif
 }
 
+fdt_addr_t dev_get_addr(struct udevice *dev)
+{
+       return dev_get_addr_index(dev, 0);
+}
+
 bool device_has_children(struct udevice *dev)
 {
        return !list_empty(&dev->child_head);