rename secure_emif_sdram_config to emif_sdram_config

diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c
index 5bcd8d44a40ac00d2b1d1edade6faa9cc0b113f1..d7fa1d013bce2a4a8ad6c279e0d1f662fa48f377 100644 (file)
--- a/arch/arm/cpu/armv7/am33xx/ddr.c
+++ b/arch/arm/cpu/armv7/am33xx/ddr.c
@@ -47,7 +47,7 @@ void config_sdram(const struct emif_regs *regs)
        writel(regs->ref_ctrl, &emif_reg->emif_sdram_ref_ctrl_shdw);
        if (regs->zq_config) {
                writel(regs->zq_config, &emif_reg->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->emif_sdram_config);
 }

diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
index 5897d0b58aacb6c8f9a1e0d6c46009ed2d4a7d5a..70189ecf3080c2019803d68b931562d85b0acedf 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/cpu.h
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -305,7 +305,7 @@ struct ctrl_stat {
        unsigned int resv1[16];
        unsigned int statusreg;         /* ofset 0x40 */
        unsigned int resv2[51];
-       unsigned int secure_emif_sdram_config;  /* offset 0x0110 */
+       unsigned int emif_sdram_config; /* offset 0x0110 */
 };
 
 /* AM33XX GPIO registers */