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 9766aeabd192f69206f5fec8bb8274979aa14edb..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;
@@ -260,7 +263,7 @@ int uclass_find_device_by_name(enum uclass_id id, const char *name,
                return ret;
 
        uclass_foreach_dev(dev, uc) {
-               if (!strncmp(dev->name, name, strlen(name))) {
+               if (!strcmp(dev->name, name)) {
                        *devp = dev;
                        return 0;
                }
@@ -269,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)
 {
@@ -277,7 +302,7 @@ 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);
@@ -285,15 +310,16 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq,
                return ret;
 
        uclass_foreach_dev(dev, uc) {
-               debug("   - %d %d '%s'\n", dev->req_seq, dev->seq, dev->name);
+               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;
 }
@@ -600,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;
@@ -690,8 +733,11 @@ 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;
 }
@@ -711,8 +757,11 @@ int uclass_post_probe_device(struct udevice *dev)
        }
 
        uc_drv = dev->uclass->uc_drv;
-       if (uc_drv->post_probe)
-               return uc_drv->post_probe(dev);
+       if (uc_drv->post_probe) {
+               ret = uc_drv->post_probe(dev);
+               if (ret)
+                       return ret;
+       }
 
        return 0;
 }
@@ -733,3 +782,8 @@ int uclass_pre_remove_device(struct udevice *dev)
        return 0;
 }
 #endif
+
+UCLASS_DRIVER(nop) = {
+       .id             = UCLASS_NOP,
+       .name           = "nop",
+};