diff mbox

[U-Boot] mx6cuboxi: Fix boot of hummingboard dual-lite

Message ID 1432915236-15320-1-git-send-email-fabio.estevam@freescale.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam May 29, 2015, 4 p.m. UTC
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>
---
I do not have access to a hummingboard dual-lite.

If anyone could test it, please provide a Tested-by, thanks

 board/solidrun/mx6cuboxi/mx6cuboxi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Andrei Gherzan May 29, 2015, 11:05 p.m. UTC | #1
Hi,

On Fri, May 29, 2015 at 6:00 PM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> 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>
Fabio Estevam June 11, 2015, 12:01 p.m. UTC | #2
Hi Stefano,

On Fri, May 29, 2015 at 8:05 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> Hi,
>
> On Fri, May 29, 2015 at 6:00 PM, Fabio Estevam
> <fabio.estevam@freescale.com> wrote:
>> 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>

Can this one be applied, please?

It fixes the boot on Hummingboard dual-lite model.

Thanks
Stefano Babic June 15, 2015, 10:14 a.m. UTC | #3
Hi Fabio,

On 11/06/2015 14:01, Fabio Estevam wrote:
> Hi Stefano,
> 
> On Fri, May 29, 2015 at 8:05 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:
>> Hi,
>>
>> On Fri, May 29, 2015 at 6:00 PM, Fabio Estevam
>> <fabio.estevam@freescale.com> wrote:
>>> 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>
> 
> Can this one be applied, please?
> 
> It fixes the boot on Hummingboard dual-lite model.
> 

Patch disappeared in patchwork (it was errouneosly set to "Changes
requested") and missed my last PR.

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index d15c726..9b1ecf0 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -536,7 +536,7 @@  static const struct mx6_mmdc_calibration mx6dl_1g_mmcd_calib = {
 	.p0_mpdgctrl0 =    0x023C0224,
 	.p0_mpdgctrl1 =    0x02000220,
 	.p1_mpdgctrl0 =    0x02200220,
-	.p1_mpdgctrl1 =    0x02000220,
+	.p1_mpdgctrl1 =    0x02040208,
 	.p0_mprddlctl =    0x44444846,
 	.p1_mprddlctl =    0x4042463C,
 	.p0_mpwrdlctl =    0x32343032,
@@ -627,7 +627,7 @@  static void spl_dram_init(int width)
 	else if (is_cpu_type(MXC_CPU_MX6Q))
 		mx6_dram_cfg(&sysinfo, &mx6q_2g_mmcd_calib, &mem_ddr_4g);
 	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))
 		mx6_dram_cfg(&sysinfo, &mx6dl_512m_mmcd_calib, &mem_ddr_2g);
 }