Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / arch / powerpc / include / asm / reg.h

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 125fc1a..7e4abeb 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -170,6 +170,16 @@
 #define SPEFSCR_FRMC   0x00000003      /* Embedded FP rounding mode control */
 
 /* Special Purpose Registers (SPRNs)*/
+
+#ifdef CONFIG_40x
+#define SPRN_PID       0x3B1   /* Process ID */
+#else
+#define SPRN_PID       0x030   /* Process ID */
+#ifdef CONFIG_BOOKE
+#define SPRN_PID0      SPRN_PID/* Process ID Register 0 */
+#endif
+#endif
+
 #define SPRN_CTR       0x009   /* Count Register */
 #define SPRN_DSCR      0x11
 #define SPRN_CTRLF     0x088
@@ -852,6 +862,8 @@
 #define PVR_7450       0x80000000
 #define PVR_8540       0x80200000
 #define PVR_8560       0x80200000
+#define PVR_VER_E500V1 0x8020
+#define PVR_VER_E500V2 0x8021
 /*
  * For the 8xx processors, all of them report the same PVR family for
  * the PowerPC core. The various versions of these processors must be
@@ -880,6 +892,7 @@
 #define PV_970         0x0039
 #define PV_POWER5      0x003A
 #define PV_POWER5p     0x003B
+#define PV_POWER7      0x003F
 #define PV_970FX       0x003C
 #define PV_630         0x0040
 #define PV_630p        0x0041