diff options
| author | Devin Heitmueller <dheitmueller@hauppauge.com> | 2010-07-31 00:49:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:28 -0200 |
| commit | 4270c3cac41e248ee339d18e01251989b74a30f1 (patch) | |
| tree | e5b303f254fd41a70ee320fd57f87e0f9682c57b /drivers/media/video/cx231xx/cx231xx-core.c | |
| parent | 8d4c20c960aa9325bd3b9995f518e1f05c374856 (diff) | |
| download | kernel_samsung_smdk4412-4270c3cac41e248ee339d18e01251989b74a30f1.zip kernel_samsung_smdk4412-4270c3cac41e248ee339d18e01251989b74a30f1.tar.gz kernel_samsung_smdk4412-4270c3cac41e248ee339d18e01251989b74a30f1.tar.bz2 | |
[media] cx231xx: Add initial support for Hauppauge USB-Live2
Add initial support for the Hauppauge USBLive 2 (2040:c200). Note that I
had to copy a bunch of the case statements used for the Conexant video grabber
reference design (which also doesn't have a tuner). This will likely need to
be refactored out into the board profile.
Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-core.c')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-core.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index fe3d500..5406ff2 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/video/cx231xx/cx231xx-core.c @@ -628,7 +628,8 @@ int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt) usb_interface_index, alt); /*To workaround error number=-71 on EP0 for videograbber, need add following codes.*/ - if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER) + if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER && + dev->model != CX231XX_BOARD_HAUPPAUGE_USBLIVE2) return -1; } @@ -1327,7 +1328,8 @@ int cx231xx_dev_init(struct cx231xx *dev) /* init hardware */ /* Note : with out calling set power mode function, afe can not be set up correctly */ - if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) { + if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER || + dev->model == CX231XX_BOARD_HAUPPAUGE_USBLIVE2) { errCode = cx231xx_set_power_mode(dev, POLARIS_AVMODE_ENXTERNAL_AV); if (errCode < 0) { @@ -1427,7 +1429,8 @@ int cx231xx_dev_init(struct cx231xx *dev) cx231xx_set_alt_setting(dev, INDEX_TS1, 0); /* set the I2C master port to 3 on channel 1 */ - if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER) + if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER && + dev->model != CX231XX_BOARD_HAUPPAUGE_USBLIVE2) errCode = cx231xx_enable_i2c_for_tuner(dev, I2C_3); return errCode; |