]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
clk: ti: dpll44xx: fix clksel register initialization
authorTero Kristo <t-kristo@ti.com>
Thu, 9 Feb 2017 09:25:28 +0000 (11:25 +0200)
committerTero Kristo <t-kristo@ti.com>
Wed, 8 Mar 2017 11:05:42 +0000 (13:05 +0200)
clksel register pointer should be used for the DPLL-MX autoidle handling.
Currently this is not setup at all. Fix by adding proper handling for the
register.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
drivers/clk/ti/dpll.c

index c149bd169f4351bd78c01a7fefab3164015ac33f..778bc90955b9209106bda1276a7ddcd0a847de9c 100644 (file)
@@ -319,6 +319,7 @@ static void _register_dpll_x2(struct device_node *node,
        struct clk_hw_omap *clk_hw;
        const char *name = node->name;
        const char *parent_name;
+       int ret;
 
        parent_name = of_clk_get_parent_name(node, 0);
        if (!parent_name) {
@@ -338,6 +339,20 @@ static void _register_dpll_x2(struct device_node *node,
        init.parent_names = &parent_name;
        init.num_parents = 1;
 
+       if (hw_ops == &clkhwops_omap4_dpllmx) {
+               /* Check if register defined, if not, drop hw-ops */
+               ret = of_property_count_elems_of_size(node, "reg", 1);
+               if (ret <= 0) {
+                       hw_ops = NULL;
+               } else {
+                       clk_hw->clksel_reg = ti_clk_get_reg_addr(node, 0);
+                       if (IS_ERR(clk_hw->clksel_reg)) {
+                               kfree(clk_hw);
+                               return;
+                       }
+               }
+       }
+
        /* register the clock */
        clk = ti_clk_register(NULL, &clk_hw->hw, name);