summaryrefslogtreecommitdiff
path: root/board/boundary/nitrogen6x/nitrogen6x.c
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2013-08-20 11:44:43 -0700
committerStefano Babic <sbabic@denx.de>2013-08-21 19:20:28 +0200
commit8907c2c50408b39e93fb42b2d74ab908480320a0 (patch)
tree9d31884f8f34f1ca5f199901e7a8e46f354f76b7 /board/boundary/nitrogen6x/nitrogen6x.c
parent326ea986ac150acdc7656d57fca647db80b50158 (diff)
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 <eric.nelson@boundarydevices.com>
Diffstat (limited to 'board/boundary/nitrogen6x/nitrogen6x.c')
-rw-r--r--board/boundary/nitrogen6x/nitrogen6x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 79ab44904e..1419f36b8e 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
<<IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET);
writel(reg, &iomux->gpr[3]);