Merge tag '4.4-additional' of git://git.lwn.net/linux

[firefly-linux-kernel-4.4.55.git] / drivers / clk / clk.c

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 0ebcf449778abc18e9956733ebb55db2e5dc77f9..f13c3f4228d4d51d5649c3705fd565b4aac82913 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -272,7 +272,7 @@ late_initcall_sync(clk_disable_unused);
 
 /***    helper functions   ***/
 
-const char *__clk_get_name(struct clk *clk)
+const char *__clk_get_name(const struct clk *clk)
 {
        return !clk ? NULL : clk->core->name;
 }
@@ -427,6 +427,11 @@ bool clk_hw_is_prepared(const struct clk_hw *hw)
        return clk_core_is_prepared(hw->core);
 }
 
+bool clk_hw_is_enabled(const struct clk_hw *hw)
+{
+       return clk_core_is_enabled(hw->core);
+}
+
 bool __clk_is_enabled(struct clk *clk)
 {
        if (!clk)
@@ -1685,7 +1690,7 @@ static struct clk_core *__clk_init_parent(struct clk_core *core)
                        "%s: multi-parent clocks must implement .get_parent\n",
                        __func__);
                goto out;
-       };
+       }
 
        /*
         * Do our best to cache parent clocks in core->parents.  This prevents
@@ -2932,7 +2937,7 @@ struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data)
        unsigned int idx = clkspec->args[0];
 
        if (idx >= clk_data->clk_num) {
-               pr_err("%s: invalid clock index %d\n", __func__, idx);
+               pr_err("%s: invalid clock index %u\n", __func__, idx);
                return ERR_PTR(-EINVAL);
        }
 
@@ -3055,6 +3060,7 @@ const char *of_clk_get_parent_name(struct device_node *np, int index)
        u32 pv;
        int rc;
        int count;
+       struct clk *clk;
 
        if (index < 0)
                return NULL;
@@ -3080,8 +3086,25 @@ const char *of_clk_get_parent_name(struct device_node *np, int index)
 
        if (of_property_read_string_index(clkspec.np, "clock-output-names",
                                          index,
-                                         &clk_name) < 0)
-               clk_name = clkspec.np->name;
+                                         &clk_name) < 0) {
+               /*
+                * Best effort to get the name if the clock has been
+                * registered with the framework. If the clock isn't
+                * registered, we return the node name as the name of
+                * the clock as long as #clock-cells = 0.
+                */
+               clk = of_clk_get_from_provider(&clkspec);
+               if (IS_ERR(clk)) {
+                       if (clkspec.args_count == 0)
+                               clk_name = clkspec.np->name;
+                       else
+                               clk_name = NULL;
+               } else {
+                       clk_name = __clk_get_name(clk);
+                       clk_put(clk);
+               }
+       }
+
 
        of_node_put(clkspec.np);
        return clk_name;
@@ -3179,13 +3202,15 @@ void __init of_clk_init(const struct of_device_id *matches)
                        list_for_each_entry_safe(clk_provider, next,
                                                 &clk_provider_list, node) {
                                list_del(&clk_provider->node);
+                               of_node_put(clk_provider->np);
                                kfree(clk_provider);
                        }
+                       of_node_put(np);
                        return;
                }
 
                parent->clk_init_cb = match->data;
-               parent->np = np;
+               parent->np = of_node_get(np);
                list_add_tail(&parent->node, &clk_provider_list);
        }
 
@@ -3199,6 +3224,7 @@ void __init of_clk_init(const struct of_device_id *matches)
                                of_clk_set_defaults(clk_provider->np, true);
 
                                list_del(&clk_provider->node);
+                               of_node_put(clk_provider->np);
                                kfree(clk_provider);
                                is_init_done = true;
                        }