Explorar o código

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
Olof Johansson %!s(int64=14) %!d(string=hai) anos
pai
achega
6d0a5636fb
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      arch/arm/mach-imx/head-v7.S

+ 1 - 1
arch/arm/mach-imx/head-v7.S

@@ -16,7 +16,6 @@
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/hardware/cache-l2x0.h>
 
 
 	.section ".text.head", "ax"
 	.section ".text.head", "ax"
-	__CPUINIT
 
 
 /*
 /*
  * The secondary kernel init calls v7_flush_dcache_all before it enables
  * The secondary kernel init calls v7_flush_dcache_all before it enables
@@ -33,6 +32,7 @@
  */
  */
 ENTRY(v7_invalidate_l1)
 ENTRY(v7_invalidate_l1)
 	mov	r0, #0
 	mov	r0, #0
+	mcr	p15, 0, r0, c7, c5, 0	@ invalidate I cache
 	mcr	p15, 2, r0, c0, c0, 0
 	mcr	p15, 2, r0, c0, c0, 0
 	mrc	p15, 1, r0, c0, c0, 0
 	mrc	p15, 1, r0, c0, c0, 0