From d3d82e9fc69e284fa66ca82c8623f7de64a28130 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Thu, 4 Apr 2013 19:51:14 +0000 Subject: 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 Signed-off-by: Lokesh Vutla --- arch/arm/cpu/armv7/omap5/emif.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/cpu/armv7/omap5/emif.c') diff --git a/arch/arm/cpu/armv7/omap5/emif.c b/arch/arm/cpu/armv7/omap5/emif.c index 8019ffe3d3..3f37abdf83 100644 --- a/arch/arm/cpu/armv7/omap5/emif.c +++ b/arch/arm/cpu/armv7/omap5/emif.c @@ -34,7 +34,6 @@ #define print_timing_reg(reg) debug(#reg" - 0x%08x\n", (reg)) static u32 *const T_num = (u32 *)OMAP5_SRAM_SCRATCH_EMIF_T_NUM; static u32 *const T_den = (u32 *)OMAP5_SRAM_SCRATCH_EMIF_T_DEN; -static u32 *const emif_sizes = (u32 *)OMAP5_SRAM_SCRATCH_EMIF_SIZE; #endif #ifdef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS -- cgit v1.2.1