Fix serial broken-ness on PXA250

PXA255 and 26x are the only PXA CPUs with HWUART. This patch prevents bogus
initialisation on other models.

Signed-off-by: Ian Molton <spyro@f2s.com>

2 files changed, 14 insertions, 2 deletions

diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 4cd50e3005e9..90b441f5df5a 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -293,7 +293,7 @@ static int __init pxa25x_init(void)
         int i, ret = 0;
 
         /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
-        if (cpu_is_pxa25x())
+        if (cpu_is_pxa255())
                 clks_register(&pxa25x_hwuart_clk, 1);
 
         if (cpu_is_pxa21x() || cpu_is_pxa25x()) {
@@ -317,7 +317,7 @@ static int __init pxa25x_init(void)
         }
 
         /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
-        if (cpu_is_pxa25x())
+        if (cpu_is_pxa255())
                 ret = platform_device_register(&pxa_device_hwuart);
 
         clks_register(&gpio7_clk, 1);
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index d9af6dabc899..b6a8317c2ec4 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -69,6 +69,12 @@
                 _id == 0x212;                           \
         })
 
+#define __cpu_is_pxa255(id)                             \
+        ({                                              \
+                unsigned int _id = (id) >> 4 & 0xfff;   \
+                _id == 0x2d0;                           \
+         })
+
 #define __cpu_is_pxa25x(id)                             \
         ({                                              \
                 unsigned int _id = (id) >> 4 & 0xfff;   \
@@ -76,6 +82,7 @@
         })
 #else
 #define __cpu_is_pxa21x(id)     (0)
+#define __cpu_is_pxa255(id)     (0)
 #define __cpu_is_pxa25x(id)     (0)
 #endif
 
@@ -124,6 +131,11 @@
                 __cpu_is_pxa21x(read_cpuid_id());       \
         })
 
+#define cpu_is_pxa255()                                 \
+        ({                                              \
+                __cpu_is_pxa255(read_cpuid_id());       \
+        })
+
 #define cpu_is_pxa25x()                                 \
         ({                                              \
                 __cpu_is_pxa25x(read_cpuid_id());       \