aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorGiampiero Giancipoli <gianci@libero.it>2006-02-07 03:49:09 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-07 03:49:09 -0500
commit3d8466ece44c70555a101da73845955c443f4d18 (patch)
tree9d7fe8df835b31c2365ec216c1ac47afad954d67 /drivers/media/video/saa7134/saa7134-cards.c
parentd97a11e091a0bf40f1cfb0bbf443ddd7b455b133 (diff)
V4L/DVB (3302): Added support for the LifeView FlyDVB-T LR301 card
Additionally to the card support, this changeset adds the option tda10046lifeview to get_dvb_firmware to download tda10046 firmware from LifeView's site. Signed-off-by: Giampiero Giancipoli <gianci@libero.it> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 3f964ed7eb56..f469f17a25cf 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2637,6 +2637,27 @@ struct saa7134_board saa7134_boards[] = {
2637 .amux = LINE1, 2637 .amux = LINE1,
2638 }}, 2638 }},
2639 }, 2639 },
2640 [SAA7134_BOARD_FLYDVBT_LR301] = {
2641 /* LifeView FlyDVB-T */
2642 /* Giampiero Giancipoli <gianci@libero.it> */
2643 .name = "LifeView FlyDVB-T",
2644 .audio_clock = 0x00200000,
2645 .tuner_type = TUNER_ABSENT,
2646 .radio_type = UNSET,
2647 .tuner_addr = ADDR_UNSET,
2648 .radio_addr = ADDR_UNSET,
2649 .mpeg = SAA7134_MPEG_DVB,
2650 .inputs = {{
2651 .name = name_comp1, /* Composite input */
2652 .vmux = 3,
2653 .amux = LINE2,
2654 },{
2655 .name = name_svideo, /* S-Video signal on S-Video input */
2656 .vmux = 8,
2657 .amux = LINE2,
2658 }},
2659 },
2660
2640}; 2661};
2641 2662
2642const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 2663const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3114,6 +3135,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
3114 .subdevice = 0x2c05, 3135 .subdevice = 0x2c05,
3115 .driver_data = SAA7134_BOARD_AVERMEDIA_777, 3136 .driver_data = SAA7134_BOARD_AVERMEDIA_777,
3116 },{ 3137 },{
3138 .vendor = PCI_VENDOR_ID_PHILIPS,
3139 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
3140 .subvendor = 0x5168,
3141 .subdevice = 0x0301,
3142 .driver_data = SAA7134_BOARD_FLYDVBT_LR301,
3143 },{
3117 /* --- boards without eeprom + subsystem ID --- */ 3144 /* --- boards without eeprom + subsystem ID --- */
3118 .vendor = PCI_VENDOR_ID_PHILIPS, 3145 .vendor = PCI_VENDOR_ID_PHILIPS,
3119 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 3146 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3213,6 +3240,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
3213 case SAA7134_BOARD_GOTVIEW_7135: 3240 case SAA7134_BOARD_GOTVIEW_7135:
3214 case SAA7134_BOARD_KWORLD_TERMINATOR: 3241 case SAA7134_BOARD_KWORLD_TERMINATOR:
3215 case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS: 3242 case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
3243 case SAA7134_BOARD_FLYDVBT_LR301:
3216 dev->has_remote = SAA7134_REMOTE_GPIO; 3244 dev->has_remote = SAA7134_REMOTE_GPIO;
3217 break; 3245 break;
3218 case SAA7134_BOARD_MD5044: 3246 case SAA7134_BOARD_MD5044: