sunxi: soft-i2c: Fix gpio handling to work with the driver-model

[u-boot] / board / sunxi / dram_sun5i_auto.c

diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c
index e86b08e67bd9968f39fabe95963185cf6c688d8f..660b18ebbdc1b8a653e215aa6e709c4c137a8971 100644 (file)
--- a/board/sunxi/dram_sun5i_auto.c
+++ b/board/sunxi/dram_sun5i_auto.c
@@ -5,24 +5,31 @@
 
 static struct dram_para dram_para = {
        .clock = CONFIG_DRAM_CLK,
+       .mbus_clock = CONFIG_DRAM_MBUS_CLK,
        .type = 3,
        .rank_num = 1,
        .density = 0,
        .io_width = 0,
        .bus_width = 0,
-       .cas = 9,
        .zq = CONFIG_DRAM_ZQ,
-       .odt_en = 0,
+       .odt_en = CONFIG_DRAM_ODT_EN,
        .size = 0,
+#ifdef CONFIG_DRAM_TIMINGS_VENDOR_MAGIC
+       .cas = 9,
        .tpr0 = 0x42d899b7,
        .tpr1 = 0xa090,
        .tpr2 = 0x22a00,
-       .tpr3 = 0,
+       .emr2 = 0x10,
+#else
+#      include "dram_timings_sun4i.h"
+       .active_windowing = 1,
+#endif
+       .tpr3 = CONFIG_DRAM_TPR3,
        .tpr4 = 0,
        .tpr5 = 0,
        .emr1 = CONFIG_DRAM_EMR1,
-       .emr2 = 0x10,
        .emr3 = 0,
+       .dqs_gating_delay = CONFIG_DRAM_DQS_GATING_DELAY,
 };
 
 unsigned long sunxi_dram_init(void)