From: Tom Rini <trini@ti.com>
Date: Thu, 26 Jul 2012 00:04:12 +0000 (-0700)
Subject: am33xx: Bugfix to config_sdram()
X-Git-Tag: v2012.10-rc1~318
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=372f11f58d2cb019b4db885b744aac6c51a97350;hp=13f1c44bc5bb6515a22e1106c1b4eb40fef39ac6;p=platform%2Fkernel%2Fu-boot.git

am33xx: Bugfix to config_sdram()

When we change SDRAM_CONFIG this triggers a refresh based on all of the
parameters that we have programmed so we must do this last.

Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c
index e592609..c37f91b 100644
--- a/arch/arm/cpu/armv7/am33xx/ddr.c
+++ b/arch/arm/cpu/armv7/am33xx/ddr.c
@@ -49,10 +49,9 @@ static struct ddr_cmdtctrl *ioctrl_reg = {
  */
 int config_sdram(struct sdram_config *cfg)
 {
-	writel(cfg->sdrcr, &emif_reg->emif_sdram_config);
-	writel(cfg->sdrcr2, &emif_reg->emif_lpddr2_nvm_config);
 	writel(cfg->refresh, &emif_reg->emif_sdram_ref_ctrl);
 	writel(cfg->refresh_sh, &emif_reg->emif_sdram_ref_ctrl_shdw);
+	writel(cfg->sdrcr, &emif_reg->emif_sdram_config);
 
 	return 0;
 }