lkml.org 
[lkml]   [2014]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 067/137] [media] tda10071: force modulation to QPSK on DVB-S
    Date
    3.11.10.15 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Antti Palosaari <crope@iki.fi>

    commit db4175ae2095634dbecd4c847da439f9c83e1b3b upstream.

    Only supported modulation for DVB-S is QPSK. Modulation parameter
    contains invalid value for DVB-S on some cases, which leads driver
    refusing tuning attempt. Due to that, hard code modulation to QPSK
    in case of DVB-S.

    Signed-off-by: Antti Palosaari <crope@iki.fi>
    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/media/dvb-frontends/tda10071.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
    index 36eb27d3fdf1..def7812d7b22 100644
    --- a/drivers/media/dvb-frontends/tda10071.c
    +++ b/drivers/media/dvb-frontends/tda10071.c
    @@ -667,6 +667,7 @@ static int tda10071_set_frontend(struct dvb_frontend *fe)
    struct dtv_frontend_properties *c = &fe->dtv_property_cache;
    int ret, i;
    u8 mode, rolloff, pilot, inversion, div;
    + fe_modulation_t modulation;

    dev_dbg(&priv->i2c->dev, "%s: delivery_system=%d modulation=%d " \
    "frequency=%d symbol_rate=%d inversion=%d pilot=%d " \
    @@ -701,10 +702,13 @@ static int tda10071_set_frontend(struct dvb_frontend *fe)

    switch (c->delivery_system) {
    case SYS_DVBS:
    + modulation = QPSK;
    rolloff = 0;
    pilot = 2;
    break;
    case SYS_DVBS2:
    + modulation = c->modulation;
    +
    switch (c->rolloff) {
    case ROLLOFF_20:
    rolloff = 2;
    @@ -749,7 +753,7 @@ static int tda10071_set_frontend(struct dvb_frontend *fe)

    for (i = 0, mode = 0xff; i < ARRAY_SIZE(TDA10071_MODCOD); i++) {
    if (c->delivery_system == TDA10071_MODCOD[i].delivery_system &&
    - c->modulation == TDA10071_MODCOD[i].modulation &&
    + modulation == TDA10071_MODCOD[i].modulation &&
    c->fec_inner == TDA10071_MODCOD[i].fec) {
    mode = TDA10071_MODCOD[i].val;
    dev_dbg(&priv->i2c->dev, "%s: mode found=%02x\n",
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-08-18 12:21    [W:4.214 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site