From 6fca2642a54c7493a6c8f9ae58df38e3042d6880 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 15 May 2007 10:26:49 +0100
Subject: [PATCH] --- yaml --- r: 59255 b: refs/heads/master c:
 b23170c01f6e4ea043df7cd9486c2488e01f3d60 h: refs/heads/master i:   59253:
 b4242f1d648c2e388a955f3b20e4a1582cdaa4a3   59251:
 db98da22775aa8919328fd8658aadb575fbef128   59247:
 a79537e3323d50f0c3363d28913dcbc855c5fd93 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/arm/mach-pxa/generic.c         |  6 ++--
 trunk/include/asm-arm/arch-pxa/hardware.h | 36 +++++++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a939335001ae..f5ba9436e52d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a2b94bc39915041304578188441f0f21aa5532a
+refs/heads/master: b23170c01f6e4ea043df7cd9486c2488e01f3d60
diff --git a/trunk/arch/arm/mach-pxa/generic.c b/trunk/arch/arm/mach-pxa/generic.c
index 64b08b744f9f..147b7c40d9f9 100644
--- a/trunk/arch/arm/mach-pxa/generic.c
+++ b/trunk/arch/arm/mach-pxa/generic.c
@@ -448,16 +448,14 @@ static struct platform_device *devices[] __initdata = {
 
 static int __init pxa_init(void)
 {
-	int cpuid, ret;
+	int ret;
 
 	ret = platform_add_devices(devices, ARRAY_SIZE(devices));
 	if (ret)
 		return ret;
 
 	/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
-	cpuid = read_cpuid(CPUID_ID);
-	if (((cpuid >> 4) & 0xfff) == 0x2d0 ||
-	    ((cpuid >> 4) & 0xfff) == 0x290)
+	if (cpu_is_pxa25x())
 		ret = platform_device_register(&hwuart_device);
 
 	return ret;
diff --git a/trunk/include/asm-arm/arch-pxa/hardware.h b/trunk/include/asm-arm/arch-pxa/hardware.h
index e2bdc2fbede1..386121746417 100644
--- a/trunk/include/asm-arm/arch-pxa/hardware.h
+++ b/trunk/include/asm-arm/arch-pxa/hardware.h
@@ -62,6 +62,42 @@
 
 #ifndef __ASSEMBLY__
 
+#define __cpu_is_pxa21x(id)				\
+	({						\
+		unsigned int _id = (id) >> 4 & 0xf3f;	\
+		_id == 0x212;				\
+	})
+
+#define __cpu_is_pxa25x(id)				\
+	({						\
+		unsigned int _id = (id) >> 4 & 0xfff;	\
+		_id == 0x2d0 || _id == 0x290;		\
+	})
+
+#define __cpu_is_pxa27x(id)				\
+	({						\
+		unsigned int _id = (id) >> 4 & 0xfff;	\
+		_id == 0x411;				\
+	})
+
+#define cpu_is_pxa21x()					\
+	({						\
+		unsigned int id = read_cpuid(CPUID_ID);	\
+		__cpu_is_pxa21x(id);			\
+	})
+
+#define cpu_is_pxa25x()					\
+	({						\
+		unsigned int id = read_cpuid(CPUID_ID);	\
+		__cpu_is_pxa25x(id);			\
+	})
+
+#define cpu_is_pxa27x()					\
+	({						\
+		unsigned int id = read_cpuid(CPUID_ID);	\
+		__cpu_is_pxa27x(id);			\
+	})
+
 /*
  * Handy routine to set GPIO alternate functions
  */