[media] cxd2820r: switch to .get_if_frequency()

All tuners used with cxd2820r offers IF frequency so switch that.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/media/dvb/frontends/cxd2820r_c.c b/drivers/media/dvb/frontends/cxd2820r_c.c
index b85f5011e344..c4128773f2ee 100644
--- a/drivers/media/dvb/frontends/cxd2820r_c.c
+++ b/drivers/media/dvb/frontends/cxd2820r_c.c
@@ -28,6 +28,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret, i;
         u8 buf[2];
+        u32 if_freq;
         u16 if_ctl;
         u64 num;
         struct reg_val_mask tab[] = {
@@ -70,7 +71,17 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
         priv->delivery_system = SYS_DVBC_ANNEX_AC;
         priv->ber_running = 0; /* tune stops BER counter */
 
-        num = priv->cfg.if_dvbc;
+        /* program IF frequency */
+        if (fe->ops.tuner_ops.get_if_frequency) {
+                ret = fe->ops.tuner_ops.get_if_frequency(fe, &if_freq);
+                if (ret)
+                        goto error;
+        } else
+                if_freq = 0;
+
+        dbg("%s: if_freq=%d", __func__, if_freq);
+
+        num = if_freq / 1000; /* Hz => kHz */
         num *= 0x4000;
         if_ctl = cxd2820r_div_u64_round_closest(num, 41000);
         buf[0] = (if_ctl >> 8) & 0x3f;