ram: rk3399: Add ddrtimingC0

Add DdrTimingC0 structure with associated bit fields.

These would help to reconfigure sdram capabilities during
lpddr4 setup related configs.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <Kever.yang@rock-chips.com>

diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
index 471702f9352c82ef0a1ff50de6ce9770d14aed21..7f41a672426375c6a20c71a0e5cf10e0a786b4fe 100644 (file)
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
@@ -18,6 +18,16 @@ struct rk3399_ddr_pi_regs {
        u32 denali_pi[200];
 };
 
+union noc_ddrtimingc0 {
+       u32 d32;
+       struct {
+               unsigned burstpenalty : 4;
+               unsigned reserved0 : 4;
+               unsigned wrtomwr : 6;
+               unsigned reserved1 : 18;
+       } b;
+};
+
 struct rk3399_msch_regs {
        u32 coreid;
        u32 revisionid;
@@ -36,7 +46,7 @@ struct rk3399_msch_regs {
 struct rk3399_msch_timings {
        u32 ddrtiminga0;
        u32 ddrtimingb0;
-       u32 ddrtimingc0;
+       union noc_ddrtimingc0 ddrtimingc0;
        u32 devtodev0;
        u32 ddrmode;
        u32 agingx0;

diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 750219921bb07d42e6a401a80148b36d3f89ab67..d47e2907c75673b1e95ca040ff65727056b1d17a 100644 (file)
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -1110,7 +1110,7 @@ static void dram_all_config(struct dram_info *dram,
                       &ddr_msch_regs->ddrtiminga0);
                writel(noc_timing->ddrtimingb0,
                       &ddr_msch_regs->ddrtimingb0);
-               writel(noc_timing->ddrtimingc0,
+               writel(noc_timing->ddrtimingc0.d32,
                       &ddr_msch_regs->ddrtimingc0);
                writel(noc_timing->devtodev0,
                       &ddr_msch_regs->devtodev0);