diff options
| author | Mauro Carvalho Chehab | 2016-01-26 10:13:30 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2016-01-26 10:13:30 +0100 |
| commit | 841502d731f1708aae907d5bdf1659e8a372fc9a (patch) | |
| tree | ffc6cf73d6d2fbc4659294e6d9bd7bd269997787 /drivers/media/i2c/tvp5150.c | |
| parent | [media] em28xx: fix implementation of s_stream (diff) | |
| download | kernel-qcow2-linux-841502d731f1708aae907d5bdf1659e8a372fc9a.tar.gz kernel-qcow2-linux-841502d731f1708aae907d5bdf1659e8a372fc9a.tar.xz kernel-qcow2-linux-841502d731f1708aae907d5bdf1659e8a372fc9a.zip | |
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>
Diffstat (limited to 'drivers/media/i2c/tvp5150.c')
| -rw-r--r-- | drivers/media/i2c/tvp5150.c | 9 |
1 files changed, 5 insertions, 4 deletions
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); |