Commit 47de9bf8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] tvp5150: Fix breakage for serial usage

changeset 460b6c08 ("tvp5150: Add s_stream subdev operation
support") broke for em28xx-based devices with uses tvp5150. On those
devices, touching the TVP5150_MISC_CTL register causes em28xx to stop
streaming.

I suspect that it uses the 27 MHz clock provided by tvp5150 to feed
em28xx. So, change the logic to do nothing on s_stream if the tvp5150 is
not set up to work with V4L2_MBUS_PARALLEL.

Tested with Hauppauge WinTV USB 2 model 42012 Rev. C186
(USB ID: 2040:4200).

Cc: Javier Martinez Canillas <javier@osg.samsung.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 27524ff8
...@@ -975,19 +975,18 @@ static int tvp5150_g_mbus_config(struct v4l2_subdev *sd, ...@@ -975,19 +975,18 @@ 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)
val = 0x0d; return 0;
/* 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, val); tvp5150_write(sd, TVP5150_MISC_CTL, 0x09);
else else
tvp5150_write(sd, TVP5150_MISC_CTL, 0x00); tvp5150_write(sd, TVP5150_MISC_CTL, 0x00);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment