Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[u-boot] / arch / arm / mach-uniphier / dram / umc-ld4.c

diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index fc75864a105caa1cc0af128435656c15cb35df88..1ea6193f88ffabedc51b501583c936b81f097b43 100644 (file)
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -175,7 +177,7 @@ int uniphier_ld4_umc_init(const struct uniphier_board_data *bd)
        for (ch = 0; ch < DRAM_CH_NR; ch++) {
                ret = umc_ch_init(dc_base, ca_base, bd->dram_freq,
                                  bd->dram_ch[ch].size,
-                                 bd->dram_ddr3plus, ch);
+                                 !!(bd->flags & UNIPHIER_BD_DDR3PLUS), ch);
                if (ret) {
                        pr_err("failed to initialize UMC ch%d\n", ch);
                        return ret;