[U-Boot] [PATCH v3 06/57] ram: rk3399: Add column enc macro

Jagan Teki
2019-07-16T11:56:54Z

Add simplified and meaningful macro for column.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: YouMin Chen <cym@rock-chips.com>
---
arch/arm/include/asm/arch-rockchip/sdram_common.h | 1 +
drivers/ram/rockchip/sdram_rk3399.c | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
index db9e30126f..e7f15a7cf9 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -83,6 +83,7 @@ struct sdram_base_params {
SYS_REG_RANK_SHIFT(ch))
#define SYS_REG_COL_SHIFT(ch) (9 + (ch) * 16)
#define SYS_REG_COL_MASK 3
+#define SYS_REG_ENC_COL(n, ch) (((n) - 9) << SYS_REG_COL_SHIFT(ch))
#define SYS_REG_BK_SHIFT(ch) (8 + (ch) * 16)
#define SYS_REG_BK_MASK 1
#define SYS_REG_CS0_ROW_SHIFT(ch) (6 + (ch) * 16)
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index c2390a771c..f6a83f2acf 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -1092,8 +1092,7 @@ static void dram_all_config(struct dram_info *dram,
sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel);
sys_reg |= SYS_REG_ENC_CHINFO(channel);
sys_reg |= SYS_REG_ENC_RANK(info->cap_info.rank, channel);
- sys_reg |= (info->cap_info.col - 9) <<
- SYS_REG_COL_SHIFT(channel);
+ sys_reg |= SYS_REG_ENC_COL(info->cap_info.col, channel);
sys_reg |= info->cap_info.bk == 3 ? 0 : 1 <<
SYS_REG_BK_SHIFT(channel);
sys_reg |= (info->cap_info.cs0_row - 13) <<
--
2.18.0.321.gffc6fa0e3