summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa25x.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-09-11 10:43:02 +0800
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-25 09:54:56 +0100
commitda1a3dc0ebb4f9209a1939eaa6b18901e0cd7bc0 (patch)
tree38fac4d68fa639b7c71a0340a14d23883879bc23 /arch/arm/mach-pxa/pxa25x.c
parent0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e (diff)
downloadlinux-da1a3dc0ebb4f9209a1939eaa6b18901e0cd7bc0.tar.bz2
[ARM] pxa: introduce cpu_is_pxa26x()
PXA26x (PXA261/262) is actually a PXA250 with stacked Intel(R) StartaFlash. And this can be decided by bit 3 (PKG_TYPE) of BOOT_DEF register. Due to this extra I/O register access, make cpu_is_pxa26x() a public function instead of a macro. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r--arch/arm/mach-pxa/pxa25x.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index a3a6aff5f0d4..3caa74a10d13 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/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);
}