aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Schilling Landgraf <dougsland@redhat.com>2008-12-27 19:38:14 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:40:09 -0500
commit1e1addd57bdf56c51dbc292d7760ea3d207fe833 (patch)
treebd005d38df97ad8fd3eaaeaeff729a2b611b9d66
parent3a0efc3200386b9288e1d3d3be0a9f5d6f286906 (diff)
V4L/DVB (10055): em28xx: Add entry for PixelView PlayTV Box 4
Added board PixelView PlayTV Box 4 Thanks to Vildenei Negrao Pereira <neodarkaman@brturbo.com.br> for testing and data collection. Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx1
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c22
-rw-r--r--drivers/media/video/em28xx/em28xx.h1
3 files changed, 24 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 0c4c721daba9..96b1eb8ac874 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -59,3 +59,4 @@
59 58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041] 59 58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
60 59 -> Pinnacle PCTV HD Mini (em2874) [2304:023f] 60 59 -> Pinnacle PCTV HD Mini (em2874) [2304:023f]
61 60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f] 61 60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f]
62 61 -> Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 3759f3a56cb7..0acab0d3c00b 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -943,6 +943,27 @@ struct em28xx_board em28xx_boards[] = {
943 .amux = EM28XX_AMUX_LINE_IN, 943 .amux = EM28XX_AMUX_LINE_IN,
944 } }, 944 } },
945 }, 945 },
946 [EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2] = {
947 .name = "Pixelview PlayTV Box 4 USB 2.0",
948 .tda9887_conf = TDA9887_PRESENT,
949 .tuner_type = TUNER_YMEC_TVF_5533MF,
950 .decoder = EM28XX_SAA711X,
951 .input = { {
952 .type = EM28XX_VMUX_TELEVISION,
953 .vmux = SAA7115_COMPOSITE2,
954 .amux = EM28XX_AMUX_VIDEO,
955 .aout = EM28XX_AOUT_MONO | /* I2S */
956 EM28XX_AOUT_MASTER, /* Line out pin */
957 }, {
958 .type = EM28XX_VMUX_COMPOSITE1,
959 .vmux = SAA7115_COMPOSITE0,
960 .amux = EM28XX_AMUX_LINE_IN,
961 }, {
962 .type = EM28XX_VMUX_SVIDEO,
963 .vmux = SAA7115_SVIDEO3,
964 .amux = EM28XX_AMUX_LINE_IN,
965 } },
966 },
946 [EM2820_BOARD_PROLINK_PLAYTV_USB2] = { 967 [EM2820_BOARD_PROLINK_PLAYTV_USB2] = {
947 .name = "Pixelview Prolink PlayTV USB 2.0", 968 .name = "Pixelview Prolink PlayTV USB 2.0",
948 .tda9887_conf = TDA9887_PRESENT, 969 .tda9887_conf = TDA9887_PRESENT,
@@ -1350,6 +1371,7 @@ MODULE_DEVICE_TABLE(usb, em28xx_id_table);
1350static struct em28xx_hash_table em28xx_eeprom_hash [] = { 1371static struct em28xx_hash_table em28xx_eeprom_hash [] = {
1351 /* P/N: SA 60002070465 Tuner: TVF7533-MF */ 1372 /* P/N: SA 60002070465 Tuner: TVF7533-MF */
1352 {0x6ce05a8f, EM2820_BOARD_PROLINK_PLAYTV_USB2, TUNER_YMEC_TVF_5533MF}, 1373 {0x6ce05a8f, EM2820_BOARD_PROLINK_PLAYTV_USB2, TUNER_YMEC_TVF_5533MF},
1374 {0x72cc5a8b, EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2, TUNER_YMEC_TVF_5533MF},
1353 {0x966a0441, EM2880_BOARD_KWORLD_DVB_310U, TUNER_XC2028}, 1375 {0x966a0441, EM2880_BOARD_KWORLD_DVB_310U, TUNER_XC2028},
1354}; 1376};
1355 1377
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 58a3675abb62..317512da9824 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -99,6 +99,7 @@
99#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58 99#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58
100#define EM2874_BOARD_PINNACLE_PCTV_80E 59 100#define EM2874_BOARD_PINNACLE_PCTV_80E 59
101#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60 101#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60
102#define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 61
102 103
103/* Limits minimum and default number of buffers */ 104/* Limits minimum and default number of buffers */
104#define EM28XX_MIN_BUF 4 105#define EM28XX_MIN_BUF 4