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

V4L/DVB (10724): saa7110: convert to v4l2_subdev. 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
[mchehab@redhat.com: fix merge conflict with removal of v4l2_ctrl_query_fill_std()]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 18d135ad

drivers/media/video/saa7110.c

+250 −218
Original line number Diff line number Diff line
@@ -33,15 +33,19 @@ 
#include <linux/wait.h>

#include <asm/uaccess.h>

#include <linux/i2c.h>

#include <linux/videodev.h>

#include <linux/video_decoder.h>

#include <media/v4l2-common.h>

#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-i2c-drv-legacy.h>



MODULE_DESCRIPTION("Philips SAA7110 video decoder driver");

MODULE_AUTHOR("Pauline Middelink");

MODULE_LICENSE("GPL");



static unsigned short normal_i2c[] = { 0x9c >> 1, 0x9e >> 1, I2C_CLIENT_END };



I2C_CLIENT_INSMOD;



static int debug;

module_param(debug, int, 0);

MODULE_PARM_DESC(debug, "Debug level (0-1)");
@@ -52,6 +56,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); 
#define SAA7110_NR_REG		0x35



struct saa7110 {

	struct v4l2_subdev sd;

	u8 reg[SAA7110_NR_REG];



	v4l2_std_id norm;
@@ -65,20 +70,28 @@ struct saa7110 { 
	wait_queue_head_t wq;

};



static inline struct saa7110 *to_saa7110(struct v4l2_subdev *sd)

{

	return container_of(sd, struct saa7110, sd);

}



/* ----------------------------------------------------------------------- */

/* I2C support functions						   */

/* ----------------------------------------------------------------------- */



static int saa7110_write(struct i2c_client *client, u8 reg, u8 value)

static int saa7110_write(struct v4l2_subdev *sd, u8 reg, u8 value)

{

	struct saa7110 *decoder = i2c_get_clientdata(client);

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct saa7110 *decoder = to_saa7110(sd);



	decoder->reg[reg] = value;

	return i2c_smbus_write_byte_data(client, reg, value);

}



static int saa7110_write_block(struct i2c_client *client, const u8 *data, unsigned int len)

static int saa7110_write_block(struct v4l2_subdev *sd, const u8 *data, unsigned int len)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct saa7110 *decoder = to_saa7110(sd);

	int ret = -1;

	u8 reg = *data;		/* first register to write to */
@@ -89,15 +102,13 @@ static int saa7110_write_block(struct i2c_client *client, const u8 *data, unsign 
	/* the saa7110 has an autoincrement function, use it if

	 * the adapter understands raw I2C */

	if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {

		struct saa7110 *decoder = i2c_get_clientdata(client);



		ret = i2c_master_send(client, data, len);



		/* Cache the written data */

		memcpy(decoder->reg + reg, data + 1, len - 1);

	} else {

		for (++data, --len; len; len--) {

			ret = saa7110_write(client, reg++, *data++);

			ret = saa7110_write(sd, reg++, *data++);

			if (ret < 0)

				break;

		}
@@ -106,8 +117,10 @@ static int saa7110_write_block(struct i2c_client *client, const u8 *data, unsign 
	return ret;

}



static inline int saa7110_read(struct i2c_client *client)

static inline int saa7110_read(struct v4l2_subdev *sd)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	return i2c_smbus_read_byte(client);

}
@@ -115,11 +128,11 @@ static inline int saa7110_read(struct i2c_client *client) 
/* SAA7110 functions							   */

/* ----------------------------------------------------------------------- */



#define FRESP_06H_COMPST 0x03	//0x13

#define FRESP_06H_SVIDEO 0x83	//0xC0

#define FRESP_06H_COMPST 0x03	/*0x13*/

#define FRESP_06H_SVIDEO 0x83	/*0xC0*/





static int saa7110_selmux(struct i2c_client *client, int chan)

static int saa7110_selmux(struct v4l2_subdev *sd, int chan)

{

	static const unsigned char modes[9][8] = {

		/* mode 0 */
@@ -150,17 +163,17 @@ static int saa7110_selmux(struct i2c_client *client, int chan) 
		{FRESP_06H_SVIDEO, 0x3C, 0x27, 0xC1, 0x23,

			      0x44, 0x75, 0x21}

	};

	struct saa7110 *decoder = i2c_get_clientdata(client);

	struct saa7110 *decoder = to_saa7110(sd);

	const unsigned char *ptr = modes[chan];



	saa7110_write(client, 0x06, ptr[0]);	/* Luminance control    */

	saa7110_write(client, 0x20, ptr[1]);	/* Analog Control #1    */

	saa7110_write(client, 0x21, ptr[2]);	/* Analog Control #2    */

	saa7110_write(client, 0x22, ptr[3]);	/* Mixer Control #1     */

	saa7110_write(client, 0x2C, ptr[4]);	/* Mixer Control #2     */

	saa7110_write(client, 0x30, ptr[5]);	/* ADCs gain control    */

	saa7110_write(client, 0x31, ptr[6]);	/* Mixer Control #3     */

	saa7110_write(client, 0x21, ptr[7]);	/* Analog Control #2    */

	saa7110_write(sd, 0x06, ptr[0]);	/* Luminance control    */

	saa7110_write(sd, 0x20, ptr[1]);	/* Analog Control #1    */

	saa7110_write(sd, 0x21, ptr[2]);	/* Analog Control #2    */

	saa7110_write(sd, 0x22, ptr[3]);	/* Mixer Control #1     */

	saa7110_write(sd, 0x2C, ptr[4]);	/* Mixer Control #2     */

	saa7110_write(sd, 0x30, ptr[5]);	/* ADCs gain control    */

	saa7110_write(sd, 0x31, ptr[6]);	/* Mixer Control #3     */

	saa7110_write(sd, 0x21, ptr[7]);	/* Analog Control #2    */

	decoder->input = chan;



	return 0;
@@ -176,156 +189,148 @@ static const unsigned char initseq[1 + SAA7110_NR_REG] = { 
	/* 0x30 */ 0x44, 0x71, 0x02, 0x8C, 0x02

};



static v4l2_std_id determine_norm(struct i2c_client *client)

static v4l2_std_id determine_norm(struct v4l2_subdev *sd)

{

	DEFINE_WAIT(wait);

	struct saa7110 *decoder = i2c_get_clientdata(client);

	struct saa7110 *decoder = to_saa7110(sd);

	int status;



	/* mode changed, start automatic detection */

	saa7110_write_block(client, initseq, sizeof(initseq));

	saa7110_selmux(client, decoder->input);

	saa7110_write_block(sd, initseq, sizeof(initseq));

	saa7110_selmux(sd, decoder->input);

	prepare_to_wait(&decoder->wq, &wait, TASK_UNINTERRUPTIBLE);

	schedule_timeout(msecs_to_jiffies(250));

	finish_wait(&decoder->wq, &wait);

	status = saa7110_read(client);

	status = saa7110_read(sd);

	if (status & 0x40) {

		v4l_dbg(1, debug, client, "status=0x%02x (no signal)\n", status);

		return decoder->norm;	// no change

		v4l2_dbg(1, debug, sd, "status=0x%02x (no signal)\n", status);

		return decoder->norm;	/* no change*/

	}

	if ((status & 3) == 0) {

		saa7110_write(client, 0x06, 0x83);

		saa7110_write(sd, 0x06, 0x83);

		if (status & 0x20) {

			v4l_dbg(1, debug, client, "status=0x%02x (NTSC/no color)\n", status);

			//saa7110_write(client,0x2E,0x81);

			v4l2_dbg(1, debug, sd, "status=0x%02x (NTSC/no color)\n", status);

			/*saa7110_write(sd,0x2E,0x81);*/

			return V4L2_STD_NTSC;

		}

		v4l_dbg(1, debug, client, "status=0x%02x (PAL/no color)\n", status);

		//saa7110_write(client,0x2E,0x9A);

		v4l2_dbg(1, debug, sd, "status=0x%02x (PAL/no color)\n", status);

		/*saa7110_write(sd,0x2E,0x9A);*/

		return V4L2_STD_PAL;

	}

	//saa7110_write(client,0x06,0x03);

	/*saa7110_write(sd,0x06,0x03);*/

	if (status & 0x20) {	/* 60Hz */

		v4l_dbg(1, debug, client, "status=0x%02x (NTSC)\n", status);

		saa7110_write(client, 0x0D, 0x86);

		saa7110_write(client, 0x0F, 0x50);

		saa7110_write(client, 0x11, 0x2C);

		//saa7110_write(client,0x2E,0x81);

		v4l2_dbg(1, debug, sd, "status=0x%02x (NTSC)\n", status);

		saa7110_write(sd, 0x0D, 0x86);

		saa7110_write(sd, 0x0F, 0x50);

		saa7110_write(sd, 0x11, 0x2C);

		/*saa7110_write(sd,0x2E,0x81);*/

		return V4L2_STD_NTSC;

	}



	/* 50Hz -> PAL/SECAM */

	saa7110_write(client, 0x0D, 0x86);

	saa7110_write(client, 0x0F, 0x10);

	saa7110_write(client, 0x11, 0x59);

	//saa7110_write(client,0x2E,0x9A);

	saa7110_write(sd, 0x0D, 0x86);

	saa7110_write(sd, 0x0F, 0x10);

	saa7110_write(sd, 0x11, 0x59);

	/*saa7110_write(sd,0x2E,0x9A);*/



	prepare_to_wait(&decoder->wq, &wait, TASK_UNINTERRUPTIBLE);

	schedule_timeout(msecs_to_jiffies(250));

	finish_wait(&decoder->wq, &wait);



	status = saa7110_read(client);

	status = saa7110_read(sd);

	if ((status & 0x03) == 0x01) {

		v4l_dbg(1, debug, client, "status=0x%02x (SECAM)\n", status);

		saa7110_write(client, 0x0D, 0x87);

		v4l2_dbg(1, debug, sd, "status=0x%02x (SECAM)\n", status);

		saa7110_write(sd, 0x0D, 0x87);

		return V4L2_STD_SECAM;

	}

	v4l_dbg(1, debug, client, "status=0x%02x (PAL)\n", status);

	v4l2_dbg(1, debug, sd, "status=0x%02x (PAL)\n", status);

	return V4L2_STD_PAL;

}



static int

saa7110_command (struct i2c_client *client,

		 unsigned int       cmd,

		 void              *arg)

{

	struct saa7110 *decoder = i2c_get_clientdata(client);

	struct v4l2_routing *route = arg;

	v4l2_std_id std;

	int v;



	switch (cmd) {

	case VIDIOC_INT_INIT:

		//saa7110_write_block(client, initseq, sizeof(initseq));

		break;



	case VIDIOC_INT_G_INPUT_STATUS:

static int saa7110_g_input_status(struct v4l2_subdev *sd, u32 *pstatus)

{

	struct saa7110 *decoder = to_saa7110(sd);

	int res = V4L2_IN_ST_NO_SIGNAL;

		int status;

	int status = saa7110_read(sd);



		status = saa7110_read(client);

		v4l_dbg(1, debug, client, "status=0x%02x norm=%llx\n",

	v4l2_dbg(1, debug, sd, "status=0x%02x norm=%llx\n",

		       status, decoder->norm);

	if (!(status & 0x40))

		res = 0;

	if (!(status & 0x03))

		res |= V4L2_IN_ST_NO_COLOR;



		*(int *) arg = res;

		break;

	*pstatus = res;

	return 0;

}



	case VIDIOC_QUERYSTD:

static int saa7110_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)

{

		*(v4l2_std_id *)arg = determine_norm(client);

		break;

	*(v4l2_std_id *)std = determine_norm(sd);

	return 0;

}



	case VIDIOC_S_STD:

		std = *(v4l2_std_id *) arg;

static int saa7110_s_std(struct v4l2_subdev *sd, v4l2_std_id std)

{

	struct saa7110 *decoder = to_saa7110(sd);



	if (decoder->norm != std) {

		decoder->norm = std;

			//saa7110_write(client, 0x06, 0x03);

		/*saa7110_write(sd, 0x06, 0x03);*/

		if (std & V4L2_STD_NTSC) {

				saa7110_write(client, 0x0D, 0x86);

				saa7110_write(client, 0x0F, 0x50);

				saa7110_write(client, 0x11, 0x2C);

				//saa7110_write(client, 0x2E, 0x81);

				v4l_dbg(1, debug, client, "switched to NTSC\n");

			saa7110_write(sd, 0x0D, 0x86);

			saa7110_write(sd, 0x0F, 0x50);

			saa7110_write(sd, 0x11, 0x2C);

			/*saa7110_write(sd, 0x2E, 0x81);*/

			v4l2_dbg(1, debug, sd, "switched to NTSC\n");

		} else if (std & V4L2_STD_PAL) {

				saa7110_write(client, 0x0D, 0x86);

				saa7110_write(client, 0x0F, 0x10);

				saa7110_write(client, 0x11, 0x59);

				//saa7110_write(client, 0x2E, 0x9A);

				v4l_dbg(1, debug, client, "switched to PAL\n");

			saa7110_write(sd, 0x0D, 0x86);

			saa7110_write(sd, 0x0F, 0x10);

			saa7110_write(sd, 0x11, 0x59);

			/*saa7110_write(sd, 0x2E, 0x9A);*/

			v4l2_dbg(1, debug, sd, "switched to PAL\n");

		} else if (std & V4L2_STD_SECAM) {

				saa7110_write(client, 0x0D, 0x87);

				saa7110_write(client, 0x0F, 0x10);

				saa7110_write(client, 0x11, 0x59);

				//saa7110_write(client, 0x2E, 0x9A);

				v4l_dbg(1, debug, client, "switched to SECAM\n");

			saa7110_write(sd, 0x0D, 0x87);

			saa7110_write(sd, 0x0F, 0x10);

			saa7110_write(sd, 0x11, 0x59);

			/*saa7110_write(sd, 0x2E, 0x9A);*/

			v4l2_dbg(1, debug, sd, "switched to SECAM\n");

		} else {

			return -EINVAL;

		}

	}

		break;

	return 0;

}



static int saa7110_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)

{

	struct saa7110 *decoder = to_saa7110(sd);



	case VIDIOC_INT_S_VIDEO_ROUTING:

	if (route->input < 0 || route->input >= SAA7110_MAX_INPUT) {

			v4l_dbg(1, debug, client, "input=%d not available\n", route->input);

		v4l2_dbg(1, debug, sd, "input=%d not available\n", route->input);

		return -EINVAL;

	}

	if (decoder->input != route->input) {

			saa7110_selmux(client, route->input);

			v4l_dbg(1, debug, client, "switched to input=%d\n", route->input);

		saa7110_selmux(sd, route->input);

		v4l2_dbg(1, debug, sd, "switched to input=%d\n", route->input);

	}

		break;



	case VIDIOC_STREAMON:

	case VIDIOC_STREAMOFF:

		v = cmd == VIDIOC_STREAMON;

		if (decoder->enable != v) {

			decoder->enable = v;

			saa7110_write(client, 0x0E, v ? 0x18 : 0x80);

			v4l_dbg(1, debug, client, "YUV %s\n", v ? "on" : "off");

	return 0;

}

		break;



	case VIDIOC_QUERYCTRL:

static int saa7110_s_stream(struct v4l2_subdev *sd, int enable)

{

		struct v4l2_queryctrl *qc = arg;

	struct saa7110 *decoder = to_saa7110(sd);



	if (decoder->enable != enable) {

		decoder->enable = enable;

		saa7110_write(sd, 0x0E, enable ? 0x18 : 0x80);

		v4l2_dbg(1, debug, sd, "YUV %s\n", enable ? "on" : "off");

	}

	return 0;

}



static int saa7110_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)

{

	switch (qc->id) {

	case V4L2_CID_BRIGHTNESS:

		return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
@@ -337,12 +342,12 @@ saa7110_command (struct i2c_client *client, 
	default:

		return -EINVAL;

	}

		break;

	return 0;

}



	case VIDIOC_G_CTRL:

static int saa7110_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

		struct v4l2_control *ctrl = arg;

	struct saa7110 *decoder = to_saa7110(sd);



	switch (ctrl->id) {

	case V4L2_CID_BRIGHTNESS:
@@ -360,66 +365,89 @@ saa7110_command (struct i2c_client *client, 
	default:

		return -EINVAL;

	}

		break;

	return 0;

}



	case VIDIOC_S_CTRL:

static int saa7110_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

		struct v4l2_control *ctrl = arg;

	struct saa7110 *decoder = to_saa7110(sd);



	switch (ctrl->id) {

	case V4L2_CID_BRIGHTNESS:

		if (decoder->bright != ctrl->value) {

			decoder->bright = ctrl->value;

				saa7110_write(client, 0x19, decoder->bright);

			saa7110_write(sd, 0x19, decoder->bright);

		}

		break;

	case V4L2_CID_CONTRAST:

		if (decoder->contrast != ctrl->value) {

			decoder->contrast = ctrl->value;

				saa7110_write(client, 0x13, decoder->contrast);

			saa7110_write(sd, 0x13, decoder->contrast);

		}

		break;

	case V4L2_CID_SATURATION:

		if (decoder->sat != ctrl->value) {

			decoder->sat = ctrl->value;

				saa7110_write(client, 0x12, decoder->sat);

			saa7110_write(sd, 0x12, decoder->sat);

		}

		break;

	case V4L2_CID_HUE:

		if (decoder->hue != ctrl->value) {

			decoder->hue = ctrl->value;

				saa7110_write(client, 0x07, decoder->hue);

			saa7110_write(sd, 0x07, decoder->hue);

		}

		break;

	default:

		return -EINVAL;

	}

		break;

	return 0;

}



	default:

		v4l_dbg(1, debug, client, "unknown command %08x\n", cmd);

		return -EINVAL;

static int saa7110_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7110, 0);

}

	return 0;



static int saa7110_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);

}



/* ----------------------------------------------------------------------- */



/*

 * Generic i2c probe

 * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'

 */

static const struct v4l2_subdev_core_ops saa7110_core_ops = {

	.g_chip_ident = saa7110_g_chip_ident,

	.g_ctrl = saa7110_g_ctrl,

	.s_ctrl = saa7110_s_ctrl,

	.queryctrl = saa7110_queryctrl,

};



static unsigned short normal_i2c[] = { 0x9c >> 1, 0x9e >> 1, I2C_CLIENT_END };

static const struct v4l2_subdev_tuner_ops saa7110_tuner_ops = {

	.s_std = saa7110_s_std,

};



I2C_CLIENT_INSMOD;

static const struct v4l2_subdev_video_ops saa7110_video_ops = {

	.s_routing = saa7110_s_routing,

	.s_stream = saa7110_s_stream,

	.querystd = saa7110_querystd,

	.g_input_status = saa7110_g_input_status,

};



static const struct v4l2_subdev_ops saa7110_ops = {

	.core = &saa7110_core_ops,

	.tuner = &saa7110_tuner_ops,

	.video = &saa7110_video_ops,

};



/* ----------------------------------------------------------------------- */



static int saa7110_probe(struct i2c_client *client,

			const struct i2c_device_id *id)

{

	struct saa7110 *decoder;

	struct v4l2_subdev *sd;

	int rv;



	/* Check if the adapter supports the needed features */
@@ -433,6 +461,8 @@ static int saa7110_probe(struct i2c_client *client, 
	decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL);

	if (!decoder)

		return -ENOMEM;

	sd = &decoder->sd;

	v4l2_i2c_subdev_init(sd, client, &saa7110_ops);

	decoder->norm = V4L2_STD_PAL;

	decoder->input = 0;

	decoder->enable = 1;
@@ -441,30 +471,29 @@ static int saa7110_probe(struct i2c_client *client, 
	decoder->hue = 32768;

	decoder->sat = 32768;

	init_waitqueue_head(&decoder->wq);

	i2c_set_clientdata(client, decoder);



	rv = saa7110_write_block(client, initseq, sizeof(initseq));

	rv = saa7110_write_block(sd, initseq, sizeof(initseq));

	if (rv < 0) {

		v4l_dbg(1, debug, client, "init status %d\n", rv);

		v4l2_dbg(1, debug, sd, "init status %d\n", rv);

	} else {

		int ver, status;

		saa7110_write(client, 0x21, 0x10);

		saa7110_write(client, 0x0e, 0x18);

		saa7110_write(client, 0x0D, 0x04);

		ver = saa7110_read(client);

		saa7110_write(client, 0x0D, 0x06);

		//mdelay(150);

		status = saa7110_read(client);

		v4l_dbg(1, debug, client, "version %x, status=0x%02x\n",

		saa7110_write(sd, 0x21, 0x10);

		saa7110_write(sd, 0x0e, 0x18);

		saa7110_write(sd, 0x0D, 0x04);

		ver = saa7110_read(sd);

		saa7110_write(sd, 0x0D, 0x06);

		/*mdelay(150);*/

		status = saa7110_read(sd);

		v4l2_dbg(1, debug, sd, "version %x, status=0x%02x\n",

			       ver, status);

		saa7110_write(client, 0x0D, 0x86);

		saa7110_write(client, 0x0F, 0x10);

		saa7110_write(client, 0x11, 0x59);

		//saa7110_write(client, 0x2E, 0x9A);

		saa7110_write(sd, 0x0D, 0x86);

		saa7110_write(sd, 0x0F, 0x10);

		saa7110_write(sd, 0x11, 0x59);

		/*saa7110_write(sd, 0x2E, 0x9A);*/

	}



	//saa7110_selmux(client,0);

	//determine_norm(client);

	/*saa7110_selmux(sd,0);*/

	/*determine_norm(sd);*/

	/* setup and implicit mode 0 select has been performed */



	return 0;
@@ -472,7 +501,10 @@ static int saa7110_probe(struct i2c_client *client, 


static int saa7110_remove(struct i2c_client *client)

{

	kfree(i2c_get_clientdata(client));

	struct v4l2_subdev *sd = i2c_get_clientdata(client);



	v4l2_device_unregister_subdev(sd);

	kfree(to_saa7110(sd));

	return 0;

}

include/media/v4l2-chip-ident.h

+1 −3
Original line number Diff line number Diff line
@@ -37,10 +37,8 @@ enum { 
	/* module saa7110: just ident 100 */

	V4L2_IDENT_SAA7110 = 100,



	/* module saa7111: just ident 101 */

	/* module saa7115: reserved range 101-149 */

	V4L2_IDENT_SAA7111 = 101,



	/* module saa7115: reserved range 102-149 */

	V4L2_IDENT_SAA7113 = 103,

	V4L2_IDENT_SAA7114 = 104,

	V4L2_IDENT_SAA7115 = 105,