15 files changed, 200 insertions, 123 deletions

diff --git a/drivers/media/common/tuners/mt2060.c b/drivers/media/common/tuners/mt2060.c
index 1305b0e63ce5..12206d75dd4e 100644
--- a/drivers/media/common/tuners/mt2060.c
+++ b/drivers/media/common/tuners/mt2060.c
@@ -170,6 +170,9 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
         b[0] = REG_LO1B1;
         b[1] = 0xFF;
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
         mt2060_writeregs(priv,b,2);
 
         freq = params->frequency / 1000; // Hz -> kHz
@@ -233,6 +236,9 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
                 i++;
         } while (i<10);
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
         return ret;
 }
 
@@ -296,13 +302,35 @@ static int mt2060_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
 static int mt2060_init(struct dvb_frontend *fe)
 {
         struct mt2060_priv *priv = fe->tuner_priv;
-        return mt2060_writereg(priv, REG_VGAG, (priv->cfg->clock_out << 6) | 0x33);
+        int ret;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
+        ret = mt2060_writereg(priv, REG_VGAG,
+                              (priv->cfg->clock_out << 6) | 0x33);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
+        return ret;
 }
 
 static int mt2060_sleep(struct dvb_frontend *fe)
 {
         struct mt2060_priv *priv = fe->tuner_priv;
-        return mt2060_writereg(priv, REG_VGAG, (priv->cfg->clock_out << 6) | 0x30);
+        int ret;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
+        ret = mt2060_writereg(priv, REG_VGAG,
+                              (priv->cfg->clock_out << 6) | 0x30);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
+        return ret;
 }
 
 static int mt2060_release(struct dvb_frontend *fe)
@@ -344,6 +372,9 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter
         priv->i2c      = i2c;
         priv->if1_freq = if1;
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
         if (mt2060_readreg(priv,REG_PART_REV,&id) != 0) {
                 kfree(priv);
                 return NULL;
@@ -360,6 +391,9 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter
 
         mt2060_calibrate(priv);
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
         return fe;
 }
 EXPORT_SYMBOL(mt2060_attach);
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
index cb25e43502fe..64379f2bf237 100644
--- a/drivers/media/common/tuners/mxl5007t.c
+++ b/drivers/media/common/tuners/mxl5007t.c
@@ -979,7 +979,6 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
         switch (instance) {
         case 0:
                 goto fail;
-                break;
         case 1:
                 /* new tuner instance */
                 state->config = cfg;
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index 93063c6fbbf6..1b48b5d0bf1e 100644
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -1155,7 +1155,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
         switch (instance) {
         case 0:
                 goto fail;
-                break;
         case 1:
                 /* new tuner instance */
                 priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c
index 8555d9cf9051..4a74f65e759a 100644
--- a/drivers/media/common/tuners/tda827x.c
+++ b/drivers/media/common/tuners/tda827x.c
@@ -447,17 +447,19 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
                         else
                                 arg = 0;
                 }
-                if (priv->cfg->tuner_callback)
-                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
-                                                                gp_func, arg);
+                if (fe->callback)
+                        fe->callback(priv->i2c_adap->algo_data,
+                                     DVB_FRONTEND_COMPONENT_TUNER,
+                                     gp_func, arg);
                 buf[1] = high ? 0 : 1;
                 if (priv->cfg->config == 2)
                         buf[1] = high ? 1 : 0;
                 i2c_transfer(priv->i2c_adap, &msg, 1);
                 break;
         case 3: /* switch with GPIO of saa713x */
-                if (priv->cfg->tuner_callback)
-                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data, 0, high);
+                if (fe->callback)
+                        fe->callback(priv->i2c_adap->algo_data,
+                                     DVB_FRONTEND_COMPONENT_TUNER, 0, high);
                 break;
         }
 }
diff --git a/drivers/media/common/tuners/tda827x.h b/drivers/media/common/tuners/tda827x.h
index 7850a9a1dc8f..7d72ce0a0c2d 100644
--- a/drivers/media/common/tuners/tda827x.h
+++ b/drivers/media/common/tuners/tda827x.h
@@ -36,7 +36,6 @@ struct tda827x_config
         /* interface to tda829x driver */
         unsigned int config;
         int          switch_addr;
-        int (*tuner_callback) (void *dev, int command, int arg);
 
         void (*agcf)(struct dvb_frontend *fe);
 };
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c
index 91204d3f282d..c112bdd4e0f0 100644
--- a/drivers/media/common/tuners/tda8290.c
+++ b/drivers/media/common/tuners/tda8290.c
@@ -672,10 +672,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
         priv->i2c_props.addr     = i2c_addr;
         priv->i2c_props.adap     = i2c_adap;
         priv->i2c_props.name     = "tda829x";
-        if (cfg) {
+        if (cfg)
                 priv->cfg.config         = cfg->lna_cfg;
-                priv->cfg.tuner_callback = cfg->tuner_callback;
-        }
 
         if (tda8290_probe(&priv->i2c_props) == 0) {
                 priv->ver = TDA8290;
diff --git a/drivers/media/common/tuners/tda8290.h b/drivers/media/common/tuners/tda8290.h
index aa074f3f0c07..7e288b26fcc3 100644
--- a/drivers/media/common/tuners/tda8290.h
+++ b/drivers/media/common/tuners/tda8290.h
@@ -22,7 +22,6 @@
 
 struct tda829x_config {
         unsigned int lna_cfg;
-        int (*tuner_callback) (void *dev, int command, int arg);
 
         unsigned int probe_tuner:1;
 #define TDA829X_PROBE_TUNER 0
diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c
index 72abf0b73486..ff1788cc5d48 100644
--- a/drivers/media/common/tuners/tda9887.c
+++ b/drivers/media/common/tuners/tda9887.c
@@ -686,7 +686,6 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
         case 0:
                 mutex_unlock(&tda9887_list_mutex);
                 return NULL;
-                break;
         case 1:
                 fe->analog_demod_priv = priv;
                 priv->mode = T_STANDBY;
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index aa773a658a2a..2a1aac1cc755 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -142,6 +142,7 @@ static inline int tuner_stereo(const int type, const int status)
         case TUNER_PHILIPS_FM1236_MK3:
         case TUNER_PHILIPS_FM1256_IH3:
         case TUNER_LG_NTSC_TAPE:
+        case TUNER_TCL_MF02GIP_5N:
                 return ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
         default:
                 return status & TUNER_STEREO;
@@ -494,6 +495,7 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer)
         case TUNER_PHILIPS_FMD1216ME_MK3:
         case TUNER_LG_NTSC_TAPE:
         case TUNER_PHILIPS_FM1256_IH3:
+        case TUNER_TCL_MF02GIP_5N:
                 buffer[3] = 0x19;
                 break;
         case TUNER_TNF_5335MF:
@@ -1038,7 +1040,6 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
         case 0:
                 mutex_unlock(&tuner_simple_list_mutex);
                 return NULL;
-                break;
         case 1:
                 fe->tuner_priv = priv;
 
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c
index 10dddca8b5d1..04961a1f44be 100644
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -1216,6 +1216,23 @@ static struct tuner_params tuner_samsung_tcpg_6121p30a_params[] = {
         },
 };
 
+/* ------------ TUNER_TCL_MF02GIP-5N-E - TCL MF02GIP-5N ------------ */
+
+static struct tuner_range tuner_tcl_mf02gip_5n_ntsc_ranges[] = {
+        { 16 * 172.00 /*MHz*/, 0x8e, 0x01, },
+        { 16 * 448.00 /*MHz*/, 0x8e, 0x02, },
+        { 16 * 999.99        , 0x8e, 0x04, },
+};
+
+static struct tuner_params tuner_tcl_mf02gip_5n_params[] = {
+        {
+                .type   = TUNER_PARAM_TYPE_NTSC,
+                .ranges = tuner_tcl_mf02gip_5n_ntsc_ranges,
+                .count  = ARRAY_SIZE(tuner_tcl_mf02gip_5n_ntsc_ranges),
+                .cb_first_if_lower_freq = 1,
+        },
+};
+
 /* --------------------------------------------------------------------- */
 
 struct tunertype tuners[] = {
@@ -1641,6 +1658,11 @@ struct tunertype tuners[] = {
                 .name   = "Xceive 5000 tuner",
                 /* see xc5000.c for details */
         },
+        [TUNER_TCL_MF02GIP_5N] = { /* TCL tuner MF02GIP-5N-E */
+                .name   = "TCL tuner MF02GIP-5N-E",
+                .params = tuner_tcl_mf02gip_5n_params,
+                .count  = ARRAY_SIZE(tuner_tcl_mf02gip_5n_params),
+        },
 };
 EXPORT_SYMBOL(tuners);
 
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index 4dd1d2421cc5..b65e6803e6c6 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -71,9 +71,6 @@ struct firmware_properties {
 struct xc2028_data {
         struct list_head        hybrid_tuner_instance_list;
         struct tuner_i2c_props  i2c_props;
-        int                     (*tuner_callback) (void *dev,
-                                                   int command, int arg);
-        void                    *video_dev;
         __u32                   frequency;
 
         struct firmware_description *firm;
@@ -492,6 +489,23 @@ ret:
         return i;
 }
 
+static inline int do_tuner_callback(struct dvb_frontend *fe, int cmd, int arg)
+{
+        struct xc2028_data *priv = fe->tuner_priv;
+
+        /* analog side (tuner-core) uses i2c_adap->algo_data.
+         * digital side is not guaranteed to have algo_data defined.
+         *
+         * digital side will always have fe->dvb defined.
+         * analog side (tuner-core) doesn't (yet) define fe->dvb.
+         */
+
+        return (!fe->callback) ? -EINVAL :
+                fe->callback(((fe->dvb) && (fe->dvb->priv)) ?
+                                fe->dvb->priv : priv->i2c_props.adap->algo_data,
+                             DVB_FRONTEND_COMPONENT_TUNER, cmd, arg);
+}
+
 static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                          v4l2_std_id *id)
 {
@@ -530,8 +544,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 
                 if (!size) {
                         /* Special callback command received */
-                        rc = priv->tuner_callback(priv->video_dev,
-                                                  XC2028_TUNER_RESET, 0);
+                        rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);
                         if (rc < 0) {
                                 tuner_err("Error at RESET code %d\n",
                                            (*p) & 0x7f);
@@ -542,8 +555,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                 if (size >= 0xff00) {
                         switch (size) {
                         case 0xff00:
-                                rc = priv->tuner_callback(priv->video_dev,
-                                                        XC2028_RESET_CLK, 0);
+                                rc = do_tuner_callback(fe, XC2028_RESET_CLK, 0);
                                 if (rc < 0) {
                                         tuner_err("Error at RESET code %d\n",
                                                   (*p) & 0x7f);
@@ -715,8 +727,7 @@ retry:
         memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
 
         /* Reset is needed before loading firmware */
-        rc = priv->tuner_callback(priv->video_dev,
-                                  XC2028_TUNER_RESET, 0);
+        rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);
         if (rc < 0)
                 goto fail;
 
@@ -933,7 +944,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
            The reset CLK is needed only with tm6000.
            Driver should work fine even if this fails.
          */
-        priv->tuner_callback(priv->video_dev, XC2028_RESET_CLK, 1);
+        do_tuner_callback(fe, XC2028_RESET_CLK, 1);
 
         msleep(10);
 
@@ -1002,11 +1013,6 @@ static int xc2028_set_params(struct dvb_frontend *fe,
 
         tuner_dbg("%s called\n", __func__);
 
-        if (priv->ctrl.d2633)
-                type |= D2633;
-        else
-                type |= D2620;
-
         switch(fe->ops.info.type) {
         case FE_OFDM:
                 bw = p->u.ofdm.bandwidth;
@@ -1021,10 +1027,8 @@ static int xc2028_set_params(struct dvb_frontend *fe,
                 break;
         case FE_ATSC:
                 bw = BANDWIDTH_6_MHZ;
-                /* The only ATSC firmware (at least on v2.7) is D2633,
-                   so overrides ctrl->d2633 */
-                type |= ATSC| D2633;
-                type &= ~D2620;
+                /* The only ATSC firmware (at least on v2.7) is D2633 */
+                type |= ATSC | D2633;
                 break;
         /* DVB-S is not supported */
         default:
@@ -1057,6 +1061,28 @@ static int xc2028_set_params(struct dvb_frontend *fe,
                 tuner_err("error: bandwidth not supported.\n");
         };
 
+        /*
+          Selects between D2633 or D2620 firmware.
+          It doesn't make sense for ATSC, since it should be D2633 on all cases
+         */
+        if (fe->ops.info.type != FE_ATSC) {
+                switch (priv->ctrl.type) {
+                case XC2028_D2633:
+                        type |= D2633;
+                        break;
+                case XC2028_D2620:
+                        type |= D2620;
+                        break;
+                case XC2028_AUTO:
+                default:
+                        /* Zarlink seems to need D2633 */
+                        if (priv->ctrl.demod == XC3028_FE_ZARLINK456)
+                                type |= D2633;
+                        else
+                                type |= D2620;
+                }
+        }
+
         /* All S-code tables need a 200kHz shift */
         if (priv->ctrl.demod)
                 demod = priv->ctrl.demod + 200;
@@ -1177,20 +1203,10 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                 break;
         case 1:
                 /* new tuner instance */
-                priv->tuner_callback = cfg->callback;
                 priv->ctrl.max_len = 13;
 
                 mutex_init(&priv->lock);
 
-                /* analog side (tuner-core) uses i2c_adap->algo_data.
-                 * digital side is not guaranteed to have algo_data defined.
-                 *
-                 * digital side will always have fe->dvb defined.
-                 * analog side (tuner-core) doesn't (yet) define fe->dvb.
-                 */
-                priv->video_dev = ((fe->dvb) && (fe->dvb->priv)) ?
-                                   fe->dvb->priv : cfg->i2c_adap->algo_data;
-
                 fe->tuner_priv = priv;
                 break;
         case 2:
diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/common/tuners/tuner-xc2028.h
index 216025cf5d4b..19de7928a74e 100644
--- a/drivers/media/common/tuners/tuner-xc2028.h
+++ b/drivers/media/common/tuners/tuner-xc2028.h
@@ -10,6 +10,7 @@
 #include "dvb_frontend.h"
 
 #define XC2028_DEFAULT_FIRMWARE "xc3028-v27.fw"
+#define XC3028L_DEFAULT_FIRMWARE "xc3028L-v36.fw"
 
 /*      Dmoduler                IF (kHz) */
 #define XC3028_FE_DEFAULT       0               /* Don't load SCODE */
@@ -23,24 +24,28 @@
 #define XC3028_FE_ZARLINK456    4560
 #define XC3028_FE_CHINA         5200
 
+enum firmware_type {
+        XC2028_AUTO = 0,        /* By default, auto-detects */
+        XC2028_D2633,
+        XC2028_D2620,
+};
+
 struct xc2028_ctrl {
         char                    *fname;
         int                     max_len;
         unsigned int            scode_table;
         unsigned int            mts   :1;
-        unsigned int            d2633 :1;
         unsigned int            input1:1;
         unsigned int            vhfbw7:1;
         unsigned int            uhfbw8:1;
         unsigned int            demod;
+        enum firmware_type      type:2;
 };
 
 struct xc2028_config {
         struct i2c_adapter *i2c_adap;
         u8                 i2c_addr;
-        void               *video_dev;
         struct xc2028_ctrl *ctrl;
-        int                (*callback) (void *dev, int command, int arg);
 };
 
 /* xc2028 commands for callback */
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index dcddfa803a75..f9c2bb917f54 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -30,7 +30,7 @@
 #include "dvb_frontend.h"
 
 #include "xc5000.h"
-#include "xc5000_priv.h"
+#include "tuner-i2c.h"
 
 static int debug;
 module_param(debug, int, 0644);
@@ -40,12 +40,26 @@ 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);
+
 #define dprintk(level,fmt, arg...) if (debug >= level) \
         printk(KERN_INFO "%s: " fmt, "xc5000", ## arg)
 
 #define XC5000_DEFAULT_FIRMWARE "dvb-fe-xc5000-1.1.fw"
 #define XC5000_DEFAULT_FIRMWARE_SIZE 12332
 
+struct xc5000_priv {
+        struct tuner_i2c_props i2c_props;
+        struct list_head hybrid_tuner_instance_list;
+
+        u32 if_khz;
+        u32 freq_hz;
+        u32 bandwidth;
+        u8  video_standard;
+        u8  rf_mode;
+};
+
 /* Misc Defines */
 #define MAX_TV_STANDARD                 23
 #define XC_MAX_I2C_WRITE_LENGTH         64
@@ -216,9 +230,12 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)
 
         dprintk(1, "%s()\n", __func__);
 
-        if (priv->cfg->tuner_callback) {
-                ret = priv->cfg->tuner_callback(priv->devptr,
-                                                XC5000_TUNER_RESET, 0);
+        if (fe->callback) {
+                ret = fe->callback(((fe->dvb) && (fe->dvb->priv)) ?
+                                           fe->dvb->priv :
+                                           priv->i2c_props.adap->algo_data,
+                                           DVB_FRONTEND_COMPONENT_TUNER,
+                                           XC5000_TUNER_RESET, 0);
                 if (ret)
                         printk(KERN_ERR "xc5000: reset failed\n");
         } else
@@ -509,13 +526,13 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
         u8 buf[2] = { reg >> 8, reg & 0xff };
         u8 bval[2] = { 0, 0 };
         struct i2c_msg msg[2] = {
-                { .addr = priv->cfg->i2c_address,
+                { .addr = priv->i2c_props.addr,
                         .flags = 0, .buf = &buf[0], .len = 2 },
-                { .addr = priv->cfg->i2c_address,
+                { .addr = priv->i2c_props.addr,
                         .flags = I2C_M_RD, .buf = &bval[0], .len = 2 },
         };
 
-        if (i2c_transfer(priv->i2c, msg, 2) != 2) {
+        if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {
                 printk(KERN_WARNING "xc5000: I2C read failed\n");
                 return -EREMOTEIO;
         }
@@ -526,10 +543,10 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
 
 static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len)
 {
-        struct i2c_msg msg = { .addr = priv->cfg->i2c_address,
+        struct i2c_msg msg = { .addr = priv->i2c_props.addr,
                 .flags = 0, .buf = buf, .len = len };
 
-        if (i2c_transfer(priv->i2c, &msg, 1) != 1) {
+        if (i2c_transfer(priv->i2c_props.adap, &msg, 1) != 1) {
                 printk(KERN_ERR "xc5000: I2C write failed (len=%i)\n",
                         (int)len);
                 return -EREMOTEIO;
@@ -539,10 +556,10 @@ static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len)
 
 static int xc5000_readregs(struct xc5000_priv *priv, u8 *buf, u8 len)
 {
-        struct i2c_msg msg = { .addr = priv->cfg->i2c_address,
+        struct i2c_msg msg = { .addr = priv->i2c_props.addr,
                 .flags = I2C_M_RD, .buf = buf, .len = len };
 
-        if (i2c_transfer(priv->i2c, &msg, 1) != 1) {
+        if (i2c_transfer(priv->i2c_props.adap, &msg, 1) != 1) {
                 printk(KERN_ERR "xc5000 I2C read failed (len=%i)\n",(int)len);
                 return -EREMOTEIO;
         }
@@ -559,7 +576,7 @@ static int xc5000_fwupload(struct dvb_frontend* fe)
         printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n",
                 XC5000_DEFAULT_FIRMWARE);
 
-        ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE, &priv->i2c->dev);
+        ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE, &priv->i2c_props.adap->dev);
         if (ret) {
                 printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n");
                 ret = XC_RESULT_RESET_FAILURE;
@@ -675,10 +692,10 @@ static int xc5000_set_params(struct dvb_frontend *fe,
                 return -EREMOTEIO;
         }
 
-        ret = xc_set_IF_frequency(priv, priv->cfg->if_khz);
+        ret = xc_set_IF_frequency(priv, priv->if_khz);
         if (ret != XC_RESULT_SUCCESS) {
                 printk(KERN_ERR "xc5000: xc_Set_IF_frequency(%d) failed\n",
-                        priv->cfg->if_khz);
+                       priv->if_khz);
                 return -EIO;
         }
 
@@ -897,9 +914,19 @@ static int xc5000_init(struct dvb_frontend *fe)
 
 static int xc5000_release(struct dvb_frontend *fe)
 {
+        struct xc5000_priv *priv = fe->tuner_priv;
+
         dprintk(1, "%s()\n", __func__);
-        kfree(fe->tuner_priv);
+
+        mutex_lock(&xc5000_list_mutex);
+
+        if (priv)
+                hybrid_tuner_release_state(priv);
+
+        mutex_unlock(&xc5000_list_mutex);
+
         fe->tuner_priv = NULL;
+
         return 0;
 }
 
@@ -924,29 +951,43 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = {
 
 struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
                                    struct i2c_adapter *i2c,
-                                   struct xc5000_config *cfg, void *devptr)
+                                   struct xc5000_config *cfg)
 {
         struct xc5000_priv *priv = NULL;
+        int instance;
         u16 id = 0;
 
-        dprintk(1, "%s()\n", __func__);
+        dprintk(1, "%s(%d-%04x)\n", __func__,
+                i2c ? i2c_adapter_id(i2c) : -1,
+                cfg ? cfg->i2c_address : -1);
 
-        priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL);
-        if (priv == NULL)
-                return NULL;
+        mutex_lock(&xc5000_list_mutex);
 
-        priv->cfg = cfg;
-        priv->bandwidth = BANDWIDTH_6_MHZ;
-        priv->i2c = i2c;
-        priv->devptr = devptr;
+        instance = hybrid_tuner_request_state(struct xc5000_priv, priv,
+                                              hybrid_tuner_instance_list,
+                                              i2c, cfg->i2c_address, "xc5000");
+        switch (instance) {
+        case 0:
+                goto fail;
+                break;
+        case 1:
+                /* new tuner instance */
+                priv->bandwidth = BANDWIDTH_6_MHZ;
+                priv->if_khz = cfg->if_khz;
+
+                fe->tuner_priv = priv;
+                break;
+        default:
+                /* existing tuner instance */
+                fe->tuner_priv = priv;
+                break;
+        }
 
         /* Check if firmware has been loaded. It is possible that another
            instance of the driver has loaded the firmware.
          */
-        if (xc5000_readreg(priv, XREG_PRODUCT_ID, &id) != 0) {
-                kfree(priv);
-                return NULL;
-        }
+        if (xc5000_readreg(priv, XREG_PRODUCT_ID, &id) != 0)
+                goto fail;
 
         switch(id) {
         case XC_PRODUCT_ID_FW_LOADED:
@@ -967,19 +1008,23 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
                 printk(KERN_ERR
                         "xc5000: Device not found at addr 0x%02x (0x%x)\n",
                         cfg->i2c_address, id);
-                kfree(priv);
-                return NULL;
+                goto fail;
         }
 
+        mutex_unlock(&xc5000_list_mutex);
+
         memcpy(&fe->ops.tuner_ops, &xc5000_tuner_ops,
                 sizeof(struct dvb_tuner_ops));
 
-        fe->tuner_priv = priv;
-
         if (xc5000_load_fw_on_attach)
                 xc5000_init(fe);
 
         return fe;
+fail:
+        mutex_unlock(&xc5000_list_mutex);
+
+        xc5000_release(fe);
+        return NULL;
 }
 EXPORT_SYMBOL(xc5000_attach);
 
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index 5389f740945a..cf1a558e0e7f 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -30,8 +30,6 @@ struct i2c_adapter;
 struct xc5000_config {
         u8   i2c_address;
         u32  if_khz;
-
-        int  (*tuner_callback) (void *priv, int command, int arg);
 };
 
 /* xc5000 callback command */
@@ -49,13 +47,11 @@ struct xc5000_config {
     (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) && defined(MODULE))
 extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                           struct i2c_adapter *i2c,
-                                          struct xc5000_config *cfg,
-                                          void *devptr);
+                                          struct xc5000_config *cfg);
 #else
 static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                                  struct i2c_adapter *i2c,
-                                                 struct xc5000_config *cfg,
-                                                 void *devptr)
+                                                 struct xc5000_config *cfg)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
diff --git a/drivers/media/common/tuners/xc5000_priv.h b/drivers/media/common/tuners/xc5000_priv.h
deleted file mode 100644
index b2a0074c99c9..000000000000
--- a/drivers/media/common/tuners/xc5000_priv.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"
- *
- *  Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef XC5000_PRIV_H
-#define XC5000_PRIV_H
-
-struct xc5000_priv {
-        struct xc5000_config *cfg;
-        struct i2c_adapter   *i2c;
-
-        u32 freq_hz;
-        u32 bandwidth;
-        u8  video_standard;
-        u8  rf_mode;
-
-        void *devptr;
-};
-
-#endif