summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-03-24 17:31:42 +0000
committerBen Dooks <ben-linux@fluff.org>2009-05-07 11:04:57 +0100
commite074f9803227236252c8e7be16d836d709abff57 (patch)
tree0d677cd105a4275752f99d8b95b0e3d5c88ab9dc
parenta6925c1c515513e22b0419e1a41155c88d22b1f4 (diff)
downloadblackbird-op-linux-e074f9803227236252c8e7be16d836d709abff57.tar.gz
blackbird-op-linux-e074f9803227236252c8e7be16d836d709abff57.zip
[ARM] S3C64XX: Add S3C6400 CPU detection.
Add detection support for the S3C6400 SoC which has it's id register in a different place to the S3C6410. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/plat-s3c64xx/cpu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c64xx/cpu.c b/arch/arm/plat-s3c64xx/cpu.c
index f9fdaab32ab4..19f68b5f0d36 100644
--- a/arch/arm/plat-s3c64xx/cpu.c
+++ b/arch/arm/plat-s3c64xx/cpu.c
@@ -126,6 +126,14 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
iotable_init(mach_desc, size);
idcode = __raw_readl(S3C_VA_SYS + 0x118);
+ if (!idcode) {
+ /* S3C6400 has the ID register in a different place,
+ * and needs a write before it can be read. */
+
+ __raw_writel(0x0, S3C_VA_SYS + 0xA1C);
+ idcode = __raw_readl(S3C_VA_SYS + 0xA1C);
+ }
+
s3c_init_cpu(idcode, cpu_ids, ARRAY_SIZE(cpu_ids));
}
OpenPOWER on IntegriCloud