1 files changed, 64 insertions, 13 deletions
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
index e89df4d0d239..c9ee4081d533 100644
--- a/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -62,26 +62,72 @@
 #ifndef __ASSEMBLY__
+/*
+ *   CPU     Stepping     CPU_ID         JTAG_ID
+ *
+ *  PXA210      B0      0x69052922      0x2926C013
+ *  PXA210      B1      0x69052923      0x3926C013
+ *  PXA210      B2      0x69052924      0x4926C013
+ *  PXA210      C0      0x69052D25      0x5926C013
+ *
+ *  PXA250      A0      0x69052100      0x09264013
+ *  PXA250      A1      0x69052101      0x19264013
+ *  PXA250      B0      0x69052902      0x29264013
+ *  PXA250      B1      0x69052903      0x39264013
+ *  PXA250      B2      0x69052904      0x49264013
+ *  PXA250      C0      0x69052D05      0x59264013
+ *
+ *  PXA255      A0      0x69052D06      0x69264013
+ *
+ *  PXA26x      A0      0x69052903      0x39264013
+ *  PXA26x      B0      0x69052D05      0x59264013
+ *
+ *  PXA27x      A0      0x69054110      0x09265013
+ *  PXA27x      A1      0x69054111      0x19265013
+ *  PXA27x      B0      0x69054112      0x29265013
+ *  PXA27x      B1      0x69054113      0x39265013
+ *  PXA27x      C0      0x69054114      0x49265013
+ *  PXA27x      C5      0x69054117      0x79265013
+ *
+ *  PXA30x      A0      0x69056880      0x0E648013
+ *  PXA30x      A1      0x69056881      0x1E648013
+ *  PXA31x      A0      0x69056890      0x0E649013
+ *  PXA31x      A1      0x69056891      0x1E649013
+ *  PXA31x      A2      0x69056892      0x2E649013
+ *  PXA32x      B1      0x69056825      0x5E642013
+ *  PXA32x      B2      0x69056826      0x6E642013
+ *
+ *  PXA930      B0      0x69056835      0x5E643013
+ *  PXA930      B1      0x69056837      0x7E643013
+ *  PXA930      B2      0x69056838      0x8E643013
+ */
 #ifdef CONFIG_PXA25x
-#define __cpu_is_pxa21x(id)                             \
+#define __cpu_is_pxa210(id)                             \
        ({                                              \
-                unsigned int _id = (id) >> 4 & 0xf3f;   \
+                unsigned int _id = (id) & 0xf3f0;       \
-                _id == 0x212;                           \
+                _id == 0x2120;                          \
        })
-#define __cpu_is_pxa255(id)                             \
+#define __cpu_is_pxa250(id)                             \
-        ({                                              \
+        ({                                              \
-                unsigned int _id = (id) >> 4 & 0xfff;   \
+                unsigned int _id = (id) & 0xf3ff;       \
-                _id == 0x2d0;                           \
+                _id <= 0x2105;                          \
-         })
+        })
+#define __cpu_is_pxa255(id)                             \
+        ({                                              \
+                unsigned int _id = (id) & 0xffff;       \
+                _id == 0x2d06;                          \
+        })
 #define __cpu_is_pxa25x(id)                             \
        ({                                              \
-                unsigned int _id = (id) >> 4 & 0xfff;   \
+                unsigned int _id = (id) & 0xf300;       \
-                _id == 0x2d0 || _id == 0x290;           \
+                _id == 0x2100;                          \
        })
 #else
-#define __cpu_is_pxa21x(id)     (0)
+#define __cpu_is_pxa210(id)     (0)
+#define __cpu_is_pxa250(id)     (0)
 #define __cpu_is_pxa255(id)     (0)
 #define __cpu_is_pxa25x(id)     (0)
 #endif
@@ -136,9 +182,14 @@
 #define __cpu_is_pxa930(id)     (0)
 #endif
-#define cpu_is_pxa21x()                                 \
+#define cpu_is_pxa210()                                 \
+        ({                                              \
+                __cpu_is_pxa210(read_cpuid_id());       \
+        })
+#define cpu_is_pxa250()                                 \
        ({                                              \
-                __cpu_is_pxa21x(read_cpuid_id());       \
+                __cpu_is_pxa250(read_cpuid_id());       \
        })
 #define cpu_is_pxa255()                                 \

diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index e89df4d0d239..c9ee4081d533 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -62,26 +62,72 @@
62		62
63	#ifndef __ASSEMBLY__	63	#ifndef __ASSEMBLY__
64		64
		65	/*
		66	* CPU Stepping CPU_ID JTAG_ID
		67	*
		68	* PXA210 B0 0x69052922 0x2926C013
		69	* PXA210 B1 0x69052923 0x3926C013
		70	* PXA210 B2 0x69052924 0x4926C013
		71	* PXA210 C0 0x69052D25 0x5926C013
		72	*
		73	* PXA250 A0 0x69052100 0x09264013
		74	* PXA250 A1 0x69052101 0x19264013
		75	* PXA250 B0 0x69052902 0x29264013
		76	* PXA250 B1 0x69052903 0x39264013
		77	* PXA250 B2 0x69052904 0x49264013
		78	* PXA250 C0 0x69052D05 0x59264013
		79	*
		80	* PXA255 A0 0x69052D06 0x69264013
		81	*
		82	* PXA26x A0 0x69052903 0x39264013
		83	* PXA26x B0 0x69052D05 0x59264013
		84	*
		85	* PXA27x A0 0x69054110 0x09265013
		86	* PXA27x A1 0x69054111 0x19265013
		87	* PXA27x B0 0x69054112 0x29265013
		88	* PXA27x B1 0x69054113 0x39265013
		89	* PXA27x C0 0x69054114 0x49265013
		90	* PXA27x C5 0x69054117 0x79265013
		91	*
		92	* PXA30x A0 0x69056880 0x0E648013
		93	* PXA30x A1 0x69056881 0x1E648013
		94	* PXA31x A0 0x69056890 0x0E649013
		95	* PXA31x A1 0x69056891 0x1E649013
		96	* PXA31x A2 0x69056892 0x2E649013
		97	* PXA32x B1 0x69056825 0x5E642013
		98	* PXA32x B2 0x69056826 0x6E642013
		99	*
		100	* PXA930 B0 0x69056835 0x5E643013
		101	* PXA930 B1 0x69056837 0x7E643013
		102	* PXA930 B2 0x69056838 0x8E643013
		103	*/
65	#ifdef CONFIG_PXA25x	104	#ifdef CONFIG_PXA25x
66	#define __cpu_is_pxa21x(id) \	105	#define __cpu_is_pxa210(id) \
67	({ \	106	({ \
68	unsigned int _id = (id) >> 4 & 0xf3f; \	107	unsigned int _id = (id) & 0xf3f0; \
69	_id == 0x212; \	108	_id == 0x2120; \
70	})	109	})
71		110
72	#define __cpu_is_pxa255(id) \	111	#define __cpu_is_pxa250(id) \
73	({ \	112	({ \
74	unsigned int _id = (id) >> 4 & 0xfff; \	113	unsigned int _id = (id) & 0xf3ff; \
75	_id == 0x2d0; \	114	_id <= 0x2105; \
76	})	115	})
		116
		117	#define __cpu_is_pxa255(id) \
		118	({ \
		119	unsigned int _id = (id) & 0xffff; \
		120	_id == 0x2d06; \
		121	})
77		122
78	#define __cpu_is_pxa25x(id) \	123	#define __cpu_is_pxa25x(id) \
79	({ \	124	({ \
80	unsigned int _id = (id) >> 4 & 0xfff; \	125	unsigned int _id = (id) & 0xf300; \
81	_id == 0x2d0 \|\| _id == 0x290; \	126	_id == 0x2100; \
82	})	127	})
83	#else	128	#else
84	#define __cpu_is_pxa21x(id) (0)	129	#define __cpu_is_pxa210(id) (0)
		130	#define __cpu_is_pxa250(id) (0)
85	#define __cpu_is_pxa255(id) (0)	131	#define __cpu_is_pxa255(id) (0)
86	#define __cpu_is_pxa25x(id) (0)	132	#define __cpu_is_pxa25x(id) (0)
87	#endif	133	#endif
@@ -136,9 +182,14 @@
136	#define __cpu_is_pxa930(id) (0)	182	#define __cpu_is_pxa930(id) (0)
137	#endif	183	#endif
138		184
139	#define cpu_is_pxa21x() \	185	#define cpu_is_pxa210() \
		186	({ \
		187	__cpu_is_pxa210(read_cpuid_id()); \
		188	})
		189
		190	#define cpu_is_pxa250() \
140	({ \	191	({ \
141	__cpu_is_pxa21x(read_cpuid_id()); \	192	__cpu_is_pxa250(read_cpuid_id()); \
142	})	193	})
143		194
144	#define cpu_is_pxa255() \	195	#define cpu_is_pxa255() \