mx6cuboxi: Fix boot of hummingboard dual-lite

Hummingboard dual-lite is picking the incorrect calibration structure.

Fix it so that it can boot.

While at it, also fix p1_mpdgctrl1 register to match Solid-run's
setting.

Reported-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Andrei Gherzan <andrei@gherzan.ro>
This commit is contained in:
Fabio Estevam 2015-05-29 13:00:36 -03:00 committed by Stefano Babic
parent 212b660161
commit dbab8b8e10
1 changed files with 2 additions and 2 deletions

View File

@ -536,7 +536,7 @@ static const struct mx6_mmdc_calibration mx6dl_1g_mmcd_calib = {
.p0_mpdgctrl0 = 0x023C0224, .p0_mpdgctrl0 = 0x023C0224,
.p0_mpdgctrl1 = 0x02000220, .p0_mpdgctrl1 = 0x02000220,
.p1_mpdgctrl0 = 0x02200220, .p1_mpdgctrl0 = 0x02200220,
.p1_mpdgctrl1 = 0x02000220, .p1_mpdgctrl1 = 0x02040208,
.p0_mprddlctl = 0x44444846, .p0_mprddlctl = 0x44444846,
.p1_mprddlctl = 0x4042463C, .p1_mprddlctl = 0x4042463C,
.p0_mpwrdlctl = 0x32343032, .p0_mpwrdlctl = 0x32343032,
@ -627,7 +627,7 @@ static void spl_dram_init(int width)
else if (is_cpu_type(MXC_CPU_MX6Q)) else if (is_cpu_type(MXC_CPU_MX6Q))
mx6_dram_cfg(&sysinfo, &mx6q_2g_mmcd_calib, &mem_ddr_4g); mx6_dram_cfg(&sysinfo, &mx6q_2g_mmcd_calib, &mem_ddr_4g);
else if (is_cpu_type(MXC_CPU_MX6DL)) else if (is_cpu_type(MXC_CPU_MX6DL))
mx6_dram_cfg(&sysinfo, &mx6q_1g_mmcd_calib, &mem_ddr_2g); mx6_dram_cfg(&sysinfo, &mx6dl_1g_mmcd_calib, &mem_ddr_2g);
else if (is_cpu_type(MXC_CPU_MX6SOLO)) else if (is_cpu_type(MXC_CPU_MX6SOLO))
mx6_dram_cfg(&sysinfo, &mx6dl_512m_mmcd_calib, &mem_ddr_2g); mx6_dram_cfg(&sysinfo, &mx6dl_512m_mmcd_calib, &mem_ddr_2g);
} }