mmc: fsl_esdhc: workaround for hardware 3.3v IO reliability issue

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

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 0085d3fb24ba353798924728a8aed93e64810509..2ab419cfe4da0171aee21d14d69a79d21d5d0f38 100644 (file)
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -6,9 +6,12 @@
  * Pavel Herrmann <morpheus.ibis@gmail.com>
  */
 
+#define LOG_CATEGORY LOGC_DM
+
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <log.h>
 #include <malloc.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
@@ -116,12 +119,12 @@ int uclass_destroy(struct uclass *uc)
        while (!list_empty(&uc->dev_head)) {
                dev = list_first_entry(&uc->dev_head, struct udevice,
                                       uclass_node);
-               ret = device_remove(dev, DM_REMOVE_NORMAL);
+               ret = device_remove(dev, DM_REMOVE_NORMAL | DM_REMOVE_NO_PD);
                if (ret)
-                       return ret;
+                       return log_msg_ret("remove", ret);
                ret = device_unbind(dev);
                if (ret)
-                       return ret;
+                       return log_msg_ret("unbind", ret);
        }
 
        uc_drv = uc->uc_drv;
@@ -171,6 +174,27 @@ enum uclass_id uclass_get_by_name(const char *name)
        return UCLASS_INVALID;
 }
 
+int dev_get_uclass_index(struct udevice *dev, struct uclass **ucp)
+{
+       struct udevice *iter;
+       struct uclass *uc = dev->uclass;
+       int i = 0;
+
+       if (list_empty(&uc->dev_head))
+               return -ENODEV;
+
+       uclass_foreach_dev(iter, uc) {
+               if (iter == dev) {
+                       if (ucp)
+                               *ucp = uc;
+                       return i;
+               }
+               i++;
+       }
+
+       return -ENODEV;
+}
+
 int uclass_find_device(enum uclass_id id, int index, struct udevice **devp)
 {
        struct uclass *uc;
@@ -184,7 +208,7 @@ int uclass_find_device(enum uclass_id id, int index, struct udevice **devp)
        if (list_empty(&uc->dev_head))
                return -ENODEV;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+       uclass_foreach_dev(dev, uc) {
                if (!index--) {
                        *devp = dev;
                        return 0;
@@ -238,8 +262,8 @@ int uclass_find_device_by_name(enum uclass_id id, const char *name,
        if (ret)
                return ret;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
-               if (!strncmp(dev->name, name, strlen(name))) {
+       uclass_foreach_dev(dev, uc) {
+               if (!strcmp(dev->name, name)) {
                        *devp = dev;
                        return 0;
                }
@@ -248,6 +272,28 @@ int uclass_find_device_by_name(enum uclass_id id, const char *name,
        return -ENODEV;
 }
 
+int uclass_find_next_free_req_seq(enum uclass_id id)
+{
+       struct uclass *uc;
+       struct udevice *dev;
+       int ret;
+       int max = -1;
+
+       ret = uclass_get(id, &uc);
+       if (ret)
+               return ret;
+
+       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+               if ((dev->req_seq != -1) && (dev->req_seq > max))
+                       max = dev->req_seq;
+       }
+
+       if (max == -1)
+               return 0;
+
+       return max + 1;
+}
+
 int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq,
                              bool find_req_seq, struct udevice **devp)
 {
@@ -256,23 +302,24 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq,
        int ret;
 
        *devp = NULL;
-       debug("%s: %d %d\n", __func__, find_req_seq, seq_or_req_seq);
+       log_debug("%d %d\n", find_req_seq, seq_or_req_seq);
        if (seq_or_req_seq == -1)
                return -ENODEV;
        ret = uclass_get(id, &uc);
        if (ret)
                return ret;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
-               debug("   - %d %d '%s'\n", dev->req_seq, dev->seq, dev->name);
+       uclass_foreach_dev(dev, uc) {
+               log_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;
-                       debug("   - found\n");
+                       log_debug("   - found\n");
                        return 0;
                }
        }
-       debug("   - not found\n");
+       log_debug("   - not found\n");
 
        return -ENODEV;
 }
@@ -291,7 +338,7 @@ int uclass_find_device_by_of_offset(enum uclass_id id, int node,
        if (ret)
                return ret;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+       uclass_foreach_dev(dev, uc) {
                if (dev_of_offset(dev) == node) {
                        *devp = dev;
                        return 0;
@@ -308,6 +355,7 @@ int uclass_find_device_by_ofnode(enum uclass_id id, ofnode node,
        struct udevice *dev;
        int ret;
 
+       log(LOGC_DM, LOGL_DEBUG, "Looking for %s\n", ofnode_get_name(node));
        *devp = NULL;
        if (!ofnode_valid(node))
                return -ENODEV;
@@ -315,21 +363,25 @@ int uclass_find_device_by_ofnode(enum uclass_id id, ofnode node,
        if (ret)
                return ret;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+       uclass_foreach_dev(dev, uc) {
+               log(LOGC_DM, LOGL_DEBUG_CONTENT, "      - checking %s\n",
+                   dev->name);
                if (ofnode_equal(dev_ofnode(dev), node)) {
                        *devp = dev;
-                       return 0;
+                       goto done;
                }
        }
+       ret = -ENODEV;
 
-       return -ENODEV;
+done:
+       log(LOGC_DM, LOGL_DEBUG, "   - result for %s: %s (ret=%d)\n",
+           ofnode_get_name(node), *devp ? (*devp)->name : "(none)", ret);
+       return ret;
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int uclass_find_device_by_phandle(enum uclass_id id,
-                                        struct udevice *parent,
-                                        const char *name,
-                                        struct udevice **devp)
+int uclass_find_device_by_phandle(enum uclass_id id, struct udevice *parent,
+                                 const char *name, struct udevice **devp)
 {
        struct udevice *dev;
        struct uclass *uc;
@@ -344,7 +396,7 @@ static int uclass_find_device_by_phandle(enum uclass_id id,
        if (ret)
                return ret;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+       uclass_foreach_dev(dev, uc) {
                uint phandle;
 
                phandle = dev_read_phandle(dev);
@@ -371,7 +423,7 @@ int uclass_get_device_by_driver(enum uclass_id id,
        if (ret)
                return ret;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+       uclass_foreach_dev(dev, uc) {
                if (dev->driver == find_drv)
                        return uclass_get_device_tail(dev, 0, devp);
        }
@@ -449,8 +501,11 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node,
        struct udevice *dev;
        int ret;
 
+       log(LOGC_DM, LOGL_DEBUG, "Looking for %s\n", ofnode_get_name(node));
        *devp = NULL;
        ret = uclass_find_device_by_ofnode(id, node, &dev);
+       log(LOGC_DM, LOGL_DEBUG, "   - result for %s: %s (ret=%d)\n",
+           ofnode_get_name(node), dev ? dev->name : "(none)", ret);
 
        return uclass_get_device_tail(dev, ret, devp);
 }
@@ -468,7 +523,7 @@ int uclass_get_device_by_phandle_id(enum uclass_id id, uint phandle_id,
        if (ret)
                return ret;
 
-       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+       uclass_foreach_dev(dev, uc) {
                uint phandle;
 
                phandle = dev_read_phandle(dev);
@@ -531,6 +586,19 @@ int uclass_next_device(struct udevice **devp)
        return uclass_get_device_tail(dev, ret, devp);
 }
 
+int uclass_next_device_err(struct udevice **devp)
+{
+       int ret;
+
+       ret = uclass_next_device(devp);
+       if (ret)
+               return ret;
+       else if (!*devp)
+               return -ENODEV;
+
+       return 0;
+}
+
 int uclass_first_device_check(enum uclass_id id, struct udevice **devp)
 {
        int ret;
@@ -558,6 +626,23 @@ int uclass_next_device_check(struct udevice **devp)
        return device_probe(*devp);
 }
 
+int uclass_first_device_drvdata(enum uclass_id id, ulong driver_data,
+                               struct udevice **devp)
+{
+       struct udevice *dev;
+       struct uclass *uc;
+
+       uclass_id_foreach_dev(id, dev, uc) {
+               if (dev_get_driver_data(dev) == driver_data) {
+                       *devp = dev;
+
+                       return device_probe(dev);
+               }
+       }
+
+       return -ENODEV;
+}
+
 int uclass_bind_device(struct udevice *dev)
 {
        struct uclass *uc;
@@ -648,18 +733,35 @@ int uclass_pre_probe_device(struct udevice *dev)
        if (!dev->parent)
                return 0;
        uc_drv = dev->parent->uclass->uc_drv;
-       if (uc_drv->child_pre_probe)
-               return uc_drv->child_pre_probe(dev);
+       if (uc_drv->child_pre_probe) {
+               ret = uc_drv->child_pre_probe(dev);
+               if (ret)
+                       return ret;
+       }
 
        return 0;
 }
 
 int uclass_post_probe_device(struct udevice *dev)
 {
-       struct uclass_driver *uc_drv = dev->uclass->uc_drv;
+       struct uclass_driver *uc_drv;
+       int ret;
 
-       if (uc_drv->post_probe)
-               return uc_drv->post_probe(dev);
+       if (dev->parent) {
+               uc_drv = dev->parent->uclass->uc_drv;
+               if (uc_drv->child_post_probe) {
+                       ret = uc_drv->child_post_probe(dev);
+                       if (ret)
+                               return ret;
+               }
+       }
+
+       uc_drv = dev->uclass->uc_drv;
+       if (uc_drv->post_probe) {
+               ret = uc_drv->post_probe(dev);
+               if (ret)
+                       return ret;
+       }
 
        return 0;
 }
@@ -680,3 +782,8 @@ int uclass_pre_remove_device(struct udevice *dev)
        return 0;
 }
 #endif
+
+UCLASS_DRIVER(nop) = {
+       .id             = UCLASS_NOP,
+       .name           = "nop",
+};