V4L/DVB: Cleanups for mt2060-integration

[deliverable/linux.git] / drivers / media / dvb / dvb-usb / dibusb-common.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 4d3d0d3dab950641c4837bf6cf48f70b5c8b7fb1..e079ba95d3841f30fd92a11da4e5d295a99ce623 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -168,63 +168,61 @@ int dibusb_read_eeprom_byte(struct dvb_usb_device *d, u8 offs, u8 *val)
 }
 EXPORT_SYMBOL(dibusb_read_eeprom_byte);
 
-static struct mt2060_config default_mt2060_config = {
+static struct mt2060_config stk3000p_mt2060_config = {
        .i2c_address = 0x60,
 };
 
 static int dibusb_tuner_init(struct dvb_frontend *fe)
 {
-       int ret;
        struct dvb_usb_device *d = fe->dvb->priv;
        struct dibusb_state *st = d->priv;
 
-       if (d->tuner_pass_ctrl) {
-               if ((int)d->fe->misc_priv==DIBUSB_TUNER_MT2060) { // Microtune MT2060
-                       d->tuner_pass_ctrl(d->fe,1,default_mt2060_config.i2c_address);
-                       ret=mt2060_init(&st->mt2060);
-               }
-               else { // Panasonic whatever
-                       d->tuner_pass_ctrl(d->fe,1,d->pll_addr);
-                       ret=dvb_usb_pll_init_i2c(fe);
-               }
-               d->tuner_pass_ctrl(d->fe,0,0);
+       if (d->tuner_pass_ctrl && st->mt2060_present) {
+               int ret;
+               d->tuner_pass_ctrl(d->fe, 1, stk3000p_mt2060_config.i2c_address);
+               ret = mt2060_init(&st->mt2060);
+               d->tuner_pass_ctrl(d->fe, 0, 0);
                return ret;
        }
-       return -ENODEV;
+       return dvb_usb_pll_init_i2c(fe);
 }
 
 static int dibusb_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
 {
-       int ret;
        struct dvb_usb_device *d = fe->dvb->priv;
        struct dibusb_state *st = d->priv;
 
-       if (d->tuner_pass_ctrl) {
-               if ((int)d->fe->misc_priv==DIBUSB_TUNER_MT2060) {
-                       d->tuner_pass_ctrl(d->fe,1,default_mt2060_config.i2c_address);
-                       ret=mt2060_set(&st->mt2060,fep);
-               }
-               else {
-                       d->tuner_pass_ctrl(d->fe,1,d->pll_addr);
-                       ret=dvb_usb_pll_set_i2c(fe,fep);
-               }
+       if (d->tuner_pass_ctrl && st->mt2060_present) {
+               int ret;
+               d->tuner_pass_ctrl(d->fe, 1, stk3000p_mt2060_config.i2c_address);
+               ret = mt2060_set(&st->mt2060,fep);
                d->tuner_pass_ctrl(d->fe,0,0);
                return ret;
        }
-       return -ENODEV;
+       return dvb_usb_pll_set_i2c(fe,fep);
 }
 
+static const struct dib3000p_agc_config dib3000p_agc_panasonic_env57h1xd5 = {
+       { 0x51, 0x301d, 0x0, 0x1cc7, 0xdc29, 0x570a,
+       0xbae1, 0x8ccd, 0x3b6d, 0x551d, 0xa, 0x951e }
+};
+
+static const struct dib3000p_agc_config dib3000p_agc_microtune_mt2060 = {
+       { 0x196, 0x301d, 0x0, 0x1cc7, 0xffff, 0x5c29,
+       0xa8f6, 0x5eb8, 0x65ff, 0x40ff, 0x8a, 0x1114 }
+};
+
 int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d)
 {
        struct dib3000_config demod_cfg;
        struct dibusb_state *st = d->priv;
 
-       demod_cfg.pll_set = dibusb_tuner_set;
+       demod_cfg.agc      = &dib3000p_agc_panasonic_env57h1xd5;
+       demod_cfg.pll_set  = dibusb_tuner_set;
        demod_cfg.pll_init = dibusb_tuner_init;
 
        for (demod_cfg.demod_address = 0x8; demod_cfg.demod_address < 0xd; demod_cfg.demod_address++)
                if ((d->fe = dib3000mc_attach(&demod_cfg,&d->i2c_adap,&st->ops)) != NULL) {
-                       d->fe->misc_priv=(void *)DIBUSB_TUNER_DEFAULT;
                        d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl;
                        return 0;
                }
@@ -236,18 +234,23 @@ EXPORT_SYMBOL(dibusb_dib3000mc_frontend_attach);
 int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)
 {
        int ret;
-       d->pll_addr = 0x60;
-       d->pll_desc = &dvb_pll_env57h1xd5;
+
        if (d->tuner_pass_ctrl) {
                struct dibusb_state *st = d->priv;
-               d->tuner_pass_ctrl(d->fe,1,default_mt2060_config.i2c_address);
-               if ((ret = mt2060_attach(&st->mt2060,&default_mt2060_config, &d->i2c_adap)) == 0) {
-                       d->fe->misc_priv=(void *)DIBUSB_TUNER_MT2060;
+               d->tuner_pass_ctrl(d->fe, 1, stk3000p_mt2060_config.i2c_address);
+               /* check for mt2060 */
+               if ((ret = mt2060_attach(&st->mt2060,&stk3000p_mt2060_config, &d->i2c_adap)) != 0) {
+                       /* not found - use panasonic pll parameters */
+                       d->pll_addr = 0x60;
+                       d->pll_desc = &dvb_pll_env57h1xd5;
+               } else {
+                       st->mt2060_present = 1;
+                       /* set the correct agc parameters for the dib3000p */
+                       dib3000mc_set_agc_config(d->fe, &dib3000p_agc_microtune_mt2060);
                }
                d->tuner_pass_ctrl(d->fe,0,0);
-               return 0;
        }
-       return -ENODEV;
+       return 0;
 }
 EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);