summaryrefslogtreecommitdiff
path: root/arch/arm/mach-socfpga/board.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2018-07-12 15:07:46 +0200
committerMarek Vasut <marex@denx.de>2018-07-25 00:13:32 +0200
commit937db7188e3a5ab8f802eff9b57854189379667a (patch)
tree8cff8de87183a22a0298f6f9cb445ef3015fbffc /arch/arm/mach-socfpga/board.c
parent00057eea66e6110898162cc72554c5fd8201cdef (diff)
ARM: socfpga: Assure correct CPACR configuration
Make sure the ARM CPACR register is zeroed out, this is mandatory on Arria10. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <chin.liang.see@intel.com> Cc: Dinh Nguyen <dinguyen@kernel.org>
Diffstat (limited to 'arch/arm/mach-socfpga/board.c')
-rw-r--r--arch/arm/mach-socfpga/board.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 26d84be6e9..e8c7503fba 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -21,12 +21,14 @@ DECLARE_GLOBAL_DATA_PTR;
void s_init(void) {
#ifndef CONFIG_ARM64
/*
- * Preconfigure ACTLR, make sure Write Full Line of Zeroes is disabled.
+ * Preconfigure ACTLR and CPACR, make sure Write Full Line of Zeroes
+ * is disabled in ACTLR.
* This is optional on CycloneV / ArriaV.
* This is mandatory on Arria10, otherwise Linux refuses to boot.
*/
asm volatile(
"mcr p15, 0, %0, c1, c0, 1\n"
+ "mcr p15, 0, %0, c1, c0, 2\n"
"isb\n"
"dsb\n"
::"r"(0x0));