summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa25x.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-09-11 10:25:59 +0800
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-25 09:54:54 +0100
commit2b12797c59d60379858050255046dacfbee68a8b (patch)
tree41ead0b1f1fe4b5a8e5106b348571bc5136c4387 /arch/arm/mach-pxa/pxa25x.c
parent2276f03b745c297733e41470dde7f32bdd4b52af (diff)
downloadop-kernel-dev-2b12797c59d60379858050255046dacfbee68a8b.zip
op-kernel-dev-2b12797c59d60379858050255046dacfbee68a8b.tar.gz
[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.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index db7be22..1be490d 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)
{
int i, ret = 0;
- /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
- if (cpu_is_pxa255())
- clks_register(&pxa25x_hwuart_clk, 1);
-
if (cpu_is_pxa21x() || cpu_is_pxa25x()) {
reset_status = RCSR;
@@ -375,9 +371,11 @@ static int __init pxa25x_init(void)
return ret;
}
- /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
- if (cpu_is_pxa255())
+ /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
+ if (cpu_is_pxa255()) {
+ clks_register(&pxa25x_hwuart_clk, 1);
ret = platform_device_register(&pxa_device_hwuart);
+ }
return ret;
}
OpenPOWER on IntegriCloud