| Message ID | 20190715182110.21336-6-jagan@amarulasolutions.com |
|---|---|
| State | Accepted |
| Commit | fa2b015b9cf9c4961d9b4cf59022cb25656fe4a4 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | ram: rk3399: Code cleanup | expand |
On 2019/7/16 上午2:21, Jagan Teki wrote: > Rename tsel_wr_select_n to tsel_wr_select_dq_n based > on the bsp code. > > No functionality change. > > 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 > --- > drivers/ram/rockchip/sdram_rk3399.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c > index de5d8c1b5f..85ff47f133 100644 > --- a/drivers/ram/rockchip/sdram_rk3399.c > +++ b/drivers/ram/rockchip/sdram_rk3399.c > @@ -161,7 +161,7 @@ static void set_ds_odt(const struct chan_info *chan, > u32 tsel_idle_en, tsel_wr_en, tsel_rd_en; > u32 tsel_idle_select_p, tsel_wr_select_p, tsel_rd_select_p; > u32 ca_tsel_wr_select_p, ca_tsel_wr_select_n; > - u32 tsel_idle_select_n, tsel_wr_select_n, tsel_rd_select_n; > + u32 tsel_idle_select_n, tsel_wr_select_dq_n, tsel_rd_select_n; > u32 reg_value; > > if (params->base.dramtype == LPDDR4) { > @@ -171,7 +171,7 @@ static void set_ds_odt(const struct chan_info *chan, > tsel_idle_select_p = PHY_DRV_ODT_HI_Z; > > tsel_rd_select_n = PHY_DRV_ODT_240; > - tsel_wr_select_n = PHY_DRV_ODT_40; > + tsel_wr_select_dq_n = PHY_DRV_ODT_40; > ca_tsel_wr_select_n = PHY_DRV_ODT_40; > tsel_idle_select_n = PHY_DRV_ODT_240; > } else if (params->base.dramtype == LPDDR3) { > @@ -181,7 +181,7 @@ static void set_ds_odt(const struct chan_info *chan, > tsel_idle_select_p = PHY_DRV_ODT_240; > > tsel_rd_select_n = PHY_DRV_ODT_HI_Z; > - tsel_wr_select_n = PHY_DRV_ODT_34_3; > + tsel_wr_select_dq_n = PHY_DRV_ODT_34_3; > ca_tsel_wr_select_n = PHY_DRV_ODT_48; > tsel_idle_select_n = PHY_DRV_ODT_HI_Z; > } else { > @@ -191,7 +191,7 @@ static void set_ds_odt(const struct chan_info *chan, > tsel_idle_select_p = PHY_DRV_ODT_240; > > tsel_rd_select_n = PHY_DRV_ODT_240; > - tsel_wr_select_n = PHY_DRV_ODT_34_3; > + tsel_wr_select_dq_n = PHY_DRV_ODT_34_3; > ca_tsel_wr_select_n = PHY_DRV_ODT_34_3; > tsel_idle_select_n = PHY_DRV_ODT_240; > } > @@ -210,7 +210,7 @@ static void set_ds_odt(const struct chan_info *chan, > * for write cycles for DQ/DM > */ > reg_value = tsel_rd_select_n | (tsel_rd_select_p << 0x4) | > - (tsel_wr_select_n << 8) | (tsel_wr_select_p << 12) | > + (tsel_wr_select_dq_n << 8) | (tsel_wr_select_p << 12) | > (tsel_idle_select_n << 16) | (tsel_idle_select_p << 20); > clrsetbits_le32(&denali_phy[6], 0xffffff, reg_value); > clrsetbits_le32(&denali_phy[134], 0xffffff, reg_value); > @@ -250,7 +250,7 @@ static void set_ds_odt(const struct chan_info *chan, > > /* phy_pad_fdbk_drive 23bit DENALI_PHY_924/925 */ > clrsetbits_le32(&denali_phy[924], 0xff, > - tsel_wr_select_n | (tsel_wr_select_p << 4)); > + tsel_wr_select_dq_n | (tsel_wr_select_p << 4)); > clrsetbits_le32(&denali_phy[925], 0xff, > tsel_rd_select_n | (tsel_rd_select_p << 4)); >
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index de5d8c1b5f..85ff47f133 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -161,7 +161,7 @@ static void set_ds_odt(const struct chan_info *chan, u32 tsel_idle_en, tsel_wr_en, tsel_rd_en; u32 tsel_idle_select_p, tsel_wr_select_p, tsel_rd_select_p; u32 ca_tsel_wr_select_p, ca_tsel_wr_select_n; - u32 tsel_idle_select_n, tsel_wr_select_n, tsel_rd_select_n; + u32 tsel_idle_select_n, tsel_wr_select_dq_n, tsel_rd_select_n; u32 reg_value; if (params->base.dramtype == LPDDR4) { @@ -171,7 +171,7 @@ static void set_ds_odt(const struct chan_info *chan, tsel_idle_select_p = PHY_DRV_ODT_HI_Z; tsel_rd_select_n = PHY_DRV_ODT_240; - tsel_wr_select_n = PHY_DRV_ODT_40; + tsel_wr_select_dq_n = PHY_DRV_ODT_40; ca_tsel_wr_select_n = PHY_DRV_ODT_40; tsel_idle_select_n = PHY_DRV_ODT_240; } else if (params->base.dramtype == LPDDR3) { @@ -181,7 +181,7 @@ static void set_ds_odt(const struct chan_info *chan, tsel_idle_select_p = PHY_DRV_ODT_240; tsel_rd_select_n = PHY_DRV_ODT_HI_Z; - tsel_wr_select_n = PHY_DRV_ODT_34_3; + tsel_wr_select_dq_n = PHY_DRV_ODT_34_3; ca_tsel_wr_select_n = PHY_DRV_ODT_48; tsel_idle_select_n = PHY_DRV_ODT_HI_Z; } else { @@ -191,7 +191,7 @@ static void set_ds_odt(const struct chan_info *chan, tsel_idle_select_p = PHY_DRV_ODT_240; tsel_rd_select_n = PHY_DRV_ODT_240; - tsel_wr_select_n = PHY_DRV_ODT_34_3; + tsel_wr_select_dq_n = PHY_DRV_ODT_34_3; ca_tsel_wr_select_n = PHY_DRV_ODT_34_3; tsel_idle_select_n = PHY_DRV_ODT_240; } @@ -210,7 +210,7 @@ static void set_ds_odt(const struct chan_info *chan, * for write cycles for DQ/DM */ reg_value = tsel_rd_select_n | (tsel_rd_select_p << 0x4) | - (tsel_wr_select_n << 8) | (tsel_wr_select_p << 12) | + (tsel_wr_select_dq_n << 8) | (tsel_wr_select_p << 12) | (tsel_idle_select_n << 16) | (tsel_idle_select_p << 20); clrsetbits_le32(&denali_phy[6], 0xffffff, reg_value); clrsetbits_le32(&denali_phy[134], 0xffffff, reg_value); @@ -250,7 +250,7 @@ static void set_ds_odt(const struct chan_info *chan, /* phy_pad_fdbk_drive 23bit DENALI_PHY_924/925 */ clrsetbits_le32(&denali_phy[924], 0xff, - tsel_wr_select_n | (tsel_wr_select_p << 4)); + tsel_wr_select_dq_n | (tsel_wr_select_p << 4)); clrsetbits_le32(&denali_phy[925], 0xff, tsel_rd_select_n | (tsel_rd_select_p << 4));