6 files changed, 118 insertions, 18 deletions

diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c
index bf14bd79e2fc..cdb645d57438 100644
--- a/drivers/media/common/tuners/tda9887.c
+++ b/drivers/media/common/tuners/tda9887.c
@@ -36,6 +36,8 @@ struct tda9887_priv {
         unsigned int       mode;
         unsigned int       audmode;
         v4l2_std_id        std;
+
+        bool               standby;
 };
 
 /* ---------------------------------------------------------------------- */
@@ -568,7 +570,7 @@ static void tda9887_configure(struct dvb_frontend *fe)
         tda9887_do_config(fe);
         tda9887_set_insmod(fe);
 
-        if (priv->mode == T_STANDBY)
+        if (priv->standby)
                 priv->data[1] |= cForcedMuteAudioON;
 
         tuner_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
@@ -616,7 +618,7 @@ static void tda9887_standby(struct dvb_frontend *fe)
 {
         struct tda9887_priv *priv = fe->analog_demod_priv;
 
-        priv->mode = T_STANDBY;
+        priv->standby = true;
 
         tda9887_configure(fe);
 }
@@ -626,6 +628,7 @@ static void tda9887_set_params(struct dvb_frontend *fe,
 {
         struct tda9887_priv *priv = fe->analog_demod_priv;
 
+        priv->standby = false;
         priv->mode    = params->mode;
         priv->audmode = params->audmode;
         priv->std     = params->std;
@@ -686,7 +689,7 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
                 return NULL;
         case 1:
                 fe->analog_demod_priv = priv;
-                priv->mode = T_STANDBY;
+                priv->standby = true;
                 tuner_info("tda988[5/6/7] found\n");
                 break;
         default:
diff --git a/drivers/media/common/tuners/tea5761.c b/drivers/media/common/tuners/tea5761.c
index 925399dffbed..bf78cb9fc52c 100644
--- a/drivers/media/common/tuners/tea5761.c
+++ b/drivers/media/common/tuners/tea5761.c
@@ -23,6 +23,7 @@ struct tea5761_priv {
         struct tuner_i2c_props i2c_props;
 
         u32 frequency;
+        bool standby;
 };
 
 /*****************************************************************************/
@@ -135,18 +136,19 @@ static void tea5761_status_dump(unsigned char *buffer)
 }
 
 /* Freq should be specifyed at 62.5 Hz */
-static int set_radio_freq(struct dvb_frontend *fe,
-                          struct analog_parameters *params)
+static int __set_radio_freq(struct dvb_frontend *fe,
+                            unsigned int freq,
+                            bool mono)
 {
         struct tea5761_priv *priv = fe->tuner_priv;
-        unsigned int frq = params->frequency;
+        unsigned int frq = freq;
         unsigned char buffer[7] = {0, 0, 0, 0, 0, 0, 0 };
         unsigned div;
         int rc;
 
         tuner_dbg("radio freq counter %d\n", frq);
 
-        if (params->mode == T_STANDBY) {
+        if (priv->standby) {
                 tuner_dbg("TEA5761 set to standby mode\n");
                 buffer[5] |= TEA5761_TNCTRL_MU;
         } else {
@@ -154,7 +156,7 @@ static int set_radio_freq(struct dvb_frontend *fe,
         }
 
 
-        if (params->audmode == V4L2_TUNER_MODE_MONO) {
+        if (mono) {
                 tuner_dbg("TEA5761 set to mono\n");
                 buffer[5] |= TEA5761_TNCTRL_MST;
         } else {
@@ -176,6 +178,26 @@ static int set_radio_freq(struct dvb_frontend *fe,
         return 0;
 }
 
+static int set_radio_freq(struct dvb_frontend *fe,
+                          struct analog_parameters *params)
+{
+        struct tea5761_priv *priv = fe->analog_demod_priv;
+
+        priv->standby = false;
+
+        return __set_radio_freq(fe, params->frequency,
+                                params->audmode == V4L2_TUNER_MODE_MONO);
+}
+
+static int set_radio_sleep(struct dvb_frontend *fe)
+{
+        struct tea5761_priv *priv = fe->analog_demod_priv;
+
+        priv->standby = true;
+
+        return __set_radio_freq(fe, priv->frequency, false);
+}
+
 static int tea5761_read_status(struct dvb_frontend *fe, char *buffer)
 {
         struct tea5761_priv *priv = fe->tuner_priv;
@@ -284,6 +306,7 @@ static struct dvb_tuner_ops tea5761_tuner_ops = {
                 .name           = "tea5761", // Philips TEA5761HN FM Radio
         },
         .set_analog_params = set_radio_freq,
+        .sleep             = set_radio_sleep,
         .release           = tea5761_release,
         .get_frequency     = tea5761_get_frequency,
         .get_status        = tea5761_get_status,
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c
index 58a513bcd747..afba6dc5e080 100644
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -971,6 +971,22 @@ static struct tuner_params tuner_tena_9533_di_params[] = {
         },
 };
 
+/* ------------ TUNER_TENA_TNF_5337 - Tena tnf5337MFD STD M/N ------------ */
+
+static struct tuner_range tuner_tena_tnf_5337_ntsc_ranges[] = {
+        { 16 * 166.25 /*MHz*/, 0x86, 0x01, },
+        { 16 * 466.25 /*MHz*/, 0x86, 0x02, },
+        { 16 * 999.99        , 0x86, 0x08, },
+};
+
+static struct tuner_params tuner_tena_tnf_5337_params[] = {
+        {
+                .type   = TUNER_PARAM_TYPE_NTSC,
+                .ranges = tuner_tena_tnf_5337_ntsc_ranges,
+                .count  = ARRAY_SIZE(tuner_tena_tnf_5337_ntsc_ranges),
+        },
+};
+
 /* ------------ TUNER_PHILIPS_FMD1216ME(X)_MK3 - Philips PAL ------------ */
 
 static struct tuner_range tuner_philips_fmd1216me_mk3_pal_ranges[] = {
@@ -1842,6 +1858,11 @@ struct tunertype tuners[] = {
                 .params = tuner_philips_fq1236_mk5_params,
                 .count  = ARRAY_SIZE(tuner_philips_fq1236_mk5_params),
         },
+        [TUNER_TENA_TNF_5337] = { /* Tena 5337 MFD */
+                .name   = "Tena TNF5337 MFD",
+                .params = tuner_tena_tnf_5337_params,
+                .count  = ARRAY_SIZE(tuner_tena_tnf_5337_params),
+        },
 };
 EXPORT_SYMBOL(tuners);
 
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index b6ce528e1889..16fba6b59616 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -685,7 +685,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
 {
         struct xc2028_data         *priv = fe->tuner_priv;
         struct firmware_properties new_fw;
-        int                        rc = 0, is_retry = 0;
+        int                        rc = 0, retry_count = 0;
         u16                        version, hwmodel;
         v4l2_std_id                std0;
 
@@ -855,9 +855,9 @@ read_not_reliable:
 
 fail:
         memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
-        if (!is_retry) {
+        if (retry_count < 8) {
                 msleep(50);
-                is_retry = 1;
+                retry_count++;
                 tuner_dbg("Retrying firmware load\n");
                 goto retry;
         }
@@ -907,7 +907,7 @@ ret:
 #define DIV 15625
 
 static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
-                            enum tuner_mode new_mode,
+                            enum v4l2_tuner_type new_type,
                             unsigned int type,
                             v4l2_std_id std,
                             u16 int_freq)
@@ -933,7 +933,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
          * that xc2028 will be in a safe state.
          * Maybe this might also be needed for DTV.
          */
-        if (new_mode == T_ANALOG_TV) {
+        if (new_type == V4L2_TUNER_ANALOG_TV) {
                 rc = send_seq(priv, {0x00, 0x00});
 
                 /* Analog modes require offset = 0 */
@@ -1054,7 +1054,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
                 if (priv->ctrl.input1)
                         type |= INPUT1;
                 return generic_set_freq(fe, (625l * p->frequency) / 10,
-                                T_RADIO, type, 0, 0);
+                                V4L2_TUNER_RADIO, type, 0, 0);
         }
 
         /* if std is not defined, choose one */
@@ -1069,7 +1069,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
         p->std |= parse_audio_std_option();
 
         return generic_set_freq(fe, 62500l * p->frequency,
-                                T_ANALOG_TV, type, p->std, 0);
+                                V4L2_TUNER_ANALOG_TV, type, p->std, 0);
 }
 
 static int xc2028_set_params(struct dvb_frontend *fe,
@@ -1174,7 +1174,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
         }
 
         return generic_set_freq(fe, p->frequency,
-                                T_DIGITAL_TV, type, 0, demod);
+                                V4L2_TUNER_DIGITAL_TV, type, 0, demod);
 }
 
 static int xc2028_sleep(struct dvb_frontend *fe)
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 76ac5cd84af7..1e28f7dcb26b 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -65,7 +65,7 @@ struct xc5000_priv {
 };
 
 /* Misc Defines */
-#define MAX_TV_STANDARD                 23
+#define MAX_TV_STANDARD                 24
 #define XC_MAX_I2C_WRITE_LENGTH         64
 
 /* Signal Types */
@@ -92,6 +92,8 @@ struct xc5000_priv {
 #define XREG_IF_OUT       0x05
 #define XREG_SEEK_MODE    0x07
 #define XREG_POWER_DOWN   0x0A /* Obsolete */
+/* Set the output amplitude - SIF for analog, DTVP/DTVN for digital */
+#define XREG_OUTPUT_AMP   0x0B
 #define XREG_SIGNALSOURCE 0x0D /* 0=Air, 1=Cable */
 #define XREG_SMOOTHEDCVBS 0x0E
 #define XREG_XTALFREQ     0x0F
@@ -173,6 +175,7 @@ struct XC_TV_STANDARD {
 #define DTV7                    20
 #define FM_Radio_INPUT2         21
 #define FM_Radio_INPUT1         22
+#define FM_Radio_INPUT1_MONO    23
 
 static struct XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {
         {"M/N-NTSC/PAL-BTSC", 0x0400, 0x8020},
@@ -197,7 +200,8 @@ static struct XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {
         {"DTV7/8",            0x00C0, 0x801B},
         {"DTV7",              0x00C0, 0x8007},
         {"FM Radio-INPUT2",   0x9802, 0x9002},
-        {"FM Radio-INPUT1",   0x0208, 0x9002}
+        {"FM Radio-INPUT1",   0x0208, 0x9002},
+        {"FM Radio-INPUT1_MONO", 0x0278, 0x9002}
 };
 
 static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe);
@@ -683,6 +687,24 @@ static int xc5000_set_params(struct dvb_frontend *fe,
                         return -EINVAL;
                 }
                 priv->rf_mode = XC_RF_MODE_AIR;
+        } else if (fe->ops.info.type == FE_QAM) {
+                dprintk(1, "%s() QAM\n", __func__);
+                switch (params->u.qam.modulation) {
+                case QAM_16:
+                case QAM_32:
+                case QAM_64:
+                case QAM_128:
+                case QAM_256:
+                case QAM_AUTO:
+                        dprintk(1, "%s() QAM modulation\n", __func__);
+                        priv->bandwidth = BANDWIDTH_8_MHZ;
+                        priv->video_standard = DTV7_8;
+                        priv->freq_hz = params->frequency - 2750000;
+                        priv->rf_mode = XC_RF_MODE_CABLE;
+                        break;
+                default:
+                        return -EINVAL;
+                }
         } else {
                 printk(KERN_ERR "xc5000 modulation type not supported!\n");
                 return -EINVAL;
@@ -714,6 +736,8 @@ static int xc5000_set_params(struct dvb_frontend *fe,
                 return -EIO;
         }
 
+        xc_write_reg(priv, XREG_OUTPUT_AMP, 0x8a);
+
         xc_tune_channel(priv, priv->freq_hz, XC_TUNE_DIGITAL);
 
         if (debug)
@@ -818,6 +842,8 @@ tune_channel:
                 return -EREMOTEIO;
         }
 
+        xc_write_reg(priv, XREG_OUTPUT_AMP, 0x09);
+
         xc_tune_channel(priv, priv->freq_hz, XC_TUNE_ANALOG);
 
         if (debug)
@@ -845,6 +871,8 @@ static int xc5000_set_radio_freq(struct dvb_frontend *fe,
                 radio_input = FM_Radio_INPUT1;
         else if  (priv->radio_input == XC5000_RADIO_FM2)
                 radio_input = FM_Radio_INPUT2;
+        else if  (priv->radio_input == XC5000_RADIO_FM1_MONO)
+                radio_input = FM_Radio_INPUT1_MONO;
         else {
                 dprintk(1, "%s() unknown radio input %d\n", __func__,
                         priv->radio_input);
@@ -871,6 +899,12 @@ static int xc5000_set_radio_freq(struct dvb_frontend *fe,
                 return -EREMOTEIO;
         }
 
+        if ((priv->radio_input == XC5000_RADIO_FM1) ||
+                                (priv->radio_input == XC5000_RADIO_FM2))
+                xc_write_reg(priv, XREG_OUTPUT_AMP, 0x09);
+        else if  (priv->radio_input == XC5000_RADIO_FM1_MONO)
+                xc_write_reg(priv, XREG_OUTPUT_AMP, 0x06);
+
         xc_tune_channel(priv, priv->freq_hz, XC_TUNE_ANALOG);
 
         return 0;
@@ -1021,6 +1055,23 @@ static int xc5000_release(struct dvb_frontend *fe)
         return 0;
 }
 
+static int xc5000_set_config(struct dvb_frontend *fe, void *priv_cfg)
+{
+        struct xc5000_priv *priv = fe->tuner_priv;
+        struct xc5000_config *p = priv_cfg;
+
+        dprintk(1, "%s()\n", __func__);
+
+        if (p->if_khz)
+                priv->if_khz = p->if_khz;
+
+        if (p->radio_input)
+                priv->radio_input = p->radio_input;
+
+        return 0;
+}
+
+
 static const struct dvb_tuner_ops xc5000_tuner_ops = {
         .info = {
                 .name           = "Xceive XC5000",
@@ -1033,6 +1084,7 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = {
         .init              = xc5000_init,
         .sleep             = xc5000_sleep,
 
+        .set_config        = xc5000_set_config,
         .set_params        = xc5000_set_params,
         .set_analog_params = xc5000_set_analog_params,
         .get_frequency     = xc5000_get_frequency,
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index 3756e73649be..e2957451b532 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -40,6 +40,7 @@ struct xc5000_config {
 #define XC5000_RADIO_NOT_CONFIGURED             0
 #define XC5000_RADIO_FM1                        1
 #define XC5000_RADIO_FM2                        2
+#define XC5000_RADIO_FM1_MONO                   3
 
 /* For each bridge framework, when it attaches either analog or digital,
  * it has to store a reference back to its _core equivalent structure,