Merge branch '2019-05-28-master-imports'

[oweals/u-boot.git] / arch / arm / mach-sunxi / dram_sun8i_a33.c

diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index fa1620cb3931eed3d5d28c25243ed609791b6197..5da01922bfaf69034ae4a8ebc24c18a1f9bde127 100644 (file)
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Sun8i a33 platform dram controller init.
  *
@@ -5,8 +6,6 @@
  *                         Jerry Wang <wangflord@allwinnertech.com>
  * (C) Copyright 2015      Vishnu Patekar <vishnupatekar0510@gmail.com>
  * (C) Copyright 2015      Hans de Goede <hdegoede@redhat.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <errno.h>
@@ -153,7 +152,7 @@ static void auto_set_timing_para(struct dram_para *para)
        reg_val &= ~(0xff << 8);
        reg_val &= ~(0xff << 0);
        reg_val |= (0x33 << 8);
-       reg_val |= (0x8 << 0);
+       reg_val |= (0x10 << 0);
        writel(reg_val, &mctl_ctl->dramtmg8);
        /* Set phy interface time */
        reg_val = (0x2 << 24) | (t_rdata_en << 16) | (0x1 << 8)
@@ -335,7 +334,7 @@ unsigned long sunxi_dram_init(void)
        struct dram_para para = {
                .cs1 = 0,
                .bank = 1,
-               .rank = 1,
+               .rank = 2,
                .rows = 15,
                .bus_width = 16,
                .page_size = 2048,