[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4EE75787.3020101@eukrea.com>
Date: Tue, 13 Dec 2011 14:47:51 +0100
From: Eric Bénard <eric@...rea.com>
To: Sascha Hauer <s.hauer@...gutronix.de>
CC: Russell King <linux@....linux.org.uk>,
Jason Liu <jason.hui@...aro.org>,
Sascha Hauer <kernel@...gutronix.de>,
linux-arm-kernel@...ts.infradead.org,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 09/19] clock-imx35: fix reboot in internal boot modeg
Le 13/12/2011 11:00, Sascha Hauer a écrit :
> On Tue, Dec 13, 2011 at 07:31:41AM +0100, Eric Bénard wrote:
>> commit 8d75a2620dc3e33ce504044c375c443ed7ed4128 disable IIM
>> clock after reading silicon revision which will prevent
>> reboot in internal boot mode (see comment a few line before)
>
> I'm a bit unsure. The fix you suggest is the least intrusive, but
> a proper fix would be to move the mentioned block below the
> imx_print_silicon_rev, like this:
>
> clk_enable(&iim_clk);
> imx_print_silicon_rev("i.MX35", mx35_revision());
> clk_disable(&iim_clk);
>
> /*
> * Check if we came up in internal boot mode. If yes, we need
> * some
> * extra clocks turned on, otherwise the MX35 boot ROM code will
> * hang after a watchdog reset.
> */
> if (!(__raw_readl(CCM_BASE + CCM_RCSR)& (3<< 10))) {
> clk_enable(&iim_clk);
> clk_enable(&uart1_clk);
> clk_enable(&scc_clk);
> }
>
> This would also get the clk enable counters right.
>
OK that's cleaner.
While fixing the patch it seems comment & code are not synced as scc_clk is
0x3 << 2 and the code was setting 0x3 << 4 which corresponds to sdma_clk (and
in my configuration, reboot works without any of these clocks forced). I chose
to have code synced with comment for v2 of the patch.
Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists