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

Commit 64fbf444 authored by Palash Bandyopadhyay's avatar Palash Bandyopadhyay Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: Added support for Carraera, Shelby, RDx_253S and VIDEO_GRABBER 



Added support for new cx231xx boards - Carraera, Shelby, RDx_253S and
VIDEO_GRABBER.

[mchehab@redhat.com: Fix a merge conflict with BKL removal patches]
Signed-off-by: default avatarPalash Bandyopadhyay <palash.bandyopadhyay@conexant.com>
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 47b75ec1

drivers/media/video/cx231xx/Makefile

+1 −1
Original line number Diff line number Diff line 
cx231xx-objs     := cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o \

		    cx231xx-avcore.o cx231xx-pcb-cfg.o cx231xx-vbi.o

		    cx231xx-avcore.o cx231xx-417.o cx231xx-pcb-cfg.o cx231xx-vbi.o



cx231xx-alsa-objs := cx231xx-audio.o

drivers/media/video/cx231xx/cx231xx-417.c

0 → 100644
+2230 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/media/video/cx231xx/cx231xx-audio.c

+179 −10
Original line number Diff line number Diff line
@@ -75,6 +75,30 @@ static int cx231xx_isoc_audio_deinit(struct cx231xx *dev) 
	return 0;

}



static int cx231xx_bulk_audio_deinit(struct cx231xx *dev)

{

	int i;



	dprintk("Stopping bulk\n");



	for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {

		if (dev->adev.urb[i]) {

			if (!irqs_disabled())

				usb_kill_urb(dev->adev.urb[i]);

			else

				usb_unlink_urb(dev->adev.urb[i]);



			usb_free_urb(dev->adev.urb[i]);

			dev->adev.urb[i] = NULL;



			kfree(dev->adev.transfer_buffer[i]);

			dev->adev.transfer_buffer[i] = NULL;

		}

	}



	return 0;

}



static void cx231xx_audio_isocirq(struct urb *urb)

{

	struct cx231xx *dev = urb->context;
@@ -158,14 +182,92 @@ static void cx231xx_audio_isocirq(struct urb *urb) 
	return;

}



static void cx231xx_audio_bulkirq(struct urb *urb)

{

	struct cx231xx *dev = urb->context;

	unsigned int oldptr;

	int period_elapsed = 0;

	int status;

	unsigned char *cp;

	unsigned int stride;

	struct snd_pcm_substream *substream;

	struct snd_pcm_runtime *runtime;



	switch (urb->status) {

	case 0:		/* success */

	case -ETIMEDOUT:	/* NAK */

		break;

	case -ECONNRESET:	/* kill */

	case -ENOENT:

	case -ESHUTDOWN:

		return;

	default:		/* error */

		dprintk("urb completition error %d.\n", urb->status);

		break;

	}



	if (dev->adev.capture_pcm_substream) {

		substream = dev->adev.capture_pcm_substream;

		runtime = substream->runtime;

		stride = runtime->frame_bits >> 3;



		if (1) {

			int length = urb->actual_length /

				     stride;

			cp = (unsigned char *)urb->transfer_buffer;



			oldptr = dev->adev.hwptr_done_capture;

			if (oldptr + length >= runtime->buffer_size) {

				unsigned int cnt;



				cnt = runtime->buffer_size - oldptr;

				memcpy(runtime->dma_area + oldptr * stride, cp,

				       cnt * stride);

				memcpy(runtime->dma_area, cp + cnt * stride,

				       length * stride - cnt * stride);

			} else {

				memcpy(runtime->dma_area + oldptr * stride, cp,

				       length * stride);

			}



			snd_pcm_stream_lock(substream);



			dev->adev.hwptr_done_capture += length;

			if (dev->adev.hwptr_done_capture >=

						runtime->buffer_size)

				dev->adev.hwptr_done_capture -=

						runtime->buffer_size;



			dev->adev.capture_transfer_done += length;

			if (dev->adev.capture_transfer_done >=

				runtime->period_size) {

				dev->adev.capture_transfer_done -=

						runtime->period_size;

				period_elapsed = 1;

			}

			snd_pcm_stream_unlock(substream);

		}

		if (period_elapsed)

			snd_pcm_period_elapsed(substream);

	}

	urb->status = 0;



	status = usb_submit_urb(urb, GFP_ATOMIC);

	if (status < 0) {

		cx231xx_errdev("resubmit of audio urb failed (error=%i)\n",

			       status);

	}

	return;

}



static int cx231xx_init_audio_isoc(struct cx231xx *dev)

{

	int i, errCode;

	int sb_size;



	cx231xx_info("%s: Starting AUDIO transfers\n", __func__);

	cx231xx_info("%s: Starting ISO AUDIO transfers\n", __func__);



	sb_size = CX231XX_NUM_AUDIO_PACKETS * dev->adev.max_pkt_size;

	sb_size = CX231XX_ISO_NUM_AUDIO_PACKETS * dev->adev.max_pkt_size;



	for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {

		struct urb *urb;
@@ -176,7 +278,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) 
			return -ENOMEM;



		memset(dev->adev.transfer_buffer[i], 0x80, sb_size);

		urb = usb_alloc_urb(CX231XX_NUM_AUDIO_PACKETS, GFP_ATOMIC);

		urb = usb_alloc_urb(CX231XX_ISO_NUM_AUDIO_PACKETS, GFP_ATOMIC);

		if (!urb) {

			cx231xx_errdev("usb_alloc_urb failed!\n");

			for (j = 0; j < i; j++) {
@@ -194,10 +296,10 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) 
		urb->transfer_buffer = dev->adev.transfer_buffer[i];

		urb->interval = 1;

		urb->complete = cx231xx_audio_isocirq;

		urb->number_of_packets = CX231XX_NUM_AUDIO_PACKETS;

		urb->number_of_packets = CX231XX_ISO_NUM_AUDIO_PACKETS;

		urb->transfer_buffer_length = sb_size;



		for (j = k = 0; j < CX231XX_NUM_AUDIO_PACKETS;

		for (j = k = 0; j < CX231XX_ISO_NUM_AUDIO_PACKETS;

			j++, k += dev->adev.max_pkt_size) {

			urb->iso_frame_desc[j].offset = k;

			urb->iso_frame_desc[j].length = dev->adev.max_pkt_size;
@@ -216,6 +318,59 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) 
	return errCode;

}



static int cx231xx_init_audio_bulk(struct cx231xx *dev)

{

	int i, errCode;

	int sb_size;



	cx231xx_info("%s: Starting BULK AUDIO transfers\n", __func__);



	sb_size = CX231XX_NUM_AUDIO_PACKETS * dev->adev.max_pkt_size;



	for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {

		struct urb *urb;

		int j;



		dev->adev.transfer_buffer[i] = kmalloc(sb_size, GFP_ATOMIC);

		if (!dev->adev.transfer_buffer[i])

			return -ENOMEM;



		memset(dev->adev.transfer_buffer[i], 0x80, sb_size);

		urb = usb_alloc_urb(CX231XX_NUM_AUDIO_PACKETS, GFP_ATOMIC);

		if (!urb) {

			cx231xx_errdev("usb_alloc_urb failed!\n");

			for (j = 0; j < i; j++) {

				usb_free_urb(dev->adev.urb[j]);

				kfree(dev->adev.transfer_buffer[j]);

			}

			return -ENOMEM;

		}



		urb->dev = dev->udev;

		urb->context = dev;

		urb->pipe = usb_rcvbulkpipe(dev->udev,

						dev->adev.end_point_addr);

		urb->transfer_flags = 0;

		urb->transfer_buffer = dev->adev.transfer_buffer[i];

		urb->complete = cx231xx_audio_bulkirq;

		urb->transfer_buffer_length = sb_size;



		dev->adev.urb[i] = urb;



	}



	for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {

		errCode = usb_submit_urb(dev->adev.urb[i], GFP_ATOMIC);

		if (errCode < 0) {

			cx231xx_bulk_audio_deinit(dev);

			return errCode;

		}

	}



	return errCode;

}





static int cx231xx_cmd(struct cx231xx *dev, int cmd, int arg)

{

	dprintk("%s transfer\n", (dev->adev.capture_stream == STREAM_ON) ?
@@ -225,7 +380,12 @@ static int cx231xx_cmd(struct cx231xx *dev, int cmd, int arg) 
	case CX231XX_CAPTURE_STREAM_EN:

		if (dev->adev.capture_stream == STREAM_OFF && arg == 1) {

			dev->adev.capture_stream = STREAM_ON;

			if (is_fw_load(dev) == 0)

				cx25840_call(dev, core, load_fw);

			if (dev->USE_ISO)

				cx231xx_init_audio_isoc(dev);

			else

				cx231xx_init_audio_bulk(dev);

		} else if (dev->adev.capture_stream == STREAM_ON && arg == 0) {

			dev->adev.capture_stream = STREAM_OFF;

			cx231xx_isoc_audio_deinit(dev);
@@ -300,7 +460,10 @@ static int snd_cx231xx_capture_open(struct snd_pcm_substream *substream) 


	/* set alternate setting for audio interface */

	/* 1 - 48000 samples per sec */

	if (dev->USE_ISO)

		ret = cx231xx_set_alt_setting(dev, INDEX_AUDIO, 1);

	else

		ret = cx231xx_set_alt_setting(dev, INDEX_AUDIO, 0);

	if (ret < 0) {

		cx231xx_errdev("failed to set alternate setting !\n");
@@ -330,6 +493,9 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream) 


	dprintk("closing device\n");



	/* inform hardware to start streaming */

	ret = cx231xx_capture_start(dev, 0, Audio);



	/* set alternate setting for audio interface */

	/* 1 - 48000 samples per sec */

	ret = cx231xx_set_alt_setting(dev, INDEX_AUDIO, 0);
@@ -339,9 +505,6 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream) 
		return ret;

	}



	/* inform hardware to start streaming */

	ret = cx231xx_capture_start(dev, 0, Audio);



	dev->mute = 1;

	mutex_lock(&dev->lock);

	dev->adev.users--;
@@ -391,6 +554,11 @@ static int snd_cx231xx_hw_capture_free(struct snd_pcm_substream *substream) 


static int snd_cx231xx_prepare(struct snd_pcm_substream *substream)

{

	struct cx231xx *dev = snd_pcm_substream_chip(substream);



	dev->adev.hwptr_done_capture = 0;

	dev->adev.capture_transfer_done = 0;



	return 0;

}
@@ -495,6 +663,7 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
	pcm->info_flags = 0;

	pcm->private_data = dev;

	strcpy(pcm->name, "Conexant cx231xx Capture");

	snd_card_set_dev(card, &dev->udev->dev);

	strcpy(card->driver, "Cx231xx-Audio");

	strcpy(card->shortname, "Cx231xx Audio");

	strcpy(card->longname, "Conexant cx231xx Audio");

drivers/media/video/cx231xx/cx231xx-avcore.c

+605 −26

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/cx231xx/cx231xx-cards.c

+304 −24
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ static int tuner = -1; 
module_param(tuner, int, 0444);

MODULE_PARM_DESC(tuner, "tuner type");



static int transfer_mode = 1;

module_param(transfer_mode, int, 0444);

MODULE_PARM_DESC(transfer_mode, "transfer mode (1-ISO or 0-BULK)");



static unsigned int disable_ir;

module_param(disable_ir, int, 0444);

MODULE_PARM_DESC(disable_ir, "disable infrared remote support");
@@ -86,8 +90,8 @@ struct cx231xx_board cx231xx_boards[] = { 
			}

		},

	},

	[CX231XX_BOARD_CNXT_RDE_250] = {

		.name = "Conexant Hybrid TV - RDE250",

	[CX231XX_BOARD_CNXT_CARRAERA] = {

		.name = "Conexant Hybrid TV - CARRAERA",

		.tuner_type = TUNER_XC5000,

		.tuner_addr = 0x61,

		.tuner_gpio = RDE250_XCV_TUNER,
@@ -125,9 +129,8 @@ struct cx231xx_board cx231xx_boards[] = { 
			}

		},

	},



	[CX231XX_BOARD_CNXT_RDU_250] = {

		.name = "Conexant Hybrid TV - RDU250",

	[CX231XX_BOARD_CNXT_SHELBY] = {

		.name = "Conexant Hybrid TV - SHELBY",

		.tuner_type = TUNER_XC5000,

		.tuner_addr = 0x61,

		.tuner_gpio = RDE250_XCV_TUNER,
@@ -165,6 +168,183 @@ struct cx231xx_board cx231xx_boards[] = { 
			}

		},

	},

	[CX231XX_BOARD_CNXT_RDE_253S] = {

		.name = "Conexant Hybrid TV - RDE253S",

		.tuner_type = TUNER_NXP_TDA18271,

		.tuner_addr = 0x60,

		.tuner_gpio = RDE250_XCV_TUNER,

		.tuner_sif_gpio = 0x05,

		.tuner_scl_gpio = 0x1a,

		.tuner_sda_gpio = 0x1b,

		.decoder = CX231XX_AVDECODER,

		.demod_xfer_mode = 0,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x1c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = 1,

		.demod_i2c_master = 2,

		.has_dvb = 1,

		.demod_addr = 0x02,

		.norm = V4L2_STD_PAL,



		.input = {{

				.type = CX231XX_VMUX_TELEVISION,

				.vmux = CX231XX_VIN_3_1,

				.amux = CX231XX_AMUX_VIDEO,

				.gpio = NULL,

			}, {

				.type = CX231XX_VMUX_COMPOSITE1,

				.vmux = CX231XX_VIN_2_1,

				.amux = CX231XX_AMUX_LINE_IN,

				.gpio = NULL,

			}, {

				.type = CX231XX_VMUX_SVIDEO,

				.vmux = CX231XX_VIN_1_1 |

					(CX231XX_VIN_1_2 << 8) |

					CX25840_SVIDEO_ON,

				.amux = CX231XX_AMUX_LINE_IN,

				.gpio = NULL,

			}

		},

	},



	[CX231XX_BOARD_CNXT_RDU_253S] = {

		.name = "Conexant Hybrid TV - RDU253S",

		.tuner_type = TUNER_NXP_TDA18271,

		.tuner_addr = 0x60,

		.tuner_gpio = RDE250_XCV_TUNER,

		.tuner_sif_gpio = 0x05,

		.tuner_scl_gpio = 0x1a,

		.tuner_sda_gpio = 0x1b,

		.decoder = CX231XX_AVDECODER,

		.demod_xfer_mode = 0,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x1c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = 1,

		.demod_i2c_master = 2,

		.has_dvb = 1,

		.demod_addr = 0x02,

		.norm = V4L2_STD_PAL,



		.input = {{

				.type = CX231XX_VMUX_TELEVISION,

				.vmux = CX231XX_VIN_3_1,

				.amux = CX231XX_AMUX_VIDEO,

				.gpio = NULL,

			}, {

				.type = CX231XX_VMUX_COMPOSITE1,

				.vmux = CX231XX_VIN_2_1,

				.amux = CX231XX_AMUX_LINE_IN,

				.gpio = NULL,

			}, {

				.type = CX231XX_VMUX_SVIDEO,

				.vmux = CX231XX_VIN_1_1 |

					(CX231XX_VIN_1_2 << 8) |

					CX25840_SVIDEO_ON,

				.amux = CX231XX_AMUX_LINE_IN,

				.gpio = NULL,

			}

		},

	},

	[CX231XX_BOARD_CNXT_VIDEO_GRABBER] = {

		.name = "Conexant VIDEO GRABBER",

		.tuner_type = TUNER_NXP_TDA18271,

		.tuner_addr = 0x60,

		.tuner_gpio = RDE250_XCV_TUNER,

		.tuner_sif_gpio = 0x05,

		.tuner_scl_gpio = 0x1a,

		.tuner_sda_gpio = 0x1b,

		.decoder = CX231XX_AVDECODER,

		.demod_xfer_mode = 0,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x1c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = 1,

		.demod_i2c_master = 2,

		.has_dvb = 0,

		.demod_addr = 0x02,

		.norm = V4L2_STD_PAL,



		.input = {{

				.type = CX231XX_VMUX_COMPOSITE1,

				.vmux = CX231XX_VIN_2_1,

				.amux = CX231XX_AMUX_LINE_IN,

				.gpio = NULL,

			}, {

				.type = CX231XX_VMUX_SVIDEO,

				.vmux = CX231XX_VIN_1_1 |

					(CX231XX_VIN_1_2 << 8) |

					CX25840_SVIDEO_ON,

				.amux = CX231XX_AMUX_LINE_IN,

				.gpio = NULL,

			}, {

				.type = CX231XX_VMUX_TELEVISION,

				.vmux = CX231XX_VIN_3_1,

				.amux = CX231XX_AMUX_VIDEO,

				.gpio = NULL,

			}

		},

	},

	[CX231XX_BOARD_CNXT_RDE_250] = {

		.name = "Conexant Hybrid TV - rde 250",

		.tuner_type = TUNER_XC5000,

		.tuner_addr = 0x61,

		.tuner_gpio = RDE250_XCV_TUNER,

		.tuner_sif_gpio = 0x05,

		.tuner_scl_gpio = 0x1a,

		.tuner_sda_gpio = 0x1b,

		.decoder = CX231XX_AVDECODER,

		.demod_xfer_mode = 0,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = 1,

		.demod_i2c_master = 2,

		.has_dvb = 1,

		.demod_addr = 0x02,

		.norm = V4L2_STD_PAL,



		.input = {{

				.type = CX231XX_VMUX_TELEVISION,

				.vmux = CX231XX_VIN_2_1,

				.amux = CX231XX_AMUX_VIDEO,

				.gpio = NULL,

			}

		},

	},

	[CX231XX_BOARD_CNXT_RDU_250] = {

		.name = "Conexant Hybrid TV - RDU 250",

		.tuner_type = TUNER_XC5000,

		.tuner_addr = 0x61,

		.tuner_gpio = RDE250_XCV_TUNER,

		.tuner_sif_gpio = 0x05,

		.tuner_scl_gpio = 0x1a,

		.tuner_sda_gpio = 0x1b,

		.decoder = CX231XX_AVDECODER,

		.demod_xfer_mode = 0,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = 1,

		.demod_i2c_master = 2,

		.has_dvb = 1,

		.demod_addr = 0x32,

		.norm = V4L2_STD_NTSC,



		.input = {{

				.type = CX231XX_VMUX_TELEVISION,

				.vmux = CX231XX_VIN_2_1,

				.amux = CX231XX_AMUX_VIDEO,

				.gpio = NULL,

			}

		},

	},











};

const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
@@ -173,8 +353,18 @@ struct usb_device_id cx231xx_id_table[] = { 
	{USB_DEVICE(0x0572, 0x5A3C),

	 .driver_info = CX231XX_BOARD_UNKNOWN},

	{USB_DEVICE(0x0572, 0x58A2),

	 .driver_info = CX231XX_BOARD_CNXT_RDE_250},

	 .driver_info = CX231XX_BOARD_CNXT_CARRAERA},

	{USB_DEVICE(0x0572, 0x58A1),

	 .driver_info = CX231XX_BOARD_CNXT_SHELBY},

	{USB_DEVICE(0x0572, 0x58A4),

	 .driver_info = CX231XX_BOARD_CNXT_RDE_253S},

	{USB_DEVICE(0x0572, 0x58A5),

	 .driver_info = CX231XX_BOARD_CNXT_RDU_253S},

	{USB_DEVICE(0x0572, 0x58A6),

	 .driver_info = CX231XX_BOARD_CNXT_VIDEO_GRABBER},

	{USB_DEVICE(0x0572, 0x589E),

	 .driver_info = CX231XX_BOARD_CNXT_RDE_250},

	{USB_DEVICE(0x0572, 0x58A0),

	 .driver_info = CX231XX_BOARD_CNXT_RDU_250},

	{USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000,0x4fff),

	 .driver_info = CX231XX_BOARD_UNKNOWN},
@@ -212,6 +402,23 @@ int cx231xx_tuner_callback(void *ptr, int component, int command, int arg) 
}

EXPORT_SYMBOL_GPL(cx231xx_tuner_callback);



void cx231xx_reset_out(struct cx231xx *dev)

{

	cx231xx_set_gpio_value(dev, CX23417_RESET, 1);

	msleep(200);

	cx231xx_set_gpio_value(dev, CX23417_RESET, 0);

	msleep(200);

	cx231xx_set_gpio_value(dev, CX23417_RESET, 1);

}

void cx231xx_enable_OSC(struct cx231xx *dev)

{

	cx231xx_set_gpio_value(dev, CX23417_OSC_EN, 1);

}

void cx231xx_sleep_s5h1432(struct cx231xx *dev)

{

	cx231xx_set_gpio_value(dev, SLEEP_S5H1432, 0);

}



static inline void cx231xx_set_model(struct cx231xx *dev)

{

	memcpy(&dev->board, &cx231xx_boards[dev->model], sizeof(dev->board));
@@ -235,9 +442,6 @@ void cx231xx_pre_card_setup(struct cx231xx *dev) 
		cx231xx_set_gpio_direction(dev, dev->board.tuner_sif_gpio, 1);



		/* request some modules if any required */



		/* reset the Tuner */

		cx231xx_gpio_set(dev, dev->board.tuner_gpio);

	}



	/* set the mode to Analog mode initially */
@@ -297,10 +501,20 @@ void cx231xx_register_i2c_ir(struct cx231xx *dev) 
	/* detect & configure */

	switch (dev->model) {



	case CX231XX_BOARD_CNXT_CARRAERA:

		break;

	case CX231XX_BOARD_CNXT_RDE_250:

		break;

	case CX231XX_BOARD_CNXT_SHELBY:

		break;

	case CX231XX_BOARD_CNXT_RDU_250:

		break;

	case CX231XX_BOARD_CNXT_RDE_253S:

		break;

	case CX231XX_BOARD_CNXT_RDU_253S:

		break;

	case CX231XX_BOARD_CNXT_VIDEO_GRABBER:

		break;

	default:

		break;

	}
@@ -326,15 +540,39 @@ void cx231xx_card_setup(struct cx231xx *dev) 


	}



	switch (dev->model) {

	case CX231XX_BOARD_CNXT_CARRAERA:

	case CX231XX_BOARD_CNXT_RDE_250:

	case CX231XX_BOARD_CNXT_SHELBY:

	case CX231XX_BOARD_CNXT_RDU_250:

		if (dev->board.tuner_type != TUNER_ABSENT) {

			dev->sd_tuner =	v4l2_i2c_new_subdev(&dev->v4l2_dev,

					&dev->i2c_bus[1].i2c_adap,

					"tuner", "tuner", 0xc2 >> 1, NULL);

			if (dev->sd_tuner == NULL)

			cx231xx_info("tuner subdev registration failure\n");

				cx231xx_info(

				"tuner subdev registration failure\n");



			cx231xx_config_tuner(dev);

		}

		break;

	case CX231XX_BOARD_CNXT_RDE_253S:

	case CX231XX_BOARD_CNXT_RDU_253S:

	case CX231XX_BOARD_CNXT_VIDEO_GRABBER:

		if (dev->board.tuner_type != TUNER_ABSENT) {

			dev->sd_tuner =	v4l2_i2c_new_subdev(&dev->v4l2_dev,

					&dev->i2c_bus[1].i2c_adap,

					"tuner", "tuner", 0xc0 >> 1, NULL);

			if (dev->sd_tuner == NULL)

				cx231xx_info(

				"tuner subdev registration failure\n");



			cx231xx_config_tuner(dev);

		}

		break;

	default:

		break;

	}



	cx231xx_config_tuner(dev);
@@ -409,6 +647,7 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev, 
	mutex_init(&dev->lock);

	mutex_init(&dev->ctrl_urb_lock);

	mutex_init(&dev->gpio_i2c_lock);

	mutex_init(&dev->i2c_lock);



	spin_lock_init(&dev->video_mode.slock);

	spin_lock_init(&dev->vbi_mode.slock);
@@ -427,6 +666,12 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev, 
	/* Query cx231xx to find what pcb config it is related to */

	initialize_cx231xx(dev);



	/*To workaround error number=-71 on EP0 for VideoGrabber,

		 need set alt here.*/

	if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) {

		cx231xx_set_alt_setting(dev, INDEX_VIDEO, 3);

		cx231xx_set_alt_setting(dev, INDEX_VANC, 1);

	}

	/* Cx231xx pre card setup */

	cx231xx_pre_card_setup(dev);
@@ -442,6 +687,7 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev, 
	/* register i2c bus */

	errCode = cx231xx_dev_init(dev);

	if (errCode < 0) {

		cx231xx_dev_uninit(dev);

		cx231xx_errdev("%s: cx231xx_i2c_register - errCode [%d]!\n",

			       __func__, errCode);

		return errCode;
@@ -480,9 +726,17 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev, 
	INIT_LIST_HEAD(&dev->vbi_mode.vidq.queued);



	/* Reset other chips required if they are tied up with GPIO pins */



	cx231xx_add_into_devlist(dev);



	printk(KERN_INFO "attach 417 %d\n", dev->model);

	if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) {

		if (cx231xx_417_register(dev) < 0) {

			printk(KERN_ERR

				"%s() Failed to register 417 on VID_B\n",

			       __func__);

		}

	}



	retval = cx231xx_register_analog_devices(dev);

	if (retval < 0) {

		cx231xx_release_resources(dev);
@@ -552,8 +806,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		cx231xx_devused |= 1 << nr;



		if (nr >= CX231XX_MAXBOARDS) {

			cx231xx_err(DRIVER_NAME ": Supports only %i cx231xx boards.\n",

				     CX231XX_MAXBOARDS);

			cx231xx_err(DRIVER_NAME

		 ": Supports only %i cx231xx boards.\n", CX231XX_MAXBOARDS);

			cx231xx_devused &= ~(1 << nr);

			return -ENOMEM;

		}
@@ -578,6 +832,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		dev->xc_fw_load_done = 0;

		dev->has_alsa_audio = 1;

		dev->power_mode = -1;

		atomic_set(&dev->devlist_count, 0);



		/* 0 - vbi ; 1 -sliced cc mode */

		dev->vbi_or_sliced_cc_mode = 0;
@@ -591,6 +846,11 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		/* store the current interface */

		lif = interface;



		/*mode_tv: digital=1 or analog=0*/

		dev->mode_tv = 0;



		dev->USE_ISO = transfer_mode;



		switch (udev->speed) {

		case USB_SPEED_LOW:

			speed = "1.5";
@@ -645,7 +905,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		 * set skip interface, for all interfaces but

		 * interface 1 and the last one

		 */

		if ((ifnum != 1) && ((dev->interface_count - 1)

		if ((ifnum != 1) && ((ifnum)

				     != dev->max_iad_interface_count))

			skip_interface = 1;
@@ -667,7 +927,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
	/* save our data pointer in this interface device */

	usb_set_intfdata(lif, dev);



	if ((dev->interface_count - 1) != dev->max_iad_interface_count)

	if ((ifnum) != dev->max_iad_interface_count)

		return 0;



	/*
@@ -680,15 +940,18 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		cx231xx_errdev("v4l2_device_register failed\n");

		cx231xx_devused &= ~(1 << nr);

		kfree(dev);

		dev = NULL;

		return -EIO;

	}



	/* allocate device struct */

	retval = cx231xx_init_dev(&dev, udev, nr);

	if (retval) {

		cx231xx_devused &= ~(1 << dev->devno);

		v4l2_device_unregister(&dev->v4l2_dev);

		kfree(dev);

		dev = NULL;

		usb_set_intfdata(lif, NULL);



		return retval;

	}
@@ -711,6 +974,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		cx231xx_devused &= ~(1 << nr);

		v4l2_device_unregister(&dev->v4l2_dev);

		kfree(dev);

		dev = NULL;

		return -ENOMEM;

	}
@@ -744,6 +1008,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		cx231xx_devused &= ~(1 << nr);

		v4l2_device_unregister(&dev->v4l2_dev);

		kfree(dev);

		dev = NULL;

		return -ENOMEM;

	}
@@ -778,6 +1043,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		cx231xx_devused &= ~(1 << nr);

		v4l2_device_unregister(&dev->v4l2_dev);

		kfree(dev);

		dev = NULL;

		return -ENOMEM;

	}
@@ -813,6 +1079,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
			cx231xx_devused &= ~(1 << nr);

			v4l2_device_unregister(&dev->v4l2_dev);

			kfree(dev);

			dev = NULL;

			return -ENOMEM;

		}
@@ -827,6 +1094,15 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		}

	}



	if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) {

		cx231xx_enable_OSC(dev);

		cx231xx_reset_out(dev);

		cx231xx_set_alt_setting(dev, INDEX_VIDEO, 3);

	}



	if (dev->model == CX231XX_BOARD_CNXT_RDE_253S)

		cx231xx_sleep_s5h1432(dev);



	/* load other modules required */

	request_modules(dev);
@@ -867,7 +1143,10 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface) 
		     video_device_node_name(dev->vdev));



		dev->state |= DEV_MISCONFIGURED;

		if (dev->USE_ISO)

			cx231xx_uninit_isoc(dev);

		else

			cx231xx_uninit_bulk(dev);

		dev->state |= DEV_DISCONNECTED;

		wake_up_interruptible(&dev->wait_frame);

		wake_up_interruptible(&dev->wait_stream);
@@ -886,6 +1165,7 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface) 
		kfree(dev->sliced_cc_mode.alt_max_pkt_size);

		kfree(dev->ts1_mode.alt_max_pkt_size);

		kfree(dev);

		dev = NULL;

	}

}