aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r--arch/arm/mach-s3c64xx/cpu.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c
index 7b665f3e2e1f..6c498f9a18c5 100644
--- a/arch/arm/mach-s3c64xx/cpu.c
+++ b/arch/arm/mach-s3c64xx/cpu.c
@@ -144,14 +144,8 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
144 iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); 144 iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
145 iotable_init(mach_desc, size); 145 iotable_init(mach_desc, size);
146 146
147 samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0x118); 147 /* detect cpu id */
148 if (!samsung_cpu_id) { 148 s3c64xx_init_cpu();
149 /* S3C6400 has the ID register in a different place,
150 * and needs a write before it can be read. */
151
152 __raw_writel(0x0, S3C_VA_SYS + 0xA1C);
153 samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0xA1C);
154 }
155 149
156 s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids)); 150 s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
157} 151}