---

yaml --- r: 76369 b: refs/heads/master c: ea4fd56 h: refs/heads/master i: 76367: c39a0a1 v: v3
git-mirror · Jan 25, 2008 · 93f7024 · 93f7024
1 parent 3950162
commit 93f7024
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03910cc39035d27f4c85c8ad2a236cc5c9456127
+refs/heads/master: ea4fd5679b258d8ae85124a47b587a53ba6409de
diff --git a/trunk/Documentation/video4linux/CARDLIST.em28xx b/trunk/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/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/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/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/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