[ARM] pxa: make cpu_is_pxa2* macros more consistent

1. add a CPUID table in the comment

2. make cpu_is_pxa25x() true for PXA210/250/255/26x

3. PXA210 is treated as PXA25x, all related code modified to
   reflect this

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 68 insertions, 17 deletions

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index ceaed0076366..cbbf30097920 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -46,7 +46,7 @@ void clear_reset_status(unsigned int mask)
  */
 unsigned int get_clk_frequency_khz(int info)
 {
-        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+        if (cpu_is_pxa25x())
                 return pxa25x_get_clk_frequency_khz(info);
         else if (cpu_is_pxa27x())
                 return pxa27x_get_clk_frequency_khz(info);
@@ -60,7 +60,7 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
  */
 unsigned int get_memclk_frequency_10khz(void)
 {
-        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+        if (cpu_is_pxa25x())
                 return pxa25x_get_memclk_frequency_10khz();
         else if (cpu_is_pxa27x())
                 return pxa27x_get_memclk_frequency_10khz();
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;   \
-                _id == 0x212;                           \
+                unsigned int _id = (id) & 0xf3f0;       \
+                _id == 0x2120;                          \
         })
 
-#define __cpu_is_pxa255(id)                             \
-        ({                                              \
-                unsigned int _id = (id) >> 4 & 0xfff;   \
-                _id == 0x2d0;                           \
-         })
+#define __cpu_is_pxa250(id)                             \
+        ({                                              \
+                unsigned int _id = (id) & 0xf3ff;       \
+                _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;   \
-                _id == 0x2d0 || _id == 0x290;           \
+                unsigned int _id = (id) & 0xf300;       \
+                _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/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 1be490d6936d..a3a6aff5f0d4 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -348,7 +348,7 @@ static int __init pxa25x_init(void)
 {
         int i, ret = 0;
 
-        if (cpu_is_pxa21x() || cpu_is_pxa25x()) {
+        if (cpu_is_pxa25x()) {
 
                 reset_status = RCSR;
 
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 67e18509d7bf..18d149745837 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -155,7 +155,7 @@ static void __init pxa_timer_init(void)
         OIER = 0;
         OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;
 
-        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+        if (cpu_is_pxa25x())
                 clock_tick_rate = 3686400;
         else if (machine_is_mainstone())
                 clock_tick_rate = 3249600;