Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2

6 files changed, 101 insertions, 30 deletions

diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c
index a8878244bb3c..31522d2e318e 100644
--- a/drivers/media/common/tuners/mxl5005s.c
+++ b/drivers/media/common/tuners/mxl5005s.c
@@ -3598,7 +3598,7 @@ static u16 MXL_GetInitRegister(struct dvb_frontend *fe, u8 *RegNum,
                 76, 77, 91, 134, 135, 137, 147,
                 156, 166, 167, 168, 25 };
 
-        *count = sizeof(RegAddr) / sizeof(u8);
+        *count = ARRAY_SIZE(RegAddr);
 
         status += MXL_BlockInit(fe);
 
@@ -3630,7 +3630,7 @@ static u16 MXL_GetCHRegister(struct dvb_frontend *fe, u8 *RegNum, u8 *RegVal,
         */
 #endif
 
-        *count = sizeof(RegAddr) / sizeof(u8);
+        *count = ARRAY_SIZE(RegAddr);
 
         for (i = 0 ; i < *count; i++) {
                 RegNum[i] = RegAddr[i];
@@ -3648,7 +3648,7 @@ static u16 MXL_GetCHRegister_ZeroIF(struct dvb_frontend *fe, u8 *RegNum,
 
         u8 RegAddr[] = {43, 136};
 
-        *count = sizeof(RegAddr) / sizeof(u8);
+        *count = ARRAY_SIZE(RegAddr);
 
         for (i = 0; i < *count; i++) {
                 RegNum[i] = RegAddr[i];
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c
index 4a74f65e759a..f4d931f14fad 100644
--- a/drivers/media/common/tuners/tda827x.c
+++ b/drivers/media/common/tuners/tda827x.c
@@ -80,10 +80,11 @@ static void tda827x_set_std(struct dvb_frontend *fe,
                 mode = "xx";
         }
 
-        if (params->mode == V4L2_TUNER_RADIO)
+        if (params->mode == V4L2_TUNER_RADIO) {
                 priv->sgIF = 88; /* if frequency is 5.5 MHz */
-
-        dprintk("setting tda827x to system %s\n", mode);
+                dprintk("setting tda827x to radio FM\n");
+        } else
+                dprintk("setting tda827x to system %s\n", mode);
 }
 
 
@@ -199,7 +200,7 @@ static int tda827xo_set_params(struct dvb_frontend *fe,
                 fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(priv->i2c_adap, &msg, 1);
 
-        priv->frequency = tuner_freq - if_freq; // FIXME
+        priv->frequency = params->frequency;
         priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
 
         return 0;
@@ -304,7 +305,7 @@ static int tda827xo_set_analog_params(struct dvb_frontend *fe,
         reg2[1] = 0x08;   /* Vsync en */
         i2c_transfer(priv->i2c_adap, &msg, 1);
 
-        priv->frequency = freq * 62500;
+        priv->frequency = params->frequency;
 
         return 0;
 }
@@ -591,7 +592,7 @@ static int tda827xa_set_params(struct dvb_frontend *fe,
                 fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(priv->i2c_adap, &msg, 1);
 
-        priv->frequency = tuner_freq - if_freq; // FIXME
+        priv->frequency = params->frequency;
         priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
 
         return 0;
@@ -691,7 +692,7 @@ static int tda827xa_set_analog_params(struct dvb_frontend *fe,
         tuner_reg[1] = 0x19 + (priv->lpsel << 1);
         i2c_transfer(priv->i2c_adap, &msg, 1);
 
-        priv->frequency = freq * 62500;
+        priv->frequency = params->frequency;
 
         return 0;
 }
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c
index c112bdd4e0f0..0ee79fd7c7a9 100644
--- a/drivers/media/common/tuners/tda8290.c
+++ b/drivers/media/common/tuners/tda8290.c
@@ -32,6 +32,9 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
+static int deemphasis_50;
+MODULE_PARM_DESC(deemphasis_50, "0 - 75us deemphasis; 1 - 50us deemphasis");
+
 /* ---------------------------------------------------------------------- */
 
 struct tda8290_priv {
@@ -139,9 +142,34 @@ static void set_audio(struct dvb_frontend *fe,
                 mode = "xx";
         }
 
-        tuner_dbg("setting tda829x to system %s\n", mode);
+        if (params->mode == V4L2_TUNER_RADIO) {
+                priv->tda8290_easy_mode = 0x01;         /* Start with MN values */
+                tuner_dbg("setting to radio FM\n");
+        } else {
+                tuner_dbg("setting tda829x to system %s\n", mode);
+        }
 }
 
+struct {
+        unsigned char seq[2];
+} fm_mode[] = {
+        { { 0x01, 0x81} },      /* Put device into expert mode */
+        { { 0x03, 0x48} },      /* Disable NOTCH and VIDEO filters */
+        { { 0x04, 0x04} },      /* Disable color carrier filter (SSIF) */
+        { { 0x05, 0x04} },      /* ADC headroom */
+        { { 0x06, 0x10} },      /* group delay flat */
+
+        { { 0x07, 0x00} },      /* use the same radio DTO values as a tda8295 */
+        { { 0x08, 0x00} },
+        { { 0x09, 0x80} },
+        { { 0x0a, 0xda} },
+        { { 0x0b, 0x4b} },
+        { { 0x0c, 0x68} },
+
+        { { 0x0d, 0x00} },      /* PLL off, no video carrier detect */
+        { { 0x14, 0x00} },      /* disable auto mute if no video */
+};
+
 static void tda8290_set_params(struct dvb_frontend *fe,
                                struct analog_parameters *params)
 {
@@ -178,15 +206,30 @@ static void tda8290_set_params(struct dvb_frontend *fe,
         tuner_i2c_xfer_send(&priv->i2c_props, soft_reset, 2);
         msleep(1);
 
-        expert_mode[1] = priv->tda8290_easy_mode + 0x80;
-        tuner_i2c_xfer_send(&priv->i2c_props, expert_mode, 2);
-        tuner_i2c_xfer_send(&priv->i2c_props, gainset_off, 2);
-        tuner_i2c_xfer_send(&priv->i2c_props, if_agc_spd, 2);
-        if (priv->tda8290_easy_mode & 0x60)
-                tuner_i2c_xfer_send(&priv->i2c_props, adc_head_9, 2);
-        else
-                tuner_i2c_xfer_send(&priv->i2c_props, adc_head_6, 2);
-        tuner_i2c_xfer_send(&priv->i2c_props, pll_bw_nom, 2);
+        if (params->mode == V4L2_TUNER_RADIO) {
+                int i;
+                unsigned char deemphasis[]  = { 0x13, 1 };
+
+                /* FIXME: allow using a different deemphasis */
+
+                if (deemphasis_50)
+                        deemphasis[1] = 2;
+
+                for (i = 0; i < ARRAY_SIZE(fm_mode); i++)
+                        tuner_i2c_xfer_send(&priv->i2c_props, fm_mode[i].seq, 2);
+
+                tuner_i2c_xfer_send(&priv->i2c_props, deemphasis, 2);
+        } else {
+                expert_mode[1] = priv->tda8290_easy_mode + 0x80;
+                tuner_i2c_xfer_send(&priv->i2c_props, expert_mode, 2);
+                tuner_i2c_xfer_send(&priv->i2c_props, gainset_off, 2);
+                tuner_i2c_xfer_send(&priv->i2c_props, if_agc_spd, 2);
+                if (priv->tda8290_easy_mode & 0x60)
+                        tuner_i2c_xfer_send(&priv->i2c_props, adc_head_9, 2);
+                else
+                        tuner_i2c_xfer_send(&priv->i2c_props, adc_head_6, 2);
+                tuner_i2c_xfer_send(&priv->i2c_props, pll_bw_nom, 2);
+        }
 
         tda8290_i2c_bridge(fe, 1);
 
diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c
index ff1788cc5d48..544cdbe88a6c 100644
--- a/drivers/media/common/tuners/tda9887.c
+++ b/drivers/media/common/tuners/tda9887.c
@@ -180,11 +180,10 @@ static struct tvnorm tvnorms[] = {
         },{
                 .std   = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H,
                 .name  = "SECAM-BGH",
-                .b     = ( cPositiveAmTV  |
+                .b     = ( cNegativeFmTV  |
                            cQSS           ),
                 .c     = ( cTopDefault),
-                .e     = ( cGating_36     |
-                           cAudioIF_5_5   |
+                .e     = ( cAudioIF_5_5   |
                            cVideoIF_38_90 ),
         },{
                 .std   = V4L2_STD_SECAM_L,
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index b65e6803e6c6..1adce9ff52ce 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -28,6 +28,12 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
+static int no_poweroff;
+module_param(no_poweroff, int, 0644);
+MODULE_PARM_DESC(debug, "0 (default) powers device off when not used.\n"
+        "1 keep device energized and with tuner ready all the times.\n"
+        "  Faster, but consumes more power and keeps the device hotter\n");
+
 static char audio_std[8];
 module_param_string(audio_std, audio_std, sizeof(audio_std), 0);
 MODULE_PARM_DESC(audio_std,
@@ -1091,6 +1097,34 @@ static int xc2028_set_params(struct dvb_frontend *fe,
                                 T_DIGITAL_TV, type, 0, demod);
 }
 
+static int xc2028_sleep(struct dvb_frontend *fe)
+{
+        struct xc2028_data *priv = fe->tuner_priv;
+        int rc = 0;
+
+        /* Avoid firmware reload on slow devices */
+        if (no_poweroff)
+                return 0;
+
+        tuner_dbg("Putting xc2028/3028 into poweroff mode.\n");
+        if (debug > 1) {
+                tuner_dbg("Printing sleep stack trace:\n");
+                dump_stack();
+        }
+
+        mutex_lock(&priv->lock);
+
+        if (priv->firm_version < 0x0202)
+                rc = send_seq(priv, {0x00, 0x08, 0x00, 0x00});
+        else
+                rc = send_seq(priv, {0x80, 0x08, 0x00, 0x00});
+
+        priv->cur_fw.type = 0;  /* need firmware reload */
+
+        mutex_unlock(&priv->lock);
+
+        return rc;
+}
 
 static int xc2028_dvb_release(struct dvb_frontend *fe)
 {
@@ -1171,6 +1205,7 @@ static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = {
         .get_frequency     = xc2028_get_frequency,
         .get_rf_strength   = xc2028_signal,
         .set_params        = xc2028_set_params,
+        .sleep             = xc2028_sleep,
 };
 
 struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index e12d13e0cbe9..493ce93caf43 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -36,10 +36,6 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
 
-static int xc5000_load_fw_on_attach;
-module_param_named(init_fw, xc5000_load_fw_on_attach, int, 0644);
-MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization.");
-
 static DEFINE_MUTEX(xc5000_list_mutex);
 static LIST_HEAD(hybrid_tuner_instance_list);
 
@@ -1017,9 +1013,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
         memcpy(&fe->ops.tuner_ops, &xc5000_tuner_ops,
                 sizeof(struct dvb_tuner_ops));
 
-        if (xc5000_load_fw_on_attach)
-                xc5000_init(fe);
-
         return fe;
 fail:
         mutex_unlock(&xc5000_list_mutex);