[media] cx231xx: fixup video grabber board profile
authorDevin Heitmueller <dheitmueller@hauppauge.com>
Wed, 18 Aug 2010 21:04:04 +0000 (18:04 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:17:30 +0000 (01:17 -0200)
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>
drivers/media/video/cx231xx/cx231xx-cards.c

index f05c5ad490b55ce6cbc937004865e455e64c35c6..ad9d0485614e8084d39512cc594c1cc3b504a65d 100644 (file)
@@ -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,
                        }
                },
        },