clk: Remove superfluous gd declarations

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

diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 6fcfd6997c88d32a312b7ec2fb0b919a870b874b..fbea72091b190c43fdf411a0d96f721735264faf 100644 (file)
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -13,17 +13,15 @@
 #include <dt-structs.h>
 #include <errno.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-static inline struct clk_ops *clk_dev_ops(struct udevice *dev)
+static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
 {
-       return (struct clk_ops *)dev->driver->ops;
+       return (const struct clk_ops *)dev->driver->ops;
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 # 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)
+                             struct phandle_1_arg *cells, struct clk *clk)
 {
        int ret;
 
@@ -32,13 +30,13 @@ int clk_get_by_index_platdata(struct udevice *dev, int index,
        ret = uclass_get_device(UCLASS_CLK, 0, &clk->dev);
        if (ret)
                return ret;
-       clk->id = cells[0].id;
+       clk->id = cells[0].arg[0];
 
        return 0;
 }
 # else
 static int clk_of_xlate_default(struct clk *clk,
-                               struct fdtdec_phandle_args *args)
+                               struct ofnode_phandle_args *args)
 {
        debug("%s(clk=%p)\n", __func__, clk);
 
@@ -58,23 +56,24 @@ static int clk_of_xlate_default(struct clk *clk,
 int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
 {
        int ret;
-       struct fdtdec_phandle_args args;
+       struct ofnode_phandle_args args;
        struct udevice *dev_clk;
-       struct clk_ops *ops;
+       const struct clk_ops *ops;
 
        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(dev),
-                                            "clocks", "#clock-cells", 0, index,
-                                            &args);
+       clk->dev = NULL;
+
+       ret = dev_read_phandle_with_args(dev, "clocks", "#clock-cells", 0,
+                                        index, &args);
        if (ret) {
                debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n",
                      __func__, ret);
                return ret;
        }
 
-       ret = uclass_get_device_by_of_offset(UCLASS_CLK, args.node, &dev_clk);
+       ret = uclass_get_device_by_ofnode(UCLASS_CLK, args.node, &dev_clk);
        if (ret) {
                debug("%s: uclass_get_device_by_of_offset failed: err=%d\n",
                      __func__, ret);
@@ -103,9 +102,9 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
        int index;
 
        debug("%s(dev=%p, name=%s, clk=%p)\n", __func__, dev, name, clk);
+       clk->dev = NULL;
 
-       index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev),
-                                     "clock-names", name);
+       index = dev_read_stringlist_search(dev, "clock-names", name);
        if (index < 0) {
                debug("fdt_stringlist_search() failed: %d\n", index);
                return index;
@@ -113,11 +112,35 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
 
        return clk_get_by_index(dev, index, clk);
 }
+
+int clk_release_all(struct clk *clk, int count)
+{
+       int i, ret;
+
+       for (i = 0; i < count; i++) {
+               debug("%s(clk[%d]=%p)\n", __func__, i, &clk[i]);
+
+               /* check if clock has been previously requested */
+               if (!clk[i].dev)
+                       continue;
+
+               ret = clk_disable(&clk[i]);
+               if (ret && ret != -ENOSYS)
+                       return ret;
+
+               ret = clk_free(&clk[i]);
+               if (ret && ret != -ENOSYS)
+                       return ret;
+       }
+
+       return 0;
+}
+
 #endif /* OF_CONTROL */
 
 int clk_request(struct udevice *dev, struct clk *clk)
 {
-       struct clk_ops *ops = clk_dev_ops(dev);
+       const struct clk_ops *ops = clk_dev_ops(dev);
 
        debug("%s(dev=%p, clk=%p)\n", __func__, dev, clk);
 
@@ -131,7 +154,7 @@ int clk_request(struct udevice *dev, struct clk *clk)
 
 int clk_free(struct clk *clk)
 {
-       struct clk_ops *ops = clk_dev_ops(clk->dev);
+       const struct clk_ops *ops = clk_dev_ops(clk->dev);
 
        debug("%s(clk=%p)\n", __func__, clk);
 
@@ -143,7 +166,7 @@ int clk_free(struct clk *clk)
 
 ulong clk_get_rate(struct clk *clk)
 {
-       struct clk_ops *ops = clk_dev_ops(clk->dev);
+       const struct clk_ops *ops = clk_dev_ops(clk->dev);
 
        debug("%s(clk=%p)\n", __func__, clk);
 
@@ -155,7 +178,7 @@ ulong clk_get_rate(struct clk *clk)
 
 ulong clk_set_rate(struct clk *clk, ulong rate)
 {
-       struct clk_ops *ops = clk_dev_ops(clk->dev);
+       const struct clk_ops *ops = clk_dev_ops(clk->dev);
 
        debug("%s(clk=%p, rate=%lu)\n", __func__, clk, rate);
 
@@ -167,7 +190,7 @@ ulong clk_set_rate(struct clk *clk, ulong rate)
 
 int clk_enable(struct clk *clk)
 {
-       struct clk_ops *ops = clk_dev_ops(clk->dev);
+       const struct clk_ops *ops = clk_dev_ops(clk->dev);
 
        debug("%s(clk=%p)\n", __func__, clk);
 
@@ -179,7 +202,7 @@ int clk_enable(struct clk *clk)
 
 int clk_disable(struct clk *clk)
 {
-       struct clk_ops *ops = clk_dev_ops(clk->dev);
+       const struct clk_ops *ops = clk_dev_ops(clk->dev);
 
        debug("%s(clk=%p)\n", __func__, clk);