From d551fb886e89f53c7c21239ebdd8ea10674eb059 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Tue, 29 Dec 2009 17:14:12 +0900 Subject: [PATCH] s5pc110: aquila: add memory setting for rev0.8 Signed-off-by: Minkyu Kang --- board/samsung/universal/lowlevel_init.S | 7 ++++--- board/samsung/universal/universal.c | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S index b4c20ef..2afaf15 100644 --- a/board/samsung/universal/lowlevel_init.S +++ b/board/samsung/universal/lowlevel_init.S @@ -168,6 +168,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.8 : 4G3G1G x16 for Infineon ES3.1 */ ldr r2, =0xE0200200 ldr r4, [r2, #0x48] @@ -178,15 +179,15 @@ lowlevel_init: nop ldr r3, [r2, #0x44] - and r1, r3, #(0x5 << 2) + and r1, r3, #(0xf << 1) cmp r1, #(0x5 << 2) moveq r9, #3 - and r1, r3, #(0x6 << 2) cmp r1, #(0x6 << 2) moveq r9, #1 - and r1, r3, #(0x7 << 2) cmp r1, #(0x7 << 2) moveq r9, #3 + cmp r1, #(0x1 << 1) + moveq r9, #3 str r4, [r2, #0x48] /* Restore PULLUP configuration */ bl mem_ctrl_asm_init diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c index 93b3b2c..6f9fb06 100644 --- a/board/samsung/universal/universal.c +++ b/board/samsung/universal/universal.c @@ -1863,8 +1863,10 @@ int dram_init(void) /* * Aquila Rev0.5 4G3G1G * Aquila Rev0.7 4G3G1G + * Aquila Rev0.8 4G3G1G */ - if (machine_is_aquila() && (hwrevision(5) || hwrevision(7))) { + if (machine_is_aquila() && + (hwrevision(5) || hwrevision(7) || hwrevision(8))) { memconfig1 = readl(base + MEMCONFIG1_OFFSET); sz = (memconfig1 >> 16) & 0xFF; -- 2.7.4