From: Masahiro Yamada Date: Mon, 20 Feb 2017 03:10:05 +0000 (+0900) Subject: ARM: uniphier: skip MEMCONF ch2 parsing if CH2_DISABLE bit is set X-Git-Tag: v2017.03-rc3~8^2~21 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bed1624d0df66c50e74a68cbdbcb8d3ed7f8411b;p=oweals%2Fu-boot.git 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 --- 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 */