commit 95beeed54fde7a7e77e50322d9badf7428b86a28
author Masahiro Yamada <yamada.masahiro@socionext.com> Mon Feb 20 12:10:05 2017 +0900
committer Masahiro Yamada <yamada.masahiro@socionext.com> Thu Feb 23 08:37:56 2017 +0900
tree 2ecca93ea40e1e35a11993d8ff38e64a5df63022
parent 4d0f6f1a238de4179f6d6a623805ed2bc7bd9916

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>

arch/arm/mach-uniphier/dram_init.c

diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index 881062d..e7afa71 100644
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@@ -159,7 +159,7 @@
 
 	dram_ch[1].size = size;
 
-	if (!data->have_ch2)
+	if (!data->have_ch2 || val & SG_MEMCONF_CH2_DISABLE)
 		return 0;
 
 	/* set up ch2 */