diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-09-10 22:43:02 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-25 04:54:56 -0400 |
commit | da1a3dc0ebb4f9209a1939eaa6b18901e0cd7bc0 (patch) | |
tree | 38fac4d68fa639b7c71a0340a14d23883879bc23 /arch/arm/mach-pxa/pxa25x.c | |
parent | 0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e (diff) |
[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.c | 8 |
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 @@ | |||
36 | #include "devices.h" | 36 | #include "devices.h" |
37 | #include "clock.h" | 37 | #include "clock.h" |
38 | 38 | ||
39 | int cpu_is_pxa26x(void) | ||
40 | { | ||
41 | return cpu_is_pxa250() && ((BOOT_DEF & 0x8) == 0); | ||
42 | } | ||
43 | EXPORT_SYMBOL_GPL(cpu_is_pxa26x); | ||
44 | |||
39 | /* | 45 | /* |
40 | * Various clock factors driven by the CCCR register. | 46 | * Various clock factors driven by the CCCR register. |
41 | */ | 47 | */ |
@@ -372,7 +378,7 @@ static int __init pxa25x_init(void) | |||
372 | } | 378 | } |
373 | 379 | ||
374 | /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */ | 380 | /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */ |
375 | if (cpu_is_pxa255()) { | 381 | if (cpu_is_pxa255() || cpu_is_pxa26x()) { |
376 | clks_register(&pxa25x_hwuart_clk, 1); | 382 | clks_register(&pxa25x_hwuart_clk, 1); |
377 | ret = platform_device_register(&pxa_device_hwuart); | 383 | ret = platform_device_register(&pxa_device_hwuart); |
378 | } | 384 | } |