openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 47de9bf893.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-01-26 07:13:30 -02:00
parent 13d52fe40f
commit 841502d731
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/i2c/tvp5150.c
View File

@ -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) static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
{ {
struct tvp5150 *decoder = to_tvp5150(sd); 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 */ /* Output format: 8-bit 4:2:2 YUV with discrete sync */
if (decoder->mbus_type != V4L2_MBUS_PARALLEL) if (decoder->mbus_type == V4L2_MBUS_PARALLEL)
return 0; val = 0x0d;
/* Initializes TVP5150 to its default values */ /* Initializes TVP5150 to its default values */
/* # set PCLK (27MHz) */ /* # set PCLK (27MHz) */
tvp5150_write(sd, TVP5150_CONF_SHARED_PIN, 0x00); tvp5150_write(sd, TVP5150_CONF_SHARED_PIN, 0x00);
/* Output format: 8-bit ITU-R BT.656 with embedded syncs */
if (enable) if (enable)
tvp5150_write(sd, TVP5150_MISC_CTL, 0x09); tvp5150_write(sd, TVP5150_MISC_CTL, val);
else else
tvp5150_write(sd, TVP5150_MISC_CTL, 0x00); tvp5150_write(sd, TVP5150_MISC_CTL, 0x00);