diff options
| author |   Michael Krufky <mkrufky@kernellabs.com> | 2010-07-06 18:23:53 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:11 -0200 |
| commit | 1a50fddefd17ec1359d08cd23c77da42fabbb4a7 (patch) | |
| tree | 2467c087a5ba145e004d5de30fa0e950bbdaf359 /drivers/media/video/cx231xx/cx231xx-core.c | |
| parent | [media] cx231xx: Added support for Carraera, Shelby, RDx_253S and VIDEO_GRABBER (diff) | |
| download | linux-dev-1a50fddefd17ec1359d08cd23c77da42fabbb4a7.tar.xz linux-dev-1a50fddefd17ec1359d08cd23c77da42fabbb4a7.zip | |
[media] cx231xx: add support for Hauppauge EXETER
Add support for various Hauppauge EXETER designs.
Note by DJH: fixed a few minor 'make checkpatch' warnings before commit.
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index e258a6261ea4..b75e9e7dd502 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/video/cx231xx/cx231xx-core.c @@ -752,6 +752,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode) break; case CX231XX_BOARD_CNXT_RDE_253S: case CX231XX_BOARD_CNXT_RDU_253S: + case CX231XX_BOARD_HAUPPAUGE_EXETER: errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 1); break; default: @@ -768,6 +769,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode) break; case CX231XX_BOARD_CNXT_RDE_253S: case CX231XX_BOARD_CNXT_RDU_253S: + case CX231XX_BOARD_HAUPPAUGE_EXETER: errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0); break; default: @@ -1306,14 +1308,14 @@ int cx231xx_dev_init(struct cx231xx *dev) /* External Master 1 Bus */ dev->i2c_bus[0].nr = 0; dev->i2c_bus[0].dev = dev; - dev->i2c_bus[0].i2c_period = I2C_SPEED_1M; /* 1MHz */ + dev->i2c_bus[0].i2c_period = I2C_SPEED_100K; /* 100 KHz */ dev->i2c_bus[0].i2c_nostop = 0; dev->i2c_bus[0].i2c_reserve = 0; /* External Master 2 Bus */ dev->i2c_bus[1].nr = 1; dev->i2c_bus[1].dev = dev; - dev->i2c_bus[1].i2c_period = I2C_SPEED_1M; /* 1MHz */ + dev->i2c_bus[1].i2c_period = I2C_SPEED_100K; /* 100 KHz */ dev->i2c_bus[1].i2c_nostop = 0; dev->i2c_bus[1].i2c_reserve = 0; @@ -1411,6 +1413,7 @@ int cx231xx_dev_init(struct cx231xx *dev) break; case CX231XX_BOARD_CNXT_RDE_253S: case CX231XX_BOARD_CNXT_RDU_253S: + case CX231XX_BOARD_HAUPPAUGE_EXETER: errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0); break; default: |