This is a note to let you know that I've just added the patch titled
ARM: imx: armadillo5x0: Fix illegal register access
to the 3.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-imx-armadillo5x0-fix-illegal-register-access.patch
and it can be found in the queue-3.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 35495173e1df621dff0e9a244accbe32cd28a98f Mon Sep 17 00:00:00 2001
From: Fabio Estevam <[email protected]>
Date: Sun, 16 Sep 2012 22:28:35 -0300
Subject: ARM: imx: armadillo5x0: Fix illegal register access
From: Fabio Estevam <[email protected]>
commit 35495173e1df621dff0e9a244accbe32cd28a98f upstream.
Since commit eb92044eb (ARM i.MX3: Make ccm base address a variable )
it is necessary to pass the CCM register base as a variable.
Fix the CCM register access in mach-armadillo5x0 by passing mx3_ccm_base and
avoid illegal accesses.
Also applies to v3.5
Reported-by: Arnd Bergmann <[email protected]>
Signed-off-by: Fabio Estevam <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Signed-off-by: Sascha Hauer <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/arm/mach-imx/mach-armadillo5x0.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/arch/arm/mach-imx/mach-armadillo5x0.c
+++ b/arch/arm/mach-imx/mach-armadillo5x0.c
@@ -526,7 +526,8 @@ static void __init armadillo5x0_init(voi
imx31_add_mxc_nand(&armadillo5x0_nand_board_info);
/* set NAND page size to 2k if not configured via boot mode pins */
- __raw_writel(__raw_readl(MXC_CCM_RCSR) | (1 << 30), MXC_CCM_RCSR);
+ __raw_writel(__raw_readl(mx3_ccm_base + MXC_CCM_RCSR) |
+ (1 << 30), mx3_ccm_base + MXC_CCM_RCSR);
/* RTC */
/* Get RTC IRQ and register the chip */
Patches currently in stable-queue which might be from
[email protected] are
queue-3.5/arm-imx-armadillo5x0-fix-illegal-register-access.patch
queue-3.5/arm-clk-imx35-fix-ssi-clock-registration.patch
queue-3.5/arm-clk-imx25-fix-ssi-clock-registration.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
