Skip to content

Commit

Permalink
Revert "[media] tvp5150: Fix breakage for serial usage"
Browse files Browse the repository at this point in the history
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 47de9bf.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
Mauro Carvalho Chehab committed Jan 26, 2016
1 parent 13d52fe commit 841502d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/media/i2c/tvp5150.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 841502d

Please sign in to comment.