Skip to contentSkip to conversation

i.MX6: nitrogen6x: force HDMI onto IPU0/DI0

PATCH New Eric Nelson 2 participants 2 messages Aug 20, 2013 – Aug 21, 2013

lore
Share & tools
lore

Eric Nelson

author
#0 lore raw

PATCH 1/1 i.MX6: nitrogen6x: force HDMI onto IPU0/DI0

Our Linux kernel switches the HDMI connector onto IPU0/DI1, but the U-Boot display driver only supports IPU0/DI0 for the time being.

Because of this, a soft re-boot will leave the HDMI output connected to the wrong display port and prevent video from being displayed.

Signed-off-by Eric Nelson <[email protected]>
---
 board/boundary/nitrogen6x/nitrogen6x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
board/boundary/nitrogen6x/nitrogen6x.c +2 -1
index 79ab449..1419f36 100644
@@ -666,7 +666,8 @@ static void setup_display(void)
 	writel(reg, &iomux->gpr[2]);
 
 	reg = readl(&iomux->gpr[3]);
-	reg = (reg & ~IOMUXC_GPR3_LVDS0_MUX_CTL_MASK)
+	reg = (reg & ~(IOMUXC_GPR3_LVDS0_MUX_CTL_MASK
+			|IOMUXC_GPR3_HDMI_MUX_CTL_MASK))
 	    | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0
 	       <<IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET);
 	writel(reg, &iomux->gpr[3]);
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 i.MX6: nitrogen6x: force HDMI onto IPU0/DI0

Hi Eric,

Quoted 19 lines · Eric Nelson

Our Linux kernel switches the HDMI connector onto IPU0/DI1, but the U-Boot display driver only supports IPU0/DI0 for the time being.

Because of this, a soft re-boot will leave the HDMI output connected to the wrong display port and prevent video from being displayed.

Signed-off-by Eric Nelson <[email protected]>
---
 board/boundary/nitrogen6x/nitrogen6x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
board/boundary/nitrogen6x/nitrogen6x.c +0 -0
index 79ab449..1419f36 100644

board/boundary/nitrogen6x/nitrogen6x.c static void setup_display(void) · line 673

Quoted 9 lines
board/boundary/nitrogen6x/nitrogen6x.c +2 -1
@@ -666,7 +666,8 @@ static void setup_display(void)
 	writel(reg, &iomux->gpr[2]);
 
 	reg = readl(&iomux->gpr[3]);
-	reg = (reg & ~IOMUXC_GPR3_LVDS0_MUX_CTL_MASK)
+	reg = (reg & ~(IOMUXC_GPR3_LVDS0_MUX_CTL_MASK
+			|IOMUXC_GPR3_HDMI_MUX_CTL_MASK))
 	    | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0
 	       <<IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET);
 	writel(reg, &iomux->gpr[3]);

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================