[v3,04/57] ram: rk3399: Add chipinfo macro
diff mbox series

Message ID 20190716115745.12585-5-jagan@amarulasolutions.com
State New
Headers show
Series
  • ram: rk3399: Add LPDDR4 support
Related show

Commit Message

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

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 | 1 +
 drivers/ram/rockchip/sdram_rk3399.c               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 chip info.
>
> 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               | 2 +-
>   2 files changed, 2 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 e5af3eab7e..2d0be920d9 100644
> --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
> +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
> @@ -73,6 +73,7 @@ struct sdram_base_params {
>   #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_CHINFO(ch)		(1 << SYS_REG_CHINFO_SHIFT(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)
> diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
> index d97efb6996..874e896369 100644
> --- a/drivers/ram/rockchip/sdram_rk3399.c
> +++ b/drivers/ram/rockchip/sdram_rk3399.c
> @@ -1090,7 +1090,7 @@ static void dram_all_config(struct dram_info *dram,
>   			continue;
>   		idx++;
>   		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 |= SYS_REG_ENC_CHINFO(channel);
>   		sys_reg |= (info->cap_info.rank - 1) <<
>   			   SYS_REG_RANK_SHIFT(channel);
>   		sys_reg |= (info->cap_info.col - 9) <<

Patch
diff mbox series 

diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
index e5af3eab7e..2d0be920d9 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -73,6 +73,7 @@  struct sdram_base_params {
 #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_CHINFO(ch)		(1 << SYS_REG_CHINFO_SHIFT(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)
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index d97efb6996..874e896369 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -1090,7 +1090,7 @@  static void dram_all_config(struct dram_info *dram,
 			continue;
 		idx++;
 		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 |= SYS_REG_ENC_CHINFO(channel);
 		sys_reg |= (info->cap_info.rank - 1) <<
 			   SYS_REG_RANK_SHIFT(channel);
 		sys_reg |= (info->cap_info.col - 9) <<