]> err.no Git - linux-2.6/blobdiff - drivers/media/video/tea5767.c
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[linux-2.6] / drivers / media / video / tea5767.c
index 71df419df7bc85b7c867fc27f593a72b1ee5bae2..f6e7d7ad842416ad5ac9b82bde9532125a3ddd80 100644 (file)
 #include "tuner-i2c.h"
 #include "tea5767.h"
 
-static int debug = 0;
+static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-#define PREFIX "tea5767 "
+/*****************************************************************************/
 
 struct tea5767_priv {
-       struct tuner_i2c_props i2c_props;
-
-       u32 frequency;
+       struct tuner_i2c_props  i2c_props;
+       u32                     frequency;
+       struct tea5767_ctrl     ctrl;
 };
 
 /*****************************************************************************/
@@ -127,33 +127,26 @@ struct tea5767_priv {
 /* Reserved for future extensions */
 #define TEA5767_RESERVED_MASK  0xff
 
-enum tea5767_xtal_freq {
-       TEA5767_LOW_LO_32768    = 0,
-       TEA5767_HIGH_LO_32768   = 1,
-       TEA5767_LOW_LO_13MHz    = 2,
-       TEA5767_HIGH_LO_13MHz   = 3,
-};
-
-
 /*****************************************************************************/
 
-static void tea5767_status_dump(unsigned char *buffer)
+static void tea5767_status_dump(struct tea5767_priv *priv,
+                               unsigned char *buffer)
 {
        unsigned int div, frq;
 
        if (TEA5767_READY_FLAG_MASK & buffer[0])
-               printk(PREFIX "Ready Flag ON\n");
+               tuner_info("Ready Flag ON\n");
        else
-               printk(PREFIX "Ready Flag OFF\n");
+               tuner_info("Ready Flag OFF\n");
 
        if (TEA5767_BAND_LIMIT_MASK & buffer[0])
-               printk(PREFIX "Tuner at band limit\n");
+               tuner_info("Tuner at band limit\n");
        else
-               printk(PREFIX "Tuner not at band limit\n");
+               tuner_info("Tuner not at band limit\n");
 
        div = ((buffer[0] & 0x3f) << 8) | buffer[1];
 
-       switch (TEA5767_HIGH_LO_32768) {
+       switch (priv->ctrl.xtal_freq) {
        case TEA5767_HIGH_LO_13MHz:
                frq = (div * 50000 - 700000 - 225000) / 4;      /* Freq in KHz */
                break;
@@ -171,23 +164,23 @@ static void tea5767_status_dump(unsigned char *buffer)
        buffer[0] = (div >> 8) & 0x3f;
        buffer[1] = div & 0xff;
 
-       printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
-              frq / 1000, frq % 1000, div);
+       tuner_info("Frequency %d.%03d KHz (divider = 0x%04x)\n",
+                  frq / 1000, frq % 1000, div);
 
        if (TEA5767_STEREO_MASK & buffer[2])
-               printk(PREFIX "Stereo\n");
+               tuner_info("Stereo\n");
        else
-               printk(PREFIX "Mono\n");
+               tuner_info("Mono\n");
 
-       printk(PREFIX "IF Counter = %d\n", buffer[2] & TEA5767_IF_CNTR_MASK);
+       tuner_info("IF Counter = %d\n", buffer[2] & TEA5767_IF_CNTR_MASK);
 
-       printk(PREFIX "ADC Level = %d\n",
-              (buffer[3] & TEA5767_ADC_LEVEL_MASK) >> 4);
+       tuner_info("ADC Level = %d\n",
+                  (buffer[3] & TEA5767_ADC_LEVEL_MASK) >> 4);
 
-       printk(PREFIX "Chip ID = %d\n", (buffer[3] & TEA5767_CHIP_ID_MASK));
+       tuner_info("Chip ID = %d\n", (buffer[3] & TEA5767_CHIP_ID_MASK));
 
-       printk(PREFIX "Reserved = 0x%02x\n",
-              (buffer[4] & TEA5767_RESERVED_MASK));
+       tuner_info("Reserved = 0x%02x\n",
+                  (buffer[4] & TEA5767_RESERVED_MASK));
 }
 
 /* Freq should be specifyed at 62.5 Hz */
@@ -202,13 +195,10 @@ static int set_radio_freq(struct dvb_frontend *fe,
 
        tuner_dbg("radio freq = %d.%03d MHz\n", frq/16000,(frq/16)%1000);
 
-       /* Rounds freq to next decimal value - for 62.5 KHz step */
-       /* frq = 20*(frq/16)+radio_frq[frq%16]; */
+       buffer[2] = 0;
 
-       buffer[2] = TEA5767_PORT1_HIGH;
-       buffer[3] = TEA5767_PORT2_HIGH | TEA5767_HIGH_CUT_CTRL |
-                   TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND;
-       buffer[4] = 0;
+       if (priv->ctrl.port1)
+               buffer[2] |= TEA5767_PORT1_HIGH;
 
        if (params->audmode == V4L2_TUNER_MODE_MONO) {
                tuner_dbg("TEA5767 set to mono\n");
@@ -217,18 +207,45 @@ static int set_radio_freq(struct dvb_frontend *fe,
                tuner_dbg("TEA5767 set to stereo\n");
        }
 
-       /* Should be replaced */
-       switch (TEA5767_HIGH_LO_32768) {
+
+       buffer[3] = 0;
+
+       if (priv->ctrl.port2)
+               buffer[3] |= TEA5767_PORT2_HIGH;
+
+       if (priv->ctrl.high_cut)
+               buffer[3] |= TEA5767_HIGH_CUT_CTRL;
+
+       if (priv->ctrl.st_noise)
+               buffer[3] |= TEA5767_ST_NOISE_CTL;
+
+       if (priv->ctrl.soft_mute)
+               buffer[3] |= TEA5767_SOFT_MUTE;
+
+       if (priv->ctrl.japan_band)
+               buffer[3] |= TEA5767_JAPAN_BAND;
+
+       buffer[4] = 0;
+
+       if (priv->ctrl.deemph_75)
+               buffer[4] |= TEA5767_DEEMPH_75;
+
+       if (priv->ctrl.pllref)
+               buffer[4] |= TEA5767_PLLREF_ENABLE;
+
+
+       /* Rounds freq to next decimal value - for 62.5 KHz step */
+       /* frq = 20*(frq/16)+radio_frq[frq%16]; */
+
+       switch (priv->ctrl.xtal_freq) {
        case TEA5767_HIGH_LO_13MHz:
                tuner_dbg("radio HIGH LO inject xtal @ 13 MHz\n");
                buffer[2] |= TEA5767_HIGH_LO_INJECT;
-               buffer[4] |= TEA5767_PLLREF_ENABLE;
                div = (frq * (4000 / 16) + 700000 + 225000 + 25000) / 50000;
                break;
        case TEA5767_LOW_LO_13MHz:
                tuner_dbg("radio LOW LO inject xtal @ 13 MHz\n");
 
-               buffer[4] |= TEA5767_PLLREF_ENABLE;
                div = (frq * (4000 / 16) - 700000 - 225000 + 25000) / 50000;
                break;
        case TEA5767_LOW_LO_32768:
@@ -256,7 +273,7 @@ static int set_radio_freq(struct dvb_frontend *fe,
                if (5 != (rc = tuner_i2c_xfer_recv(&priv->i2c_props, buffer, 5)))
                        tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);
                else
-                       tea5767_status_dump(buffer);
+                       tea5767_status_dump(priv, buffer);
        }
 
        priv->frequency = frq * 125 / 2;
@@ -376,13 +393,7 @@ int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr)
                return EINVAL;
        }
 
-       /* It seems that tea5767 returns 0xff after the 5th byte */
-       if ((buffer[5] != 0xff) || (buffer[6] != 0xff)) {
-               printk(KERN_WARNING "Returned more than 5 bytes. It is not a TEA5767\n");
-               return EINVAL;
-       }
 
-       printk(KERN_WARNING "TEA5767 detected.\n");
        return 0;
 }
 
@@ -398,6 +409,16 @@ static int tea5767_get_frequency(struct dvb_frontend *fe, u32 *frequency)
 {
        struct tea5767_priv *priv = fe->tuner_priv;
        *frequency = priv->frequency;
+
+       return 0;
+}
+
+static int tea5767_set_config (struct dvb_frontend *fe, void *priv_cfg)
+{
+       struct tea5767_priv *priv = fe->tuner_priv;
+
+       memcpy(&priv->ctrl, priv_cfg, sizeof(priv->ctrl));
+
        return 0;
 }
 
@@ -407,6 +428,7 @@ static struct dvb_tuner_ops tea5767_tuner_ops = {
        },
 
        .set_analog_params = set_radio_freq,
+       .set_config        = tea5767_set_config,
        .sleep             = tea5767_standby,
        .release           = tea5767_release,
        .get_frequency     = tea5767_get_frequency,
@@ -425,8 +447,16 @@ struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
                return NULL;
        fe->tuner_priv = priv;
 
-       priv->i2c_props.addr = i2c_addr;
-       priv->i2c_props.adap = i2c_adap;
+       priv->i2c_props.addr  = i2c_addr;
+       priv->i2c_props.adap  = i2c_adap;
+       priv->i2c_props.name  = "tea5767";
+
+       priv->ctrl.xtal_freq  = TEA5767_HIGH_LO_32768;
+       priv->ctrl.port1      = 1;
+       priv->ctrl.port2      = 1;
+       priv->ctrl.high_cut   = 1;
+       priv->ctrl.st_noise   = 1;
+       priv->ctrl.japan_band = 1;
 
        memcpy(&fe->ops.tuner_ops, &tea5767_tuner_ops,
               sizeof(struct dvb_tuner_ops));
@@ -436,7 +466,6 @@ struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
        return fe;
 }
 
-
 EXPORT_SYMBOL_GPL(tea5767_attach);
 EXPORT_SYMBOL_GPL(tea5767_autodetection);