From patchwork Tue Dec 13 06:31:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Benard X-Patchwork-Id: 131012 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 81EB21007D3 for ; Tue, 13 Dec 2011 17:37:50 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RaLx5-0006lb-9q; Tue, 13 Dec 2011 06:34:59 +0000 Received: from smtp3-g21.free.fr ([2a01:e0c:1:1599::12]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RaLuo-0005Xo-30 for linux-arm-kernel@lists.infradead.org; Tue, 13 Dec 2011 06:32:42 +0000 Received: from localhost.localdomain (unknown [82.233.81.124]) by smtp3-g21.free.fr (Postfix) with ESMTP id A4A92A6501; Tue, 13 Dec 2011 07:32:31 +0100 (CET) From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/19] clock-imx35: fix reboot in internal boot mode Date: Tue, 13 Dec 2011 07:31:41 +0100 Message-Id: <1323757911-25217-9-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1323757911-25217-1-git-send-email-eric@eukrea.com> References: <1323757911-25217-1-git-send-email-eric@eukrea.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Russell King , Jason Liu , open list , Sascha Hauer X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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,