summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-02-20 12:10:05 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-02-23 08:37:56 +0900
commitbed1624d0df66c50e74a68cbdbcb8d3ed7f8411b (patch)
tree2ecca93ea40e1e35a11993d8ff38e64a5df63022
parent14bb7a4e3707a382efc96052e9c8f6995f6ea2b3 (diff)
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>
-rw-r--r--arch/arm/mach-uniphier/dram_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index 881062d9b6..e7afa711f5 100644
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/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 */