Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: mmp: update cpuid of pxa168 and pxa910

Browse Source 
Correct the cpuid of pxa168 and pxa910.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Haojian Zhuang 2010-09-21 16:43:57 +08:00 committed by Eric Miao
parent 799929d704
commit f090c74b23
2 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-mmp/common.c
View File

@ -10,13 +10,20 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/addr-map.h> #include <mach/addr-map.h>
#include <mach/cputype.h>
#include "common.h" #include "common.h"
#define MMP_CHIPID (AXI_VIRT_BASE + 0x82c00)
unsigned int mmp_chip_id;
EXPORT_SYMBOL(mmp_chip_id);
static struct map_desc standard_io_desc[] __initdata = { static struct map_desc standard_io_desc[] __initdata = {
{ {
.pfn = __phys_to_pfn(APB_PHYS_BASE), .pfn = __phys_to_pfn(APB_PHYS_BASE),
@ -34,4 +41,7 @@ static struct map_desc standard_io_desc[] __initdata = {
void __init mmp_map_io(void) void __init mmp_map_io(void)
{ {
iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc));
/* this is early, initialize mmp_chip_id here */
mmp_chip_id = __raw_readl(MMP_CHIPID);
} }

49
arch/arm/mach-mmp/include/mach/cputype.h
View File

@ -4,36 +4,51 @@
#include <asm/cputype.h> #include <asm/cputype.h>
/* /*
* CPU Stepping OLD_ID CPU_ID CHIP_ID * CPU Stepping CPU_ID CHIP_ID
* *
* PXA168 A0 0x41159263 0x56158400 0x00A0A333 * PXA168 S0 0x56158400 0x0000C910
* PXA910 Y0 0x41159262 0x56158000 0x00F0C910 * PXA168 A0 0x56158400 0x00A0A168
* MMP2 Z0 0x560f5811 * PXA910 Y1 0x56158400 0x00F2C920
* PXA910 A0 0x56158400 0x00F2C910
* PXA910 A1 0x56158400 0x00A0C910
* PXA920 Y0 0x56158400 0x00F2C920
* PXA920 A0 0x56158400 0x00A0C920
* PXA920 A1 0x56158400 0x00A1C920
* MMP2 Z0 0x560f5811 0x00F00410
* MMP2 Z1 0x560f5811 0x00E00410
* MMP2 A0 0x560f5811 0x00A0A610
*/ */
extern unsigned int mmp_chip_id;
#ifdef CONFIG_CPU_PXA168 #ifdef CONFIG_CPU_PXA168
# define __cpu_is_pxa168(id) \ static inline int cpu_is_pxa168(void)
({ unsigned int _id = ((id) >> 8) & 0xff; _id == 0x84; }) {
return (((read_cpuid_id() >> 8) & 0xff) == 0x84) &&
((mmp_chip_id & 0xfff) == 0x168);
}
#else #else
# define __cpu_is_pxa168(id) (0) #define cpu_is_pxa168() (0)
#endif #endif
/* cpu_is_pxa910() is shared on both pxa910 and pxa920 */
#ifdef CONFIG_CPU_PXA910 #ifdef CONFIG_CPU_PXA910
# define __cpu_is_pxa910(id) \ static inline int cpu_is_pxa910(void)
({ unsigned int _id = ((id) >> 8) & 0xff; _id == 0x80; }) {
return (((read_cpuid_id() >> 8) & 0xff) == 0x84) &&
(((mmp_chip_id & 0xfff) == 0x910) ||
((mmp_chip_id & 0xfff) == 0x920));
}
#else #else
# define __cpu_is_pxa910(id) (0) #define cpu_is_pxa910() (0)
#endif #endif
#ifdef CONFIG_CPU_MMP2 #ifdef CONFIG_CPU_MMP2
# define __cpu_is_mmp2(id) \ static inline int cpu_is_mmp2(void)
({ unsigned int _id = ((id) >> 8) & 0xff; _id == 0x58; }) {
return (((cpu_readid_id() >> 8) & 0xff) == 0x58);
#else #else
# define __cpu_is_mmp2(id) (0) #define cpu_is_mmp2() (0)
#endif #endif
#define cpu_is_pxa168() ({ __cpu_is_pxa168(read_cpuid_id()); })
#define cpu_is_pxa910() ({ __cpu_is_pxa910(read_cpuid_id()); })
#define cpu_is_mmp2() ({ __cpu_is_mmp2(read_cpuid_id()); })
#endif /* __ASM_MACH_CPUTYPE_H */ #endif /* __ASM_MACH_CPUTYPE_H */