diff mbox series

[v3,05/57] ram: rk3399: Add rank enc macro

Message ID 20190716115745.12585-6-jagan@amarulasolutions.com (mailing list archive)
State New, archived
Headers show
Series ram: rk3399: Add LPDDR4 support | expand

Commit Message

Jagan Teki July 16, 2019, 11:56 a.m. UTC 
Add simplified and meaningful macro for rank.

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(-)

Comments

Kever Yang July 16, 2019, 12:58 p.m. UTC | #1 
On 2019/7/16 下午7:56, Jagan Teki wrote:
> Add simplified and meaningful macro for rank.
>
> 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 | 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 2d0be920d9..db9e30126f 100644
> --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
> +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
> @@ -79,6 +79,8 @@ struct sdram_base_params {
>   					SYS_REG_NUM_CH_SHIFT)
>   #define SYS_REG_RANK_SHIFT(ch)		(11 + (ch) * 16)
>   #define SYS_REG_RANK_MASK		1
> +#define SYS_REG_ENC_RANK(n, ch)		(((n) - SYS_REG_RANK_MASK) << \
> +					 SYS_REG_RANK_SHIFT(ch))
>   #define SYS_REG_COL_SHIFT(ch)		(9 + (ch) * 16)
>   #define SYS_REG_COL_MASK		3
>   #define SYS_REG_BK_SHIFT(ch)		(8 + (ch) * 16)
> diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
> index 874e896369..c2390a771c 100644
> --- a/drivers/ram/rockchip/sdram_rk3399.c
> +++ b/drivers/ram/rockchip/sdram_rk3399.c
> @@ -1091,8 +1091,7 @@ static void dram_all_config(struct dram_info *dram,
>   		idx++;
>   		sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel);
>   		sys_reg |= SYS_REG_ENC_CHINFO(channel);
> -		sys_reg |= (info->cap_info.rank - 1) <<
> -			   SYS_REG_RANK_SHIFT(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 |= info->cap_info.bk == 3 ? 0 : 1 <<
diff mbox series

Patch

diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
index 2d0be920d9..db9e30126f 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -79,6 +79,8 @@  struct sdram_base_params {
 					SYS_REG_NUM_CH_SHIFT)
 #define SYS_REG_RANK_SHIFT(ch)		(11 + (ch) * 16)
 #define SYS_REG_RANK_MASK		1
+#define SYS_REG_ENC_RANK(n, ch)		(((n) - SYS_REG_RANK_MASK) << \
+					 SYS_REG_RANK_SHIFT(ch))
 #define SYS_REG_COL_SHIFT(ch)		(9 + (ch) * 16)
 #define SYS_REG_COL_MASK		3
 #define SYS_REG_BK_SHIFT(ch)		(8 + (ch) * 16)
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 874e896369..c2390a771c 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -1091,8 +1091,7 @@  static void dram_all_config(struct dram_info *dram,
 		idx++;
 		sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel);
 		sys_reg |= SYS_REG_ENC_CHINFO(channel);
-		sys_reg |= (info->cap_info.rank - 1) <<
-			   SYS_REG_RANK_SHIFT(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 |= info->cap_info.bk == 3 ? 0 : 1 <<