From: Eric Nelson Date: Tue, 20 Aug 2013 18:44:43 +0000 (-0700) Subject: i.MX6: nitrogen6x: force HDMI onto IPU0/DI0 X-Git-Tag: v2013.10-rc3~5^2~5^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8907c2c50408b39e93fb42b2d74ab908480320a0;p=platform%2Fkernel%2Fu-boot.git 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 --- diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 79ab449..1419f36 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -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 <gpr[3]);