common: Drop asm/global_data.h from common header

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

diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 70df9d4..b87288d 100644 (file)
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -14,30 +14,35 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <dm/device-internal.h>
 #include <dm/devres.h>
 #include <dm/read.h>
 #include <linux/bug.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
+#include <asm/global_data.h>
 
 static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
 {
        return (const struct clk_ops *)dev->driver->ops;
 }
 
+struct clk *dev_get_clk_ptr(struct udevice *dev)
+{
+       return (struct clk *)dev_get_uclass_priv(dev);
+}
+
 #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_1_arg *cells, struct clk *clk)
+int clk_get_by_driver_info(struct udevice *dev, struct phandle_1_arg *cells,
+                          struct clk *clk)
 {
        int ret;
 
-       if (index != 0)
-               return -ENOSYS;
-       ret = uclass_get_device(UCLASS_CLK, 0, &clk->dev);
+       ret = device_get_by_driver_info_idx(cells->idx, &clk->dev);
        if (ret)
                return ret;
-       clk->id = cells[0].arg[0];
+       clk->id = cells->arg[0];
 
        return 0;
 }
@@ -79,7 +84,7 @@ static int clk_get_by_index_tail(int ret, ofnode node,
        if (ret) {
                debug("%s: uclass_get_device_by_of_offset failed: err=%d\n",
                      __func__, ret);
-               return ret;
+               return log_msg_ret("get", ret);
        }
 
        clk->dev = dev_clk;
@@ -92,14 +97,15 @@ static int clk_get_by_index_tail(int ret, ofnode node,
                ret = clk_of_xlate_default(clk, args);
        if (ret) {
                debug("of_xlate() failed: %d\n", ret);
-               return ret;
+               return log_msg_ret("xlate", ret);
        }
 
        return clk_request(dev_clk, clk);
 err:
        debug("%s: Node '%s', property '%s', failed to request CLK index %d: %d\n",
              __func__, ofnode_get_name(node), list_name, index, ret);
-       return ret;
+
+       return log_msg_ret("prop", ret);
 }
 
 static int clk_get_by_indexed_prop(struct udevice *dev, const char *prop_name,
@@ -118,7 +124,7 @@ static int clk_get_by_indexed_prop(struct udevice *dev, const char *prop_name,
        if (ret) {
                debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n",
                      __func__, ret);
-               return ret;
+               return log_ret(ret);
        }
 
 
@@ -156,7 +162,7 @@ int clk_get_bulk(struct udevice *dev, struct clk_bulk *bulk)
        
        bulk->count = 0;
 
-       count = dev_count_phandle_with_args(dev, "clocks", "#clock-cells");
+       count = dev_count_phandle_with_args(dev, "clocks", "#clock-cells", 0);
        if (count < 1)
                return count;
 
@@ -183,15 +189,32 @@ bulk_get_err:
        return ret;
 }
 
+static struct clk *clk_set_default_get_by_id(struct clk *clk)
+{
+       struct clk *c = clk;
+
+       if (CONFIG_IS_ENABLED(CLK_CCF)) {
+               int ret = clk_get_by_id(clk->id, &c);
+
+               if (ret) {
+                       debug("%s(): could not get parent clock pointer, id %lu\n",
+                             __func__, clk->id);
+                       ERR_PTR(ret);
+               }
+       }
+
+       return c;
+}
+
 static int clk_set_default_parents(struct udevice *dev, int stage)
 {
-       struct clk clk, parent_clk;
+       struct clk clk, parent_clk, *c, *p;
        int index;
        int num_parents;
        int ret;
 
        num_parents = dev_count_phandle_with_args(dev, "assigned-clock-parents",
-                                                 "#clock-cells");
+                                                 "#clock-cells", 0);
        if (num_parents < 0) {
                debug("%s: could not read assigned-clock-parents for %p\n",
                      __func__, dev);
@@ -211,6 +234,10 @@ static int clk_set_default_parents(struct udevice *dev, int stage)
                        return ret;
                }
 
+               p = clk_set_default_get_by_id(&parent_clk);
+               if (IS_ERR(p))
+                       return PTR_ERR(p);
+
                ret = clk_get_by_indexed_prop(dev, "assigned-clocks",
                                              index, &clk);
                if (ret) {
@@ -230,7 +257,11 @@ static int clk_set_default_parents(struct udevice *dev, int stage)
                        /* do not setup twice the parent clocks */
                        continue;
 
-               ret = clk_set_parent(&clk, &parent_clk);
+               c = clk_set_default_get_by_id(&clk);
+               if (IS_ERR(c))
+                       return PTR_ERR(c);
+
+               ret = clk_set_parent(c, p);
                /*
                 * Not all drivers may support clock-reparenting (as of now).
                 * Ignore errors due to this.
@@ -250,7 +281,7 @@ static int clk_set_default_parents(struct udevice *dev, int stage)
 
 static int clk_set_default_rates(struct udevice *dev, int stage)
 {
-       struct clk clk;
+       struct clk clk, *c;
        int index;
        int num_rates;
        int size;
@@ -294,7 +325,11 @@ static int clk_set_default_rates(struct udevice *dev, int stage)
                        /* do not setup twice the parent clocks */
                        continue;
 
-               ret = clk_set_rate(&clk, rates[index]);
+               c = clk_set_default_get_by_id(&clk);
+               if (IS_ERR(c))
+                       return PTR_ERR(c);
+
+               ret = clk_set_rate(c, rates[index]);
 
                if (ret < 0) {
                        debug("%s: failed to set rate on clock index %d (%ld) for %s\n",
@@ -312,7 +347,7 @@ int clk_set_defaults(struct udevice *dev, int stage)
 {
        int ret;
 
-       if (!dev_of_valid(dev))
+       if (!dev_has_ofnode(dev))
                return 0;
 
        /* If this not in SPL and pre-reloc state, don't take any action. */
@@ -437,6 +472,7 @@ int clk_free(struct clk *clk)
 ulong clk_get_rate(struct clk *clk)
 {
        const struct clk_ops *ops;
+       int ret;
 
        debug("%s(clk=%p)\n", __func__, clk);
        if (!clk_valid(clk))
@@ -446,7 +482,11 @@ ulong clk_get_rate(struct clk *clk)
        if (!ops->get_rate)
                return -ENOSYS;
 
-       return ops->get_rate(clk);
+       ret = ops->get_rate(clk);
+       if (ret)
+               return log_ret(ret);
+
+       return 0;
 }
 
 struct clk *clk_get_parent(struct clk *clk)
@@ -490,6 +530,21 @@ long long clk_get_parent_rate(struct clk *clk)
        return pclk->rate;
 }
 
+ulong clk_round_rate(struct clk *clk, ulong rate)
+{
+       const struct clk_ops *ops;
+
+       debug("%s(clk=%p, rate=%lu)\n", __func__, clk, rate);
+       if (!clk_valid(clk))
+               return 0;
+
+       ops = clk_dev_ops(clk->dev);
+       if (!ops->round_rate)
+               return -ENOSYS;
+
+       return ops->round_rate(clk, rate);
+}
+
 ulong clk_set_rate(struct clk *clk, ulong rate)
 {
        const struct clk_ops *ops;
@@ -508,6 +563,7 @@ ulong clk_set_rate(struct clk *clk, ulong rate)
 int clk_set_parent(struct clk *clk, struct clk *parent)
 {
        const struct clk_ops *ops;
+       int ret;
 
        debug("%s(clk=%p, parent=%p)\n", __func__, clk, parent);
        if (!clk_valid(clk))
@@ -517,7 +573,14 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
        if (!ops->set_parent)
                return -ENOSYS;
 
-       return ops->set_parent(clk, parent);
+       ret = ops->set_parent(clk, parent);
+       if (ret)
+               return ret;
+
+       if (CONFIG_IS_ENABLED(CLK_CCF))
+               ret = device_reparent(clk->dev, parent->dev);
+
+       return ret;
 }
 
 int clk_enable(struct clk *clk)
@@ -593,6 +656,9 @@ int clk_disable(struct clk *clk)
 
        if (CONFIG_IS_ENABLED(CLK_CCF)) {
                if (clk->id && !clk_get_by_id(clk->id, &clkp)) {
+                       if (clkp->flags & CLK_IS_CRITICAL)
+                               return 0;
+
                        if (clkp->enable_count == 0) {
                                printf("clk %s already disabled\n",
                                       clkp->dev->name);