2 files changed, 42 insertions, 0 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 991829eb15da..77e5be98e4c6 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2584,6 +2584,41 @@ struct saa7134_board saa7134_boards[] = {
                         .gpio   = 0x0200000,
                 },
         },
+        [SAA7134_BOARD_FLYDVB_TRIO] = {
+                /* LifeView LR319 FlyDVB Trio */
+                /* Peter Missel <peter.missel@onlinehome.de> */
+                .name           = "LifeView FlyDVB Trio",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x00200000,
+                .inputs         = {{
+                        .name = name_tv,        /* Analog broadcast/cable TV */
+                        .vmux = 1,
+                        .amux = TV,
+                        .gpio = 0x200000,       /* GPIO21=High for TV input */
+                        .tv   = 1,
+                },{
+                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .vmux = 8,
+                        .amux = LINE2,
+                },{
+                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .vmux = 0,
+                        .amux = LINE2,
+                },{
+                        .name = name_comp2,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE2,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x000000,       /* GPIO21=Low for FM radio antenna */
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3043,6 +3078,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x1160,
                 .driver_data  = SAA7134_BOARD_CINERGY250PCI,
         },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,  /* SAA 7131E */
+                .subvendor    = 0x5168,
+                .subdevice    = 0x0319,
+                .driver_data  = SAA7134_BOARD_FLYDVB_TRIO,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 18978a484ddb..e70eae8d29bb 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -209,6 +209,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_PHILIPS_TIGER  81
 #define SAA7134_BOARD_MSI_TVATANYWHERE_PLUS  82
 #define SAA7134_BOARD_CINERGY250PCI 83
+#define SAA7134_BOARD_FLYDVB_TRIO 84
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8