summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mmp/common.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2010-09-21 12:43:57 +0400
committerEric Miao <eric.y.miao@gmail.com>2010-10-09 13:07:32 +0400
commitf090c74b23de6d8f362684e4a8c4b2bf8a32b6eb (patch)
tree3d82059f5980634f884882a26b3bab23a93dfeeb /arch/arm/mach-mmp/common.c
parent799929d7048b3ec0086ed525ed7ccf6f2b8ecda6 (diff)
downloadlinux-f090c74b23de6d8f362684e4a8c4b2bf8a32b6eb.tar.xz
ARM: mmp: update cpuid of pxa168 and pxa910
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>
Diffstat (limited to 'arch/arm/mach-mmp/common.c')
-rw-r--r--arch/arm/mach-mmp/common.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/common.c b/arch/arm/mach-mmp/common.c
index 3b29fa7e9b08..0ec0ca80bb3e 100644
--- a/arch/arm/mach-mmp/common.c
+++ b/arch/arm/mach-mmp/common.c
@@ -10,13 +10,20 @@
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/module.h>
#include <asm/page.h>
#include <asm/mach/map.h>
#include <mach/addr-map.h>
+#include <mach/cputype.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 = {
{
.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)
{
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);
}