summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-vf610/imx-regs.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-10-02 09:38:44 -0400
committerTom Rini <trini@konsulko.com>2015-10-02 09:38:44 -0400
commitb8d242121dd3c8c418751c37e6f7157cf6428dbf (patch)
tree53f1fc557eff2989a27402b7dd226949fd61533f /arch/arm/include/asm/arch-vf610/imx-regs.h
parent4bbc08f2ecdd16d38f933f202fb1a711fb30d880 (diff)
parent7daaac5281db0788cde895a0add38ad5195b5be1 (diff)
downloadu-boot-imx-b8d242121dd3c8c418751c37e6f7157cf6428dbf.zip
u-boot-imx-b8d242121dd3c8c418751c37e6f7157cf6428dbf.tar.gz
u-boot-imx-b8d242121dd3c8c418751c37e6f7157cf6428dbf.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/arch-vf610/imx-regs.h')
-rw-r--r--arch/arm/include/asm/arch-vf610/imx-regs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h
index 4366985..9758323 100644
--- a/arch/arm/include/asm/arch-vf610/imx-regs.h
+++ b/arch/arm/include/asm/arch-vf610/imx-regs.h
@@ -148,7 +148,7 @@
#define DDRMC_CR18_TCKE(v) ((v) & 0x7)
#define DDRMC_CR20_AP_EN (1 << 24)
#define DDRMC_CR21_TRCD_INT(v) (((v) & 0xff) << 16)
-#define DDRMC_CR21_TRAS_LOCKOUT (1 << 8)
+#define DDRMC_CR21_TRAS_LOCKOUT(v) ((v) << 8)
#define DDRMC_CR21_CCMAP_EN 1
#define DDRMC_CR22_TDAL(v) (((v) & 0x3f) << 16)
#define DDRMC_CR23_BSTLEN(v) (((v) & 0x7) << 24)
@@ -200,8 +200,8 @@
#define DDRMC_CR78_BUR_ON_FLY_BIT(v) ((v) & 0xf)
#define DDRMC_CR79_CTLUPD_AREF(v) (((v) & 0x1) << 24)
#define DDRMC_CR82_INT_MASK 0x10000000
-#define DDRMC_CR87_ODT_WR_MAPCS0 (1 << 24)
-#define DDRMC_CR87_ODT_RD_MAPCS0 (1 << 16)
+#define DDRMC_CR87_ODT_WR_MAPCS0(v) ((v) << 24)
+#define DDRMC_CR87_ODT_RD_MAPCS0(v) ((v) << 16)
#define DDRMC_CR88_TODTL_CMD(v) (((v) & 0x1f) << 16)
#define DDRMC_CR89_AODT_RWSMCS(v) ((v) & 0xf)
#define DDRMC_CR91_R2W_SMCSDL(v) (((v) & 0x7) << 16)