]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
clk: ux500: clk-sysctrl: handle clocks with no parents
authorFabio Baltieri <fabio.baltieri@linaro.org>
Tue, 30 Apr 2013 12:45:06 +0000 (14:45 +0200)
committerMike Turquette <mturquette@linaro.org>
Wed, 29 May 2013 18:52:18 +0000 (11:52 -0700)
Fix clk_reg_sysctrl() to set main clock registers of new struct
clk_sysctrl even if the registered clock has no parents.

This fixes an issue where "ulpclk" was registered with all clk->reg_*
fields uninitialized, causing a -EINVAL error from clk_prepare().

Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
drivers/clk/ux500/clk-sysctrl.c

index bc7e9bde792b9ea5061752cd368a5a9e87fcbd9c..e364c9d4aa60e38b05085926297d3514da319048 100644 (file)
@@ -145,7 +145,13 @@ static struct clk *clk_reg_sysctrl(struct device *dev,
                return ERR_PTR(-ENOMEM);
        }
 
-       for (i = 0; i < num_parents; i++) {
+       /* set main clock registers */
+       clk->reg_sel[0] = reg_sel[0];
+       clk->reg_bits[0] = reg_bits[0];
+       clk->reg_mask[0] = reg_mask[0];
+
+       /* handle clocks with more than one parent */
+       for (i = 1; i < num_parents; i++) {
                clk->reg_sel[i] = reg_sel[i];
                clk->reg_bits[i] = reg_bits[i];
                clk->reg_mask[i] = reg_mask[i];