V4L/DVB (6537): Add entry for Pixelview Prolink PlayTV USB 2.0

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index f947dca5ac4880087f48f0158fbb1f2f815cfa3b..b3a8181343a4862800743711642a6e21208ba6f4 100644 (file)
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -12,3 +12,4 @@
  11 -> Terratec Hybrid XS                       (em2880)
  12 -> Kworld PVR TV 2800 RF                    (em2820/em2840)
  13 -> Terratec Prodigy XS                      (em2880)
+ 14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 4cd49415eef20db960c81dc3d22fb04284b73b47..e1e7510146e14d0b1439a1b3fa27ca353de147cf 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -328,6 +328,26 @@ struct em28xx_board em28xx_boards[] = {
                        .amux     = 1,
                }},
        },
+       [EM2820_BOARD_PROLINK_PLAYTV_USB2] = {
+               .name         = "Pixelview Prolink PlayTV USB 2.0",
+               .vchannels    = 3,
+               .tda9887_conf = TDA9887_PRESENT,
+               .has_tuner    = 1,
+               .decoder      = EM28XX_SAA7113,
+               .input          = {{
+                       .type     = EM28XX_VMUX_TELEVISION,
+                       .vmux     = SAA7115_COMPOSITE2,
+                       .amux     = 1,
+               },{
+                       .type     = EM28XX_VMUX_COMPOSITE1,
+                       .vmux     = SAA7115_COMPOSITE0,
+                       .amux     = 1,
+               },{
+                       .type     = EM28XX_VMUX_SVIDEO,
+                       .vmux     = SAA7115_SVIDEO3,
+                       .amux     = 1,
+               }},
+       },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
@@ -355,7 +375,8 @@ struct usb_device_id em28xx_id_table [] = {
 MODULE_DEVICE_TABLE (usb, em28xx_id_table);
 
 static struct em28xx_hash_table em28xx_hash [] = {
-       { 0, 0, 0 },
+       /* P/N: SA 60002070465 Tuner: TVF7533-MF */
+       { 0x6ce05a8f, EM2820_BOARD_PROLINK_PLAYTV_USB2, TUNER_YMEC_TVF_5533MF },
 };
 
 /* Since em28xx_pre_card_setup() requires a proper dev->model,

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index e98dac7fc05b639d36f2a6cad54d176c983b4dd2..209f6f9d55816e3c267314c0c310722fe1e54119 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -46,6 +46,7 @@
 #define EM2880_BOARD_TERRATEC_HYBRID_XS                11
 #define EM2820_BOARD_KWORLD_PVRTV2800RF                12
 #define EM2880_BOARD_TERRATEC_PRODIGY_XS       13
+#define EM2820_BOARD_PROLINK_PLAYTV_USB2       14
 
 #define UNSET -1