From 70100fb1d68b3dc386c9ab546940681e566131e1 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 11 May 2010 07:05:09 +0000 Subject: [PATCH] --- yaml --- r: 191671 b: refs/heads/master c: d40db0c4a63c3af44fd31a7c47cc4a11a44befc7 h: refs/heads/master i: 191669: bd86b10ee36fa0d31bf2576b9c10db0e8b3d190d 191667: d42ac585eea1951db7af35108bf5586d7e5634b2 191663: 1d8a6d4081c5b27663fe316c801d04b9257ee603 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/clock-cpg.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 660f4d126b05..b63b019828c4 100644 --- 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 index 17a73ad7a20d..0b165f6ae08c 100644 --- 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);