diff options
author | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
commit | 5495dae7aa9d5cd161e07174d38acac86515c58a (patch) | |
tree | 848c7f48688aeb5ada1fe221dc5dff4729561814 /arch/arm/cpu/armv7/am33xx/ddr.c | |
parent | c0d297946fd2540c8057eb1589429978da888dbb (diff) | |
parent | 27019e4a949fc3be2e895ac20839c4d4d119f902 (diff) | |
download | u-boot-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.gz u-boot-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.xz u-boot-5495dae7aa9d5cd161e07174d38acac86515c58a.zip |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/ddr.c')
-rw-r--r-- | arch/arm/cpu/armv7/am33xx/ddr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c index d05e666a74..9a625c4661 100644 --- a/arch/arm/cpu/armv7/am33xx/ddr.c +++ b/arch/arm/cpu/armv7/am33xx/ddr.c @@ -80,8 +80,8 @@ static void configure_mr(int nr, u32 cs) */ void config_sdram_emif4d5(const struct emif_regs *regs, int nr) { - writel(0x0, &emif_reg[nr]->emif_pwr_mgmt_ctrl); - writel(0x0, &emif_reg[nr]->emif_pwr_mgmt_ctrl_shdw); + writel(0xA0, &emif_reg[nr]->emif_pwr_mgmt_ctrl); + writel(0xA0, &emif_reg[nr]->emif_pwr_mgmt_ctrl_shdw); writel(0x1, &emif_reg[nr]->emif_iodft_tlgc); writel(regs->zq_config, &emif_reg[nr]->emif_zq_config); @@ -96,6 +96,7 @@ void config_sdram_emif4d5(const struct emif_regs *regs, int nr) writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl); writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config); + writel(regs->sdram_config, &cstat->secure_emif_sdram_config); if (emif_sdram_type() == EMIF_SDRAM_TYPE_LPDDR2) { configure_mr(nr, 0); |