Skip to contentSkip to conversation

clk: tegra: use _clk_pll_disable from _program_pll

PATCH New Stephen Warren 2 participants 3 messages Jan 14, 2013 – Jan 22, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: tegra: use _clk_pll_disable from _program_pll

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.

---
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(-)
drivers/clk/tegra/clk-pll.c +1 -7
index 474ce1f..9f9bb73 100644
@@ -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);
 
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 clk: tegra: use _clk_pll_disable from _program_pll

Quoting Stephen Warren (2013-01-14 10:36:12)

Quoted 7 lines

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.

Quoted 6 lines

---
Mike, this also will need to go through the Tegra tree; just looking for any review/ack from you. Thanks.

Stephen,

This change looks good to me, but should it not be rolled into the tegra CCF series? Several patches on top of that series have surfaced; do you plan on posting a V6?

Regards,
Mike

Quoted 25 lines
 drivers/clk/tegra/clk-pll.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/clk/tegra/clk-pll.c +1 -7
index 474ce1f..9f9bb73 100644
@@ -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);
 
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 1/1 clk: tegra: use _clk_pll_disable from _program_pll

Quoted 14 lines · Mike Turquette

Quoting Stephen Warren (2013-01-14 10:36:12)

Quoted 7 lines

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.

Quoted 5 lines

---
Mike, this also will need to go through the Tegra tree; just looking for any review/ack from you. Thanks.

Quoted 5 lines

Stephen,

This change looks good to me, but should it not be rolled into the tegra CCF series? Several patches on top of that series have surfaced; do you plan on posting a V6?

(in order to help you find the patches in the list) I posted v5 on 1/16 1:52pm Mountain time, and I posted v6 on 1/17 3:05pm Mountain time. For v6, only patch 1/3 had any modifications relative to v5, so I didn't repost the other 2 patches.