[U-Boot] [PATCH v3 03/57] ram: rk3399: Add row_3_4 enc macro

Kever Yang
2019-07-16T12:58:25Z

On 2019/7/16 下午7:56, Jagan Teki wrote:
> Add simplified and meaningful macro for row_3_4.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> Signed-off-by: YouMin Chen <cym@rock-chips.com>

Reviewed-by: Kever Yang <Kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
> 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 076afe2ae3..e5af3eab7e 100644
> --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
> +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
> @@ -71,6 +71,7 @@ struct sdram_base_params {
> #define SYS_REG_NUM_CH_MASK 1
> #define SYS_REG_ROW_3_4_SHIFT(ch) (30 + (ch))
> #define SYS_REG_ROW_3_4_MASK 1
> +#define SYS_REG_ENC_ROW_3_4(n, ch) ((n) << (30 + (ch)))
> #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) << \
> diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
> index 830311ffa9..d97efb6996 100644
> --- a/drivers/ram/rockchip/sdram_rk3399.c
> +++ b/drivers/ram/rockchip/sdram_rk3399.c
> @@ -1089,8 +1089,7 @@ static void dram_all_config(struct dram_info *dram,
> if (params->ch[channel].cap_info.col == 0)
> continue;
> idx++;
> - sys_reg |= info->cap_info.row_3_4 <<
> - SYS_REG_ROW_3_4_SHIFT(channel);
> + sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel);
> sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(channel);
> sys_reg |= (info->cap_info.rank - 1) <<
> SYS_REG_RANK_SHIFT(channel);