Merge branch 'uboot'

[oweals/u-boot.git] / board / compulab / cm_t335 / spl.c

diff --git a/board/compulab/cm_t335/spl.c b/board/compulab/cm_t335/spl.c
index 99f3a869bbca2f6aa717c584c49061a12ae1c315..d57436445e93b61a88501b391461dfd73e09bdf5 100644 (file)
--- a/board/compulab/cm_t335/spl.c
+++ b/board/compulab/cm_t335/spl.c
@@ -18,7 +18,15 @@
 #include <asm/arch/clocks_am33xx.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware_am33xx.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
+
+const struct ctrl_ioregs ioregs = {
+       .cm0ioctl               = MT41J128MJT125_IOCTRL_VALUE,
+       .cm1ioctl               = MT41J128MJT125_IOCTRL_VALUE,
+       .cm2ioctl               = MT41J128MJT125_IOCTRL_VALUE,
+       .dt0ioctl               = MT41J128MJT125_IOCTRL_VALUE,
+       .dt1ioctl               = MT41J128MJT125_IOCTRL_VALUE,
+};
 
 static const struct ddr_data ddr3_data = {
        .datardsratio0          = MT41J128MJT125_RD_DQS,
@@ -89,7 +97,7 @@ static void probe_sdram_size(long size)
                reset_cpu(0);
        }
        debug("%s: setting DRAM size to %ldM\n", __func__, size >> 20);
-       config_ddr(303, MT41J128MJT125_IOCTRL_VALUE, &ddr3_data,
+       config_ddr(303, &ioregs, &ddr3_data,
                   &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0);
 }