aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini2015-12-04 08:21:28 -0500
committerTom Rini2015-12-04 08:21:28 -0500
commita85670e40da1ef4f299effb73c36e48d39d50106 (patch)
tree19886e80adb2c9e201387b74a042953e0070bb10 /drivers
parentf5bcfe151e61558572b9f9036c67d51bd831a436 (diff)
parenta80a999c9b5c128cad2f67b4b32036bd4d667904 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/ipu_disp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/ipu_disp.c b/drivers/video/ipu_disp.c
index e08ddd4a4e9..cbac9f72fcb 100644
--- a/drivers/video/ipu_disp.c
+++ b/drivers/video/ipu_disp.c
@@ -611,11 +611,9 @@ void ipu_dp_dc_enable(ipu_channel_t channel)
uint32_t reg;
uint32_t dc_chan;
- if (channel == MEM_FG_SYNC)
- dc_chan = 5;
if (channel == MEM_DC_SYNC)
dc_chan = 1;
- else if (channel == MEM_BG_SYNC)
+ else if ((channel == MEM_BG_SYNC) || (channel == MEM_FG_SYNC))
dc_chan = 5;
else
return;