dm: core: Export uclass_find_device_by_of_offset()

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

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 04e939d6c13bc216ec31ae311a9ceb659d027a25..12095e75a41ef2c303115ea0c107a0ca234821dd 100644 (file)
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -56,9 +56,14 @@ static int uclass_add(enum uclass_id id, struct uclass **ucp)
        *ucp = NULL;
        uc_drv = lists_uclass_lookup(id);
        if (!uc_drv) {
-               dm_warn("Cannot find uclass for id %d: please add the UCLASS_DRIVER() declaration for this UCLASS_... id\n",
-                       id);
-               return -ENOENT;
+               debug("Cannot find uclass for id %d: please add the UCLASS_DRIVER() declaration for this UCLASS_... id\n",
+                     id);
+               /*
+                * 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)
@@ -153,6 +158,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 +254,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;
@@ -271,12 +278,46 @@ 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, parent->of_offset, 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 = fdt_get_phandle(gd->fdt_blob, dev->of_offset);
+
+               if (phandle == find_phandle) {
+                       *devp = dev;
+                       return 0;
+               }
+       }
+
+       return -ENODEV;
+}
+#endif
+
 int uclass_get_device_tail(struct udevice *dev, int ret,
                                  struct udevice **devp)
 {
        if (ret)
                return ret;
 
+       assert(dev);
        ret = device_probe(dev);
        if (ret)
                return ret;
@@ -335,6 +376,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;
@@ -342,6 +396,8 @@ int uclass_first_device(enum uclass_id id, struct udevice **devp)
 
        *devp = NULL;
        ret = uclass_find_first_device(id, &dev);
+       if (!dev)
+               return 0;
        return uclass_get_device_tail(dev, ret, devp);
 }
 
@@ -352,6 +408,8 @@ int uclass_next_device(struct udevice **devp)
 
        *devp = NULL;
        ret = uclass_find_next_device(&dev);
+       if (!dev)
+               return 0;
        return uclass_get_device_tail(dev, ret, devp);
 }
 
@@ -372,11 +430,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:
@@ -386,7 +439,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;
@@ -466,25 +519,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;
 }