diff options
Diffstat (limited to 'drivers/media/dvb-frontends/cxd2880')
| -rw-r--r-- | drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_driver_version.h | 4 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_driver_version.h b/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_driver_version.h index fab55038b37b..c6d6c8dd16a1 100644 --- a/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_driver_version.h +++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_driver_version.h @@ -7,6 +7,6 @@ * Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions Corporation */ -#define CXD2880_TNRDMD_DRIVER_VERSION "1.4.1 - 1.0.4" +#define CXD2880_TNRDMD_DRIVER_VERSION "1.4.1 - 1.0.5" -#define CXD2880_TNRDMD_DRIVER_RELEASE_DATE "2018-01-17" +#define CXD2880_TNRDMD_DRIVER_RELEASE_DATE "2018-04-25" diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c index d474dc1b05da..bd9101e246d5 100644 --- a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c +++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c @@ -520,6 +520,15 @@ static int cxd2880_init(struct dvb_frontend *fe) pr_err("cxd2880 integ init failed %d\n", ret); return ret; } + + ret = cxd2880_tnrdmd_set_cfg(&priv->tnrdmd, + CXD2880_TNRDMD_CFG_TSPIN_CURRENT, + 0x00); + if (ret) { + mutex_unlock(priv->spi_mutex); + pr_err("cxd2880 set config failed %d\n", ret); + return ret; + } mutex_unlock(priv->spi_mutex); pr_debug("OK.\n"); @@ -1126,7 +1135,7 @@ static int cxd2880_get_stats(struct dvb_frontend *fe, priv = fe->demodulator_priv; c = &fe->dtv_property_cache; - if (!(status & FE_HAS_LOCK)) { + if (!(status & FE_HAS_LOCK) || !(status & FE_HAS_CARRIER)) { c->pre_bit_error.len = 1; c->pre_bit_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE; c->pre_bit_count.len = 1; @@ -1345,7 +1354,8 @@ static int cxd2880_read_status(struct dvb_frontend *fe, pr_debug("status %d\n", *status); - if (priv->s == 0 && (*status & FE_HAS_LOCK)) { + if (priv->s == 0 && (*status & FE_HAS_LOCK) && + (*status & FE_HAS_CARRIER)) { mutex_lock(priv->spi_mutex); if (c->delivery_system == SYS_DVBT) { ret = cxd2880_set_ber_per_period_t(fe); |