am33xx: Convert to using <asm/emif.h> to describe the EMIF

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 ed982c11e88debf95f545bdd5a97b6da7b65f350..e59260937d4bb8b99a10f0dd73cb83190b621062 100644 (file)
--- a/arch/arm/cpu/armv7/am33xx/ddr.c
+++ b/arch/arm/cpu/armv7/am33xx/ddr.c
@@ -18,12 +18,13 @@ http://www.ti.com/
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/io.h>
+#include <asm/emif.h>
 
 /**
  * Base address for EMIF instances
  */
-static struct emif_regs *emif_reg = {
-                               (struct emif_regs *)EMIF4_0_CFG_BASE};
+static struct emif_reg_struct *emif_reg = {
+                               (struct emif_reg_struct *)EMIF4_0_CFG_BASE};
 
 /**
  * Base address for DDR instance
@@ -48,10 +49,10 @@ static struct ddr_cmdtctrl *ioctrl_reg = {
  */
 int config_sdram(struct sdram_config *cfg)
 {
-       writel(cfg->sdrcr, &emif_reg->sdrcr);
-       writel(cfg->sdrcr2, &emif_reg->sdrcr2);
-       writel(cfg->refresh, &emif_reg->sdrrcr);
-       writel(cfg->refresh_sh, &emif_reg->sdrrcsr);
+       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);
 
        return 0;
 }
@@ -61,12 +62,12 @@ int config_sdram(struct sdram_config *cfg)
  */
 int set_sdram_timings(struct sdram_timing *t)
 {
-       writel(t->time1, &emif_reg->sdrtim1);
-       writel(t->time1_sh, &emif_reg->sdrtim1sr);
-       writel(t->time2, &emif_reg->sdrtim2);
-       writel(t->time2_sh, &emif_reg->sdrtim2sr);
-       writel(t->time3, &emif_reg->sdrtim3);
-       writel(t->time3_sh, &emif_reg->sdrtim3sr);
+       writel(t->time1, &emif_reg->emif_sdram_tim_1);
+       writel(t->time1_sh, &emif_reg->emif_sdram_tim_1_shdw);
+       writel(t->time2, &emif_reg->emif_sdram_tim_2);
+       writel(t->time2_sh, &emif_reg->emif_sdram_tim_2_shdw);
+       writel(t->time3, &emif_reg->emif_sdram_tim_3);
+       writel(t->time3_sh, &emif_reg->emif_sdram_tim_3_shdw);
 
        return 0;
 }
@@ -76,8 +77,8 @@ int set_sdram_timings(struct sdram_timing *t)
  */
 int config_ddr_phy(struct ddr_phy_control *p)
 {
-       writel(p->reg, &emif_reg->ddrphycr);
-       writel(p->reg_sh, &emif_reg->ddrphycsr);
+       writel(p->reg, &emif_reg->emif_ddr_phy_ctrl_1);
+       writel(p->reg_sh, &emif_reg->emif_ddr_phy_ctrl_1_shdw);
 
        return 0;
 }

diff --git a/arch/arm/include/asm/arch-am33xx/ddr_defs.h b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
index 388336f9d70a2aab663022acba58a5da30fc860c..c62f826f78bfb4fbf8281583f7352ee566435460 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/ddr_defs.h
+++ b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
@@ -55,33 +55,6 @@
 #define PHY_DLL_LOCK_DIFF      0x0
 #define DDR_IOCTRL_VALUE       0x18B
 
-/**
- * This structure represents the EMIF registers on AM33XX devices.
- */
-struct emif_regs {
-       unsigned int sdrrev;            /* offset 0x00 */
-       unsigned int sdrstat;           /* offset 0x04 */
-       unsigned int sdrcr;             /* offset 0x08 */
-       unsigned int sdrcr2;            /* offset 0x0C */
-       unsigned int sdrrcr;            /* offset 0x10 */
-       unsigned int sdrrcsr;           /* offset 0x14 */
-       unsigned int sdrtim1;           /* offset 0x18 */
-       unsigned int sdrtim1sr;         /* offset 0x1C */
-       unsigned int sdrtim2;           /* offset 0x20 */
-       unsigned int sdrtim2sr;         /* offset 0x24 */
-       unsigned int sdrtim3;           /* offset 0x28 */
-       unsigned int sdrtim3sr;         /* offset 0x2C */
-       unsigned int res1[2];
-       unsigned int sdrmcr;            /* offset 0x38 */
-       unsigned int sdrmcsr;           /* offset 0x3C */
-       unsigned int res2[8];
-       unsigned int sdritr;            /* offset 0x60 */
-       unsigned int res3[32];
-       unsigned int ddrphycr;          /* offset 0xE4 */
-       unsigned int ddrphycsr;         /* offset 0xE8 */
-       unsigned int ddrphycr2;         /* offset 0xEC */
-};
-
 /**
  * Encapsulates DDR PHY control and corresponding shadow registers.
  */