Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bd1d91d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: tvp5150: implement decoder lock when irq is not used 



When irq is used, the lock is set via IRQ code. When it isn't,
the driver just assumes it is always locked. Instead, read the
lock status from the status register.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent ee9a6ff6

drivers/media/i2c/tvp5150.c

+19 −4
Original line number Diff line number Diff line
@@ -810,11 +810,25 @@ static v4l2_std_id tvp5150_read_std(struct v4l2_subdev *sd) 
	}

}



static int query_lock(struct v4l2_subdev *sd)

{

	struct tvp5150 *decoder = to_tvp5150(sd);

	int status;



	if (decoder->irq)

		return decoder->lock;



	regmap_read(decoder->regmap, TVP5150_STATUS_REG_1, &status);



	/* For standard detection, we need the 3 locks */

	return (status & 0x0e) == 0x0e;

}



static int tvp5150_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id)

{

	struct tvp5150 *decoder = to_tvp5150(sd);



	*std_id = decoder->lock ? tvp5150_read_std(sd) : V4L2_STD_UNKNOWN;

	*std_id = query_lock(sd) ? tvp5150_read_std(sd) : V4L2_STD_UNKNOWN;



	return 0;

}
@@ -1208,7 +1222,10 @@ static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable) 
		tvp5150_enable(sd);



		/* Enable outputs if decoder is locked */

		if (decoder->irq)

			val = decoder->lock ? decoder->oe : 0;

		else

			val = decoder->oe;

		int_val = TVP5150_INT_A_LOCK;

		v4l2_subdev_notify_event(&decoder->sd, &tvp5150_ev_fmt);

	}
@@ -1777,8 +1794,6 @@ static int tvp5150_probe(struct i2c_client *c, 
						IRQF_ONESHOT, "tvp5150", core);

		if (res)

			return res;

	} else {

		core->lock = true;

	}



	res = v4l2_async_register_subdev(sd);