mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

clk: tegra: Implement locking for super clock 

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>
This commit is contained in:
Peter De Schrijver 2013-02-07 18:24:14 +02:00 committed by Stephen Warren
parent 22ca335f6d
commit c64c65d494
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/clk/tegra/clk-super.c
View File

@ -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); struct tegra_clk_super_mux *mux = to_clk_super_mux(hw);
u32 val, state; u32 val, state;
int err = 0;
u8 parent_index, shift; u8 parent_index, shift;
unsigned long flags = 0;
if (mux->lock)
spin_lock_irqsave(mux->lock, flags);
val = readl_relaxed(mux->reg); val = readl_relaxed(mux->reg);
state = val & SUPER_STATE_MASK; state = val & SUPER_STATE_MASK;
@ -92,8 +97,10 @@ static int clk_super_set_parent(struct clk_hw *hw, u8 index)
(index == mux->pllx_index))) { (index == mux->pllx_index))) {
parent_index = clk_super_get_parent(hw); parent_index = clk_super_get_parent(hw);
if ((parent_index == mux->div2_index) || if ((parent_index == mux->div2_index) ||
(parent_index == mux->pllx_index)) (parent_index == mux->pllx_index)) {
return -EINVAL; err = -EINVAL;
goto out;
}
val ^= SUPER_LP_DIV2_BYPASS; val ^= SUPER_LP_DIV2_BYPASS;
writel_relaxed(val, mux->reg); writel_relaxed(val, mux->reg);
@ -107,7 +114,12 @@ static int clk_super_set_parent(struct clk_hw *hw, u8 index)
writel_relaxed(val, mux->reg); writel_relaxed(val, mux->reg);
udelay(2); udelay(2);
return 0;
out:
if (mux->lock)
spin_unlock_irqrestore(mux->lock, flags);
return err;
} }
const struct clk_ops tegra_clk_super_ops = { const struct clk_ops tegra_clk_super_ops = {