summaryrefslogtreecommitdiff
path: root/drivers/video/mxc/mxc_ipuv3_fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/mxc/mxc_ipuv3_fb.c')
-rw-r--r--drivers/video/mxc/mxc_ipuv3_fb.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index 5f2b1bbedff7..d7c48dfd145b 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -589,14 +589,16 @@ static int mxcfb_set_par(struct fb_info *fbi)
sig_cfg.clk_pol = true;
if (fbi->var.sync & FB_SYNC_DATA_INVERT)
sig_cfg.data_pol = true;
- if (
+ if (!(fbi->var.sync & FB_SYNC_OE_LOW_ACT))
+ sig_cfg.enable_pol = true;
+#ifdef CONFIG_MACH_APALIS_IMX6
/* Hack: The home-brew resistor video DAC on Apalis iMX6 uses DI0_PIN15 as
- output enable but with reversed polarity. */
-#ifndef CONFIG_MACH_APALIS_IMX6
- !
+ output enable but with reversed polarity.
+ if we're on IPU1, DI0 force reversed polarity */
+ if ((mxc_fbi->ipu_id)==1 && (mxc_fbi->ipu_di)==0) {
+ sig_cfg.enable_pol = false;
+ }
#endif
- (fbi->var.sync & FB_SYNC_OE_LOW_ACT))
- sig_cfg.enable_pol = true;
if (fbi->var.sync & FB_SYNC_CLK_IDLE_EN)
sig_cfg.clkidle_en = true;