Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index e0f85677e3464e5de1ba81c6e942da3cd0129aaf..6fcfd6997c88d32a312b7ec2fb0b919a870b874b 100644 (file)
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -21,7 +21,6 @@ static inline struct clk_ops *clk_dev_ops(struct udevice *dev)
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-#ifdef CONFIG_SPL_BUILD
 # if CONFIG_IS_ENABLED(OF_PLATDATA)
 int clk_get_by_index_platdata(struct udevice *dev, int index,
                              struct phandle_2_cell *cells, struct clk *clk)
@@ -38,31 +37,6 @@ int clk_get_by_index_platdata(struct udevice *dev, int index,
        return 0;
 }
 # else
-int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
-{
-       int ret;
-       u32 cell[2];
-
-       if (index != 0)
-               return -ENOSYS;
-       assert(clk);
-       ret = uclass_get_device(UCLASS_CLK, 0, &clk->dev);
-       if (ret)
-               return ret;
-       ret = fdtdec_get_int_array(gd->fdt_blob, dev->of_offset, "clocks",
-                                  cell, 2);
-       if (ret)
-               return ret;
-       clk->id = cell[1];
-       return 0;
-}
-# endif /* OF_PLATDATA */
-
-int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
-{
-       return -ENOSYS;
-}
-#else
 static int clk_of_xlate_default(struct clk *clk,
                                struct fdtdec_phandle_args *args)
 {
@@ -91,7 +65,7 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
        debug("%s(dev=%p, index=%d, clk=%p)\n", __func__, dev, index, clk);
 
        assert(clk);
-       ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev->of_offset,
+       ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev),
                                             "clocks", "#clock-cells", 0, index,
                                             &args);
        if (ret) {
@@ -106,6 +80,9 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
                      __func__, ret);
                return ret;
        }
+
+       clk->dev = dev_clk;
+
        ops = clk_dev_ops(dev_clk);
 
        if (ops->of_xlate)
@@ -119,6 +96,7 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
 
        return clk_request(dev_clk, clk);
 }
+# endif /* OF_PLATDATA */
 
 int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
 {
@@ -126,16 +104,15 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
 
        debug("%s(dev=%p, name=%s, clk=%p)\n", __func__, dev, name, clk);
 
-       index = fdt_find_string(gd->fdt_blob, dev->of_offset, "clock-names",
-                               name);
+       index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev),
+                                     "clock-names", name);
        if (index < 0) {
-               debug("fdt_find_string() failed: %d\n", index);
+               debug("fdt_stringlist_search() failed: %d\n", index);
                return index;
        }
 
        return clk_get_by_index(dev, index, clk);
 }
-#endif /* CONFIG_SPL_BUILD */
 #endif /* OF_CONTROL */
 
 int clk_request(struct udevice *dev, struct clk *clk)