From 3616fb1e1c7772503d9443001c3a69dfb8dba726 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 28 Apr 2010 18:00:07 +0900
Subject: [PATCH] --- yaml --- r: 191943 b: refs/heads/master c:
 d11a7d7100123d178821f82ecc11ba2d9d6e97c8 h: refs/heads/master i:   191941:
 1eda99d6f4f20f8eb0be458f24692630df1ae694   191939:
 72d15b9ee3b63d388a5807a129bd0b3e69981134   191935:
 011b7b04fcdd4ee64a5ae9971026c477422a691e v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/plat-s3c24xx/cpu.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fc561bff8a34..c95981542b5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d24131470f3def698683144cf1e81ee0f4f9c0b8
+refs/heads/master: d11a7d7100123d178821f82ecc11ba2d9d6e97c8
diff --git a/trunk/arch/arm/plat-s3c24xx/cpu.c b/trunk/arch/arm/plat-s3c24xx/cpu.c
index 494f4f3a9332..32db85651af0 100644
--- a/trunk/arch/arm/plat-s3c24xx/cpu.c
+++ b/trunk/arch/arm/plat-s3c24xx/cpu.c
@@ -181,10 +181,18 @@ static struct map_desc s3c_iodesc[] __initdata = {
 
 static unsigned long s3c24xx_read_idcode_v5(void)
 {
+#if defined(CONFIG_CPU_S3C2416)
+	/* s3c2416 is v5, with S3C24XX_GSTATUS1 instead of S3C2412_GSTATUS1 */
+
+	u32 gs = __raw_readl(S3C24XX_GSTATUS1);
+
+	/* test for s3c2416 or similar device */
+	if ((gs >> 16) == 0x3245)
+		return gs;
+#endif
+
 #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
 	return __raw_readl(S3C2412_GSTATUS1);
-#elif defined(CONFIG_CPU_S3C2416)
-	return __raw_readl(S3C24XX_GSTATUS1);
 #else
 	return 1UL;	/* don't look like an 2400 */
 #endif