projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[cascardo/linux.git] / drivers / media / dvb-frontends / cxd2820r_t.c
diff --git a/drivers/media/dvb-frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c
index e328fe2..c2e7caf 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2820r_t.c
+++ b/drivers/media/dvb-frontends/cxd2820r_t.c
@@ -24,8 +24,9 @@
 int cxd2820r_set_frontend_t(struct dvb_frontend *fe)
 {
        struct cxd2820r_priv *priv = fe->demodulator_priv;
+       struct i2c_client *client = priv->client[0];
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
-       int ret, i, bw_i;
+       int ret, bw_i;
        unsigned int utmp;
        u32 if_frequency;
        u8 buf[3], bw_param;
@@ -55,8 +56,10 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe)
                { 0x00427, 0x41, 0xff },
        };
 
-       dev_dbg(&priv->i2c->dev, "%s: frequency=%d bandwidth_hz=%d\n", __func__,
-                       c->frequency, c->bandwidth_hz);
+       dev_dbg(&client->dev,
+               "delivery_system=%d modulation=%d frequency=%u bandwidth_hz=%u inversion=%d\n",
+               c->delivery_system, c->modulation, c->frequency,
+               c->bandwidth_hz, c->inversion);
 
        switch (c->bandwidth_hz) {
        case 6000000:
@@ -80,12 +83,9 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe)
                fe->ops.tuner_ops.set_params(fe);
 
        if (priv->delivery_system != SYS_DVBT) {
-               for (i = 0; i < ARRAY_SIZE(tab); i++) {
-                       ret = cxd2820r_wr_reg_mask(priv, tab[i].reg,
-                               tab[i].val, tab[i].mask);
-                       if (ret)
-                               goto error;
-               }
+               ret = cxd2820r_wr_reg_val_mask_tab(priv, tab, ARRAY_SIZE(tab));
+               if (ret)
+                       goto error;
        }
 
        priv->delivery_system = SYS_DVBT;
@@ -96,8 +96,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe)
                ret = fe->ops.tuner_ops.get_if_frequency(fe, &if_frequency);
                if (ret)
                        goto error;
-               dev_dbg(&priv->i2c->dev, "%s: if_frequency=%u\n", __func__,
-                       if_frequency);
+               dev_dbg(&client->dev, "if_frequency=%u\n", if_frequency);
        } else {
                ret = -EINVAL;
                goto error;
@@ -107,33 +106,33 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe)
        buf[0] = (utmp >> 16) & 0xff;
        buf[1] = (utmp >>  8) & 0xff;
        buf[2] = (utmp >>  0) & 0xff;
-       ret = cxd2820r_wr_regs(priv, 0x000b6, buf, 3);
+       ret = regmap_bulk_write(priv->regmap[0], 0x00b6, buf, 3);
        if (ret)
                goto error;
 
-       ret = cxd2820r_wr_regs(priv, 0x0009f, bw_params1[bw_i], 5);
+       ret = regmap_bulk_write(priv->regmap[0], 0x009f, bw_params1[bw_i], 5);
        if (ret)
                goto error;
 
-       ret = cxd2820r_wr_reg_mask(priv, 0x000d7, bw_param << 6, 0xc0);
+       ret = regmap_update_bits(priv->regmap[0], 0x00d7, 0xc0, bw_param << 6);
        if (ret)
                goto error;
 
-       ret = cxd2820r_wr_regs(priv, 0x000d9, bw_params2[bw_i], 2);
+       ret = regmap_bulk_write(priv->regmap[0], 0x00d9, bw_params2[bw_i], 2);
        if (ret)
                goto error;
 
-       ret = cxd2820r_wr_reg(priv, 0x000ff, 0x08);
+       ret = regmap_write(priv->regmap[0], 0x00ff, 0x08);
        if (ret)
                goto error;
 
-       ret = cxd2820r_wr_reg(priv, 0x000fe, 0x01);
+       ret = regmap_write(priv->regmap[0], 0x00fe, 0x01);
        if (ret)
                goto error;
 
        return ret;
 error:
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
+       dev_dbg(&client->dev, "failed=%d\n", ret);
        return ret;
 }
 
@@ -141,10 +140,14 @@ int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
                            struct dtv_frontend_properties *c)
 {
        struct cxd2820r_priv *priv = fe->demodulator_priv;
+       struct i2c_client *client = priv->client[0];
        int ret;
+       unsigned int utmp;
        u8 buf[2];
 
-       ret = cxd2820r_rd_regs(priv, 0x0002f, buf, sizeof(buf));
+       dev_dbg(&client->dev, "\n");
+
+       ret = regmap_bulk_read(priv->regmap[0], 0x002f, buf, sizeof(buf));
        if (ret)
                goto error;
 
@@ -235,11 +238,11 @@ int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
                break;
        }
 
-       ret = cxd2820r_rd_reg(priv, 0x007c6, &buf[0]);
+       ret = regmap_read(priv->regmap[0], 0x07c6, &utmp);
        if (ret)
                goto error;
 
-       switch ((buf[0] >> 0) & 0x01) {
+       switch ((utmp >> 0) & 0x01) {
        case 0:
                c->inversion = INVERSION_OFF;
                break;
@@ -250,57 +253,48 @@ int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
 
        return ret;
 error:
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
+       dev_dbg(&client->dev, "failed=%d\n", ret);
        return ret;
 }
 
 int cxd2820r_read_status_t(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct cxd2820r_priv *priv = fe->demodulator_priv;
+       struct i2c_client *client = priv->client[0];
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        int ret;
-       unsigned int utmp;
-       u8 buf[4];
-       *status = 0;
+       unsigned int utmp, utmp1, utmp2;
+       u8 buf[3];
 
-       ret = cxd2820r_rd_reg(priv, 0x00010, &buf[0]);
+       /* Lock detection */
+       ret = regmap_bulk_read(priv->regmap[0], 0x0010, &buf[0], 1);
+       if (ret)
+               goto error;
+       ret = regmap_bulk_read(priv->regmap[0], 0x0073, &buf[1], 1);
        if (ret)
                goto error;
 
-       if ((buf[0] & 0x07) == 6) {
-               ret = cxd2820r_rd_reg(priv, 0x00073, &buf[1]);
-               if (ret)
-                       goto error;
+       utmp1 = (buf[0] >> 0) & 0x07;
+       utmp2 = (buf[1] >> 3) & 0x01;
 
-               if (((buf[1] >> 3) & 0x01) == 1) {
-                       *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |
-                               FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
-               } else {
-                       *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |
-                               FE_HAS_VITERBI | FE_HAS_SYNC;
-               }
+       if (utmp1 == 6 && utmp2 == 1) {
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER |
+                         FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
+       } else if (utmp1 == 6 || utmp2 == 1) {
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER |
+                         FE_HAS_VITERBI | FE_HAS_SYNC;
        } else {
-               ret = cxd2820r_rd_reg(priv, 0x00014, &buf[2]);
-               if (ret)
-                       goto error;
-
-               if ((buf[2] & 0x0f) >= 4) {
-                       ret = cxd2820r_rd_reg(priv, 0x00a14, &buf[3]);
-                       if (ret)
-                               goto error;
-
-                       if (((buf[3] >> 4) & 0x01) == 1)
-                               *status |= FE_HAS_SIGNAL;
-               }
+               *status = 0;
        }
 
-       dev_dbg(&priv->i2c->dev, "%s: lock=%*ph\n", __func__, 4, buf);
+       dev_dbg(&client->dev, "status=%02x raw=%*ph sync=%u ts=%u\n",
+               *status, 2, buf, utmp1, utmp2);
 
        /* Signal strength */
        if (*status & FE_HAS_SIGNAL) {
                unsigned int strength;
 
-               ret = cxd2820r_rd_regs(priv, 0x00026, buf, 2);
+               ret = regmap_bulk_read(priv->regmap[0], 0x0026, buf, 2);
                if (ret)
                        goto error;
 
@@ -321,7 +315,7 @@ int cxd2820r_read_status_t(struct dvb_frontend *fe, enum fe_status *status)
        if (*status & FE_HAS_VITERBI) {
                unsigned int cnr;
 
-               ret = cxd2820r_rd_regs(priv, 0x0002c, buf, 2);
+               ret = regmap_bulk_read(priv->regmap[0], 0x002c, buf, 2);
                if (ret)
                        goto error;
 
@@ -347,7 +341,7 @@ int cxd2820r_read_status_t(struct dvb_frontend *fe, enum fe_status *status)
                bool start_ber;
 
                if (priv->ber_running) {
-                       ret = cxd2820r_rd_regs(priv, 0x00076, buf, 3);
+                       ret = regmap_bulk_read(priv->regmap[0], 0x0076, buf, 3);
                        if (ret)
                                goto error;
 
@@ -366,7 +360,7 @@ int cxd2820r_read_status_t(struct dvb_frontend *fe, enum fe_status *status)
                }
 
                if (start_ber) {
-                       ret = cxd2820r_wr_reg(priv, 0x00079, 0x01);
+                       ret = regmap_write(priv->regmap[0], 0x0079, 0x01);
                        if (ret)
                                goto error;
                        priv->ber_running = true;
@@ -384,29 +378,33 @@ int cxd2820r_read_status_t(struct dvb_frontend *fe, enum fe_status *status)
 
        return ret;
 error:
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
+       dev_dbg(&client->dev, "failed=%d\n", ret);
        return ret;
 }
 
 int cxd2820r_init_t(struct dvb_frontend *fe)
 {
        struct cxd2820r_priv *priv = fe->demodulator_priv;
+       struct i2c_client *client = priv->client[0];
        int ret;
 
-       ret = cxd2820r_wr_reg(priv, 0x00085, 0x07);
+       dev_dbg(&client->dev, "\n");
+
+       ret = regmap_write(priv->regmap[0], 0x0085, 0x07);
        if (ret)
                goto error;
 
        return ret;
 error:
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
+       dev_dbg(&client->dev, "failed=%d\n", ret);
        return ret;
 }
 
 int cxd2820r_sleep_t(struct dvb_frontend *fe)
 {
        struct cxd2820r_priv *priv = fe->demodulator_priv;
-       int ret, i;
+       struct i2c_client *client = priv->client[0];
+       int ret;
        struct reg_val_mask tab[] = {
                { 0x000ff, 0x1f, 0xff },
                { 0x00085, 0x00, 0xff },
@@ -415,20 +413,17 @@ int cxd2820r_sleep_t(struct dvb_frontend *fe)
                { 0x00080, 0x00, 0xff },
        };
 
-       dev_dbg(&priv->i2c->dev, "%s\n", __func__);
+       dev_dbg(&client->dev, "\n");
 
        priv->delivery_system = SYS_UNDEFINED;
 
-       for (i = 0; i < ARRAY_SIZE(tab); i++) {
-               ret = cxd2820r_wr_reg_mask(priv, tab[i].reg, tab[i].val,
-                       tab[i].mask);
-               if (ret)
-                       goto error;
-       }
+       ret = cxd2820r_wr_reg_val_mask_tab(priv, tab, ARRAY_SIZE(tab));
+       if (ret)
+               goto error;
 
        return ret;
 error:
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
+       dev_dbg(&client->dev, "failed=%d\n", ret);
        return ret;
 }
 
Unnamed repository; edit this file 'description' to name the repository.