From 9835647a007168c7202c57a9c05fa761bcf47a1d Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Thu, 11 Sep 2008 10:43:02 +0800
Subject: [PATCH] --- yaml --- r: 112375 b: refs/heads/master c:
 da1a3dc0ebb4f9209a1939eaa6b18901e0cd7bc0 h: refs/heads/master i:   112373:
 ca2a0a3587252650f9b96d151ff5858b722311ca   112371:
 e76d3b6bb920b76a8e448770e82d7ce10c85e4ef   112367:
 d163e2e93f76ec00209670c842e5a7e8ff72a335 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-pxa/include/mach/hardware.h | 2 ++
 trunk/arch/arm/mach-pxa/pxa25x.c                | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d297b55ebd02..4490164fd4f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e
+refs/heads/master: da1a3dc0ebb4f9209a1939eaa6b18901e0cd7bc0
diff --git a/trunk/arch/arm/mach-pxa/include/mach/hardware.h b/trunk/arch/arm/mach-pxa/include/mach/hardware.h
index c9ee4081d533..9dc71114e287 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/hardware.h
@@ -202,6 +202,8 @@
 		__cpu_is_pxa25x(read_cpuid_id());	\
 	})
 
+extern int cpu_is_pxa26x(void);
+
 #define cpu_is_pxa27x()					\
 	({						\
 		__cpu_is_pxa27x(read_cpuid_id());	\
diff --git a/trunk/arch/arm/mach-pxa/pxa25x.c b/trunk/arch/arm/mach-pxa/pxa25x.c
index a3a6aff5f0d4..3caa74a10d13 100644
--- a/trunk/arch/arm/mach-pxa/pxa25x.c
+++ b/trunk/arch/arm/mach-pxa/pxa25x.c
@@ -36,6 +36,12 @@
 #include "devices.h"
 #include "clock.h"
 
+int cpu_is_pxa26x(void)
+{
+	return cpu_is_pxa250() && ((BOOT_DEF & 0x8) == 0);
+}
+EXPORT_SYMBOL_GPL(cpu_is_pxa26x);
+
 /*
  * Various clock factors driven by the CCCR register.
  */
@@ -372,7 +378,7 @@ static int __init pxa25x_init(void)
 	}
 
 	/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
-	if (cpu_is_pxa255()) {
+	if (cpu_is_pxa255() || cpu_is_pxa26x()) {
 		clks_register(&pxa25x_hwuart_clk, 1);
 		ret = platform_device_register(&pxa_device_hwuart);
 	}