From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Tue, 26 Jan 2016 09:13:30 +0000 (-0200)
Subject: Revert "[media] tvp5150: Fix breakage for serial usage"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=841502d731f1708aae907d5bdf1659e8a372fc9a;p=linux-beck.git

Revert "[media] tvp5150: Fix breakage for serial usage"

This patch were a workaround for a regression at tvp5150, but
it causes troubles on devices with omap3+tvp5151 when working
in non-parallel bus mode.

Now that em28xx was fixed, we can get rid of that.

This reverts commit 47de9bf8931e6bf9c92fdba9867925d1ce482ab1.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 779c6f453cc9..437f1a7ecb96 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -975,18 +975,19 @@ static int tvp5150_g_mbus_config(struct v4l2_subdev *sd,
 static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
 {
 	struct tvp5150 *decoder = to_tvp5150(sd);
+	/* Output format: 8-bit ITU-R BT.656 with embedded syncs */
+	int val = 0x09;
 
 	/* Output format: 8-bit 4:2:2 YUV with discrete sync */
-	if (decoder->mbus_type != V4L2_MBUS_PARALLEL)
-		return 0;
+	if (decoder->mbus_type == V4L2_MBUS_PARALLEL)
+		val = 0x0d;
 
 	/* Initializes TVP5150 to its default values */
 	/* # set PCLK (27MHz) */
 	tvp5150_write(sd, TVP5150_CONF_SHARED_PIN, 0x00);
 
-	/* Output format: 8-bit ITU-R BT.656 with embedded syncs */
 	if (enable)
-		tvp5150_write(sd, TVP5150_MISC_CTL, 0x09);
+		tvp5150_write(sd, TVP5150_MISC_CTL, val);
 	else
 		tvp5150_write(sd, TVP5150_MISC_CTL, 0x00);