diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-06 15:44:35 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-06 15:44:35 -0500 |
| commit | 6d0a5636fba5a3f82ec80ab124dd4748344549c3 (patch) | |
| tree | eb6d09f90c370696dd21f46baf6bdc6d36abb8c1 | |
| parent | 038485ea9b66858c17f82e5393004532825106a7 (diff) | |
| parent | 7996bad8e62d8ca5888a935185ce313e693814b2 (diff) | |
Merge branch 'imx6/pm' into next/pm
* imx6/pm:
ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
| -rw-r--r-- | arch/arm/mach-imx/head-v7.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S index cec23a857c7e..7e49deb128a4 100644 --- a/arch/arm/mach-imx/head-v7.S +++ b/arch/arm/mach-imx/head-v7.S | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <asm/hardware/cache-l2x0.h> | 16 | #include <asm/hardware/cache-l2x0.h> |
| 17 | 17 | ||
| 18 | .section ".text.head", "ax" | 18 | .section ".text.head", "ax" |
| 19 | __CPUINIT | ||
| 20 | 19 | ||
| 21 | /* | 20 | /* |
| 22 | * The secondary kernel init calls v7_flush_dcache_all before it enables | 21 | * The secondary kernel init calls v7_flush_dcache_all before it enables |
| @@ -33,6 +32,7 @@ | |||
| 33 | */ | 32 | */ |
| 34 | ENTRY(v7_invalidate_l1) | 33 | ENTRY(v7_invalidate_l1) |
| 35 | mov r0, #0 | 34 | mov r0, #0 |
| 35 | mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache | ||
| 36 | mcr p15, 2, r0, c0, c0, 0 | 36 | mcr p15, 2, r0, c0, c0, 0 |
| 37 | mrc p15, 1, r0, c0, c0, 0 | 37 | mrc p15, 1, r0, c0, c0, 0 |
| 38 | 38 | ||