[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 3c90534a30bbfd46aad95b2277af3e8c33b8aa1a
Author: Rask Ingemann Lambertsen <rask at sygehus.dk>
Date:   Tue Mar 31 00:28:09 2009 +0200

    Fix cpu_is_s3c2442() returning false for an S3C2442B
    
       An S3C2442B would be detected as S3C2440 by the cpu_is_s3cxxxx()
    macros. This patch fixes it.
    
    Signed-off-by: Rask Ingeman Lambertsen <rask at sygehus.dk>

diff --git a/arch/arm/plat-s3c/init.c b/arch/arm/plat-s3c/init.c
index 94a3120..c1ddac1 100644
--- a/arch/arm/plat-s3c/init.c
+++ b/arch/arm/plat-s3c/init.c
@@ -52,7 +52,8 @@ static void __init set_system_rev(unsigned int idcode)
 
 	if (idcode == 0x32410002 || idcode == 0x32440001)
 		system_rev |= (0x1 << 16);
-	if (idcode == 0x32440aaa)	/* s3c2442 */
+	if (idcode == 0x32440aaa	/* s3c2442 */
+	    || idcode == 0x32440aab)	/* s3c2442b */
 		system_rev |= (0x2 << 16);
 	if (idcode == 0x0)		/* s3c2400 */
 		system_rev |= (0x2400 << 16);

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko