[U-Boot] [PATCH v3 15/57] ram: rk3399: Add cs1_col enc macro

Kever Yang
2019-07-16T13:02:53Z

On 2019/7/16 下午7:57, Jagan Teki wrote:
> Add dram config macro for handling cs1 column.
>
> 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 | 3 +++
> drivers/ram/rockchip/sdram_rk3399.c | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
> index 9cd9f3b969..f5c99fea8b 100644
> --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
> +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
> @@ -113,6 +113,9 @@ struct sdram_base_params {
> (4 + 2 * (ch)); \
> } while (0)
>
> +#define SYS_REG_CS1_COL_SHIFT(ch) (0 + 2 * (ch))
> +#define SYS_REG_ENC_CS1_COL(n, ch) (((n) - 9) << SYS_REG_CS1_COL_SHIFT(ch))
> +
> /* Get sdram size decode from reg */
> size_t rockchip_sdram_size(phys_addr_t reg);
>
> diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
> index 1222da39c2..0f28163d6e 100644
> --- a/drivers/ram/rockchip/sdram_rk3399.c
> +++ b/drivers/ram/rockchip/sdram_rk3399.c
> @@ -1101,6 +1101,7 @@ static void dram_all_config(struct dram_info *dram,
> if (info->cap_info.cs1_row)
> SYS_REG_ENC_CS1_ROW(info->cap_info.cs1_row, sys_reg2,
> sys_reg3, channel);
> + sys_reg3 |= SYS_REG_ENC_CS1_COL(info->cap_info.col, channel);
>
> ddr_msch_regs = dram->chan[channel].msch;
> noc_timing = &params->ch[channel].noc_timings;