Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / media / usb / cx231xx / cx231xx-cards.c

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 36bc25494319dbf1b48d2414c1e0b3f76965dc64..f730fdbc915670225ff2ca08a9f4cc60340523ed 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -841,6 +841,33 @@ struct cx231xx_board cx231xx_boards[] = {
                        .gpio = NULL,
                } },
        },
+       [CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD] = {
+               .name = "Evromedia USB Full Hybrid Full HD",
+               .tuner_type = TUNER_ABSENT,
+               .demod_addr = 0x64, /* 0xc8 >> 1 */
+               .demod_i2c_master = I2C_1_MUX_3,
+               .has_dvb = 1,
+               .ir_i2c_master = I2C_0,
+               .norm = V4L2_STD_PAL,
+               .output_mode = OUT_MODE_VIP11,
+               .tuner_addr = 0x60, /* 0xc0 >> 1 */
+               .tuner_i2c_master = I2C_2,
+               .input = {{
+                       .type = CX231XX_VMUX_TELEVISION,
+                       .vmux = 0,
+                       .amux = CX231XX_AMUX_VIDEO,
+               }, {
+                       .type = CX231XX_VMUX_COMPOSITE1,
+                       .vmux = CX231XX_VIN_2_1,
+                       .amux = CX231XX_AMUX_LINE_IN,
+               }, {
+                       .type = CX231XX_VMUX_SVIDEO,
+                       .vmux = CX231XX_VIN_1_1 |
+                               (CX231XX_VIN_1_2 << 8) |
+                               CX25840_SVIDEO_ON,
+                       .amux = CX231XX_AMUX_LINE_IN,
+               } },
+       },
 };
 const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
 
@@ -908,6 +935,8 @@ struct usb_device_id cx231xx_id_table[] = {
         .driver_info = CX231XX_BOARD_OTG102},
        {USB_DEVICE(USB_VID_TERRATEC, 0x00a6),
         .driver_info = CX231XX_BOARD_TERRATEC_GRABBY},
+       {USB_DEVICE(0x1b80, 0xd3b2),
+       .driver_info = CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD},
        {},
 };