Merge commit drm-intel-fixes into topic/ppgtt

[firefly-linux-kernel-4.4.55.git] / arch / arm / include / asm / v7m.h

diff --git a/arch/arm/include/asm/v7m.h b/arch/arm/include/asm/v7m.h
index fa88d09fa3d9f10a8ca5de8a11dbb812645df2da..615781c61627ed30bfaed0d734cdc05417f69e3e 100644 (file)
--- a/arch/arm/include/asm/v7m.h
+++ b/arch/arm/include/asm/v7m.h
@@ -15,6 +15,10 @@
 
 #define V7M_SCB_VTOR                   0x08
 
+#define V7M_SCB_AIRCR                  0x0c
+#define V7M_SCB_AIRCR_VECTKEY                  (0x05fa << 16)
+#define V7M_SCB_AIRCR_SYSRESETREQ              (1 << 2)
+
 #define V7M_SCB_SCR                    0x10
 #define V7M_SCB_SCR_SLEEPDEEP                  (1 << 2)
 
@@ -42,3 +46,11 @@
  */
 #define EXC_RET_STACK_MASK                     0x00000004
 #define EXC_RET_THREADMODE_PROCESSSTACK                0xfffffffd
+
+#ifndef __ASSEMBLY__
+
+enum reboot_mode;
+
+void armv7m_restart(enum reboot_mode mode, const char *cmd);
+
+#endif /* __ASSEMBLY__ */