Right now all these debug statements are printing on the console to make sure proper dram initialization happens.

Mark them into RAM_ROCKCHIP_DEBUG would be more meaningful and work like before since the RAM_ROCKCHIP_DEBUG is by default yet.

No functionality changes.

Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- drivers/ram/rockchip/sdram_rk3399.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index d2f3fde236..670925420d 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -2551,8 +2551,10 @@ static int lpddr4_set_rate(struct dram_info *dram, lpddr4_set_ctl(dram, params, ctl_fn, dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq);

- printf("%s: change freq to %d mhz %d, %d\n", __func__, - dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq, ctl_fn, phy_fn); + if (IS_ENABLED(CONFIG_RAM_ROCKCHIP_DEBUG)) + printf("%s: change freq to %d mhz %d, %d\n", __func__, + dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq, + ctl_fn, phy_fn); }

return 0; @@ -2966,8 +2968,10 @@ static int sdram_init(struct dram_info *dram, params->base.num_channels++; }

- printf("Channel "); - printf(channel ? "1: " : "0: "); + if (IS_ENABLED(CONFIG_RAM_ROCKCHIP_DEBUG)) { + printf("Channel "); + printf(channel ? "1: " : "0: "); + }

if (channel == 0) set_ddr_stride(dram->pmusgrf, 0x17);

Disable ram rockchip debug driver for roc-rk3399-pc boards since we have verified ram in many instances with respective U-Boot versions.

Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- configs/roc-pc-mezzanine-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 1 + 2 files changed, 2 insertions(+)

diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index f15dddc684..c87a8568fc 100644 --- a/configs/roc-pc-mezzanine-rk3399_defconfig +++ b/configs/roc-pc-mezzanine-rk3399_defconfig @@ -53,6 +53,7 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +# CONFIG_RAM_ROCKCHIP_DEBUG is not set CONFIG_RAM_RK3399_LPDDR4=y CONFIG_DM_RESET=y CONFIG_BAUDRATE=1500000 diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index 9ffde7f960..601f5c6ae1 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -50,6 +50,7 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +# CONFIG_RAM_ROCKCHIP_DEBUG is not set CONFIG_RAM_RK3399_LPDDR4=y CONFIG_DM_RESET=y CONFIG_BAUDRATE=1500000

On 2020/7/14 上午4:06, Jagan Teki wrote:

stride debug is already present in sdram_common.c via RAM_ROCKCHIP_DEBUG.

So, drop the redundant debug stride code in rk3399 driver.

Signed-off-by: Jagan Teki jagan@amarulasolutions.com

Reviewed-by: Kever Yangkever.yang@rock-chips.com

Thanks, - Kever

---

drivers/ram/rockchip/sdram_rk3399.c | 25 ------------------------- 1 file changed, 25 deletions(-)

diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 60a1ab8b51..d2f3fde236 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -2875,31 +2875,6 @@ static unsigned char calculate_stride(struct rk3399_sdram_params *params) if (stride == (-1)) goto error; }

• switch (stride) {

• case 0xc:

• printf("128B stride\n");
  

• break;
  

• case 5:

• case 9:

• case 0xd:

• case 0x11:

• case 0x19:

• printf("256B stride\n");
  

• break;
  

• case 0xa:

• case 0xe:

• case 0x12:

• printf("512B stride\n");
  

• break;
  

• case 0xf:

• printf("4K stride\n");
  

• break;
  

• case 0x1f:

• printf("32MB + 256B stride\n");
  

• break;
  

• default:

• printf("no stride\n");
  

• }

  sdram_print_stride(stride);