s5pc110: aquila: rev0.7 is 4G2G1G
authorMinkyu Kang <mk7.kang@samsung.com>
Tue, 29 Dec 2009 08:39:58 +0000 (17:39 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Tue, 29 Dec 2009 08:39:58 +0000 (17:39 +0900)
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
board/samsung/universal/lowlevel_init.S
board/samsung/universal/universal.c

index 2afaf15..10a18f8 100644 (file)
@@ -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 */
index 6f9fb06..d22072c 100644 (file)
@@ -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;