V4L/DVB (3326): Adding support for Terratec Prodigy XS

Adding support for Terratec Prodigy XS

Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index a9e7cec17a6be3c2dadc15afdee8db563e846ad2..703927e8da134dacd263710732da0d78f9e6b2d6 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -198,6 +198,30 @@ struct em28xx_board em28xx_boards[] = {
                        .amux     = 1,
                }},
        },
+       /* maybe there's a reason behind it why Terratec sells the Hybrid XS as Prodigy XS with a
+        * different PID, let's keep it separated for now maybe we'll need it lateron */
+       [EM2880_BOARD_TERRATEC_PRODIGY_XS] = {
+               .name         = "Terratec Prodigy XS",
+               .vchannels    = 3,
+               .norm         = VIDEO_MODE_PAL,
+               .tda9887_conf = TDA9887_PRESENT,
+               .has_tuner    = 1,
+               .tuner_type   = TUNER_XCEIVE_XC3028,
+               .decoder      = EM28XX_TVP5150,
+               .input          = {{
+                       .type     = EM28XX_VMUX_TELEVISION,
+                       .vmux     = 0,
+                       .amux     = 0,
+               },{
+                       .type     = EM28XX_VMUX_COMPOSITE1,
+                       .vmux     = 2,
+                       .amux     = 1,
+               },{
+                       .type     = EM28XX_VMUX_SVIDEO,
+                       .vmux     = 9,
+                       .amux     = 1,
+               }},
+       },
        [EM2820_BOARD_MSI_VOX_USB_2] = {
                .name           = "MSI VOX USB 2.0",
                .vchannels      = 3,
@@ -318,6 +342,7 @@ struct usb_device_id em28xx_id_table [] = {
        { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
        { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
        { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
+       { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
        { },
 };
 
@@ -325,6 +350,7 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 {
        /* request some modules */
        switch(dev->model){
+               case EM2880_BOARD_TERRATEC_PRODIGY_XS:
                case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
                case EM2880_BOARD_TERRATEC_HYBRID_XS:
                        {

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 4e2fe62b7350c248120e3714bdc0097db5fb4659..e1ddc2f27a2152df39dbe8f9af74749cb2bbdb31 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -45,6 +45,7 @@
 #define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900   10
 #define EM2880_BOARD_TERRATEC_HYBRID_XS                11
 #define EM2820_BOARD_KWORLD_PVRTV2800RF                12
+#define EM2880_BOARD_TERRATEC_PRODIGY_XS       13
 
 #define UNSET -1