* Paul Walmsley <paul@xxxxxxxxx> [081017 15:19]:
>
> 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
> <tomi.valkeinen@xxxxxxxxx> - thanks Tomi.
>
> Also fix omap3_noncore_dpll_set_rate() to assign clk->rate after a
> DPLL reprogram.
>
> Tested on 3430SDP.
Great, pushing today.
Tony
>
>
> Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
> Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
> Cc: Rick Bronson <rick@xxxxxxx>
> Cc: Timo Kokkonen <timo.t.kokkonen@xxxxxxxxx>
> Cc: Sakari Poussa <sakari.poussa@xxxxxxxxx>
> ---
> arch/arm/mach-omap2/clock34xx.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
> index df258f7..cc43f4f 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);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
