Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
  V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
  V4L/DVB (4210a): git-dvb versus matroxfb
  V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
  Fixes some sync issues between V4L/DVB development and GIT
  V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
  V4L/DVB (4205): Merge tda9887 module into tuner.
  V4L/DVB (4203): Explicitly set the enum values.
  V4L/DVB (4202): allow selecting CX2341x port mode
  V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
  V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
  V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
  V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
  V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
  V4L/DVB (4193): Update cx2341x fw encoding API doc.
  V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
  V4L/DVB (4191): Add CX2341X MPEG encoder module.
  V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
  V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
  V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
  V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
  ...

1 files changed, 29 insertions, 4 deletions

diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 51d4e043716..0677b047b3a 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -42,7 +42,7 @@
 #define DST_TYPE_IS_CABLE       2
 #define DST_TYPE_IS_ATSC        3
 
-#define DST_TYPE_HAS_NEWTUNE    1
+#define DST_TYPE_HAS_TS188      1
 #define DST_TYPE_HAS_TS204      2
 #define DST_TYPE_HAS_SYMDIV     4
 #define DST_TYPE_HAS_FW_1       8
@@ -52,6 +52,9 @@
 #define DST_TYPE_HAS_OBS_REGS   128
 #define DST_TYPE_HAS_INC_COUNT  256
 #define DST_TYPE_HAS_MULTI_FE   512
+#define DST_TYPE_HAS_NEWTUNE_2  1024
+#define DST_TYPE_HAS_DBOARD     2048
+#define DST_TYPE_HAS_VLF        4096
 
 /*      Card capability list    */
 
@@ -64,6 +67,20 @@
 #define DST_TYPE_HAS_ANALOG     64      /*      Analog inputs   */
 #define DST_TYPE_HAS_SESSION    128
 
+#define TUNER_TYPE_MULTI        1
+#define TUNER_TYPE_UNKNOWN      2
+/*      DVB-S           */
+#define TUNER_TYPE_L64724       4
+#define TUNER_TYPE_STV0299      8
+#define TUNER_TYPE_MB86A15      16
+
+/*      DVB-T           */
+#define TUNER_TYPE_TDA10046     32
+
+/*      ATSC            */
+#define TUNER_TYPE_NXT200x      64
+
+
 #define RDC_8820_PIO_0_DISABLE  0
 #define RDC_8820_PIO_0_ENABLE   1
 #define RDC_8820_INT            2
@@ -84,8 +101,6 @@ struct dst_state {
 
         struct bt878* bt;
 
-        struct dvb_frontend_ops ops;
-
         /* configuration settings */
         const struct dst_config* config;
 
@@ -121,8 +136,17 @@ struct dst_state {
         u8 card_info[8];
         u8 vendor[8];
         u8 board_info[8];
-
+        u32 tuner_type;
+        char *tuner_name;
         struct mutex dst_mutex;
+        u8 fw_name[8];
+};
+
+struct tuner_types {
+        u32 tuner_type;
+        char *tuner_name;
+        char *board_name;
+        char *fw_name;
 };
 
 struct dst_types {
@@ -131,6 +155,7 @@ struct dst_types {
         u8 dst_type;
         u32 type_flags;
         u32 dst_feature;
+        u32 tuner_type;
 };
 
 struct dst_config