aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa25x.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-11-26 05:25:52 -0500
committerEric Miao <eric.miao@marvell.com>2008-12-02 01:42:37 -0500
commite88db8b91f1f5de24ae6bb3241d92fecaae64abf (patch)
treec53b6bbf40dc806b7ba4c5bb1963c095c44ebcf5 /arch/arm/mach-pxa/pxa25x.c
parentddd244dd814ee3e5ef1e4872705cbec0dfced541 (diff)
Revert "[ARM] pxa: introduce cpu_is_pxa26x()"
This reverts commit da1a3dc0ebb4f9209a1939eaa6b18901e0cd7bc0. The originally proposed way in the above commit is incorrect. And there is no easy way to distinguish between pxa25x and pxa26x at run-time. Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r--arch/arm/mach-pxa/pxa25x.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 25d17a1dab78..6543321a2df4 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -36,12 +36,6 @@
36#include "devices.h" 36#include "devices.h"
37#include "clock.h" 37#include "clock.h"
38 38
39int cpu_is_pxa26x(void)
40{
41 return cpu_is_pxa250() && ((BOOT_DEF & 0x8) == 0);
42}
43EXPORT_SYMBOL_GPL(cpu_is_pxa26x);
44
45/* 39/*
46 * Various clock factors driven by the CCCR register. 40 * Various clock factors driven by the CCCR register.
47 */ 41 */
@@ -356,7 +350,7 @@ static int __init pxa25x_init(void)
356 } 350 }
357 351
358 /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */ 352 /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
359 if (cpu_is_pxa255() || cpu_is_pxa26x()) { 353 if (cpu_is_pxa255()) {
360 clks_register(&pxa25x_hwuart_clk, 1); 354 clks_register(&pxa25x_hwuart_clk, 1);
361 ret = platform_device_register(&pxa_device_hwuart); 355 ret = platform_device_register(&pxa_device_hwuart);
362 } 356 }