summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-cards.c
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-08-18 18:04:04 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:17:30 -0200
commit9f51259f4acfffc71dd8f2f2c1472f7caedbdfae (patch)
treed31cd44efa15d9d8499c2816ffb75030bbad4c09 /drivers/media/video/cx231xx/cx231xx-cards.c
parent888062188cfbed50bbe14f7e180cdc70336dfc4c (diff)
downloadblackbird-op-linux-9f51259f4acfffc71dd8f2f2c1472f7caedbdfae.tar.gz
blackbird-op-linux-9f51259f4acfffc71dd8f2f2c1472f7caedbdfae.zip
[media] cx231xx: fixup video grabber board profile
The video grabber reference design (Veyron) does not have a tuner input, so do not have it defined in 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-cards.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-cards.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index f05c5ad490b5..ad9d0485614e 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -253,22 +253,12 @@ struct cx231xx_board cx231xx_boards[] = {
},
[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,
+ .tuner_type = TUNER_ABSENT,
.decoder = CX231XX_AVDECODER,
.output_mode = OUT_MODE_VIP11,
- .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 = {{
@@ -283,11 +273,6 @@ struct cx231xx_board cx231xx_boards[] = {
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,
}
},
},
OpenPOWER on IntegriCloud