浏览代码

ARM: uniphier: skip MEMCONF ch2 parsing if CH2_DISABLE bit is set

If SG_MEMCONF_CH2_DISABLE bit is set, the DRAM channel 2 is unused.
The register settings for the ch2 should be ignored.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Masahiro Yamada 8 年之前
父节点
当前提交
bed1624d0d
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/arm/mach-uniphier/dram_init.c

+ 1 - 1
arch/arm/mach-uniphier/dram_init.c

@@ -159,7 +159,7 @@ static int uniphier_memconf_decode(struct uniphier_dram_ch *dram_ch)
 
 	dram_ch[1].size = size;
 
-	if (!data->have_ch2)
+	if (!data->have_ch2 || val & SG_MEMCONF_CH2_DISABLE)
 		return 0;
 
 	/* set up ch2 */