From: Eric Miao Date: Thu, 11 Sep 2008 02:25:59 +0000 (+0800) Subject: [ARM] pxa: merge common cpu_is_pxa255() code together X-Git-Tag: v2.6.28-rc1~293^2~6^2~23 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2b12797c59d60379858050255046dacfbee68a8b;p=linux-2.6-omap-h63xx.git [ARM] pxa: merge common cpu_is_pxa255() code together Signed-off-by: Eric Miao Signed-off-by: Russell King --- diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index db7be22ccd1..1be490d6936 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; }