From: Minkyu Kang <mk7.kang@samsung.com>
Date: Tue, 29 Dec 2009 08:39:58 +0000 (+0900)
Subject: s5pc110: aquila: rev0.7 is 4G2G1G
X-Git-Tag: JA02_20100111~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcd25168f2d011362403269832dce71c9740ddad;p=kernel%2Fu-boot.git

s5pc110: aquila: rev0.7 is 4G2G1G

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S
index 2afaf15..10a18f8 100644
--- a/board/samsung/universal/lowlevel_init.S
+++ b/board/samsung/universal/lowlevel_init.S
@@ -167,7 +167,7 @@ lowlevel_init:
 	/*
 	 * Aquila Rev 0.5 : 4G3G1G x16 for Infineon ES3.1
 	 * Aquila Rev 0.6 : 4G1G1G x32 for MSM6290
-	 * Aquila Rev 0.7 : 4G3G1G x16 for Infineon ES3.1
+	 * Aquila Rev 0.7 : 4G2G1G x16 for Infineon ES3.1
 	 * Aquila Rev 0.8 : 4G3G1G x16 for Infineon ES3.1
 	 */
 	ldr	r2, =0xE0200200
@@ -185,7 +185,7 @@ lowlevel_init:
 	cmp	r1, #(0x6 << 2)
 	moveq	r9, #1
 	cmp	r1, #(0x7 << 2)
-	moveq	r9, #3
+	moveq	r9, #2
 	cmp	r1, #(0x1 << 1)
 	moveq	r9, #3
 	str	r4, [r2, #0x48]		/* Restore PULLUP configuration */
diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 6f9fb06..d22072c 100644
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -1862,11 +1862,9 @@ int dram_init(void)
 
 		/*
 		 * Aquila Rev0.5 4G3G1G
-		 * Aquila Rev0.7 4G3G1G
 		 * Aquila Rev0.8 4G3G1G
 		 */
-		if (machine_is_aquila() &&
-			(hwrevision(5) || hwrevision(7) || hwrevision(8))) {
+		if (machine_is_aquila() && (hwrevision(5) || hwrevision(8))) {
 			memconfig1 = readl(base + MEMCONFIG1_OFFSET);
 
 			sz = (memconfig1 >> 16) & 0xFF;