diff options
| author | Antti Palosaari <crope@iki.fi> | 2016-08-12 16:58:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-09-22 10:42:21 -0300 |
| commit | d51dc917616c6c52daeeea3f93418f48f484ade5 (patch) | |
| tree | 4b3ec6a0627ba340d4ca17f38356350e57929885 /drivers/media/dvb-frontends/cxd2820r_c.c | |
| parent | c98975f92c1d488b273f10edfc6c48bab1c6e046 (diff) | |
| download | lwn-d51dc917616c6c52daeeea3f93418f48f484ade5.tar.gz lwn-d51dc917616c6c52daeeea3f93418f48f484ade5.zip | |
[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>
Diffstat (limited to 'drivers/media/dvb-frontends/cxd2820r_c.c')
| -rw-r--r-- | drivers/media/dvb-frontends/cxd2820r_c.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/drivers/media/dvb-frontends/cxd2820r_c.c b/drivers/media/dvb-frontends/cxd2820r_c.c index beb46a620160..0f96add3e69a 100644 --- 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) { |