dm: core: Add flags parameter to device_remove()

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

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index aba98801fd4505b269f3aecf6ac454c3f21bff86..d94d43a98d2f8619d6a803029ee2e162fa1d1b24 100644 (file)
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -58,7 +58,12 @@ static int uclass_add(enum uclass_id id, struct uclass **ucp)
        if (!uc_drv) {
                debug("Cannot find uclass for id %d: please add the UCLASS_DRIVER() declaration for this UCLASS_... id\n",
                      id);
-               return -ENOENT;
+               /*
+                * Use a strange error to make this case easier to find. When
+                * a uclass is not available it can prevent driver model from
+                * starting up and this failure is otherwise hard to debug.
+                */
+               return -EPFNOSUPPORT;
        }
        uc = calloc(1, sizeof(*uc));
        if (!uc)
@@ -111,7 +116,7 @@ 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);
+               ret = device_remove(dev, DM_REMOVE_NORMAL);
                if (ret)
                        return ret;
                ret = device_unbind(dev);
@@ -143,6 +148,15 @@ int uclass_get(enum uclass_id id, struct uclass **ucp)
        return 0;
 }
 
+const char *uclass_get_name(enum uclass_id id)
+{
+       struct uclass *uc;
+
+       if (uclass_get(id, &uc))
+               return NULL;
+       return uc->uc_drv->name;
+}
+
 int uclass_find_device(enum uclass_id id, int index, struct udevice **devp)
 {
        struct uclass *uc;
@@ -153,6 +167,8 @@ int uclass_find_device(enum uclass_id id, int index, struct udevice **devp)
        ret = uclass_get(id, &uc);
        if (ret)
                return ret;
+       if (list_empty(&uc->dev_head))
+               return -ENODEV;
 
        list_for_each_entry(dev, &uc->dev_head, uclass_node) {
                if (!index--) {
@@ -247,8 +263,8 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq,
        return -ENODEV;
 }
 
-static int uclass_find_device_by_of_offset(enum uclass_id id, int node,
-                                          struct udevice **devp)
+int uclass_find_device_by_of_offset(enum uclass_id id, int node,
+                                   struct udevice **devp)
 {
        struct uclass *uc;
        struct udevice *dev;
@@ -262,7 +278,7 @@ static int uclass_find_device_by_of_offset(enum uclass_id id, int node,
                return ret;
 
        list_for_each_entry(dev, &uc->dev_head, uclass_node) {
-               if (dev->of_offset == node) {
+               if (dev_of_offset(dev) == node) {
                        *devp = dev;
                        return 0;
                }
@@ -271,6 +287,61 @@ static int uclass_find_device_by_of_offset(enum uclass_id id, int node,
        return -ENODEV;
 }
 
+#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)
+{
+       struct udevice *dev;
+       struct uclass *uc;
+       int find_phandle;
+       int ret;
+
+       *devp = NULL;
+       find_phandle = fdtdec_get_int(gd->fdt_blob, dev_of_offset(parent), name,
+                                     -1);
+       if (find_phandle <= 0)
+               return -ENOENT;
+       ret = uclass_get(id, &uc);
+       if (ret)
+               return ret;
+
+       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+               uint phandle;
+
+               phandle = fdt_get_phandle(gd->fdt_blob, dev_of_offset(dev));
+
+               if (phandle == find_phandle) {
+                       *devp = dev;
+                       return 0;
+               }
+       }
+
+       return -ENODEV;
+}
+#endif
+
+int uclass_get_device_by_driver(enum uclass_id id,
+                               const struct driver *find_drv,
+                               struct udevice **devp)
+{
+       struct udevice *dev;
+       struct uclass *uc;
+       int ret;
+
+       ret = uclass_get(id, &uc);
+       if (ret)
+               return ret;
+
+       list_for_each_entry(dev, &uc->dev_head, uclass_node) {
+               if (dev->driver == find_drv)
+                       return uclass_get_device_tail(dev, 0, devp);
+       }
+
+       return -ENODEV;
+}
+
 int uclass_get_device_tail(struct udevice *dev, int ret,
                                  struct udevice **devp)
 {
@@ -336,6 +407,19 @@ int uclass_get_device_by_of_offset(enum uclass_id id, int node,
        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)
+{
+       struct udevice *dev;
+       int ret;
+
+       *devp = NULL;
+       ret = uclass_find_device_by_phandle(id, parent, name, &dev);
+       return uclass_get_device_tail(dev, ret, devp);
+}
+#endif
+
 int uclass_first_device(enum uclass_id id, struct udevice **devp)
 {
        struct udevice *dev;
@@ -348,6 +432,19 @@ int uclass_first_device(enum uclass_id id, struct udevice **devp)
        return uclass_get_device_tail(dev, ret, devp);
 }
 
+int uclass_first_device_err(enum uclass_id id, struct udevice **devp)
+{
+       int ret;
+
+       ret = uclass_first_device(id, devp);
+       if (ret)
+               return ret;
+       else if (!*devp)
+               return -ENODEV;
+
+       return 0;
+}
+
 int uclass_next_device(struct udevice **devp)
 {
        struct udevice *dev = *devp;
@@ -377,11 +474,6 @@ int uclass_bind_device(struct udevice *dev)
                                goto err;
                }
        }
-       if (uc->uc_drv->post_bind) {
-               ret = uc->uc_drv->post_bind(dev);
-               if (ret)
-                       goto err;
-       }
 
        return 0;
 err:
@@ -391,7 +483,7 @@ err:
        return ret;
 }
 
-#ifdef CONFIG_DM_DEVICE_REMOVE
+#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
 int uclass_unbind_device(struct udevice *dev)
 {
        struct uclass *uc;
@@ -471,25 +563,18 @@ int uclass_post_probe_device(struct udevice *dev)
        return 0;
 }
 
-#ifdef CONFIG_DM_DEVICE_REMOVE
+#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
 int uclass_pre_remove_device(struct udevice *dev)
 {
-       struct uclass_driver *uc_drv;
        struct uclass *uc;
        int ret;
 
        uc = dev->uclass;
-       uc_drv = uc->uc_drv;
        if (uc->uc_drv->pre_remove) {
                ret = uc->uc_drv->pre_remove(dev);
                if (ret)
                        return ret;
        }
-       if (uc_drv->per_device_auto_alloc_size) {
-               free(dev->uclass_priv);
-               dev->uclass_priv = NULL;
-       }
-       dev->seq = -1;
 
        return 0;
 }