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

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
  V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
  V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
  V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
  V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
  V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
  V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
  V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
  V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
  V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
  V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
  V4L/DVB (7719): pvrusb2: Implement input selection enforcement
  V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
  V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
  V4L/DVB (7716): pvrusb2: clean up global functions
  V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
  V4L/DVB (7714): pvrusb2: Fix hang on module removal
  V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
  V4L/DVB (7712): pvrusb2: Close connect/disconnect race
  V4L/DVB (7711): pvrusb2: Fix race on module unload
  V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
  ...

1 files changed, 257 insertions, 13 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index fe9991c10cf4..2dd06a90adce 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -32,7 +32,15 @@ pvr2_device_desc structures.
 /* This is needed in order to pull in tuner type ids... */
 #include <linux/i2c.h>
 #include <media/tuner.h>
-
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+#include "pvrusb2-hdw-internal.h"
+#include "lgdt330x.h"
+#include "s5h1409.h"
+#include "tda10048.h"
+#include "tda18271.h"
+#include "tda8290.h"
+#include "tuner-simple.h"
+#endif
 
 
 /*------------------------------------------------------------------------*/
@@ -49,14 +57,19 @@ static const char *pvr2_fw1_names_29xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_29xxx = {
-                .description = "WinTV PVR USB2 Model Category 29xxxx",
+                .description = "WinTV PVR USB2 Model Category 29xxx",
                 .shortname = "29xxx",
                 .client_modules.lst = pvr2_client_29xxx,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_29xxx),
                 .fx2_firmware.lst = pvr2_fw1_names_29xxx,
                 .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_29xxx),
                 .flag_has_hauppauge_rom = !0,
+                .flag_has_analogtuner = !0,
+                .flag_has_fmradio = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
 };
 
 
@@ -75,7 +88,7 @@ static const char *pvr2_fw1_names_24xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_24xxx = {
-                .description = "WinTV PVR USB2 Model Category 24xxxx",
+                .description = "WinTV PVR USB2 Model Category 24xxx",
                 .shortname = "24xxx",
                 .client_modules.lst = pvr2_client_24xxx,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_24xxx),
@@ -85,7 +98,12 @@ static const struct pvr2_device_desc pvr2_device_24xxx = {
                 .flag_has_wm8775 = !0,
                 .flag_has_hauppauge_rom = !0,
                 .flag_has_hauppauge_custom_ir = !0,
+                .flag_has_analogtuner = !0,
+                .flag_has_fmradio = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
 };
 
 
@@ -105,6 +123,30 @@ static const struct pvr2_device_desc pvr2_device_gotview_2 = {
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_gotview_2),
                 .flag_has_cx25840 = !0,
                 .default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
+                .flag_has_analogtuner = !0,
+                .flag_has_fmradio = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
+                .signal_routing_scheme = PVR2_ROUTING_SCHEME_GOTVIEW,
+};
+
+
+
+/*------------------------------------------------------------------------*/
+/* GOTVIEW USB2.0 DVD Deluxe */
+
+/* (same module list as gotview_2) */
+
+static const struct pvr2_device_desc pvr2_device_gotview_2d = {
+                .description = "Gotview USB 2.0 DVD Deluxe",
+                .shortname = "gv2d",
+                .client_modules.lst = pvr2_client_gotview_2,
+                .client_modules.cnt = ARRAY_SIZE(pvr2_client_gotview_2),
+                .flag_has_cx25840 = !0,
+                .default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
+                .flag_has_analogtuner = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_GOTVIEW,
 };
 
@@ -114,6 +156,38 @@ static const struct pvr2_device_desc pvr2_device_gotview_2 = {
 /*------------------------------------------------------------------------*/
 /* OnAir Creator */
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+static struct lgdt330x_config pvr2_lgdt3303_config = {
+        .demod_address       = 0x0e,
+        .demod_chip          = LGDT3303,
+        .clock_polarity_flip = 1,
+};
+
+static int pvr2_lgdt3303_attach(struct pvr2_dvb_adapter *adap)
+{
+        adap->fe = dvb_attach(lgdt330x_attach, &pvr2_lgdt3303_config,
+                              &adap->channel.hdw->i2c_adap);
+        if (adap->fe)
+                return 0;
+
+        return -EIO;
+}
+
+static int pvr2_lgh06xf_attach(struct pvr2_dvb_adapter *adap)
+{
+        dvb_attach(simple_tuner_attach, adap->fe,
+                   &adap->channel.hdw->i2c_adap, 0x61,
+                   TUNER_LG_TDVS_H06XF);
+
+        return 0;
+}
+
+struct pvr2_dvb_props pvr2_onair_creator_fe_props = {
+        .frontend_attach = pvr2_lgdt3303_attach,
+        .tuner_attach    = pvr2_lgh06xf_attach,
+};
+#endif
+
 static const char *pvr2_client_onair_creator[] = {
         "saa7115",
         "tuner",
@@ -126,7 +200,16 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = {
                 .client_modules.lst = pvr2_client_onair_creator,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_creator),
                 .default_tuner_type = TUNER_LG_TDVS_H06XF,
+                .flag_has_analogtuner = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
+                .flag_digital_requires_cx23416 = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR,
+                .default_std_mask = V4L2_STD_NTSC_M,
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+                .dvb_props = &pvr2_onair_creator_fe_props,
+#endif
 };
 #endif
 
@@ -136,6 +219,37 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = {
 /*------------------------------------------------------------------------*/
 /* OnAir USB 2.0 */
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+static struct lgdt330x_config pvr2_lgdt3302_config = {
+        .demod_address       = 0x0e,
+        .demod_chip          = LGDT3302,
+};
+
+static int pvr2_lgdt3302_attach(struct pvr2_dvb_adapter *adap)
+{
+        adap->fe = dvb_attach(lgdt330x_attach, &pvr2_lgdt3302_config,
+                              &adap->channel.hdw->i2c_adap);
+        if (adap->fe)
+                return 0;
+
+        return -EIO;
+}
+
+static int pvr2_fcv1236d_attach(struct pvr2_dvb_adapter *adap)
+{
+        dvb_attach(simple_tuner_attach, adap->fe,
+                   &adap->channel.hdw->i2c_adap, 0x61,
+                   TUNER_PHILIPS_FCV1236D);
+
+        return 0;
+}
+
+struct pvr2_dvb_props pvr2_onair_usb2_fe_props = {
+        .frontend_attach = pvr2_lgdt3302_attach,
+        .tuner_attach    = pvr2_fcv1236d_attach,
+};
+#endif
+
 static const char *pvr2_client_onair_usb2[] = {
         "saa7115",
         "tuner",
@@ -147,8 +261,17 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
                 .shortname = "oa2",
                 .client_modules.lst = pvr2_client_onair_usb2,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_usb2),
-                .default_tuner_type = TUNER_PHILIPS_ATSC,
+                .default_tuner_type = TUNER_PHILIPS_FCV1236D,
+                .flag_has_analogtuner = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
+                .flag_digital_requires_cx23416 = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR,
+                .default_std_mask = V4L2_STD_NTSC_M,
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+                .dvb_props = &pvr2_onair_usb2_fe_props,
+#endif
 };
 #endif
 
@@ -157,6 +280,50 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
 /*------------------------------------------------------------------------*/
 /* Hauppauge PVR-USB2 Model 73xxx */
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+static struct tda10048_config hauppauge_tda10048_config = {
+        .demod_address  = 0x10 >> 1,
+        .output_mode    = TDA10048_PARALLEL_OUTPUT,
+        .fwbulkwritelen = TDA10048_BULKWRITE_50,
+        .inversion      = TDA10048_INVERSION_ON,
+};
+
+static struct tda829x_config tda829x_no_probe = {
+        .probe_tuner = TDA829X_DONT_PROBE,
+};
+
+static struct tda18271_config hauppauge_tda18271_dvb_config = {
+        .gate    = TDA18271_GATE_ANALOG,
+};
+
+static int pvr2_tda10048_attach(struct pvr2_dvb_adapter *adap)
+{
+        adap->fe = dvb_attach(tda10048_attach, &hauppauge_tda10048_config,
+                              &adap->channel.hdw->i2c_adap);
+        if (adap->fe)
+                return 0;
+
+        return -EIO;
+}
+
+static int pvr2_73xxx_tda18271_8295_attach(struct pvr2_dvb_adapter *adap)
+{
+        dvb_attach(tda829x_attach, adap->fe,
+                   &adap->channel.hdw->i2c_adap, 0x42,
+                   &tda829x_no_probe);
+        dvb_attach(tda18271_attach, adap->fe, 0x60,
+                   &adap->channel.hdw->i2c_adap,
+                   &hauppauge_tda18271_dvb_config);
+
+        return 0;
+}
+
+struct pvr2_dvb_props pvr2_73xxx_dvb_props = {
+        .frontend_attach = pvr2_tda10048_attach,
+        .tuner_attach    = pvr2_73xxx_tda18271_8295_attach,
+};
+#endif
+
 static const char *pvr2_client_73xxx[] = {
         "cx25840",
         "tuner",
@@ -167,7 +334,7 @@ static const char *pvr2_fw1_names_73xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_73xxx = {
-                .description = "WinTV PVR USB2 Model Category 73xxxx",
+                .description = "WinTV PVR USB2 Model Category 73xxx",
                 .shortname = "73xxx",
                 .client_modules.lst = pvr2_client_73xxx,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx),
@@ -175,15 +342,14 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
                 .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
                 .flag_has_cx25840 = !0,
                 .flag_has_hauppauge_rom = !0,
-#if 0
                 .flag_has_analogtuner = !0,
                 .flag_has_composite = !0,
                 .flag_has_svideo = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
-#else
-                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+                .dvb_props = &pvr2_73xxx_dvb_props,
 #endif
 };
 
@@ -192,6 +358,56 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
 /*------------------------------------------------------------------------*/
 /* Hauppauge PVR-USB2 Model 75xxx */
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+static struct s5h1409_config pvr2_s5h1409_config = {
+        .demod_address = 0x32 >> 1,
+        .output_mode   = S5H1409_PARALLEL_OUTPUT,
+        .gpio          = S5H1409_GPIO_OFF,
+        .qam_if        = 4000,
+        .inversion     = S5H1409_INVERSION_ON,
+        .status_mode   = S5H1409_DEMODLOCKING,
+};
+
+static struct tda18271_std_map hauppauge_tda18271_std_map = {
+        .atsc_6   = { .if_freq = 5380, .agc_mode = 3, .std = 3,
+                      .if_lvl = 6, .rfagc_top = 0x37, },
+        .qam_6    = { .if_freq = 4000, .agc_mode = 3, .std = 0,
+                      .if_lvl = 6, .rfagc_top = 0x37, },
+};
+
+static struct tda18271_config hauppauge_tda18271_config = {
+        .std_map = &hauppauge_tda18271_std_map,
+        .gate    = TDA18271_GATE_ANALOG,
+};
+
+static int pvr2_s5h1409_attach(struct pvr2_dvb_adapter *adap)
+{
+        adap->fe = dvb_attach(s5h1409_attach, &pvr2_s5h1409_config,
+                              &adap->channel.hdw->i2c_adap);
+        if (adap->fe)
+                return 0;
+
+        return -EIO;
+}
+
+static int pvr2_tda18271_8295_attach(struct pvr2_dvb_adapter *adap)
+{
+        dvb_attach(tda829x_attach, adap->fe,
+                   &adap->channel.hdw->i2c_adap, 0x42,
+                   &tda829x_no_probe);
+        dvb_attach(tda18271_attach, adap->fe, 0x60,
+                   &adap->channel.hdw->i2c_adap,
+                   &hauppauge_tda18271_config);
+
+        return 0;
+}
+
+struct pvr2_dvb_props pvr2_750xx_dvb_props = {
+        .frontend_attach = pvr2_s5h1409_attach,
+        .tuner_attach    = pvr2_tda18271_8295_attach,
+};
+#endif
+
 static const char *pvr2_client_75xxx[] = {
         "cx25840",
         "tuner",
@@ -201,17 +417,43 @@ static const char *pvr2_fw1_names_75xxx[] = {
                 "v4l-pvrusb2-73xxx-01.fw",
 };
 
-static const struct pvr2_device_desc pvr2_device_75xxx = {
-                .description = "WinTV PVR USB2 Model Category 75xxxx",
-                .shortname = "75xxx",
+static const struct pvr2_device_desc pvr2_device_750xx = {
+                .description = "WinTV PVR USB2 Model Category 750xx",
+                .shortname = "750xx",
+                .client_modules.lst = pvr2_client_75xxx,
+                .client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
+                .fx2_firmware.lst = pvr2_fw1_names_75xxx,
+                .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx),
+                .flag_has_cx25840 = !0,
+                .flag_has_hauppauge_rom = !0,
+                .flag_has_analogtuner = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
+                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
+                .default_std_mask = V4L2_STD_NTSC_M,
+                .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
+#ifdef CONFIG_VIDEO_PVRUSB2_DVB
+                .dvb_props = &pvr2_750xx_dvb_props,
+#endif
+};
+
+static const struct pvr2_device_desc pvr2_device_751xx = {
+                .description = "WinTV PVR USB2 Model Category 751xx",
+                .shortname = "751xx",
                 .client_modules.lst = pvr2_client_75xxx,
                 .client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
                 .fx2_firmware.lst = pvr2_fw1_names_75xxx,
                 .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx),
                 .flag_has_cx25840 = !0,
                 .flag_has_hauppauge_rom = !0,
+                .flag_has_analogtuner = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .default_std_mask = V4L2_STD_NTSC_M,
+                .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
 };
 
 
@@ -225,6 +467,8 @@ struct usb_device_id pvr2_device_table[] = {
           .driver_info = (kernel_ulong_t)&pvr2_device_24xxx},
         { USB_DEVICE(0x1164, 0x0622),
           .driver_info = (kernel_ulong_t)&pvr2_device_gotview_2},
+        { USB_DEVICE(0x1164, 0x0602),
+          .driver_info = (kernel_ulong_t)&pvr2_device_gotview_2d},
 #ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR
         { USB_DEVICE(0x11ba, 0x1003),
           .driver_info = (kernel_ulong_t)&pvr2_device_onair_creator},
@@ -236,9 +480,9 @@ struct usb_device_id pvr2_device_table[] = {
         { USB_DEVICE(0x2040, 0x7300),
           .driver_info = (kernel_ulong_t)&pvr2_device_73xxx},
         { USB_DEVICE(0x2040, 0x7500),
-          .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
+          .driver_info = (kernel_ulong_t)&pvr2_device_750xx},
         { USB_DEVICE(0x2040, 0x7501),
-          .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
+          .driver_info = (kernel_ulong_t)&pvr2_device_751xx},
         { }
 };