Re: [PATCH 1/1] ARM:OMAP3: Fix PLL_MOD CLKEN offset in scratchpad

[Kevin Hilman <khilman@deeprootsystems.com>]

Kalle Jokiniemi <kalle.jokiniemi@digia.com> writes:

> The CM_CLKEN_PLL register saved in scratchpad memory
> was wrongly using offset of 0x0004 instead of 0x0000.
>
> The effect of this was that boot ROM code would
> restore the wrong value when waking up from off mode.
> This wrong value, however, will be overwritten by
> prcm context restore. Still, a short period of wrong
> clock settings in CM_CLKEN_PLL remained between ROM
> code and prcm context restore. This is fixed by the
> patch.
>
> Problem reported by: Jouni Högander <jouni.hogander@nokia.com>
>
> Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>

Thanks, pushed to PM branch.

Kevin

> ---
>  arch/arm/mach-omap2/control.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
> index a0429fe..60de860 100644
> --- a/arch/arm/mach-omap2/control.c
> +++ b/arch/arm/mach-omap2/control.c
> @@ -235,7 +235,7 @@ void omap3_save_scratchpad_contents(void)
>  	prcm_block_contents.cm_clksel_wkup =
>  			cm_read_mod_reg(WKUP_MOD, CM_CLKSEL);
>  	prcm_block_contents.cm_clken_pll =
> -			cm_read_mod_reg(PLL_MOD, OMAP3430_CM_CLKEN_PLL);
> +			cm_read_mod_reg(PLL_MOD, CM_CLKEN);
>  	prcm_block_contents.cm_autoidle_pll =
>  			cm_read_mod_reg(PLL_MOD, OMAP3430_CM_AUTOIDLE_PLL);
>  	prcm_block_contents.cm_clksel1_pll =
> -- 
> 1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html