aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:36:49 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:12 -0500
commit058afaf80932445fb33f957d29758479a65932ce (patch)
treeaf57c3039bd162a891e9824c7356e957edf4f88d
parent5ea246862863d712bacf3f2c0cb43de7bf1feeba (diff)
[PATCH] v4l: 690: added support for lifeview flytv platinum mini2
- Added support for LifeView FlyTV Platinum Mini2. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71341
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c33
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
3 files changed, 35 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 82b5f7c73c83..57439d081570 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -72,3 +72,4 @@
72 71 -> Compro Videomate DVB-T200 [185b:c901] 72 71 -> Compro Videomate DVB-T200 [185b:c901]
73 72 -> RTD Embedded Technologies VFG7350 [1435:7350] 73 72 -> RTD Embedded Technologies VFG7350 [1435:7350]
74 73 -> RTD Embedded Technologies VFG7330 [1435:7330] 74 73 -> RTD Embedded Technologies VFG7330 [1435:7330]
75 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 9600305771bc..a096799dc5f9 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2319,6 +2319,33 @@ struct saa7134_board saa7134_boards[] = {
2319 .amux = LINE2, 2319 .amux = LINE2,
2320 }}, 2320 }},
2321 }, 2321 },
2322 [SAA7134_BOARD_FLYTVPLATINUM_MINI2] = {
2323 .name = "LifeView FlyTV Platinum Mini2",
2324 .audio_clock = 0x00200000,
2325 .tuner_type = TUNER_PHILIPS_TDA8290,
2326 .radio_type = UNSET,
2327 .tuner_addr = ADDR_UNSET,
2328 .radio_addr = ADDR_UNSET,
2329
2330 .inputs = {{
2331 .name = name_tv,
2332 .vmux = 1,
2333 .amux = TV,
2334 .tv = 1,
2335 },{
2336 .name = name_comp1, /* Composite signal on S-Video input */
2337 .vmux = 0,
2338 .amux = LINE2,
2339 },{
2340 .name = name_comp2, /* Composite input */
2341 .vmux = 3,
2342 .amux = LINE2,
2343 },{
2344 .name = name_svideo,
2345 .vmux = 8,
2346 .amux = LINE2,
2347 }},
2348 },
2322}; 2349};
2323 2350
2324const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 2351const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2402,6 +2429,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
2402 },{ 2429 },{
2403 .vendor = PCI_VENDOR_ID_PHILIPS, 2430 .vendor = PCI_VENDOR_ID_PHILIPS,
2404 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2431 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2432 .subvendor = 0x14c0,
2433 .subdevice = 0x1212, /* minipci, LR1212 */
2434 .driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI2,
2435 },{
2436 .vendor = PCI_VENDOR_ID_PHILIPS,
2437 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2405 .subvendor = 0x4e42, 2438 .subvendor = 0x4e42,
2406 .subdevice = 0x0212, /* OEM minipci, LR212 */ 2439 .subdevice = 0x0212, /* OEM minipci, LR212 */
2407 .driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI, 2440 .driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI,
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 4169c2a857f1..e907d86da7b5 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -194,6 +194,7 @@ struct saa7134_format {
194#define SAA7134_BOARD_VIDEOMATE_DVBT_200 71 194#define SAA7134_BOARD_VIDEOMATE_DVBT_200 71
195#define SAA7134_BOARD_RTD_VFG7350 72 195#define SAA7134_BOARD_RTD_VFG7350 72
196#define SAA7134_BOARD_RTD_VFG7330 73 196#define SAA7134_BOARD_RTD_VFG7330 73
197#define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74
197 198
198#define SAA7134_MAXBOARDS 8 199#define SAA7134_MAXBOARDS 8
199#define SAA7134_INPUT_MAX 8 200#define SAA7134_INPUT_MAX 8