[media] cxd2820r: improve lock detection

Check demod and ts locks and report lock status according to those.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/dvb-frontends/cxd2820r_c.c b/drivers/media/dvb-frontends/cxd2820r_c.c
index beb46a620160de08e718361391e0d4ac883ce185..0f96add3e69aa49b1ce328076babcef9e27be13d 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2820r_c.c
+++ b/drivers/media/dvb-frontends/cxd2820r_c.c
@@ -160,25 +160,32 @@ int cxd2820r_read_status_c(struct dvb_frontend *fe, enum fe_status *status)
        struct i2c_client *client = priv->client[0];
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        int ret;
-       unsigned int utmp;
+       unsigned int utmp, utmp1, utmp2;
        u8 buf[3];
-       *status = 0;
 
-       ret = cxd2820r_rd_regs(priv, 0x10088, buf, 2);
+       /* Lock detection */
+       ret = cxd2820r_rd_reg(priv, 0x10088, &buf[0]);
+       if (ret)
+               goto error;
+       ret = cxd2820r_rd_reg(priv, 0x10073, &buf[1]);
        if (ret)
                goto error;
 
-       if (((buf[0] >> 0) & 0x01) == 1) {
-               *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |
-                       FE_HAS_VITERBI | FE_HAS_SYNC;
+       utmp1 = (buf[0] >> 0) & 0x01;
+       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;
-               }
+       if (utmp1 == 1 && utmp2 == 1) {
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER |
+                         FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
+       } else if (utmp1 == 1 || utmp2 == 1) {
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER |
+                         FE_HAS_VITERBI | FE_HAS_SYNC;
+       } else {
+               *status = 0;
        }
 
-       dev_dbg(&client->dev, "lock=%*ph\n", 2, 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) {

diff --git a/drivers/media/dvb-frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c
index 174d916d1aaaadb46f25ffb4a4f1f148a207a883..19f72cd2d01bb17ecb2f372dc1e5da0c9a6dc1a8 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2820r_t.c
+++ b/drivers/media/dvb-frontends/cxd2820r_t.c
@@ -265,42 +265,32 @@ int cxd2820r_read_status_t(struct dvb_frontend *fe, enum fe_status *status)
        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];
 
+       /* Lock detection */
        ret = cxd2820r_rd_reg(priv, 0x00010, &buf[0]);
+       if (ret)
+               goto error;
+       ret = cxd2820r_rd_reg(priv, 0x00073, &buf[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(&client->dev, "lock=%*ph\n", 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) {

diff --git a/drivers/media/dvb-frontends/cxd2820r_t2.c b/drivers/media/dvb-frontends/cxd2820r_t2.c
index 939a68d808f8d2cf9410628b6d3a69aa3558460f..4a6fbf8d242ba8ffc95531ca6344dd0ec493b3db 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2820r_t2.c
+++ b/drivers/media/dvb-frontends/cxd2820r_t2.c
@@ -293,25 +293,29 @@ int cxd2820r_read_status_t2(struct dvb_frontend *fe, enum fe_status *status)
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        struct i2c_client *client = priv->client[0];
        int ret;
-       unsigned int utmp;
+       unsigned int utmp, utmp1, utmp2;
        u8 buf[4];
-       *status = 0;
 
+       /* Lock detection */
        ret = cxd2820r_rd_reg(priv, 0x02010 , &buf[0]);
        if (ret)
                goto error;
 
-       if ((buf[0] & 0x07) == 6) {
-               if (((buf[0] >> 5) & 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;
-               }
+       utmp1 = (buf[0] >> 0) & 0x07;
+       utmp2 = (buf[0] >> 5) & 0x01;
+
+       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 {
+               *status = 0;
        }
 
-       dev_dbg(&client->dev, "lock=%*ph\n", 1, buf);
+       dev_dbg(&client->dev, "status=%02x raw=%*ph sync=%u ts=%u\n",
+               *status, 1, buf, utmp1, utmp2);
 
        /* Signal strength */
        if (*status & FE_HAS_SIGNAL) {