aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-08-18 17:04:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:17:30 -0400
commit9f51259f4acfffc71dd8f2f2c1472f7caedbdfae (patch)
treed31cd44efa15d9d8499c2816ffb75030bbad4c09 /drivers
parent888062188cfbed50bbe14f7e180cdc70336dfc4c (diff)
[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')
-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[] = {
253 }, 253 },
254 [CX231XX_BOARD_CNXT_VIDEO_GRABBER] = { 254 [CX231XX_BOARD_CNXT_VIDEO_GRABBER] = {
255 .name = "Conexant VIDEO GRABBER", 255 .name = "Conexant VIDEO GRABBER",
256 .tuner_type = TUNER_NXP_TDA18271, 256 .tuner_type = TUNER_ABSENT,
257 .tuner_addr = 0x60,
258 .tuner_gpio = RDE250_XCV_TUNER,
259 .tuner_sif_gpio = 0x05,
260 .tuner_scl_gpio = 0x1a,
261 .tuner_sda_gpio = 0x1b,
262 .decoder = CX231XX_AVDECODER, 257 .decoder = CX231XX_AVDECODER,
263 .output_mode = OUT_MODE_VIP11, 258 .output_mode = OUT_MODE_VIP11,
264 .demod_xfer_mode = 0,
265 .ctl_pin_status_mask = 0xFFFFFFC4, 259 .ctl_pin_status_mask = 0xFFFFFFC4,
266 .agc_analog_digital_select_gpio = 0x1c, 260 .agc_analog_digital_select_gpio = 0x1c,
267 .gpio_pin_status_mask = 0x4001000, 261 .gpio_pin_status_mask = 0x4001000,
268 .tuner_i2c_master = 1,
269 .demod_i2c_master = 2,
270 .has_dvb = 0,
271 .demod_addr = 0x02,
272 .norm = V4L2_STD_PAL, 262 .norm = V4L2_STD_PAL,
273 263
274 .input = {{ 264 .input = {{
@@ -283,11 +273,6 @@ struct cx231xx_board cx231xx_boards[] = {
283 CX25840_SVIDEO_ON, 273 CX25840_SVIDEO_ON,
284 .amux = CX231XX_AMUX_LINE_IN, 274 .amux = CX231XX_AMUX_LINE_IN,
285 .gpio = NULL, 275 .gpio = NULL,
286 }, {
287 .type = CX231XX_VMUX_TELEVISION,
288 .vmux = CX231XX_VIN_3_1,
289 .amux = CX231XX_AMUX_VIDEO,
290 .gpio = NULL,
291 } 276 }
292 }, 277 },
293 }, 278 },