diff options
author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-04-30 14:45:06 +0200 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-05-29 11:52:18 -0700 |
commit | f586938ba2cf83ed4cbebe96436220d182a7808e (patch) | |
tree | 1ad0d4f8f49a2e522b67368715bdf05386197c7a /drivers | |
parent | dd4704480372fdbf3e8f7826274a883c4c7c335a (diff) | |
download | linux-f586938ba2cf83ed4cbebe96436220d182a7808e.tar.gz linux-f586938ba2cf83ed4cbebe96436220d182a7808e.tar.bz2 linux-f586938ba2cf83ed4cbebe96436220d182a7808e.zip |
clk: ux500: clk-sysctrl: handle clocks with no parents
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/ux500/clk-sysctrl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/clk/ux500/clk-sysctrl.c b/drivers/clk/ux500/clk-sysctrl.c index bc7e9bde792b..e364c9d4aa60 100644 --- a/drivers/clk/ux500/clk-sysctrl.c +++ b/drivers/clk/ux500/clk-sysctrl.c @@ -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]; |