From patchwork Tue Dec 13 06:31:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [09/19] clock-imx35: fix reboot in internal boot mode Date: Mon, 12 Dec 2011 20:31:41 -0000 From: Eric Benard X-Patchwork-Id: 131012 Message-Id: <1323757911-25217-9-git-send-email-eric@eukrea.com> To: linux-arm-kernel@lists.infradead.org Cc: Russell King , Jason Liu , open list , Sascha Hauer commit 8d75a2620dc3e33ce504044c375c443ed7ed4128 disable IIM 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 Cc: Jason Liu Cc: Sascha Hauer --- 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); + } #ifdef CONFIG_MXC_USE_EPIT epit_timer_init(&epit1_clk,