---

yaml --- r: 191671 b: refs/heads/master c: d40db0c h: refs/heads/master i: 191669: bd86b10 191667: d42ac58 191663: 1d8a6d4 v: v3
git-mirror · May 13, 2010 · 70100fb · 70100fb
1 parent ab21674
commit 70100fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c77a9c3edee079fe0411d98cfb9d872bc336ee32
+refs/heads/master: d40db0c4a63c3af44fd31a7c47cc4a11a44befc7
diff --git a/trunk/arch/sh/kernel/cpu/clock-cpg.c b/trunk/arch/sh/kernel/cpu/clock-cpg.c
@@ -168,7 +168,12 @@ static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent)
 	u32 value;
 	int ret;
 
-	if (!strcmp("pll_clk", parent->name))
+	/* we really need a better way to determine parent index, but for
+	 * now assume internal parent comes with CLK_ENABLE_ON_INIT set,
+	 * no CLK_ENABLE_ON_INIT means external clock...
+	 */
+
+	if (parent->flags & CLK_ENABLE_ON_INIT)
 		value = __raw_readl(clk->enable_reg) & ~(1 << 7);
 	else
 		value = __raw_readl(clk->enable_reg) | (1 << 7);