1 files changed, 75 insertions, 36 deletions

diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 6ca533ea0f0..1bff7f457e1 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -224,47 +224,86 @@ static int tda10021_init (struct dvb_frontend *fe)
         return 0;
 }
 
-static int tda10021_set_parameters (struct dvb_frontend *fe,
-                            struct dvb_frontend_parameters *p)
+struct qam_params {
+        u8 conf, agcref, lthr, mseth, aref;
+};
+
+static int tda10021_set_parameters(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        u32 delsys  = c->delivery_system;
+        unsigned qam = c->modulation;
+        bool is_annex_c;
+        u32 reg0x3d;
         struct tda10021_state* state = fe->demodulator_priv;
+        static const struct qam_params qam_params[] = {
+                /* Modulation  Conf  AGCref  LTHR  MSETH  AREF */
+                [QPSK]     = { 0x14, 0x78,   0x78, 0x8c,  0x96 },
+                [QAM_16]   = { 0x00, 0x8c,   0x87, 0xa2,  0x91 },
+                [QAM_32]   = { 0x04, 0x8c,   0x64, 0x74,  0x96 },
+                [QAM_64]   = { 0x08, 0x6a,   0x46, 0x43,  0x6a },
+                [QAM_128]  = { 0x0c, 0x78,   0x36, 0x34,  0x7e },
+                [QAM_256]  = { 0x10, 0x5c,   0x26, 0x23,  0x6b },
+        };
+
+        switch (delsys) {
+        case SYS_DVBC_ANNEX_A:
+                is_annex_c = false;
+                break;
+        case SYS_DVBC_ANNEX_C:
+                is_annex_c = true;
+                break;
+        default:
+                return -EINVAL;
+        }
 
-        //table for QAM4-QAM256 ready  QAM4  QAM16 QAM32 QAM64 QAM128 QAM256
-        //CONF
-        static const u8 reg0x00 [] = { 0x14, 0x00, 0x04, 0x08, 0x0c,  0x10 };
-        //AGCREF value
-        static const u8 reg0x01 [] = { 0x78, 0x8c, 0x8c, 0x6a, 0x78,  0x5c };
-        //LTHR value
-        static const u8 reg0x05 [] = { 0x78, 0x87, 0x64, 0x46, 0x36,  0x26 };
-        //MSETH
-        static const u8 reg0x08 [] = { 0x8c, 0xa2, 0x74, 0x43, 0x34,  0x23 };
-        //AREF
-        static const u8 reg0x09 [] = { 0x96, 0x91, 0x96, 0x6a, 0x7e,  0x6b };
-
-        int qam = p->u.qam.modulation;
-
-        if (qam < 0 || qam > 5)
+        /*
+         * gcc optimizes the code bellow the same way as it would code:
+         *           "if (qam > 5) return -EINVAL;"
+         * Yet, the code is clearer, as it shows what QAM standards are
+         * supported by the driver, and avoids the usage of magic numbers on
+         * it.
+         */
+        switch (qam) {
+        case QPSK:
+        case QAM_16:
+        case QAM_32:
+        case QAM_64:
+        case QAM_128:
+        case QAM_256:
+                break;
+        default:
                 return -EINVAL;
+        }
 
-        if (p->inversion != INVERSION_ON && p->inversion != INVERSION_OFF)
+        if (c->inversion != INVERSION_ON && c->inversion != INVERSION_OFF)
                 return -EINVAL;
 
-        //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate);
+        /*printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->symbol_rate);*/
 
         if (fe->ops.tuner_ops.set_params) {
-                fe->ops.tuner_ops.set_params(fe, p);
+                fe->ops.tuner_ops.set_params(fe);
                 if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
-        tda10021_set_symbolrate (state, p->u.qam.symbol_rate);
-        _tda10021_writereg (state, 0x34, state->pwm);
-
-        _tda10021_writereg (state, 0x01, reg0x01[qam]);
-        _tda10021_writereg (state, 0x05, reg0x05[qam]);
-        _tda10021_writereg (state, 0x08, reg0x08[qam]);
-        _tda10021_writereg (state, 0x09, reg0x09[qam]);
-
-        tda10021_setup_reg0 (state, reg0x00[qam], p->inversion);
+        tda10021_set_symbolrate(state, c->symbol_rate);
+        _tda10021_writereg(state, 0x34, state->pwm);
+
+        _tda10021_writereg(state, 0x01, qam_params[qam].agcref);
+        _tda10021_writereg(state, 0x05, qam_params[qam].lthr);
+        _tda10021_writereg(state, 0x08, qam_params[qam].mseth);
+        _tda10021_writereg(state, 0x09, qam_params[qam].aref);
+
+        /*
+         * Bit 0 == 0 means roll-off = 0.15 (Annex A)
+         *       == 1 means roll-off = 0.13 (Annex C)
+         */
+        reg0x3d = tda10021_readreg (state, 0x3d);
+        if (is_annex_c)
+                _tda10021_writereg (state, 0x3d, 0x01 | reg0x3d);
+        else
+                _tda10021_writereg (state, 0x3d, 0xfe & reg0x3d);
+        tda10021_setup_reg0(state, qam_params[qam].conf, c->inversion);
 
         return 0;
 }
@@ -347,8 +386,9 @@ static int tda10021_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         return 0;
 }
 
-static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int tda10021_get_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct tda10021_state* state = fe->demodulator_priv;
         int sync;
         s8 afc = 0;
@@ -360,17 +400,17 @@ static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
                 printk(sync & 2 ? "DVB: TDA10021(%d): AFC (%d) %dHz\n" :
                                   "DVB: TDA10021(%d): [AFC (%d) %dHz]\n",
                         state->frontend.dvb->num, afc,
-                       -((s32)p->u.qam.symbol_rate * afc) >> 10);
+                       -((s32)p->symbol_rate * afc) >> 10);
         }
 
         p->inversion = ((state->reg0 & 0x20) == 0x20) ^ (state->config->invert != 0) ? INVERSION_ON : INVERSION_OFF;
-        p->u.qam.modulation = ((state->reg0 >> 2) & 7) + QAM_16;
+        p->modulation = ((state->reg0 >> 2) & 7) + QAM_16;
 
-        p->u.qam.fec_inner = FEC_NONE;
+        p->fec_inner = FEC_NONE;
         p->frequency = ((p->frequency + 31250) / 62500) * 62500;
 
         if (sync & 2)
-                p->frequency -= ((s32)p->u.qam.symbol_rate * afc) >> 10;
+                p->frequency -= ((s32)p->symbol_rate * afc) >> 10;
 
         return 0;
 }
@@ -444,10 +484,9 @@ error:
 }
 
 static struct dvb_frontend_ops tda10021_ops = {
-
+        .delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_C },
         .info = {
                 .name = "Philips TDA10021 DVB-C",
-                .type = FE_QAM,
                 .frequency_stepsize = 62500,
                 .frequency_min = 47000000,
                 .frequency_max = 862000000,