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, 139 insertions, 11 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index f80154b87d22..67cdd8270863 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -114,7 +114,7 @@ struct cx88_board cx88_boards[] = {
                 .radio = {
                          .type  = CX88_RADIO,
                          .gpio0 = 0xff10,
-                 },
+                },
         },
         [CX88_BOARD_ATI_WONDER_PRO] = {
                 .name           = "ATI TV Wonder Pro",
@@ -267,7 +267,7 @@ struct cx88_board cx88_boards[] = {
                         .gpio1  = 0x00007004,
                         .gpio2  = 0x0035d700,
                         .gpio3  = 0x02000000,
-                 },
+                },
         },
         [CX88_BOARD_LEADTEK_PVR2000] = {
                 // gpio values for PAL version from regspy by DScaler
@@ -413,7 +413,7 @@ struct cx88_board cx88_boards[] = {
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
                         .gpio0  = 0x000027df,
-                 },{
+                },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
                         .gpio0  = 0x000027df,
@@ -536,7 +536,7 @@ struct cx88_board cx88_boards[] = {
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
                         .gpio0  = 0x000027df,
-                 },{
+                },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
                         .gpio0  = 0x000027df,
@@ -759,7 +759,7 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD] = {
                 .name           = "DViCO FusionHDTV 5 Gold",
-                .tuner_type     = TUNER_LG_TDVS_H062F,
+                .tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H062F */
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1050,11 +1050,7 @@ struct cx88_board cx88_boards[] = {
                 .dvb            = 1,
         },
         [CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = {
-                /* FIXME: Standard video using the cx88 broadcast decoder is
-                 * working, but blackbird isn't working yet, audio is only
-                 * working correctly for television mode. S-Video and Composite
-                 * are working for video-only, so I have them disabled for now.
-                 */
+                /* FIXME: Audio not working for s-video / composite inputs. */
                 .name           = "KWorld HardwareMpegTV XPert",
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
                 .radio_type     = UNSET,
@@ -1065,12 +1061,21 @@ struct cx88_board cx88_boards[] = {
                         .vmux   = 0,
                         .gpio0  = 0x3de2,
                         .gpio2  = 0x00ff,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x3de6,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x3de6,
                 }},
                 .radio = {
                         .type   = CX88_RADIO,
                         .gpio0  = 0x3de6,
                         .gpio2  = 0x00ff,
                 },
+                .blackbird      = 1,
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
                 .name           = "DViCO FusionHDTV DVB-T Hybrid",
@@ -1093,7 +1098,102 @@ struct cx88_board cx88_boards[] = {
                 }},
                 .dvb            = 1,
         },
-
+        [CX88_BOARD_PCHDTV_HD5500] = {
+                .name           = "pcHDTV HD5500 HDTV",
+                .tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x87fd,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x87f9,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x87f9,
+                }},
+                .dvb            = 1,
+        },
+        [CX88_BOARD_KWORLD_MCE200_DELUXE] = {
+                /* FIXME: tested TV input only, disabled composite,
+                   svideo and radio until they can be tested also. */
+                .name           = "Kworld MCE 200 Deluxe",
+                .tuner_type     = TUNER_TENA_9533_DI,
+                .radio_type     = UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x0000BDE6
+                }},
+                .blackbird = 1,
+        },
+        [CX88_BOARD_PIXELVIEW_PLAYTV_P7000] = {
+                /* FIXME: SVideo, Composite and FM inputs are untested */
+                .name           = "PixelView PlayTV P7000",
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE |
+                                  TDA9887_PORT2_ACTIVE,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x5da6,
+                }},
+                .blackbird = 1,
+        },
+        [CX88_BOARD_NPGTECH_REALTV_TOP10FM] = {
+                .name           = "NPG Tech Real TV FM Top 10",
+                .tuner_type     = TUNER_TNF_5335MF, /* Actually a TNF9535 */
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x0788,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x078b,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x078b,
+                }},
+                .radio = {
+                         .type  = CX88_RADIO,
+                         .gpio0 = 0x074a,
+                },
+        },
+        [CX88_BOARD_WINFAST_DTV2000H] = {
+                /* video inputs and radio still in testing */
+                .name           = "WinFast DTV2000 H",
+                .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x00017304,
+                        .gpio1  = 0x00008203,
+                        .gpio2  = 0x00017304,
+                        .gpio3  = 0x02000000,
+                }},
+                .dvb            = 1,
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1311,6 +1411,34 @@ struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x18ac,
                 .subdevice = 0xdb44,
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID,
+        },{
+                .subvendor = 0x7063,
+                .subdevice = 0x5500,
+                .card      = CX88_BOARD_PCHDTV_HD5500,
+        },{
+                .subvendor = 0x17de,
+                .subdevice = 0x0841,
+                .card      = CX88_BOARD_KWORLD_MCE200_DELUXE,
+        },{
+                .subvendor = 0x1822,
+                .subdevice = 0x0019,
+                .card      = CX88_BOARD_DNTV_LIVE_DVB_T_PRO,
+        },{
+                .subvendor = 0x1554,
+                .subdevice = 0x4813,
+                .card      = CX88_BOARD_PIXELVIEW_PLAYTV_P7000,
+        },{
+                .subvendor = 0x14f1,
+                .subdevice = 0x0842,
+                .card      = CX88_BOARD_NPGTECH_REALTV_TOP10FM,
+        },{
+                .subvendor = 0x107d,
+                .subdevice = 0x665e,
+                .card      = CX88_BOARD_WINFAST_DTV2000H,
+        },{
+                .subvendor = 0x18ac,
+                .subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */
+                .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,
         },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);