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

Commit 784e8fe4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4546): Add u32 argument to VIDIOC_INT_RESET. 



The extra argument makes it possible to reset subsystems of a chip if
that is supported.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1739adea

drivers/media/video/em28xx/em28xx-video.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void em28xx_config_i2c(struct em28xx *dev) 


	route.input = INPUT(dev->ctl_input)->vmux;

	route.output = 0;

	em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);

	em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, 0);

	em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);

	em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);

drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt, 
static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)

{

	int ret;

	ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);

	ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0);

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);

}

drivers/media/video/v4l2-common.c

+1 −0
Original line number Diff line number Diff line
@@ -938,6 +938,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg) 
	case VIDIOC_INT_AUDIO_CLOCK_FREQ:

	case VIDIOC_INT_I2S_CLOCK_FREQ:

	case VIDIOC_INT_S_STANDBY:

	case VIDIOC_INT_RESET:

	{

		u32 *p=arg;

include/media/v4l2-common.h

+3 −2
Original line number Diff line number Diff line
@@ -169,8 +169,9 @@ enum v4l2_chip_ident { 
#define	VIDIOC_INT_S_REGISTER 		_IOR ('d', 100, struct v4l2_register)

#define	VIDIOC_INT_G_REGISTER 		_IOWR('d', 101, struct v4l2_register)



/* Reset the I2C chip */

#define VIDIOC_INT_RESET            	_IO  ('d', 102)

/* Generic reset command. The argument selects which subsystems to reset.

   Passing 0 will always reset the whole chip. */

#define VIDIOC_INT_RESET            	_IOW ('d', 102, u32)



/* Set the frequency (in Hz) of the audio clock output.

   Used to slave an audio processor to the video decoder, ensuring that audio