summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-omap4
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2013-04-04 19:51:14 +0000
committerTom Rini <trini@ti.com>2013-04-08 11:29:34 -0400
commitd3d82e9fc69e284fa66ca82c8623f7de64a28130 (patch)
treedf7cf4906d83f428df10f7737bda9c6778e1aa61 /arch/arm/include/asm/arch-omap4
parenta8f408a8c4607a63cf2803be205f7350f316f3bc (diff)
downloadtalos-obmc-uboot-d3d82e9fc69e284fa66ca82c8623f7de64a28130.tar.gz
talos-obmc-uboot-d3d82e9fc69e284fa66ca82c8623f7de64a28130.zip
arm: omap4: Fix SDRAM AUTO DETECTION
Commit "8602114 omap: emif: configure emif only when required" breaks SDRAM_AUTO_DETECTION. The issue is dmm_init() depends on emif_sizes[](SDRAM Auto detection) done in do_sdram_init(). The above commit moves dmm_init() above do_sdram_init() because of which dmm_init() uses uninitialized emif_sizes[]. So instead of using global emif_sizes[], get sdram details locally and calculate emif sizes. Reported-by: Michael Cashwell <mboards@prograde.net> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch/arm/include/asm/arch-omap4')
-rw-r--r--arch/arm/include/asm/arch-omap4/omap.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h
index 5f321fe6f0..ad984da0b4 100644
--- a/arch/arm/include/asm/arch-omap4/omap.h
+++ b/arch/arm/include/asm/arch-omap4/omap.h
@@ -147,7 +147,6 @@ struct s32ktimer {
#define SRAM_SCRATCH_SPACE_ADDR NON_SECURE_SRAM_START
/* SRAM scratch space entries */
#define OMAP4_SRAM_SCRATCH_OMAP4_REV SRAM_SCRATCH_SPACE_ADDR
-#define OMAP4_SRAM_SCRATCH_EMIF_SIZE (SRAM_SCRATCH_SPACE_ADDR + 0x4)
#define OMAP4_SRAM_SCRATCH_EMIF_T_NUM (SRAM_SCRATCH_SPACE_ADDR + 0xC)
#define OMAP4_SRAM_SCRATCH_EMIF_T_DEN (SRAM_SCRATCH_SPACE_ADDR + 0x10)
#define OMAP_SRAM_SCRATCH_PRCM_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x14)
OpenPOWER on IntegriCloud