1 files changed, 59 insertions, 13 deletions

diff --git a/drivers/media/common/tuners/tda18212.c b/drivers/media/common/tuners/tda18212.c
index e29cc2bc113..602c2e392b1 100644
--- a/drivers/media/common/tuners/tda18212.c
+++ b/drivers/media/common/tuners/tda18212.c
@@ -25,6 +25,8 @@
 struct tda18212_priv {
         struct tda18212_config *cfg;
         struct i2c_adapter *i2c;
+
+        u32 if_frequency;
 };
 
 #define dbg(fmt, arg...)                                        \
@@ -128,20 +130,31 @@ static void tda18212_dump_regs(struct tda18212_priv *priv)
 }
 #endif
 
-static int tda18212_set_params(struct dvb_frontend *fe,
-        struct dvb_frontend_parameters *p)
+static int tda18212_set_params(struct dvb_frontend *fe)
 {
         struct tda18212_priv *priv = fe->tuner_priv;
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret, i;
         u32 if_khz;
         u8 buf[9];
+        #define DVBT_6   0
+        #define DVBT_7   1
+        #define DVBT_8   2
+        #define DVBT2_6  3
+        #define DVBT2_7  4
+        #define DVBT2_8  5
+        #define DVBC_6   6
+        #define DVBC_8   7
         static const u8 bw_params[][3] = {
-                /*  0f    13    23 */
-                { 0xb3, 0x20, 0x03 }, /* DVB-T 6 MHz */
-                { 0xb3, 0x31, 0x01 }, /* DVB-T 7 MHz */
-                { 0xb3, 0x22, 0x01 }, /* DVB-T 8 MHz */
-                { 0x92, 0x53, 0x03 }, /* DVB-C */
+                     /* reg:   0f    13    23 */
+                [DVBT_6]  = { 0xb3, 0x20, 0x03 },
+                [DVBT_7]  = { 0xb3, 0x31, 0x01 },
+                [DVBT_8]  = { 0xb3, 0x22, 0x01 },
+                [DVBT2_6] = { 0xbc, 0x20, 0x03 },
+                [DVBT2_7] = { 0xbc, 0x72, 0x03 },
+                [DVBT2_8] = { 0xbc, 0x22, 0x01 },
+                [DVBC_6]  = { 0x92, 0x50, 0x03 },
+                [DVBC_8]  = { 0x92, 0x53, 0x03 },
         };
 
         dbg("delsys=%d RF=%d BW=%d\n",
@@ -155,24 +168,44 @@ static int tda18212_set_params(struct dvb_frontend *fe,
                 switch (c->bandwidth_hz) {
                 case 6000000:
                         if_khz = priv->cfg->if_dvbt_6;
-                        i = 0;
+                        i = DVBT_6;
                         break;
                 case 7000000:
                         if_khz = priv->cfg->if_dvbt_7;
-                        i = 1;
+                        i = DVBT_7;
                         break;
                 case 8000000:
                         if_khz = priv->cfg->if_dvbt_8;
-                        i = 2;
+                        i = DVBT_8;
                         break;
                 default:
                         ret = -EINVAL;
                         goto error;
                 }
                 break;
-        case SYS_DVBC_ANNEX_AC:
+        case SYS_DVBT2:
+                switch (c->bandwidth_hz) {
+                case 6000000:
+                        if_khz = priv->cfg->if_dvbt2_6;
+                        i = DVBT2_6;
+                        break;
+                case 7000000:
+                        if_khz = priv->cfg->if_dvbt2_7;
+                        i = DVBT2_7;
+                        break;
+                case 8000000:
+                        if_khz = priv->cfg->if_dvbt2_8;
+                        i = DVBT2_8;
+                        break;
+                default:
+                        ret = -EINVAL;
+                        goto error;
+                }
+                break;
+        case SYS_DVBC_ANNEX_A:
+        case SYS_DVBC_ANNEX_C:
                 if_khz = priv->cfg->if_dvbc;
-                i = 3;
+                i = DVBC_8;
                 break;
         default:
                 ret = -EINVAL;
@@ -194,7 +227,7 @@ static int tda18212_set_params(struct dvb_frontend *fe,
         buf[0] = 0x02;
         buf[1] = bw_params[i][1];
         buf[2] = 0x03; /* default value */
-        buf[3] = if_khz / 50;
+        buf[3] = DIV_ROUND_CLOSEST(if_khz, 50);
         buf[4] = ((c->frequency / 1000) >> 16) & 0xff;
         buf[5] = ((c->frequency / 1000) >>  8) & 0xff;
         buf[6] = ((c->frequency / 1000) >>  0) & 0xff;
@@ -204,6 +237,9 @@ static int tda18212_set_params(struct dvb_frontend *fe,
         if (ret)
                 goto error;
 
+        /* actual IF rounded as it is on register */
+        priv->if_frequency = buf[3] * 50 * 1000;
+
 exit:
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */
@@ -215,6 +251,15 @@ error:
         goto exit;
 }
 
+static int tda18212_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct tda18212_priv *priv = fe->tuner_priv;
+
+        *frequency = priv->if_frequency;
+
+        return 0;
+}
+
 static int tda18212_release(struct dvb_frontend *fe)
 {
         kfree(fe->tuner_priv);
@@ -234,6 +279,7 @@ static const struct dvb_tuner_ops tda18212_tuner_ops = {
         .release       = tda18212_release,
 
         .set_params    = tda18212_set_params,
+        .get_if_frequency = tda18212_get_if_frequency,
 };
 
 struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,