Changeset d085df10 in mainline for kernel/arch/arm32/include/asm.h

Timestamp:

2012-09-23T16:19:26Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

21aab25

Parents:

47d2ca9 (diff), 40ad375 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge changes from the beagleboard-xm branch

File:

• kernel/arch/arm32/include/asm.h (modified) (2 diffs)

kernel/arch/arm32/include/asm.h

@@ -46 +46 @@
  *
  * ARMv7 introduced wait for event and wait for interrupt (wfe/wfi).
+ * ARM920T has custom coprocessor action to do the same. See ARM920T Technical
+ * Reference Manual ch 4.9 p. 4-23 (103 in the PDF)
  */
 NO_TRACE static inline void cpu_sleep(void)
@@ -51 +53 @@
 #ifdef PROCESSOR_armv7_a
         asm volatile ( "wfe" :: );
+#elif defined(MACHINE_gta02)
+        asm volatile ( "mcr p15,0,R0,c7,c0,4" :: );
 #endif
 }