Skip to content

Commit

Permalink
clk: tegra: Implement locking for super clock
Browse files Browse the repository at this point in the history
Although tegra_clk_register_super_mux() has a lock parameter, the lock is not
actually used by the code. Fixed with this patch.

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
  • Loading branch information
Peter De Schrijver authored and Stephen Warren committed Feb 12, 2013
1 parent 22ca335 commit c64c65d
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions drivers/clk/tegra/clk-super.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ static int clk_super_set_parent(struct clk_hw *hw, u8 index)
{
struct tegra_clk_super_mux *mux = to_clk_super_mux(hw);
u32 val, state;
int err = 0;
u8 parent_index, shift;
unsigned long flags = 0;

if (mux->lock)
spin_lock_irqsave(mux->lock, flags);

val = readl_relaxed(mux->reg);
state = val & SUPER_STATE_MASK;
Expand All @@ -92,8 +97,10 @@ static int clk_super_set_parent(struct clk_hw *hw, u8 index)
(index == mux->pllx_index))) {
parent_index = clk_super_get_parent(hw);
if ((parent_index == mux->div2_index) ||
(parent_index == mux->pllx_index))
return -EINVAL;
(parent_index == mux->pllx_index)) {
err = -EINVAL;
goto out;
}

val ^= SUPER_LP_DIV2_BYPASS;
writel_relaxed(val, mux->reg);
Expand All @@ -107,7 +114,12 @@ static int clk_super_set_parent(struct clk_hw *hw, u8 index)

writel_relaxed(val, mux->reg);
udelay(2);
return 0;

out:
if (mux->lock)
spin_unlock_irqrestore(mux->lock, flags);

return err;
}

const struct clk_ops tegra_clk_super_ops = {
Expand Down

0 comments on commit c64c65d

Please sign in to comment.