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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 1cd354e..d98187d 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -166,7 +166,7 @@ static int uniphier_memconf_decode(struct uniphier_dram_map *dram_map)

dram_map[1].size = size;

- if (!data->have_ch2) + if (!data->have_ch2 || val & SG_MEMCONF_CH2_DISABLE) return 0;

/* set up ch2 */