karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / am33xx / ddr.c

diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c
index 311104be43d16e4541afbad5aa17785237fe0b2a..59dfe45dba63dd6ac27e5a1596be755d62babcd1 100644 (file)
--- a/arch/arm/cpu/armv7/am33xx/ddr.c
+++ b/arch/arm/cpu/armv7/am33xx/ddr.c
@@ -122,7 +122,7 @@ void config_sdram_emif4d5(const struct emif_regs *regs, int nr)
                        EMIF_REG_INITREF_DIS_MASK);
 
        writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config);
-       writel(regs->sdram_config, &cstat->secure_emif_sdram_config);
+       writel(regs->sdram_config, &cstat->emif_sdram_config);
        writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl);
        writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw);
 
@@ -165,7 +165,7 @@ void config_sdram(const struct emif_regs *regs, int nr)
 {
        if (regs->zq_config) {
                writel(regs->zq_config, &emif_reg[nr]->emif_zq_config);
-               writel(regs->sdram_config, &cstat->secure_emif_sdram_config);
+               writel(regs->sdram_config, &cstat->emif_sdram_config);
                writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config);
                writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl);
                writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw);