[U-Boot] [PATCH v3 02/57] ram: rk3399: Add channel number encoder macro

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

Add simplified and meaningful macro for channel number.

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 | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
index 92a4c485c2..076afe2ae3 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -73,6 +73,8 @@ struct sdram_base_params {
#define SYS_REG_ROW_3_4_MASK 1
#define SYS_REG_CHINFO_SHIFT(ch) (28 + (ch))
#define SYS_REG_ENC_DDRTYPE(n) ((n) << SYS_REG_DDRTYPE_SHIFT)
+#define SYS_REG_ENC_NUM_CH(n) (((n) - SYS_REG_NUM_CH_MASK) << \
+ SYS_REG_NUM_CH_SHIFT)
#define SYS_REG_RANK_SHIFT(ch) (11 + (ch) * 16)
#define SYS_REG_RANK_MASK 1
#define SYS_REG_COL_SHIFT(ch) (9 + (ch) * 16)
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index f58836c037..830311ffa9 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -1077,7 +1077,7 @@ static void dram_all_config(struct dram_info *dram,
unsigned int channel, idx;

sys_reg |= SYS_REG_ENC_DDRTYPE(params->base.dramtype);
- sys_reg |= (params->base.num_channels - 1) << SYS_REG_NUM_CH_SHIFT;
+ sys_reg |= SYS_REG_ENC_NUM_CH(params->base.num_channels);

for (channel = 0, idx = 0;
(idx < params->base.num_channels) && (channel < 2);
--
2.18.0.321.gffc6fa0e3