Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
[cascardo/linux.git] / drivers / media / tuners / e4000.c
index 40c1da7..90d9334 100644 (file)
 #include "e4000_priv.h"
 #include <linux/math64.h>
 
-/* Max transfer size done by I2C transfer functions */
-#define MAX_XFER_SIZE  64
-
-/* write multiple registers */
-static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
-{
-       int ret;
-       u8 buf[MAX_XFER_SIZE];
-       struct i2c_msg msg[1] = {
-               {
-                       .addr = priv->cfg->i2c_addr,
-                       .flags = 0,
-                       .len = 1 + len,
-                       .buf = buf,
-               }
-       };
-
-       if (1 + len > sizeof(buf)) {
-               dev_warn(&priv->i2c->dev,
-                        "%s: i2c wr reg=%04x: len=%d is too big!\n",
-                        KBUILD_MODNAME, reg, len);
-               return -EINVAL;
-       }
-
-       buf[0] = reg;
-       memcpy(&buf[1], val, len);
-
-       ret = i2c_transfer(priv->i2c, msg, 1);
-       if (ret == 1) {
-               ret = 0;
-       } else {
-               dev_warn(&priv->i2c->dev,
-                               "%s: i2c wr failed=%d reg=%02x len=%d\n",
-                               KBUILD_MODNAME, ret, reg, len);
-               ret = -EREMOTEIO;
-       }
-       return ret;
-}
-
-/* read multiple registers */
-static int e4000_rd_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
-{
-       int ret;
-       u8 buf[MAX_XFER_SIZE];
-       struct i2c_msg msg[2] = {
-               {
-                       .addr = priv->cfg->i2c_addr,
-                       .flags = 0,
-                       .len = 1,
-                       .buf = &reg,
-               }, {
-                       .addr = priv->cfg->i2c_addr,
-                       .flags = I2C_M_RD,
-                       .len = len,
-                       .buf = buf,
-               }
-       };
-
-       if (len > sizeof(buf)) {
-               dev_warn(&priv->i2c->dev,
-                        "%s: i2c rd reg=%04x: len=%d is too big!\n",
-                        KBUILD_MODNAME, reg, len);
-               return -EINVAL;
-       }
-
-       ret = i2c_transfer(priv->i2c, msg, 2);
-       if (ret == 2) {
-               memcpy(val, buf, len);
-               ret = 0;
-       } else {
-               dev_warn(&priv->i2c->dev,
-                               "%s: i2c rd failed=%d reg=%02x len=%d\n",
-                               KBUILD_MODNAME, ret, reg, len);
-               ret = -EREMOTEIO;
-       }
-
-       return ret;
-}
-
-/* write single register */
-static int e4000_wr_reg(struct e4000_priv *priv, u8 reg, u8 val)
-{
-       return e4000_wr_regs(priv, reg, &val, 1);
-}
-
-/* read single register */
-static int e4000_rd_reg(struct e4000_priv *priv, u8 reg, u8 *val)
-{
-       return e4000_rd_regs(priv, reg, val, 1);
-}
-
 static int e4000_init(struct dvb_frontend *fe)
 {
-       struct e4000_priv *priv = fe->tuner_priv;
+       struct e4000 *s = fe->tuner_priv;
        int ret;
 
-       dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
+       dev_dbg(&s->client->dev, "%s:\n", __func__);
 
        /* dummy I2C to ensure I2C wakes up */
-       ret = e4000_wr_reg(priv, 0x02, 0x40);
+       ret = regmap_write(s->regmap, 0x02, 0x40);
 
        /* reset */
-       ret = e4000_wr_reg(priv, 0x00, 0x01);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x00, 0x01);
+       if (ret)
                goto err;
 
        /* disable output clock */
-       ret = e4000_wr_reg(priv, 0x06, 0x00);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x06, 0x00);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_reg(priv, 0x7a, 0x96);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x7a, 0x96);
+       if (ret)
                goto err;
 
        /* configure gains */
-       ret = e4000_wr_regs(priv, 0x7e, "\x01\xfe", 2);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x7e, "\x01\xfe", 2);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_reg(priv, 0x82, 0x00);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x82, 0x00);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_reg(priv, 0x24, 0x05);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x24, 0x05);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_regs(priv, 0x87, "\x20\x01", 2);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x87, "\x20\x01", 2);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_regs(priv, 0x9f, "\x7f\x07", 2);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x9f, "\x7f\x07", 2);
+       if (ret)
                goto err;
 
        /* DC offset control */
-       ret = e4000_wr_reg(priv, 0x2d, 0x1f);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x2d, 0x1f);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_regs(priv, 0x70, "\x01\x01", 2);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x70, "\x01\x01", 2);
+       if (ret)
                goto err;
 
        /* gain control */
-       ret = e4000_wr_reg(priv, 0x1a, 0x17);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x1a, 0x17);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_reg(priv, 0x1f, 0x1a);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x1f, 0x1a);
+       if (ret)
                goto err;
 
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
-
-       return 0;
+       s->active = true;
 err:
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
+       if (ret)
+               dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
 
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
        return ret;
 }
 
 static int e4000_sleep(struct dvb_frontend *fe)
 {
-       struct e4000_priv *priv = fe->tuner_priv;
+       struct e4000 *s = fe->tuner_priv;
        int ret;
 
-       dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
+       dev_dbg(&s->client->dev, "%s:\n", __func__);
 
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
+       s->active = false;
 
-       ret = e4000_wr_reg(priv, 0x00, 0x00);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x00, 0x00);
+       if (ret)
                goto err;
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
-
-       return 0;
 err:
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
+       if (ret)
+               dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
 
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
        return ret;
 }
 
 static int e4000_set_params(struct dvb_frontend *fe)
 {
-       struct e4000_priv *priv = fe->tuner_priv;
+       struct e4000 *s = fe->tuner_priv;
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        int ret, i, sigma_delta;
-       unsigned int f_vco;
+       unsigned int pll_n, pll_f;
+       u64 f_vco;
        u8 buf[5], i_data[4], q_data[4];
 
-       dev_dbg(&priv->i2c->dev,
-                       "%s: delivery_system=%d frequency=%d bandwidth_hz=%d\n",
+       dev_dbg(&s->client->dev,
+                       "%s: delivery_system=%d frequency=%u bandwidth_hz=%u\n",
                        __func__, c->delivery_system, c->frequency,
                        c->bandwidth_hz);
 
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
-
        /* gain control manual */
-       ret = e4000_wr_reg(priv, 0x1a, 0x00);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x1a, 0x00);
+       if (ret)
                goto err;
 
        /* PLL */
@@ -248,23 +141,21 @@ static int e4000_set_params(struct dvb_frontend *fe)
                goto err;
        }
 
-       /*
-        * Note: Currently f_vco overflows when c->frequency is 1 073 741 824 Hz
-        * or more.
-        */
-       f_vco = c->frequency * e4000_pll_lut[i].mul;
-       sigma_delta = div_u64(0x10000ULL * (f_vco % priv->cfg->clock), priv->cfg->clock);
-       buf[0] = f_vco / priv->cfg->clock;
+       f_vco = 1ull * c->frequency * e4000_pll_lut[i].mul;
+       pll_n = div_u64_rem(f_vco, s->clock, &pll_f);
+       sigma_delta = div_u64(0x10000ULL * pll_f, s->clock);
+       buf[0] = pll_n;
        buf[1] = (sigma_delta >> 0) & 0xff;
        buf[2] = (sigma_delta >> 8) & 0xff;
        buf[3] = 0x00;
        buf[4] = e4000_pll_lut[i].div;
 
-       dev_dbg(&priv->i2c->dev, "%s: f_vco=%u pll div=%d sigma_delta=%04x\n",
+       dev_dbg(&s->client->dev,
+                       "%s: f_vco=%llu pll div=%d sigma_delta=%04x\n",
                        __func__, f_vco, buf[0], sigma_delta);
 
-       ret = e4000_wr_regs(priv, 0x09, buf, 5);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x09, buf, 5);
+       if (ret)
                goto err;
 
        /* LNA filter (RF filter) */
@@ -278,8 +169,8 @@ static int e4000_set_params(struct dvb_frontend *fe)
                goto err;
        }
 
-       ret = e4000_wr_reg(priv, 0x10, e400_lna_filter_lut[i].val);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x10, e400_lna_filter_lut[i].val);
+       if (ret)
                goto err;
 
        /* IF filters */
@@ -296,8 +187,8 @@ static int e4000_set_params(struct dvb_frontend *fe)
        buf[0] = e4000_if_filter_lut[i].reg11_val;
        buf[1] = e4000_if_filter_lut[i].reg12_val;
 
-       ret = e4000_wr_regs(priv, 0x11, buf, 2);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x11, buf, 2);
+       if (ret)
                goto err;
 
        /* frequency band */
@@ -311,34 +202,34 @@ static int e4000_set_params(struct dvb_frontend *fe)
                goto err;
        }
 
-       ret = e4000_wr_reg(priv, 0x07, e4000_band_lut[i].reg07_val);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x07, e4000_band_lut[i].reg07_val);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_reg(priv, 0x78, e4000_band_lut[i].reg78_val);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x78, e4000_band_lut[i].reg78_val);
+       if (ret)
                goto err;
 
        /* DC offset */
        for (i = 0; i < 4; i++) {
                if (i == 0)
-                       ret = e4000_wr_regs(priv, 0x15, "\x00\x7e\x24", 3);
+                       ret = regmap_bulk_write(s->regmap, 0x15, "\x00\x7e\x24", 3);
                else if (i == 1)
-                       ret = e4000_wr_regs(priv, 0x15, "\x00\x7f", 2);
+                       ret = regmap_bulk_write(s->regmap, 0x15, "\x00\x7f", 2);
                else if (i == 2)
-                       ret = e4000_wr_regs(priv, 0x15, "\x01", 1);
+                       ret = regmap_bulk_write(s->regmap, 0x15, "\x01", 1);
                else
-                       ret = e4000_wr_regs(priv, 0x16, "\x7e", 1);
+                       ret = regmap_bulk_write(s->regmap, 0x16, "\x7e", 1);
 
-               if (ret < 0)
+               if (ret)
                        goto err;
 
-               ret = e4000_wr_reg(priv, 0x29, 0x01);
-               if (ret < 0)
+               ret = regmap_write(s->regmap, 0x29, 0x01);
+               if (ret)
                        goto err;
 
-               ret = e4000_rd_regs(priv, 0x2a, buf, 3);
-               if (ret < 0)
+               ret = regmap_bulk_read(s->regmap, 0x2a, buf, 3);
+               if (ret)
                        goto err;
 
                i_data[i] = (((buf[2] >> 0) & 0x3) << 6) | (buf[0] & 0x3f);
@@ -348,53 +239,226 @@ static int e4000_set_params(struct dvb_frontend *fe)
        swap(q_data[2], q_data[3]);
        swap(i_data[2], i_data[3]);
 
-       ret = e4000_wr_regs(priv, 0x50, q_data, 4);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x50, q_data, 4);
+       if (ret)
                goto err;
 
-       ret = e4000_wr_regs(priv, 0x60, i_data, 4);
-       if (ret < 0)
+       ret = regmap_bulk_write(s->regmap, 0x60, i_data, 4);
+       if (ret)
                goto err;
 
        /* gain control auto */
-       ret = e4000_wr_reg(priv, 0x1a, 0x17);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x1a, 0x17);
+       if (ret)
                goto err;
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
-
-       return 0;
 err:
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
+       if (ret)
+               dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
 
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
        return ret;
 }
 
 static int e4000_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
 {
-       struct e4000_priv *priv = fe->tuner_priv;
+       struct e4000 *s = fe->tuner_priv;
 
-       dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
+       dev_dbg(&s->client->dev, "%s:\n", __func__);
 
        *frequency = 0; /* Zero-IF */
 
        return 0;
 }
 
-static int e4000_release(struct dvb_frontend *fe)
+#if IS_ENABLED(CONFIG_VIDEO_V4L2)
+static int e4000_set_lna_gain(struct dvb_frontend *fe)
 {
-       struct e4000_priv *priv = fe->tuner_priv;
+       struct e4000 *s = fe->tuner_priv;
+       int ret;
+       u8 u8tmp;
+
+       dev_dbg(&s->client->dev, "%s: lna auto=%d->%d val=%d->%d\n",
+                       __func__, s->lna_gain_auto->cur.val,
+                       s->lna_gain_auto->val, s->lna_gain->cur.val,
+                       s->lna_gain->val);
+
+       if (s->lna_gain_auto->val && s->if_gain_auto->cur.val)
+               u8tmp = 0x17;
+       else if (s->lna_gain_auto->val)
+               u8tmp = 0x19;
+       else if (s->if_gain_auto->cur.val)
+               u8tmp = 0x16;
+       else
+               u8tmp = 0x10;
+
+       ret = regmap_write(s->regmap, 0x1a, u8tmp);
+       if (ret)
+               goto err;
+
+       if (s->lna_gain_auto->val == false) {
+               ret = regmap_write(s->regmap, 0x14, s->lna_gain->val);
+               if (ret)
+                       goto err;
+       }
+err:
+       if (ret)
+               dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
 
-       dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
+       return ret;
+}
 
-       kfree(fe->tuner_priv);
+static int e4000_set_mixer_gain(struct dvb_frontend *fe)
+{
+       struct e4000 *s = fe->tuner_priv;
+       int ret;
+       u8 u8tmp;
 
-       return 0;
+       dev_dbg(&s->client->dev, "%s: mixer auto=%d->%d val=%d->%d\n",
+                       __func__, s->mixer_gain_auto->cur.val,
+                       s->mixer_gain_auto->val, s->mixer_gain->cur.val,
+                       s->mixer_gain->val);
+
+       if (s->mixer_gain_auto->val)
+               u8tmp = 0x15;
+       else
+               u8tmp = 0x14;
+
+       ret = regmap_write(s->regmap, 0x20, u8tmp);
+       if (ret)
+               goto err;
+
+       if (s->mixer_gain_auto->val == false) {
+               ret = regmap_write(s->regmap, 0x15, s->mixer_gain->val);
+               if (ret)
+                       goto err;
+       }
+err:
+       if (ret)
+               dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
+
+       return ret;
 }
 
+static int e4000_set_if_gain(struct dvb_frontend *fe)
+{
+       struct e4000 *s = fe->tuner_priv;
+       int ret;
+       u8 buf[2];
+       u8 u8tmp;
+
+       dev_dbg(&s->client->dev, "%s: if auto=%d->%d val=%d->%d\n",
+                       __func__, s->if_gain_auto->cur.val,
+                       s->if_gain_auto->val, s->if_gain->cur.val,
+                       s->if_gain->val);
+
+       if (s->if_gain_auto->val && s->lna_gain_auto->cur.val)
+               u8tmp = 0x17;
+       else if (s->lna_gain_auto->cur.val)
+               u8tmp = 0x19;
+       else if (s->if_gain_auto->val)
+               u8tmp = 0x16;
+       else
+               u8tmp = 0x10;
+
+       ret = regmap_write(s->regmap, 0x1a, u8tmp);
+       if (ret)
+               goto err;
+
+       if (s->if_gain_auto->val == false) {
+               buf[0] = e4000_if_gain_lut[s->if_gain->val].reg16_val;
+               buf[1] = e4000_if_gain_lut[s->if_gain->val].reg17_val;
+               ret = regmap_bulk_write(s->regmap, 0x16, buf, 2);
+               if (ret)
+                       goto err;
+       }
+err:
+       if (ret)
+               dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
+
+       return ret;
+}
+
+static int e4000_pll_lock(struct dvb_frontend *fe)
+{
+       struct e4000 *s = fe->tuner_priv;
+       int ret;
+       unsigned int utmp;
+
+       ret = regmap_read(s->regmap, 0x07, &utmp);
+       if (ret)
+               goto err;
+
+       s->pll_lock->val = (utmp & 0x01);
+err:
+       if (ret)
+               dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
+
+       return ret;
+}
+
+static int e4000_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+       struct e4000 *s = container_of(ctrl->handler, struct e4000, hdl);
+       int ret;
+
+       if (s->active == false)
+               return 0;
+
+       switch (ctrl->id) {
+       case  V4L2_CID_RF_TUNER_PLL_LOCK:
+               ret = e4000_pll_lock(s->fe);
+               break;
+       default:
+               dev_dbg(&s->client->dev, "%s: unknown ctrl: id=%d name=%s\n",
+                               __func__, ctrl->id, ctrl->name);
+               ret = -EINVAL;
+       }
+
+       return ret;
+}
+
+static int e4000_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+       struct e4000 *s = container_of(ctrl->handler, struct e4000, hdl);
+       struct dvb_frontend *fe = s->fe;
+       struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+       int ret;
+
+       if (s->active == false)
+               return 0;
+
+       switch (ctrl->id) {
+       case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO:
+       case V4L2_CID_RF_TUNER_BANDWIDTH:
+               c->bandwidth_hz = s->bandwidth->val;
+               ret = e4000_set_params(s->fe);
+               break;
+       case  V4L2_CID_RF_TUNER_LNA_GAIN_AUTO:
+       case  V4L2_CID_RF_TUNER_LNA_GAIN:
+               ret = e4000_set_lna_gain(s->fe);
+               break;
+       case  V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO:
+       case  V4L2_CID_RF_TUNER_MIXER_GAIN:
+               ret = e4000_set_mixer_gain(s->fe);
+               break;
+       case  V4L2_CID_RF_TUNER_IF_GAIN_AUTO:
+       case  V4L2_CID_RF_TUNER_IF_GAIN:
+               ret = e4000_set_if_gain(s->fe);
+               break;
+       default:
+               dev_dbg(&s->client->dev, "%s: unknown ctrl: id=%d name=%s\n",
+                               __func__, ctrl->id, ctrl->name);
+               ret = -EINVAL;
+       }
+
+       return ret;
+}
+
+static const struct v4l2_ctrl_ops e4000_ctrl_ops = {
+       .g_volatile_ctrl = e4000_g_volatile_ctrl,
+       .s_ctrl = e4000_s_ctrl,
+};
+#endif
+
 static const struct dvb_tuner_ops e4000_tuner_ops = {
        .info = {
                .name           = "Elonics E4000",
@@ -402,8 +466,6 @@ static const struct dvb_tuner_ops e4000_tuner_ops = {
                .frequency_max  = 862000000,
        },
 
-       .release = e4000_release,
-
        .init = e4000_init,
        .sleep = e4000_sleep,
        .set_params = e4000_set_params,
@@ -411,62 +473,148 @@ static const struct dvb_tuner_ops e4000_tuner_ops = {
        .get_if_frequency = e4000_get_if_frequency,
 };
 
-struct dvb_frontend *e4000_attach(struct dvb_frontend *fe,
-               struct i2c_adapter *i2c, const struct e4000_config *cfg)
+/*
+ * Use V4L2 subdev to carry V4L2 control handler, even we don't implement
+ * subdev itself, just to avoid reinventing the wheel.
+ */
+static int e4000_probe(struct i2c_client *client,
+               const struct i2c_device_id *id)
 {
-       struct e4000_priv *priv;
+       struct e4000_config *cfg = client->dev.platform_data;
+       struct dvb_frontend *fe = cfg->fe;
+       struct e4000 *s;
        int ret;
-       u8 chip_id;
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
+       unsigned int utmp;
+       static const struct regmap_config regmap_config = {
+               .reg_bits = 8,
+               .val_bits = 8,
+               .max_register = 0xff,
+       };
 
-       priv = kzalloc(sizeof(struct e4000_priv), GFP_KERNEL);
-       if (!priv) {
+       s = kzalloc(sizeof(struct e4000), GFP_KERNEL);
+       if (!s) {
                ret = -ENOMEM;
-               dev_err(&i2c->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME);
+               dev_err(&client->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME);
                goto err;
        }
 
-       priv->cfg = cfg;
-       priv->i2c = i2c;
+       s->clock = cfg->clock;
+       s->client = client;
+       s->fe = cfg->fe;
+       s->regmap = devm_regmap_init_i2c(client, &regmap_config);
+       if (IS_ERR(s->regmap)) {
+               ret = PTR_ERR(s->regmap);
+               goto err;
+       }
 
        /* check if the tuner is there */
-       ret = e4000_rd_reg(priv, 0x02, &chip_id);
-       if (ret < 0)
+       ret = regmap_read(s->regmap, 0x02, &utmp);
+       if (ret)
                goto err;
 
-       dev_dbg(&priv->i2c->dev, "%s: chip_id=%02x\n", __func__, chip_id);
+       dev_dbg(&s->client->dev, "%s: chip id=%02x\n", __func__, utmp);
 
-       if (chip_id != 0x40)
+       if (utmp != 0x40) {
+               ret = -ENODEV;
                goto err;
+       }
 
        /* put sleep as chip seems to be in normal mode by default */
-       ret = e4000_wr_reg(priv, 0x00, 0x00);
-       if (ret < 0)
+       ret = regmap_write(s->regmap, 0x00, 0x00);
+       if (ret)
                goto err;
 
-       dev_info(&priv->i2c->dev,
+#if IS_ENABLED(CONFIG_VIDEO_V4L2)
+       /* Register controls */
+       v4l2_ctrl_handler_init(&s->hdl, 9);
+       s->bandwidth_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_BANDWIDTH_AUTO, 0, 1, 1, 1);
+       s->bandwidth = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_BANDWIDTH, 4300000, 11000000, 100000, 4300000);
+       v4l2_ctrl_auto_cluster(2, &s->bandwidth_auto, 0, false);
+       s->lna_gain_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_LNA_GAIN_AUTO, 0, 1, 1, 1);
+       s->lna_gain = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_LNA_GAIN, 0, 15, 1, 10);
+       v4l2_ctrl_auto_cluster(2, &s->lna_gain_auto, 0, false);
+       s->mixer_gain_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO, 0, 1, 1, 1);
+       s->mixer_gain = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_MIXER_GAIN, 0, 1, 1, 1);
+       v4l2_ctrl_auto_cluster(2, &s->mixer_gain_auto, 0, false);
+       s->if_gain_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_IF_GAIN_AUTO, 0, 1, 1, 1);
+       s->if_gain = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_IF_GAIN, 0, 54, 1, 0);
+       v4l2_ctrl_auto_cluster(2, &s->if_gain_auto, 0, false);
+       s->pll_lock = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
+                       V4L2_CID_RF_TUNER_PLL_LOCK,  0, 1, 1, 0);
+       if (s->hdl.error) {
+               ret = s->hdl.error;
+               dev_err(&s->client->dev, "Could not initialize controls\n");
+               v4l2_ctrl_handler_free(&s->hdl);
+               goto err;
+       }
+
+       s->sd.ctrl_handler = &s->hdl;
+#endif
+
+       dev_info(&s->client->dev,
                        "%s: Elonics E4000 successfully identified\n",
                        KBUILD_MODNAME);
 
-       fe->tuner_priv = priv;
+       fe->tuner_priv = s;
        memcpy(&fe->ops.tuner_ops, &e4000_tuner_ops,
                        sizeof(struct dvb_tuner_ops));
 
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
+       v4l2_set_subdevdata(&s->sd, client);
+       i2c_set_clientdata(client, &s->sd);
 
-       return fe;
+       return 0;
 err:
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
+       if (ret) {
+               dev_dbg(&client->dev, "%s: failed=%d\n", __func__, ret);
+               kfree(s);
+       }
+
+       return ret;
+}
+
+static int e4000_remove(struct i2c_client *client)
+{
+       struct v4l2_subdev *sd = i2c_get_clientdata(client);
+       struct e4000 *s = container_of(sd, struct e4000, sd);
+       struct dvb_frontend *fe = s->fe;
+
+       dev_dbg(&client->dev, "%s:\n", __func__);
 
-       dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
-       kfree(priv);
-       return NULL;
+#if IS_ENABLED(CONFIG_VIDEO_V4L2)
+       v4l2_ctrl_handler_free(&s->hdl);
+#endif
+       memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
+       fe->tuner_priv = NULL;
+       kfree(s);
+
+       return 0;
 }
-EXPORT_SYMBOL(e4000_attach);
+
+static const struct i2c_device_id e4000_id[] = {
+       {"e4000", 0},
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, e4000_id);
+
+static struct i2c_driver e4000_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "e4000",
+       },
+       .probe          = e4000_probe,
+       .remove         = e4000_remove,
+       .id_table       = e4000_id,
+};
+
+module_i2c_driver(e4000_driver);
 
 MODULE_DESCRIPTION("Elonics E4000 silicon tuner driver");
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");