summaryrefslogtreecommitdiff
path: root/src/cpu/samsung
diff options
context:
space:
mode:
authorDavid Hendricks <dhendrix@chromium.org>2013-08-22 18:45:10 -0700
committerIsaac Christensen <isaac.christensen@se-eng.com>2014-08-12 22:02:56 +0200
commit0f0c720621deacc3c51b409e10ea8100acc88c80 (patch)
treeac137b5e56aad6ad7a8b18371b7bf8a1afa5bc82 /src/cpu/samsung
parent2f3daddd28c95a134f2543e366f8ee9dd8d2be41 (diff)
downloadcoreboot-0f0c720621deacc3c51b409e10ea8100acc88c80.tar.xz
exynos5420: ddr3: Cleanup init to use constants for directcmd
The old ddr3_mem_ctrl_init() for exynos5420 had hardcoded constants for accessing directcmd registers. Modify to use #defines where possible. This is ported from: https://gerrit.chromium.org/gerrit/#/c/65616 Signed-off-by: David Hendricks <dhendrix@chromium.org> Change-Id: I01567fc6941608a570832de97259c55e84942d01 Reviewed-on: https://gerrit.chromium.org/gerrit/66789 Commit-Queue: David Hendricks <dhendrix@chromium.org> Tested-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: Ronald G. Minnich <rminnich@chromium.org> (cherry picked from commit d751e019f450172f060ce255ae53e972bc4a19ea) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6605 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/cpu/samsung')
-rw-r--r--src/cpu/samsung/exynos5420/dmc_init_ddr3.c37
1 files changed, 21 insertions, 16 deletions
diff --git a/src/cpu/samsung/exynos5420/dmc_init_ddr3.c b/src/cpu/samsung/exynos5420/dmc_init_ddr3.c
index 0a4edc848b..6c774a04f5 100644
--- a/src/cpu/samsung/exynos5420/dmc_init_ddr3.c
+++ b/src/cpu/samsung/exynos5420/dmc_init_ddr3.c
@@ -264,10 +264,11 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, int interleave_size, int reset)
nLockR |= nLockW_phy1;
writel(nLockR, &phy1_ctrl->phy_con12);
- writel(0x00030004, &drex0->directcmd);
- writel(0x00130004, &drex0->directcmd);
- writel(0x00030004, &drex1->directcmd);
- writel(0x00130004, &drex1->directcmd);
+ val = (0x3 << DIRECT_CMD_BANK_SHIFT) | 0x4;
+ writel(val, &drex0->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex0->directcmd);
+ writel(val, &drex1->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex1->directcmd);
setbits_le32(&phy0_ctrl->phy_con2, RDLVL_GATE_EN);
setbits_le32(&phy1_ctrl->phy_con2, RDLVL_GATE_EN);
@@ -316,16 +317,19 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, int interleave_size, int reset)
writel(0, &phy0_ctrl->phy_con14);
writel(0, &phy1_ctrl->phy_con14);
- writel(0x00030000, &drex0->directcmd);
- writel(0x00130000, &drex0->directcmd);
- writel(0x00030000, &drex1->directcmd);
- writel(0x00130000, &drex1->directcmd);
+ val = (0x3 << DIRECT_CMD_BANK_SHIFT);
+ writel(val, &drex0->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex0->directcmd);
+ writel(val, &drex1->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex1->directcmd);
/* Set Read DQ Calibration */
- writel(0x00030004, &drex0->directcmd);
- writel(0x00130004, &drex0->directcmd);
- writel(0x00030004, &drex1->directcmd);
- writel(0x00130004, &drex1->directcmd);
+ val = (0x3 << DIRECT_CMD_BANK_SHIFT) | 0x4;
+ writel(val, &drex0->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex0->directcmd);
+ writel(val, &drex1->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex1->directcmd);
+
val = readl(&phy0_ctrl->phy_con1);
val |= READ_LEVELLING_DDR3;
@@ -371,10 +375,11 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, int interleave_size, int reset)
return SETUP_ERR_RDLV_COMPLETE_TIMEOUT;
clrbits_le32(&drex1->rdlvl_config, CTRL_RDLVL_DATA_ENABLE);
- writel(0x00030000, &drex0->directcmd);
- writel(0x00130000, &drex0->directcmd);
- writel(0x00030000, &drex1->directcmd);
- writel(0x00130000, &drex1->directcmd);
+ val = (0x3 << DIRECT_CMD_BANK_SHIFT);
+ writel(val, &drex0->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex0->directcmd);
+ writel(val, &drex1->directcmd);
+ writel(val | (0x1 << DIRECT_CMD_CHIP_SHIFT), &drex1->directcmd);
update_reset_dll(drex0, DDR_MODE_DDR3);
update_reset_dll(drex1, DDR_MODE_DDR3);