summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorJimmy Rubin <jimmy.rubin@stericsson.com>2011-03-23 21:40:06 +0100
committerRobert Marklund <robert.marklund@stericsson.com>2011-10-05 11:19:45 +0200
commit3a11016e1e1b98e9130a685f162f2671ffc70dd2 (patch)
tree36f50c4d6cd7145050830c97c3c2371230d73067 /drivers/video
parente8c1a3b81e5dd865b39f8abe192c6cb492d187de (diff)
video: mcde: update formatter setup for U5500
If channel B is used, LINK1_VID or LINK0_CMD can be used. For channel A, LINK0_VID and LINK1_CMD can be used. ST-Ericsson Linux next: Not tested, ER 282779 ST-Ericsson ID: 333074 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I21ee3b8dd84495292518e48c68e536f1dd18b8b6 Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19527 Reviewed-by: Dan JOHANSSON <dan.johansson@stericsson.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/mcde/mcde_hw.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/mcde/mcde_hw.c b/drivers/video/mcde/mcde_hw.c
index 69e4617d896..0cbcc70fce0 100644
--- a/drivers/video/mcde/mcde_hw.c
+++ b/drivers/video/mcde/mcde_hw.c
@@ -1160,9 +1160,9 @@ static int update_channel_static_registers(struct mcde_chnl_state *chnl)
return -EINVAL;
if (port->type == MCDE_PORTTYPE_DSI) {
- if (port->link == 1 && port->ifc == 0)
- return -EINVAL;
- if (port->link == 0 && port->ifc == 1)
+ if ((port->link == 1 &&
+ port->ifc == DSI_VIDEO_MODE) ||
+ (port->link == 0 && port->ifc == DSI_CMD_MODE))
return -EINVAL;
mcde_wfld(MCDE_CR, DSI0_EN_V3, true);
@@ -1179,9 +1179,8 @@ static int update_channel_static_registers(struct mcde_chnl_state *chnl)
if (chnl->id != 1)
return -EINVAL;
- if (port->link == 0 && port->ifc == 0)
- return -EINVAL;
- if (port->link == 1 && port->ifc == 0)
+ if ((port->link == 0 && port->ifc == DSI_VIDEO_MODE) ||
+ (port->link == 1 && port->ifc == DSI_CMD_MODE))
return -EINVAL;
mcde_wfld(MCDE_CR, DSI1_EN_V3, true);