summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2014-09-05 10:40:11 +0800
committerMax Krummenacher <max.krummenacher@toradex.com>2016-03-09 14:42:26 +0100
commitbf85f481d5b87e24081e0332cf47b1ac29600b3f (patch)
treec4c3056f881c02db028984f7eaf8204d9103621d
parent235dd35fa31dfc009cc240f4b6fcd3b56b3ff164 (diff)
ENGR00329484-2 ARM:MX6: Clear Align bit in SCTLR
This problem is found when debugging QuadSPI. When "A" bit is enabled, unaligned access will cause data abort exception. Actually, we do not want this exception. So clear the align bit for MX6 SOCs. Tested this code with android team colleague and did not find problem. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit aa76a7e472e34bc59554f9932d611b1047d24590)
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index eda7e124f45..5f661039567 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -419,6 +419,9 @@ static void imx_set_pcie_phy_power_down(void)
int arch_cpu_init(void)
{
+ /* Clear the Align bit in SCTLR */
+ set_cr(get_cr() & ~CR_A);
+
#if !defined(CONFIG_MX6SX) && !defined(CONFIG_MX6SL)
/*
* imx6sl doesn't have pcie at all.