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

All of lore.kernel.org
 help / color / mirror / Atom feed

From: eric@eukrea.com (Eric Bénard)
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	[thread overview]
Message-ID: <1323757911-25217-9-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1323757911-25217-1-git-send-email-eric@eukrea.com>

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 <eric@eukrea.com>
Cc: Jason Liu <jason.hui@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
---
 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,
-- 
1.7.6.4

WARNING: multiple messages have this Message-ID (diff)

From: "Eric Bénard" <eric@eukrea.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Jason Liu <jason.hui@linaro.org>,
	Sascha Hauer <kernel@pengutronix.de>,
	Russell King <linux@arm.linux.org.uk> (maintainer:ARM PORT),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 09/19] clock-imx35: fix reboot in internal boot mode
Date: Tue, 13 Dec 2011 07:31:41 +0100	[thread overview]
Message-ID: <1323757911-25217-9-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1323757911-25217-1-git-send-email-eric@eukrea.com>

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 <eric@eukrea.com>
Cc: Jason Liu <jason.hui@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
---
 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,
-- 
1.7.6.4

next prev parent reply	other threads:[~2011-12-13  6:31 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-13  6:31 [PATCH 01/19] mxc_udc: add workaround for ENGcm09152 for i.MX25 Eric Bénard
2011-12-13  6:31 ` Eric Bénard
2011-12-13  6:31 ` Eric Bénard
2011-12-13  6:31 ` [PATCH 02/19] eukrea_cpuimx25: enable workaround ENGcm09152 Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 03/19] cpuimx25sd: fix Kconfig Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13 10:16   ` Wolfram Sang
2011-12-13 10:16     ` Wolfram Sang
2011-12-13  6:31 ` [PATCH 04/19] mbimxsd25: add spi controler and spidev support Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13 12:39   ` Fabio Estevam
2011-12-13 12:39     ` Fabio Estevam
2011-12-13  6:31 ` [PATCH 05/19] cpuimx25: add watchdog support Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 06/19] mx27vis-aic32x4: only register when running on the right machine Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:40   ` Mark Brown
2011-12-13  6:40     ` Mark Brown
2011-12-13  6:31 ` [PATCH 07/19] imx_v4_v5_defconfig: update default configuration Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 08/19] dma: MX3_IPU fix depends Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13 10:53   ` Sergei Shtylyov
2011-12-13 10:53     ` Sergei Shtylyov
2011-12-13 13:17     ` Eric Bénard
2011-12-13 13:17       ` Eric Bénard
2011-12-13 12:48   ` Fabio Estevam
2011-12-13 12:48     ` Fabio Estevam
2011-12-13 14:12     ` [PATCH v2 " Eric Bénard
2011-12-13 14:12       ` Eric Bénard
2011-12-23 15:45       ` Vinod Koul
2011-12-23 15:45         ` Vinod Koul
2011-12-23 16:04         ` Eric Bénard
2011-12-23 16:04           ` Eric Bénard
2011-12-23 16:14           ` Vinod Koul
2011-12-23 16:14             ` Vinod Koul
2011-12-13  6:31 ` Eric Bénard [this message]
2011-12-13  6:31   ` [PATCH 09/19] clock-imx35: fix reboot in internal boot mode Eric Bénard
2011-12-13 10:00   ` [PATCH 09/19] clock-imx35: fix reboot in internal boot modeg Sascha Hauer
2011-12-13 10:00     ` Sascha Hauer
2011-12-13 13:47     ` Eric Bénard
2011-12-13 13:47       ` Eric Bénard
2011-12-13 14:13     ` [PATCH v2 09/19] clock-imx35: fix reboot in internal boot mode Eric Bénard
2011-12-13 14:13       ` Eric Bénard
2011-12-13 10:52   ` [PATCH " Sergei Shtylyov
2011-12-13 10:52     ` Sergei Shtylyov
2011-12-13 13:41     ` Eric Bénard
2011-12-13 13:41       ` Eric Bénard
2011-12-13  6:31 ` [PATCH 10/19] wm1133-ev1: only register when running on the right machine Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 11/19] cpuimx35sd: fix Kconfig Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 12/19] cpuimx35: fix touchscreen support Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 13/19] enable uncompress log on cpuimx35sd Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 14/19] mbimxsd35: add spi controler and spidev support Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 15/19] mx3_defconfig: update default configuration Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 16/19] eukrea-cpuimx51: remove board Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13 10:05   ` Sascha Hauer
2011-12-13 10:05     ` Sascha Hauer
2011-12-13 10:13     ` Eric Bénard
2011-12-13 10:13       ` Eric Bénard
2011-12-15  3:58       ` Amit Kucheria
2011-12-15  3:58         ` Amit Kucheria
2011-12-15  6:55         ` Eric Bénard
2011-12-15  6:55           ` Eric Bénard
2011-12-13  6:31 ` [PATCH 17/19] cpuimx51sd: add watchdog support Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 18/19] mbimx51sd: add audio codec support Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13  6:31 ` [PATCH 19/19] eukrea-cpuimx51sd: support rev2 PCB Eric Bénard
2011-12-13  6:31   ` Eric Bénard
2011-12-13 10:17 ` [PATCH 01/19] mxc_udc: add workaround for ENGcm09152 for i.MX25 Sascha Hauer
2011-12-13 10:17   ` Sascha Hauer
2011-12-13 10:17   ` Sascha Hauer
2011-12-13 10:18 ` Wolfram Sang
2011-12-13 10:18   ` Wolfram Sang
2011-12-13 10:18   ` Wolfram Sang
2011-12-13 14:09   ` [PATCH v2 " Eric Bénard
2011-12-13 14:09     ` Eric Bénard
2011-12-13 14:09     ` Eric Bénard
2011-12-13 14:18     ` Felipe Balbi
2011-12-13 14:18       ` Felipe Balbi
2011-12-13 14:18       ` Felipe Balbi

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8116f11 dfblob:b49a732 dfblob:8116f11 dfblob:b49a732 )
 OR (
bs:"[PATCH 09/19] clock-imx35: fix reboot in internal boot mode" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1323757911-25217-9-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.