p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media: tvp5150: split reset/enable routine 

To trigger standard autodetection only the reset part of the routine
is necessary during probe(). Split this out to make it callable on its own.

[m.felsch@pengutronix.de: adapt commit message]
[m.felsch@pengutronix.de: add tvp5150_enable() to tvp5150_s_stream()]
[m.chehab@samsung.com: fix a compilation breakage]
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Philipp Zabel 2018-06-28 12:20:42 -04:00 committed by Mauro Carvalho Chehab
parent 1569586688
commit 1bb086bc4d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -802,7 +802,6 @@ static v4l2_std_id tvp5150_read_std(struct v4l2_subdev *sd)
static int tvp5150_reset(struct v4l2_subdev *sd, u32 val) static int tvp5150_reset(struct v4l2_subdev *sd, u32 val)
{ {
struct tvp5150 *decoder = to_tvp5150(sd); struct tvp5150 *decoder = to_tvp5150(sd);
v4l2_std_id std;
/* Initializes TVP5150 to its default values */ /* Initializes TVP5150 to its default values */
tvp5150_write_inittab(sd, tvp5150_init_default); tvp5150_write_inittab(sd, tvp5150_init_default);
@ -813,12 +812,20 @@ static int tvp5150_reset(struct v4l2_subdev *sd, u32 val)
/* Selects decoder input */ /* Selects decoder input */
tvp5150_selmux(sd); tvp5150_selmux(sd);
/* Initializes TVP5150 to stream enabled values */
tvp5150_write_inittab(sd, tvp5150_init_enable);
/* Initialize image preferences */ /* Initialize image preferences */
v4l2_ctrl_handler_setup(&decoder->hdl); v4l2_ctrl_handler_setup(&decoder->hdl);
return 0;
}
static int tvp5150_enable(struct v4l2_subdev *sd)
{
struct tvp5150 *decoder = to_tvp5150(sd);
v4l2_std_id std;
/* Initializes TVP5150 to stream enabled values */
tvp5150_write_inittab(sd, tvp5150_init_enable);
if (decoder->norm == V4L2_STD_ALL) if (decoder->norm == V4L2_STD_ALL)
std = tvp5150_read_std(sd); std = tvp5150_read_std(sd);
else else
@ -1105,6 +1112,8 @@ static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
TVP5150_MISC_CTL_CLOCK_OE; TVP5150_MISC_CTL_CLOCK_OE;
if (enable) { if (enable) {
tvp5150_enable(sd);
/* /*
* Enable the YCbCr and clock outputs. In discrete sync mode * Enable the YCbCr and clock outputs. In discrete sync mode
* (non-BT.656) additionally enable the the sync outputs. * (non-BT.656) additionally enable the the sync outputs.