qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: ram: sdram_common: add 4rank support for rk3568 

Change-Id: I179ff4ef1f07a881f76ac086c4ab330e3ff82d73
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
This commit is contained in:
Tang Yun ping 2020-11-04 16:23:56 +08:00 committed by YouMin Chen
parent 600d0322ca
commit de9242dcd7
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/include/asm/arch-rockchip/sdram.h
View File

@ -14,6 +14,9 @@ enum {
LPDDR2 = 5,
LPDDR3 = 6,
LPDDR4 = 7,
LPDDR4X = 8,
LPDDR5 = 9,
DDR5 = 10,
UNUSED = 0xFF
};

4
arch/arm/include/asm/arch-rockchip/sdram_common.h
View File

@ -228,6 +228,10 @@ 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;

32
drivers/ram/rockchip/sdram_common.c
View File

@ -28,6 +28,9 @@ void sdram_print_dram_type(unsigned char dramtype)
case LPDDR4:
printascii("LPDDR4");
break;
case LPDDR4X:
printascii("LPDDR4X");
break;
default:
printascii("Unknown Device");
break;
@ -74,6 +77,14 @@ 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=");
@ -99,7 +110,7 @@ void sdram_print_ddr_info(struct sdram_cap_info *cap_info,
u64 sdram_get_cs_cap(struct sdram_cap_info *cap_info, u32 cs, u32 dram_type)
{
u32 bg;
u64 cap[2];
u64 cap[4];
if (dram_type == DDR4)
/* DDR4 8bit dram BG = 2(4bank groups),
@ -111,18 +122,31 @@ u64 sdram_get_cs_cap(struct sdram_cap_info *cap_info, u32 cs, u32 dram_type)
cap[0] = 1llu << (cap_info->bw + cap_info->col +
bg + cap_info->bk + cap_info->cs0_row);
if (cap_info->rank == 2)
if (cap_info->rank >= 2)
cap[1] = 1llu << (cap_info->bw + cap_info->col +
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);
cap[3] = 1llu << (cap_info->bw + cap_info->col +
bg + cap_info->bk + cap_info->cs3_row);
} else {
cap[2] = 0;
cap[3] = 0;
}
#else
cap[2] = 0;
cap[3] = 0;
#endif
if (cs == 0)
return cap[0];
else if (cs == 1)
return cap[1];
else
return (cap[0] + cap[1]);
return (cap[0] + cap[1] + cap[2] + cap[3]);
}
/* n: Unit bytes */