From: Stephen Warren <[email protected]> _program_pll() was dropping the PLL's lock and calling clk_pll_disable(). clk_pll_disable() does nothing but acquire the same lock and call _clk_pll_disable(). So, remove the lock manipulation code, and just call _clk_pll_disable() directly instead.
Reported-by: Sivaram Nair <[email protected]> Signed-off-by: Stephen Warren <[email protected]> --- Mike, this also will need to go through the Tegra tree; just looking for any review/ack from you. Thanks. drivers/clk/tegra/clk-pll.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c index 474ce1f..9f9bb73 100644 --- a/drivers/clk/tegra/clk-pll.c +++ b/drivers/clk/tegra/clk-pll.c @@ -339,14 +339,8 @@ static int _program_pll(struct clk_hw *hw, struct tegra_clk_pll_freq_table *cfg, state = clk_pll_is_enabled(hw); if (state) { - if (pll->lock) - spin_unlock_irqrestore(pll->lock, flags); - - clk_pll_disable(hw); + _clk_pll_disable(hw); val &= ~(PLL_BASE_BYPASS | PLL_BASE_ENABLE); - - if (pll->lock) - spin_lock_irqsave(pll->lock, flags); } pll_writel_base(val, pll); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
