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 @@
  71 -> Compro Videomate DVB-T200                [185b:c901]
  72 -> RTD Embedded Technologies VFG7350        [1435:7350]
  73 -> RTD Embedded Technologies VFG7330        [1435:7330]
+ 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[] = {
                         .amux   = LINE2,
                 }},
         },
+        [SAA7134_BOARD_FLYTVPLATINUM_MINI2] = {
+                .name           = "LifeView FlyTV Platinum Mini2",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .vmux = 0,
+                        .amux = LINE2,
+                },{
+                        .name = name_comp2,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2402,6 +2429,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x14c0,
+                .subdevice    = 0x1212, /* minipci, LR1212 */
+                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_MINI2,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x4e42,
                 .subdevice    = 0x0212, /* OEM minipci, LR212 */
                 .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 {
 #define SAA7134_BOARD_VIDEOMATE_DVBT_200 71
 #define SAA7134_BOARD_RTD_VFG7350 72
 #define SAA7134_BOARD_RTD_VFG7330 73
+#define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8