Skip to content

Commit

Permalink
[ARM] pxa: introduce cpu_is_pxa26x()
Browse files Browse the repository at this point in the history
PXA26x (PXA261/262) is actually a PXA250 with stacked Intel(R)
StartaFlash. And this can be decided by bit 3 (PKG_TYPE) of
BOOT_DEF register.

Due to this extra I/O register access, make cpu_is_pxa26x() a
public function instead of a macro.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Eric Miao authored and Russell King committed Sep 25, 2008
1 parent 0ffcbfd commit da1a3dc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions arch/arm/mach-pxa/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@
__cpu_is_pxa25x(read_cpuid_id()); \
})

extern int cpu_is_pxa26x(void);

#define cpu_is_pxa27x() \
({ \
__cpu_is_pxa27x(read_cpuid_id()); \
Expand Down
8 changes: 7 additions & 1 deletion arch/arm/mach-pxa/pxa25x.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
#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.
*/
Expand Down Expand Up @@ -372,7 +378,7 @@ static int __init pxa25x_init(void)
}

/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
if (cpu_is_pxa255()) {
if (cpu_is_pxa255() || cpu_is_pxa26x()) {
clks_register(&pxa25x_hwuart_clk, 1);
ret = platform_device_register(&pxa_device_hwuart);
}
Expand Down

0 comments on commit da1a3dc

Please sign in to comment.