Subject: [PATCH 09/19] clock-imx35: fix reboot in internal boot mode

From: [email-masked] (Sergei Shtylyov)
Date: Tue, 13 Dec 2011 14:52:07 +0400

Hello.

On 13-12-2011 10:31, Eric B?nard wrote:

> commit 8d75a2620dc3e33ce504044c375c443ed7ed4128

    Please also specify that commit's summary in parens.

 > disable IIM

    Disables?

> clock after reading silicon revision which will prevent
> reboot in internal boot mode (see comment a few line before)

> Signed-off-by: Eric B?nard<[email-masked]>
> Cc: Jason Liu<[email-masked]>
> Cc: Sascha Hauer<[email-masked]>
> ---
>   arch/arm/mach-imx/clock-imx35.c |    5 ++++-
>   1 files changed, 4 insertions(+), 1 deletions(-)

> diff --git a/arch/arm/mach-imx/clock-imx35.c b/arch/arm/mach-imx/clock-imx35.c
> index 8116f11..b49a732 100644
> --- a/arch/arm/mach-imx/clock-imx35.c
> +++ b/arch/arm/mach-imx/clock-imx35.c
> @@ -538,7 +538,10 @@ int __init mx35_clocks_init()
>
>   	clk_enable(&iim_clk);
>   	imx_print_silicon_rev("i.MX35", mx35_revision());
> -	clk_disable(&iim_clk);
> +	/* Don't disable IIM clock if we came up in internal boot mode */
> +	if (__raw_readl(CCM_BASE + CCM_RCSR) & (3 << 10)) {
> +		clk_disable(&iim_clk);
> +	}

    {} not needed -- scripts/checkpatch.pl should have warned you.

WBR, Sergei