]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Revert "[ARM] pxa: introduce cpu_is_pxa26x()"
authorEric Miao <eric.miao@marvell.com>
Wed, 26 Nov 2008 10:25:52 +0000 (18:25 +0800)
committerEric Miao <eric.miao@marvell.com>
Tue, 2 Dec 2008 06:42:37 +0000 (14:42 +0800)
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>
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/pxa25x.c

index a582a6d9b92b10c93d6ecae6d95128472b4ae9a3..292a93af2b2501f61df847138424d4a0bf024bc6 100644 (file)
                __cpu_is_pxa25x(read_cpuid_id());       \
        })
 
-extern int cpu_is_pxa26x(void);
-
 #define cpu_is_pxa27x()                                        \
        ({                                              \
                __cpu_is_pxa27x(read_cpuid_id());       \
index 25d17a1dab78bd68606224d233e6660960de0300..6543321a2df422294982e9acdb9c41e28108a344 100644 (file)
 #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.
  */
@@ -356,7 +350,7 @@ static int __init pxa25x_init(void)
        }
 
        /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
-       if (cpu_is_pxa255() || cpu_is_pxa26x()) {
+       if (cpu_is_pxa255()) {
                clks_register(&pxa25x_hwuart_clk, 1);
                ret = platform_device_register(&pxa_device_hwuart);
        }