Skip to contentSkip to conversation

mips: mt7620: fallback to SDRAM when syscfg0 does not have a valid value for the memory type

PATCH New Sashka Nochkin 1 participant 1 message Apr 20, 2016

Subsystems (3)
MIPS Arm MediaTek Ralink MIPS architecture
lore
Share & tools
lore

Sashka Nochkin

author
#0 lore raw

PATCH 1/1 mips: mt7620: fallback to SDRAM when syscfg0 does not have a valid value for the memory type

Mediatek MT7620 SoC has syscfg0 bits where it sets the type of memory being used. However, sometimes those bits are not set properly (reading "11"). In this case, the SoC assumes SDRAM. The patch below reflects that.

Signed-off-by Sashka Nochkin <[email protected]>
---
 arch/mips/include/asm/mach-ralink/mt7620.h | 1 +
 arch/mips/ralink/mt7620.c                  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
arch/mips/include/asm/mach-ralink/mt7620.h +1 -0
index 455d406..1f5998a 100644
@@ -72,6 +72,7 @@
 #define SYSCFG0_DRAM_TYPE_SDRAM		0
 #define SYSCFG0_DRAM_TYPE_DDR1		1
 #define SYSCFG0_DRAM_TYPE_DDR2		2
+#define SYSCFG0_DRAM_TYPE_UNKNOWN	3
 
 #define SYSCFG0_DRAM_TYPE_DDR2_MT7628	0
 #define SYSCFG0_DRAM_TYPE_DDR1_MT7628	1
arch/mips/ralink/mt7620.c +5 -2
index 0d3d1a9..0358ac4d 100644
@@ -581,11 +581,14 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
 		(rev & CHIP_REV_ECO_MASK));
 
 	cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0);
-	if (is_mt76x8())
+	if (is_mt76x8()) {
 		dram_type = cfg0 & DRAM_TYPE_MT7628_MASK;
-	else
+	} else {
 		dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) &
 			    SYSCFG0_DRAM_TYPE_MASK;
+		if (dram_type == SYSCFG0_DRAM_TYPE_UNKNOWN)
+			dram_type = SYSCFG0_DRAM_TYPE_SDRAM;
+	}
 
 	soc_info->mem_base = MT7620_DRAM_BASE;
 	if (is_mt76x8())