From 1a6462e18b332d3d7224ca63f04699cdae79be46 Mon Sep 17 00:00:00 2001 From: Tang Yun ping Date: Wed, 13 Jan 2021 16:36:10 +0800 Subject: [PATCH] drivers: ram: sdram_common: add 4rank support for sdram_cap_info Signed-off-by: Tang Yun ping Change-Id: Icda7bdc73e6c36c1351f0671b374a9d906dafec8 --- arch/arm/include/asm/arch-rockchip/sdram_common.h | 2 -- drivers/ram/rockchip/sdram_common.c | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 3e8f6ed83d..0676c969cc 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -231,10 +231,8 @@ struct sdram_cap_info { unsigned int row_3_4; unsigned int cs0_row; unsigned int cs1_row; -#ifdef CONFIG_ROCKCHIP_RK3568 unsigned int cs2_row; unsigned int cs3_row; -#endif unsigned int cs0_high16bit_row; unsigned int cs1_high16bit_row; unsigned int ddrconfig; diff --git a/drivers/ram/rockchip/sdram_common.c b/drivers/ram/rockchip/sdram_common.c index c00fd89d28..93980ad701 100644 --- a/drivers/ram/rockchip/sdram_common.c +++ b/drivers/ram/rockchip/sdram_common.c @@ -77,14 +77,12 @@ void sdram_print_ddr_info(struct sdram_cap_info *cap_info, printdec(cap_info->cs1_high16bit_row); } } -#ifdef CONFIG_ROCKCHIP_RK3568 if (cap_info->rank > 2) { printascii(" CS2 Row="); printdec(cap_info->cs2_row); printascii(" CS3 Row="); printdec(cap_info->cs3_row); } -#endif printascii(" CS="); printdec(cap_info->rank); printascii(" Die BW="); @@ -127,7 +125,7 @@ u64 sdram_get_cs_cap(struct sdram_cap_info *cap_info, u32 cs, u32 dram_type) bg + cap_info->bk + cap_info->cs1_row); else cap[1] = 0; -#ifdef CONFIG_ROCKCHIP_RK3568 + if (cap_info->rank == 4) { cap[2] = 1llu << (cap_info->bw + cap_info->col + bg + cap_info->bk + cap_info->cs2_row); @@ -137,10 +135,6 @@ u64 sdram_get_cs_cap(struct sdram_cap_info *cap_info, u32 cs, u32 dram_type) cap[2] = 0; cap[3] = 0; } -#else - cap[2] = 0; - cap[3] = 0; -#endif if (cs == 0) return cap[0]; else if (cs == 1)