rockchip: rk356x: attempt to fix ram detection

Signed-off-by: Peter Geis <pgwipeout@gmail.com> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
RadxaNaoki · Dec 31, 2022 · 7964051 · 7964051
1 parent 56d6441
commit 7964051
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
@@ -99,7 +99,7 @@ size_t rockchip_sdram_size(phys_addr_t reg)
 		cs1_col = cs0_col;
 		bk = 3 - ((sys_reg2 >> SYS_REG_BK_SHIFT(ch)) & SYS_REG_BK_MASK);
 		if ((sys_reg3 >> SYS_REG_VERSION_SHIFT &
-		     SYS_REG_VERSION_MASK) == 0x2) {
+		     SYS_REG_VERSION_MASK) >= 0x2) {
 			cs1_col = 9 + (sys_reg3 >> SYS_REG_CS1_COL_SHIFT(ch) &
 				  SYS_REG_CS1_COL_MASK);
 			if (((sys_reg3 >> SYS_REG_EXTEND_CS0_ROW_SHIFT(ch) &
@@ -136,7 +136,8 @@ size_t rockchip_sdram_size(phys_addr_t reg)
 			SYS_REG_BW_MASK));
 		row_3_4 = sys_reg2 >> SYS_REG_ROW_3_4_SHIFT(ch) &
 			SYS_REG_ROW_3_4_MASK;
-		if (dram_type == DDR4) {
+		if (dram_type == DDR4 && (sys_reg3 >> SYS_REG_VERSION_SHIFT &
+					  SYS_REG_VERSION_MASK) != 0x3) {
 			dbw = (sys_reg2 >> SYS_REG_DBW_SHIFT(ch)) &
 				SYS_REG_DBW_MASK;
 			bg = (dbw == 2) ? 2 : 1;