1 From 3dfa10c1a1d49b3b5b7cf6652fe965d088d4abc0 Mon Sep 17 00:00:00 2001
2 From: Marek Vasut <marex@denx.de>
3 Date: Thu, 3 May 2012 05:47:18 +0000
4 Subject: [PATCH 21/56] Revert "i.MX28: Enable additional DRAM address bits"
6 This reverts commit 69d26d09de1cb93e0a09ca71d9f0d41a66f0756a.
8 Apparently, this commit got mainline only because of out-of-tree
9 port and causes breakage on board that is mainline. Revert.
12 * The OOT board has 512MB of DRAM, enabling this additional address
13 line enabled it to work fine with 512MB of RAM.
14 * Every mainline port has max. 256MB of DRAM, therefore this revert
15 has no impact on any mainline port
16 * Though this caused a problem with new M28 board with 256MB of DRAM
17 where the chips are wired differently. The patch-to-be-reverted
18 caused the DRAM to behave like this:
20 [128MB chunk #1][128MB chunk #1 again][128MB chunk #2][128MB chunk #2 again]
22 Therefore to retain the current one-memory-init-rules-them-all situation,
23 revert this patch until another board emerges and will actually be pushed
24 mainline that needs different setup.
26 Signed-off-by: Marek Vasut <marex@denx.de>
27 Cc: Wolfgang Denk <wd@denx.de>
28 Cc: Detlev Zundel <dzu@denx.de>
29 Cc: Stefano Babic <sbabic@denx.de>
30 Cc: Fabio Estevam <festevam@gmail.com>
32 arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c | 2 +-
33 1 file changed, 1 insertion(+), 1 deletion(-)
35 diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
36 index 911bbef..0f825ed 100644
37 --- a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
38 +++ b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
39 @@ -39,7 +39,7 @@ uint32_t dram_vals[] = {
40 0x00000000, 0x00000100, 0x00000000, 0x00000000,
41 0x00000000, 0x00000000, 0x00000000, 0x00000000,
42 0x00000000, 0x00000000, 0x00010101, 0x01010101,
43 - 0x000f0f01, 0x0f02010a, 0x00000000, 0x00010101,
44 + 0x000f0f01, 0x0f02020a, 0x00000000, 0x00010101,
45 0x00000100, 0x00000100, 0x00000000, 0x00000002,
46 0x01010000, 0x05060302, 0x06005003, 0x0a0000c8,
47 0x02009c40, 0x0000030c, 0x0036a609, 0x031a0612,