---

yaml --- r: 351021 b: refs/heads/master c: b596470 h: refs/heads/master i: 351019: bebadec v: v3
git-mirror · Feb 1, 2013 · 1f9c480 · 1f9c480
1 parent 25b5d72
commit 1f9c480
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd603455f366bd66a5e1870bc285c05c9cb6a72d
+refs/heads/master: b5964708532f4713e9cfb1b8b1a6ac8544fc66af
diff --git a/trunk/drivers/clk/clk-highbank.c b/trunk/drivers/clk/clk-highbank.c
@@ -182,8 +182,10 @@ static int clk_pll_set_rate(struct clk_hw *hwclk, unsigned long rate,
 		reg |= HB_PLL_EXT_ENA;
 		reg &= ~HB_PLL_EXT_BYPASS;
 	} else {
+		writel(reg | HB_PLL_EXT_BYPASS, hbclk->reg);
 		reg &= ~HB_PLL_DIVQ_MASK;
 		reg |= divq << HB_PLL_DIVQ_SHIFT;
+		writel(reg | HB_PLL_EXT_BYPASS, hbclk->reg);
 	}
 	writel(reg, hbclk->reg);