]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
swapped files emif4.c and ddr.c
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 17 Jul 2012 09:11:05 +0000 (11:11 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 17 Jul 2012 09:11:05 +0000 (11:11 +0200)
arch/arm/cpu/armv7/am33xx/ddr.c [deleted file]
arch/arm/cpu/armv7/am33xx/ddr2.c [new file with mode: 0644]
arch/arm/cpu/armv7/am33xx/emif4.c

diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c
deleted file mode 100644 (file)
index ed982c1..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * DDR Configuration for AM33xx devices.
- *
- * Copyright (C) 2011 Texas Instruments Incorporated -
-http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed .as is. WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <asm/arch/cpu.h>
-#include <asm/arch/ddr_defs.h>
-#include <asm/io.h>
-
-/**
- * Base address for EMIF instances
- */
-static struct emif_regs *emif_reg = {
-                               (struct emif_regs *)EMIF4_0_CFG_BASE};
-
-/**
- * Base address for DDR instance
- */
-static struct ddr_regs *ddr_reg[2] = {
-                               (struct ddr_regs *)DDR_PHY_BASE_ADDR,
-                               (struct ddr_regs *)DDR_PHY_BASE_ADDR2};
-
-/**
- * Base address for ddr io control instances
- */
-static struct ddr_cmdtctrl *ioctrl_reg = {
-                       (struct ddr_cmdtctrl *)DDR_CONTROL_BASE_ADDR};
-
-/**
- * As a convention, all functions here return 0 on success
- * -1 on failure.
- */
-
-/**
- * Configure SDRAM
- */
-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);
-
-       return 0;
-}
-
-/**
- * Set SDRAM timings
- */
-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);
-
-       return 0;
-}
-
-/**
- * Configure DDR PHY
- */
-int config_ddr_phy(struct ddr_phy_control *p)
-{
-       writel(p->reg, &emif_reg->ddrphycr);
-       writel(p->reg_sh, &emif_reg->ddrphycsr);
-
-       return 0;
-}
-
-/**
- * Configure DDR CMD control registers
- */
-int config_cmd_ctrl(struct cmd_control *cmd)
-{
-       writel(cmd->cmd0csratio, &ddr_reg[0]->cm0csratio);
-       writel(cmd->cmd0csforce, &ddr_reg[0]->cm0csforce);
-       writel(cmd->cmd0csdelay, &ddr_reg[0]->cm0csdelay);
-       writel(cmd->cmd0dldiff, &ddr_reg[0]->cm0dldiff);
-       writel(cmd->cmd0iclkout, &ddr_reg[0]->cm0iclkout);
-
-       writel(cmd->cmd1csratio, &ddr_reg[0]->cm1csratio);
-       writel(cmd->cmd1csforce, &ddr_reg[0]->cm1csforce);
-       writel(cmd->cmd1csdelay, &ddr_reg[0]->cm1csdelay);
-       writel(cmd->cmd1dldiff, &ddr_reg[0]->cm1dldiff);
-       writel(cmd->cmd1iclkout, &ddr_reg[0]->cm1iclkout);
-
-       writel(cmd->cmd2csratio, &ddr_reg[0]->cm2csratio);
-       writel(cmd->cmd2csforce, &ddr_reg[0]->cm2csforce);
-       writel(cmd->cmd2csdelay, &ddr_reg[0]->cm2csdelay);
-       writel(cmd->cmd2dldiff, &ddr_reg[0]->cm2dldiff);
-       writel(cmd->cmd2iclkout, &ddr_reg[0]->cm2iclkout);
-
-       return 0;
-}
-
-/**
- * Configure DDR DATA registers
- */
-int config_ddr_data(int macrono, struct ddr_data *data)
-{
-       writel(data->datardsratio0, &ddr_reg[macrono]->dt0rdsratio0);
-       writel(data->datardsratio1, &ddr_reg[macrono]->dt0rdsratio1);
-
-       writel(data->datawdsratio0, &ddr_reg[macrono]->dt0wdsratio0);
-       writel(data->datawdsratio1, &ddr_reg[macrono]->dt0wdsratio1);
-
-       writel(data->datawiratio0, &ddr_reg[macrono]->dt0wiratio0);
-       writel(data->datawiratio1, &ddr_reg[macrono]->dt0wiratio1);
-       writel(data->datagiratio0, &ddr_reg[macrono]->dt0giratio0);
-       writel(data->datagiratio1, &ddr_reg[macrono]->dt0giratio1);
-
-       writel(data->datafwsratio0, &ddr_reg[macrono]->dt0fwsratio0);
-       writel(data->datafwsratio1, &ddr_reg[macrono]->dt0fwsratio1);
-
-       writel(data->datawrsratio0, &ddr_reg[macrono]->dt0wrsratio0);
-       writel(data->datawrsratio1, &ddr_reg[macrono]->dt0wrsratio1);
-
-       writel(data->datadldiff0, &ddr_reg[macrono]->dt0dldiff0);
-
-       return 0;
-}
-
-int config_io_ctrl(struct ddr_ioctrl *ioctrl)
-{
-       writel(ioctrl->cmd1ctl, &ioctrl_reg->cm0ioctl);
-       writel(ioctrl->cmd2ctl, &ioctrl_reg->cm1ioctl);
-       writel(ioctrl->cmd3ctl, &ioctrl_reg->cm2ioctl);
-       writel(ioctrl->data1ctl, &ioctrl_reg->dt0ioctl);
-       writel(ioctrl->data2ctl, &ioctrl_reg->dt1ioctl);
-
-       return 0;
-}
diff --git a/arch/arm/cpu/armv7/am33xx/ddr2.c b/arch/arm/cpu/armv7/am33xx/ddr2.c
new file mode 100644 (file)
index 0000000..2f4164d
--- /dev/null
@@ -0,0 +1,201 @@
+/*
+ * emif4.c
+ *
+ * AM33XX emif4 configuration file
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/ddr_defs.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/clock.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ddr_regs *ddrregs = (struct ddr_regs *)DDR_PHY_BASE_ADDR;
+struct vtp_reg *vtpreg = (struct vtp_reg *)VTP0_CTRL_ADDR;
+struct ddr_ctrl *ddrctrl = (struct ddr_ctrl *)DDR_CTRL_ADDR;
+
+
+int dram_init(void)
+{
+       /* dram_init must store complete ramsize in gd->ram_size */
+       gd->ram_size = get_ram_size(
+                       (void *)CONFIG_SYS_SDRAM_BASE,
+                       CONFIG_MAX_RAM_BANK_SIZE);
+       return 0;
+}
+
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
+
+#ifdef CONFIG_SPL_BUILD
+static void data_macro_config(int dataMacroNum)
+{
+       struct ddr_data data;
+
+       data.datardsratio0 = ((DDR2_RD_DQS<<30)|(DDR2_RD_DQS<<20)
+                               |(DDR2_RD_DQS<<10)|(DDR2_RD_DQS<<0));
+       data.datardsratio1 = DDR2_RD_DQS>>2;
+       data.datawdsratio0 = ((DDR2_WR_DQS<<30)|(DDR2_WR_DQS<<20)
+                               |(DDR2_WR_DQS<<10)|(DDR2_WR_DQS<<0));
+       data.datawdsratio1 = DDR2_WR_DQS>>2;
+       data.datawiratio0 = ((DDR2_PHY_WRLVL<<30)|(DDR2_PHY_WRLVL<<20)
+                               |(DDR2_PHY_WRLVL<<10)|(DDR2_PHY_WRLVL<<0));
+       data.datawiratio1 = DDR2_PHY_WRLVL>>2;
+       data.datagiratio0 = ((DDR2_PHY_GATELVL<<30)|(DDR2_PHY_GATELVL<<20)
+                               |(DDR2_PHY_GATELVL<<10)|(DDR2_PHY_GATELVL<<0));
+       data.datagiratio1 = DDR2_PHY_GATELVL>>2;
+       data.datafwsratio0 = ((DDR2_PHY_FIFO_WE<<30)|(DDR2_PHY_FIFO_WE<<20)
+                               |(DDR2_PHY_FIFO_WE<<10)|(DDR2_PHY_FIFO_WE<<0));
+       data.datafwsratio1 = DDR2_PHY_FIFO_WE>>2;
+       data.datawrsratio0 = ((DDR2_PHY_WR_DATA<<30)|(DDR2_PHY_WR_DATA<<20)
+                               |(DDR2_PHY_WR_DATA<<10)|(DDR2_PHY_WR_DATA<<0));
+       data.datawrsratio1 = DDR2_PHY_WR_DATA>>2;
+       data.datadldiff0 = PHY_DLL_LOCK_DIFF;
+
+       config_ddr_data(dataMacroNum, &data);
+}
+
+static void cmd_macro_config(void)
+{
+       struct cmd_control cmd;
+
+       cmd.cmd0csratio = DDR2_RATIO;
+       cmd.cmd0csforce = CMD_FORCE;
+       cmd.cmd0csdelay = CMD_DELAY;
+       cmd.cmd0dldiff = DDR2_DLL_LOCK_DIFF;
+       cmd.cmd0iclkout = DDR2_INVERT_CLKOUT;
+
+       cmd.cmd1csratio = DDR2_RATIO;
+       cmd.cmd1csforce = CMD_FORCE;
+       cmd.cmd1csdelay = CMD_DELAY;
+       cmd.cmd1dldiff = DDR2_DLL_LOCK_DIFF;
+       cmd.cmd1iclkout = DDR2_INVERT_CLKOUT;
+
+       cmd.cmd2csratio = DDR2_RATIO;
+       cmd.cmd2csforce = CMD_FORCE;
+       cmd.cmd2csdelay = CMD_DELAY;
+       cmd.cmd2dldiff = DDR2_DLL_LOCK_DIFF;
+       cmd.cmd2iclkout = DDR2_INVERT_CLKOUT;
+
+       config_cmd_ctrl(&cmd);
+
+}
+
+static void config_vtp(void)
+{
+       writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_ENABLE,
+                       &vtpreg->vtp0ctrlreg);
+       writel(readl(&vtpreg->vtp0ctrlreg) & (~VTP_CTRL_START_EN),
+                       &vtpreg->vtp0ctrlreg);
+       writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_START_EN,
+                       &vtpreg->vtp0ctrlreg);
+
+       /* Poll for READY */
+       while ((readl(&vtpreg->vtp0ctrlreg) & VTP_CTRL_READY) !=
+                       VTP_CTRL_READY)
+               ;
+}
+
+static void config_emif_ddr2(void)
+{
+       int i;
+       int ret;
+       struct sdram_config cfg;
+       struct sdram_timing tmg;
+       struct ddr_phy_control phyc;
+
+       /*Program EMIF0 CFG Registers*/
+       phyc.reg = EMIF_READ_LATENCY;
+       phyc.reg_sh = EMIF_READ_LATENCY;
+       phyc.reg2 = EMIF_READ_LATENCY;
+
+       tmg.time1 = EMIF_TIM1;
+       tmg.time1_sh = EMIF_TIM1;
+       tmg.time2 = EMIF_TIM2;
+       tmg.time2_sh = EMIF_TIM2;
+       tmg.time3 = EMIF_TIM3;
+       tmg.time3_sh = EMIF_TIM3;
+
+       cfg.sdrcr = EMIF_SDCFG;
+       cfg.sdrcr2 = EMIF_SDCFG;
+       cfg.refresh = 0x00004650;
+       cfg.refresh_sh = 0x00004650;
+
+       /* Program EMIF instance */
+       ret = config_ddr_phy(&phyc);
+       if (ret < 0)
+               printf("Couldn't configure phyc\n");
+
+       ret = config_sdram(&cfg);
+       if (ret < 0)
+               printf("Couldn't configure SDRAM\n");
+
+       ret = set_sdram_timings(&tmg);
+       if (ret < 0)
+               printf("Couldn't configure timings\n");
+
+       /* Delay */
+       for (i = 0; i < 5000; i++)
+               ;
+
+       cfg.refresh = EMIF_SDREF;
+       cfg.refresh_sh = EMIF_SDREF;
+       cfg.sdrcr = EMIF_SDCFG;
+       cfg.sdrcr2 = EMIF_SDCFG;
+
+       ret = config_sdram(&cfg);
+       if (ret < 0)
+               printf("Couldn't configure SDRAM\n");
+}
+
+void config_ddr(void)
+{
+       int data_macro_0 = 0;
+       int data_macro_1 = 1;
+       struct ddr_ioctrl ioctrl;
+
+       enable_emif_clocks();
+
+       config_vtp();
+
+       cmd_macro_config();
+
+       data_macro_config(data_macro_0);
+       data_macro_config(data_macro_1);
+
+       writel(PHY_RANK0_DELAY, &ddrregs->dt0rdelays0);
+       writel(PHY_RANK0_DELAY, &ddrregs->dt1rdelays0);
+
+       ioctrl.cmd1ctl = DDR_IOCTRL_VALUE;
+       ioctrl.cmd2ctl = DDR_IOCTRL_VALUE;
+       ioctrl.cmd3ctl = DDR_IOCTRL_VALUE;
+       ioctrl.data1ctl = DDR_IOCTRL_VALUE;
+       ioctrl.data2ctl = DDR_IOCTRL_VALUE;
+
+       config_io_ctrl(&ioctrl);
+
+       writel(readl(&ddrctrl->ddrioctrl) & 0xefffffff, &ddrctrl->ddrioctrl);
+       writel(readl(&ddrctrl->ddrckectrl) | 0x00000001, &ddrctrl->ddrckectrl);
+
+       config_emif_ddr2();
+}
+#endif
index 2f4164df8218a348bd82c0fd6439a529e6ddd06b..ed982c11e88debf95f545bdd5a97b6da7b65f350 100644 (file)
 /*
- * emif4.c
+ * DDR Configuration for AM33xx devices.
  *
- * AM33XX emif4 configuration file
- *
- * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ * Copyright (C) 2011 Texas Instruments Incorporated -
+http://www.ti.com/
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE.  See the
+ * This program is distributed .as is. WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
 
-#include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/clock.h>
 #include <asm/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
+/**
+ * Base address for EMIF instances
+ */
+static struct emif_regs *emif_reg = {
+                               (struct emif_regs *)EMIF4_0_CFG_BASE};
+
+/**
+ * Base address for DDR instance
+ */
+static struct ddr_regs *ddr_reg[2] = {
+                               (struct ddr_regs *)DDR_PHY_BASE_ADDR,
+                               (struct ddr_regs *)DDR_PHY_BASE_ADDR2};
 
-struct ddr_regs *ddrregs = (struct ddr_regs *)DDR_PHY_BASE_ADDR;
-struct vtp_reg *vtpreg = (struct vtp_reg *)VTP0_CTRL_ADDR;
-struct ddr_ctrl *ddrctrl = (struct ddr_ctrl *)DDR_CTRL_ADDR;
+/**
+ * Base address for ddr io control instances
+ */
+static struct ddr_cmdtctrl *ioctrl_reg = {
+                       (struct ddr_cmdtctrl *)DDR_CONTROL_BASE_ADDR};
 
+/**
+ * As a convention, all functions here return 0 on success
+ * -1 on failure.
+ */
 
-int dram_init(void)
+/**
+ * Configure SDRAM
+ */
+int config_sdram(struct sdram_config *cfg)
 {
-       /* dram_init must store complete ramsize in gd->ram_size */
-       gd->ram_size = get_ram_size(
-                       (void *)CONFIG_SYS_SDRAM_BASE,
-                       CONFIG_MAX_RAM_BANK_SIZE);
+       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);
+
        return 0;
 }
 
-void dram_init_banksize(void)
+/**
+ * Set SDRAM timings
+ */
+int set_sdram_timings(struct sdram_timing *t)
 {
-       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-       gd->bd->bi_dram[0].size = gd->ram_size;
-}
+       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);
 
-
-#ifdef CONFIG_SPL_BUILD
-static void data_macro_config(int dataMacroNum)
-{
-       struct ddr_data data;
-
-       data.datardsratio0 = ((DDR2_RD_DQS<<30)|(DDR2_RD_DQS<<20)
-                               |(DDR2_RD_DQS<<10)|(DDR2_RD_DQS<<0));
-       data.datardsratio1 = DDR2_RD_DQS>>2;
-       data.datawdsratio0 = ((DDR2_WR_DQS<<30)|(DDR2_WR_DQS<<20)
-                               |(DDR2_WR_DQS<<10)|(DDR2_WR_DQS<<0));
-       data.datawdsratio1 = DDR2_WR_DQS>>2;
-       data.datawiratio0 = ((DDR2_PHY_WRLVL<<30)|(DDR2_PHY_WRLVL<<20)
-                               |(DDR2_PHY_WRLVL<<10)|(DDR2_PHY_WRLVL<<0));
-       data.datawiratio1 = DDR2_PHY_WRLVL>>2;
-       data.datagiratio0 = ((DDR2_PHY_GATELVL<<30)|(DDR2_PHY_GATELVL<<20)
-                               |(DDR2_PHY_GATELVL<<10)|(DDR2_PHY_GATELVL<<0));
-       data.datagiratio1 = DDR2_PHY_GATELVL>>2;
-       data.datafwsratio0 = ((DDR2_PHY_FIFO_WE<<30)|(DDR2_PHY_FIFO_WE<<20)
-                               |(DDR2_PHY_FIFO_WE<<10)|(DDR2_PHY_FIFO_WE<<0));
-       data.datafwsratio1 = DDR2_PHY_FIFO_WE>>2;
-       data.datawrsratio0 = ((DDR2_PHY_WR_DATA<<30)|(DDR2_PHY_WR_DATA<<20)
-                               |(DDR2_PHY_WR_DATA<<10)|(DDR2_PHY_WR_DATA<<0));
-       data.datawrsratio1 = DDR2_PHY_WR_DATA>>2;
-       data.datadldiff0 = PHY_DLL_LOCK_DIFF;
-
-       config_ddr_data(dataMacroNum, &data);
+       return 0;
 }
 
-static void cmd_macro_config(void)
+/**
+ * Configure DDR PHY
+ */
+int config_ddr_phy(struct ddr_phy_control *p)
 {
-       struct cmd_control cmd;
-
-       cmd.cmd0csratio = DDR2_RATIO;
-       cmd.cmd0csforce = CMD_FORCE;
-       cmd.cmd0csdelay = CMD_DELAY;
-       cmd.cmd0dldiff = DDR2_DLL_LOCK_DIFF;
-       cmd.cmd0iclkout = DDR2_INVERT_CLKOUT;
-
-       cmd.cmd1csratio = DDR2_RATIO;
-       cmd.cmd1csforce = CMD_FORCE;
-       cmd.cmd1csdelay = CMD_DELAY;
-       cmd.cmd1dldiff = DDR2_DLL_LOCK_DIFF;
-       cmd.cmd1iclkout = DDR2_INVERT_CLKOUT;
-
-       cmd.cmd2csratio = DDR2_RATIO;
-       cmd.cmd2csforce = CMD_FORCE;
-       cmd.cmd2csdelay = CMD_DELAY;
-       cmd.cmd2dldiff = DDR2_DLL_LOCK_DIFF;
-       cmd.cmd2iclkout = DDR2_INVERT_CLKOUT;
-
-       config_cmd_ctrl(&cmd);
+       writel(p->reg, &emif_reg->ddrphycr);
+       writel(p->reg_sh, &emif_reg->ddrphycsr);
 
+       return 0;
 }
 
-static void config_vtp(void)
+/**
+ * Configure DDR CMD control registers
+ */
+int config_cmd_ctrl(struct cmd_control *cmd)
 {
-       writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_ENABLE,
-                       &vtpreg->vtp0ctrlreg);
-       writel(readl(&vtpreg->vtp0ctrlreg) & (~VTP_CTRL_START_EN),
-                       &vtpreg->vtp0ctrlreg);
-       writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_START_EN,
-                       &vtpreg->vtp0ctrlreg);
-
-       /* Poll for READY */
-       while ((readl(&vtpreg->vtp0ctrlreg) & VTP_CTRL_READY) !=
-                       VTP_CTRL_READY)
-               ;
-}
+       writel(cmd->cmd0csratio, &ddr_reg[0]->cm0csratio);
+       writel(cmd->cmd0csforce, &ddr_reg[0]->cm0csforce);
+       writel(cmd->cmd0csdelay, &ddr_reg[0]->cm0csdelay);
+       writel(cmd->cmd0dldiff, &ddr_reg[0]->cm0dldiff);
+       writel(cmd->cmd0iclkout, &ddr_reg[0]->cm0iclkout);
+
+       writel(cmd->cmd1csratio, &ddr_reg[0]->cm1csratio);
+       writel(cmd->cmd1csforce, &ddr_reg[0]->cm1csforce);
+       writel(cmd->cmd1csdelay, &ddr_reg[0]->cm1csdelay);
+       writel(cmd->cmd1dldiff, &ddr_reg[0]->cm1dldiff);
+       writel(cmd->cmd1iclkout, &ddr_reg[0]->cm1iclkout);
+
+       writel(cmd->cmd2csratio, &ddr_reg[0]->cm2csratio);
+       writel(cmd->cmd2csforce, &ddr_reg[0]->cm2csforce);
+       writel(cmd->cmd2csdelay, &ddr_reg[0]->cm2csdelay);
+       writel(cmd->cmd2dldiff, &ddr_reg[0]->cm2dldiff);
+       writel(cmd->cmd2iclkout, &ddr_reg[0]->cm2iclkout);
 
-static void config_emif_ddr2(void)
-{
-       int i;
-       int ret;
-       struct sdram_config cfg;
-       struct sdram_timing tmg;
-       struct ddr_phy_control phyc;
-
-       /*Program EMIF0 CFG Registers*/
-       phyc.reg = EMIF_READ_LATENCY;
-       phyc.reg_sh = EMIF_READ_LATENCY;
-       phyc.reg2 = EMIF_READ_LATENCY;
-
-       tmg.time1 = EMIF_TIM1;
-       tmg.time1_sh = EMIF_TIM1;
-       tmg.time2 = EMIF_TIM2;
-       tmg.time2_sh = EMIF_TIM2;
-       tmg.time3 = EMIF_TIM3;
-       tmg.time3_sh = EMIF_TIM3;
-
-       cfg.sdrcr = EMIF_SDCFG;
-       cfg.sdrcr2 = EMIF_SDCFG;
-       cfg.refresh = 0x00004650;
-       cfg.refresh_sh = 0x00004650;
-
-       /* Program EMIF instance */
-       ret = config_ddr_phy(&phyc);
-       if (ret < 0)
-               printf("Couldn't configure phyc\n");
-
-       ret = config_sdram(&cfg);
-       if (ret < 0)
-               printf("Couldn't configure SDRAM\n");
-
-       ret = set_sdram_timings(&tmg);
-       if (ret < 0)
-               printf("Couldn't configure timings\n");
-
-       /* Delay */
-       for (i = 0; i < 5000; i++)
-               ;
-
-       cfg.refresh = EMIF_SDREF;
-       cfg.refresh_sh = EMIF_SDREF;
-       cfg.sdrcr = EMIF_SDCFG;
-       cfg.sdrcr2 = EMIF_SDCFG;
-
-       ret = config_sdram(&cfg);
-       if (ret < 0)
-               printf("Couldn't configure SDRAM\n");
+       return 0;
 }
 
-void config_ddr(void)
+/**
+ * Configure DDR DATA registers
+ */
+int config_ddr_data(int macrono, struct ddr_data *data)
 {
-       int data_macro_0 = 0;
-       int data_macro_1 = 1;
-       struct ddr_ioctrl ioctrl;
+       writel(data->datardsratio0, &ddr_reg[macrono]->dt0rdsratio0);
+       writel(data->datardsratio1, &ddr_reg[macrono]->dt0rdsratio1);
 
-       enable_emif_clocks();
+       writel(data->datawdsratio0, &ddr_reg[macrono]->dt0wdsratio0);
+       writel(data->datawdsratio1, &ddr_reg[macrono]->dt0wdsratio1);
 
-       config_vtp();
+       writel(data->datawiratio0, &ddr_reg[macrono]->dt0wiratio0);
+       writel(data->datawiratio1, &ddr_reg[macrono]->dt0wiratio1);
+       writel(data->datagiratio0, &ddr_reg[macrono]->dt0giratio0);
+       writel(data->datagiratio1, &ddr_reg[macrono]->dt0giratio1);
 
-       cmd_macro_config();
+       writel(data->datafwsratio0, &ddr_reg[macrono]->dt0fwsratio0);
+       writel(data->datafwsratio1, &ddr_reg[macrono]->dt0fwsratio1);
 
-       data_macro_config(data_macro_0);
-       data_macro_config(data_macro_1);
+       writel(data->datawrsratio0, &ddr_reg[macrono]->dt0wrsratio0);
+       writel(data->datawrsratio1, &ddr_reg[macrono]->dt0wrsratio1);
 
-       writel(PHY_RANK0_DELAY, &ddrregs->dt0rdelays0);
-       writel(PHY_RANK0_DELAY, &ddrregs->dt1rdelays0);
+       writel(data->datadldiff0, &ddr_reg[macrono]->dt0dldiff0);
 
-       ioctrl.cmd1ctl = DDR_IOCTRL_VALUE;
-       ioctrl.cmd2ctl = DDR_IOCTRL_VALUE;
-       ioctrl.cmd3ctl = DDR_IOCTRL_VALUE;
-       ioctrl.data1ctl = DDR_IOCTRL_VALUE;
-       ioctrl.data2ctl = DDR_IOCTRL_VALUE;
-
-       config_io_ctrl(&ioctrl);
+       return 0;
+}
 
-       writel(readl(&ddrctrl->ddrioctrl) & 0xefffffff, &ddrctrl->ddrioctrl);
-       writel(readl(&ddrctrl->ddrckectrl) | 0x00000001, &ddrctrl->ddrckectrl);
+int config_io_ctrl(struct ddr_ioctrl *ioctrl)
+{
+       writel(ioctrl->cmd1ctl, &ioctrl_reg->cm0ioctl);
+       writel(ioctrl->cmd2ctl, &ioctrl_reg->cm1ioctl);
+       writel(ioctrl->cmd3ctl, &ioctrl_reg->cm2ioctl);
+       writel(ioctrl->data1ctl, &ioctrl_reg->dt0ioctl);
+       writel(ioctrl->data2ctl, &ioctrl_reg->dt1ioctl);
 
-       config_emif_ddr2();
+       return 0;
 }
-#endif