arm: mvebu: fix boot from UART when in fallback mode

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

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index d94d43a98d2f8619d6a803029ee2e162fa1d1b24..f5e406792209686a897c7395dc80d616f082036f 100644 (file)
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <malloc.h>
 #include <dm/device.h>
@@ -250,7 +251,7 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq,
                return ret;
 
        list_for_each_entry(dev, &uc->dev_head, uclass_node) {
-               debug("   - %d %d\n", dev->req_seq, dev->seq);
+               debug("   - %d %d '%s'\n", dev->req_seq, dev->seq, dev->name);
                if ((find_req_seq ? dev->req_seq : dev->seq) ==
                                seq_or_req_seq) {
                        *devp = dev;
@@ -287,6 +288,30 @@ int uclass_find_device_by_of_offset(enum uclass_id id, int node,
        return -ENODEV;
 }
 
+int uclass_find_device_by_ofnode(enum uclass_id id, ofnode node,
+                                struct udevice **devp)
+{
+       struct uclass *uc;
+       struct udevice *dev;
+       int ret;
+
+       *devp = NULL;
+       if (!ofnode_valid(node))
+               return -ENODEV;
+       ret = uclass_get(id, &uc);
+       if (ret)
+               return ret;
+
+       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+               if (ofnode_equal(dev_ofnode(dev), node)) {
+                       *devp = dev;
+                       return 0;
+               }
+       }
+
+       return -ENODEV;
+}
+
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 static int uclass_find_device_by_phandle(enum uclass_id id,
                                         struct udevice *parent,
@@ -299,8 +324,7 @@ static int uclass_find_device_by_phandle(enum uclass_id id,
        int ret;
 
        *devp = NULL;
-       find_phandle = fdtdec_get_int(gd->fdt_blob, dev_of_offset(parent), name,
-                                     -1);
+       find_phandle = dev_read_u32_default(parent, name, -1);
        if (find_phandle <= 0)
                return -ENOENT;
        ret = uclass_get(id, &uc);
@@ -310,7 +334,7 @@ static int uclass_find_device_by_phandle(enum uclass_id id,
        list_for_each_entry(dev, &uc->dev_head, uclass_node) {
                uint phandle;
 
-               phandle = fdt_get_phandle(gd->fdt_blob, dev_of_offset(dev));
+               phandle = dev_read_phandle(dev);
 
                if (phandle == find_phandle) {
                        *devp = dev;
@@ -342,8 +366,7 @@ int uclass_get_device_by_driver(enum uclass_id id,
        return -ENODEV;
 }
 
-int uclass_get_device_tail(struct udevice *dev, int ret,
-                                 struct udevice **devp)
+int uclass_get_device_tail(struct udevice *dev, int ret, struct udevice **devp)
 {
        if (ret)
                return ret;
@@ -407,6 +430,18 @@ int uclass_get_device_by_of_offset(enum uclass_id id, int node,
        return uclass_get_device_tail(dev, ret, devp);
 }
 
+int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node,
+                               struct udevice **devp)
+{
+       struct udevice *dev;
+       int ret;
+
+       *devp = NULL;
+       ret = uclass_find_device_by_ofnode(id, node, &dev);
+
+       return uclass_get_device_tail(dev, ret, devp);
+}
+
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent,
                                 const char *name, struct udevice **devp)
@@ -457,6 +492,33 @@ int uclass_next_device(struct udevice **devp)
        return uclass_get_device_tail(dev, ret, devp);
 }
 
+int uclass_first_device_check(enum uclass_id id, struct udevice **devp)
+{
+       int ret;
+
+       *devp = NULL;
+       ret = uclass_find_first_device(id, devp);
+       if (ret)
+               return ret;
+       if (!*devp)
+               return 0;
+
+       return device_probe(*devp);
+}
+
+int uclass_next_device_check(struct udevice **devp)
+{
+       int ret;
+
+       ret = uclass_find_next_device(devp);
+       if (ret)
+               return ret;
+       if (!*devp)
+               return 0;
+
+       return device_probe(*devp);
+}
+
 int uclass_bind_device(struct udevice *dev)
 {
        struct uclass *uc;