From: Paul Walmsley Date: Fri, 17 Oct 2008 22:18:42 +0000 (-0600) Subject: OMAP3 clock: fix non-CORE DPLL rate assignment bugs X-Git-Tag: v2.6.27-omap1~8 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2ac1da8c787f73f067e717408e631501ba60aabc;p=linux-2.6-omap-h63xx.git OMAP3 clock: fix non-CORE DPLL rate assignment bugs Commit 8b1f0bd44fe490ec631230c8c040753a2bda8caa introduced a bug that caused non-CORE DPLL rates to be incorrectly set on boot in omap3_noncore_dpll_enable(). Debugged by Tomi Valkeinen - thanks Tomi. Also fix omap3_noncore_dpll_set_rate() to assign clk->rate after a DPLL reprogram. Tested on 3430SDP. Signed-off-by: Paul Walmsley Cc: Tomi Valkeinen Cc: Rick Bronson Cc: Timo Kokkonen Cc: Sakari Poussa Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index df258f76203..cc43f4f2a54 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -271,7 +271,6 @@ static int _omap3_noncore_dpll_stop(struct clk *clk) static int omap3_noncore_dpll_enable(struct clk *clk) { int r; - long rate; struct dpll_data *dd; if (clk == &dpll3_ck) @@ -287,7 +286,7 @@ static int omap3_noncore_dpll_enable(struct clk *clk) r = _omap3_noncore_dpll_lock(clk); if (!r) - clk->rate = rate; + clk->rate = omap2_get_dpll_rate(clk); return r; } @@ -430,6 +429,9 @@ static int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate) ret = omap3_noncore_dpll_program(clk, dd->last_rounded_m, dd->last_rounded_n, freqsel); + if (!ret) + clk->rate = rate; + } omap3_dpll_recalc(clk);