No, please drop it from 3.2-stable.
This one should only go to 3.5/3.6 stable trees.
Otherwise it will break 3.2-stable.
Regards,
Fabio Estevam
________________________________________
From: Ben Hutchings [b...@decadent.org.uk]
Sent: Sunday, October 07, 2012 5:59 PM
To: linux-kernel@vger.kernel.org; sta...@vger.kernel.org
Cc: a...@linux-foundation.org; a...@lxorguk.ukuu.org.uk; Estevam Fabio-R49496;
Arnd Bergmann; Sascha Hauer
Subject: [ 028/108] ARM: imx: armadillo5x0: Fix illegal register access
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <fabio.este...@freescale.com>
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 <a...@arndb.de>
Signed-off-by: Fabio Estevam <fabio.este...@freescale.com>
Acked-by: Arnd Bergmann <a...@arndb.de>
Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
arch/arm/mach-imx/mach-armadillo5x0.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c
b/arch/arm/mach-imx/mach-armadillo5x0.c
index 2c6ab32..5985ed1 100644
--- 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(void)
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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
