mirror of https://gitee.com/openkylin/linux.git
[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>
This commit is contained in:
parent
2276f03b74
commit
2b12797c59
|
@ -348,10 +348,6 @@ static int __init pxa25x_init(void)
|
||||||
{
|
{
|
||||||
int i, ret = 0;
|
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()) {
|
if (cpu_is_pxa21x() || cpu_is_pxa25x()) {
|
||||||
|
|
||||||
reset_status = RCSR;
|
reset_status = RCSR;
|
||||||
|
@ -375,9 +371,11 @@ static int __init pxa25x_init(void)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
|
/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
|
||||||
if (cpu_is_pxa255())
|
if (cpu_is_pxa255()) {
|
||||||
|
clks_register(&pxa25x_hwuart_clk, 1);
|
||||||
ret = platform_device_register(&pxa_device_hwuart);
|
ret = platform_device_register(&pxa_device_hwuart);
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue