diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-09-10 22:25:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-25 04:54:54 -0400 |
commit | 2b12797c59d60379858050255046dacfbee68a8b (patch) | |
tree | 41ead0b1f1fe4b5a8e5106b348571bc5136c4387 /arch/arm/mach-pxa/pxa25x.c | |
parent | 2276f03b745c297733e41470dde7f32bdd4b52af (diff) |
[ARM] pxa: merge common cpu_is_pxa255() code together
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 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index db7be22ccd17..1be490d6936d 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -348,10 +348,6 @@ static int __init pxa25x_init(void) | |||
348 | { | 348 | { |
349 | int i, ret = 0; | 349 | int i, ret = 0; |
350 | 350 | ||
351 | /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */ | ||
352 | if (cpu_is_pxa255()) | ||
353 | clks_register(&pxa25x_hwuart_clk, 1); | ||
354 | |||
355 | if (cpu_is_pxa21x() || cpu_is_pxa25x()) { | 351 | if (cpu_is_pxa21x() || cpu_is_pxa25x()) { |
356 | 352 | ||
357 | reset_status = RCSR; | 353 | reset_status = RCSR; |
@@ -375,9 +371,11 @@ static int __init pxa25x_init(void) | |||
375 | return ret; | 371 | return ret; |
376 | } | 372 | } |
377 | 373 | ||
378 | /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */ | 374 | /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */ |
379 | if (cpu_is_pxa255()) | 375 | if (cpu_is_pxa255()) { |
376 | clks_register(&pxa25x_hwuart_clk, 1); | ||
380 | ret = platform_device_register(&pxa_device_hwuart); | 377 | ret = platform_device_register(&pxa_device_hwuart); |
378 | } | ||
381 | 379 | ||
382 | return ret; | 380 | return ret; |
383 | } | 381 | } |