[U-Boot] [PATCH v3 07/57] ram: rk3399: Add bk enc macro

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

Add simplified and meaningful macro for bk.

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 | 2 ++
drivers/ram/rockchip/sdram_rk3399.c | 3 +--
2 files changed, 3 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 e7f15a7cf9..71062e3e71 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -86,6 +86,8 @@ struct sdram_base_params {
#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_ENC_BK(n, ch) (((n) == 3 ? 0 : 1) << \
+ SYS_REG_BK_SHIFT(ch))
#define SYS_REG_CS0_ROW_SHIFT(ch) (6 + (ch) * 16)
#define SYS_REG_CS0_ROW_MASK 3
#define SYS_REG_CS1_ROW_SHIFT(ch) (4 + (ch) * 16)
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index f6a83f2acf..b93a6c6c44 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -1093,8 +1093,7 @@ static void dram_all_config(struct dram_info *dram,
sys_reg |= SYS_REG_ENC_CHINFO(channel);
sys_reg |= SYS_REG_ENC_RANK(info->cap_info.rank, 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 |= SYS_REG_ENC_BK(info->cap_info.bk, channel);
sys_reg |= (info->cap_info.cs0_row - 13) <<
SYS_REG_CS0_ROW_SHIFT(channel);
sys_reg |= (info->cap_info.cs1_row - 13) <<
--
2.18.0.321.gffc6fa0e3