diff options
author | Will Deacon <will.deacon@arm.com> | 2011-06-06 13:27:34 +0200 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2011-07-07 20:20:53 +0200 |
commit | f4daf06fc23b99df5ca5b3e892428b91e148cc52 (patch) | |
tree | 25d034cbf3109c03d33b404d1d910f64ee048629 /arch/arm/mm/proc-v6.S | |
parent | ARM: perf: add support for the Cortex-A15 PMU (diff) | |
download | linux-f4daf06fc23b99df5ca5b3e892428b91e148cc52.tar.xz linux-f4daf06fc23b99df5ca5b3e892428b91e148cc52.zip |
ARM: proc: add definition of cpu_reset for ARMv6 and ARMv7 cores
This patch adds simple definitions of cpu_reset for ARMv6 and ARMv7
cores, which disable the MMU via the SCTLR.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
-rw-r--r-- | arch/arm/mm/proc-v6.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 5ec15431cf12..aedf3c5dbe4e 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -56,6 +56,11 @@ ENTRY(cpu_v6_proc_fin) */ .align 5 ENTRY(cpu_v6_reset) + mrc p15, 0, r1, c1, c0, 0 @ ctrl register + bic r1, r1, #0x1 @ ...............m + mcr p15, 0, r1, c1, c0, 0 @ disable MMU + mov r1, #0 + mcr p15, 0, r1, c7, c5, 4 @ ISB mov pc, r0 /* |