Merge git://www.denx.de/git/u-boot-ppc4xx

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

diff --git a/drivers/core/device.c b/drivers/core/device.c
index afa4b4fda97809e72f0e671fa6f9307a3a92e88d..758f39064cca9a4b288733cce1a1d8c1c00ff3ee 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -11,10 +11,12 @@
 
 #include <common.h>
 #include <fdtdec.h>
+#include <fdt_support.h>
 #include <malloc.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
+#include <dm/pinctrl.h>
 #include <dm/platdata.h>
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
@@ -38,8 +40,10 @@ int device_bind(struct udevice *parent, const struct driver *drv,
                return -EINVAL;
 
        ret = uclass_get(drv->id, &uc);
-       if (ret)
+       if (ret) {
+               debug("Missing uclass for driver %s\n", drv->name);
                return ret;
+       }
 
        dev = calloc(1, sizeof(struct udevice));
        if (!dev)
@@ -286,6 +290,13 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
 
        dev->flags |= DM_FLAG_ACTIVATED;
 
+       /*
+        * Process pinctrl for everything except the root device, and
+        * continue regardless of the result of pinctrl.
+        */
+       if (dev->parent)
+               pinctrl_select_state(dev, "default");
+
        ret = uclass_pre_probe_device(dev);
        if (ret)
                goto fail;
@@ -384,7 +395,7 @@ void *dev_get_uclass_priv(struct udevice *dev)
        return dev->uclass_priv;
 }
 
-void *dev_get_parentdata(struct udevice *dev)
+void *dev_get_parent_priv(struct udevice *dev)
 {
        if (!dev) {
                dm_warn("%s: null device\n", __func__);
@@ -575,7 +586,29 @@ fdt_addr_t dev_get_addr(struct udevice *dev)
 #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(OF_TRANSLATE)) {
+               const fdt32_t *reg;
+
+               reg = fdt_getprop(gd->fdt_blob, dev->of_offset, "reg", NULL);
+               if (!reg)
+                       return FDT_ADDR_T_NONE;
+
+               /*
+                * Use the full-fledged translate function for complex
+                * bus setups.
+                */
+               return fdt_translate_address((void *)gd->fdt_blob,
+                                            dev->of_offset, reg);
+       }
+
+       /*
+        * Use the "simple" translate function for less complex
+        * bus setups.
+        */
+       addr = fdtdec_get_addr_size_auto_parent(gd->fdt_blob,
+                                               dev->parent->of_offset,
+                                               dev->of_offset, "reg",
+                                               0, NULL);
        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);