[media] dib7090: add the reference board TFE7090E

The intend of this patch is to add the support for the DiBcom reference
board TFE7090E.

Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr>
Signed-off-by: Patrick Boettcher <patrick.boettcher@dibcom.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

4 files changed, 211 insertions, 8 deletions

diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c
index 9030f3dc95f9..26c6c615f18d 100644
--- a/drivers/media/dvb/frontends/dib0090.c
+++ b/drivers/media/dvb/frontends/dib0090.c
@@ -717,6 +717,34 @@ static const u16 rf_ramp_pwm_cband_7090[] = {
         (0 << 10) | 109,        /* RF_RAMP4, LNA 4 */
 };
 
+static const uint16_t rf_ramp_pwm_cband_7090e_sensitivity[] = {
+        186,
+        40,
+        746,
+        (10 << 10) | 345,
+        (0  << 10) | 746,
+        (0 << 10) | 0,
+        (0  << 10) | 0,
+        (28 << 10) | 200,
+        (0  << 10) | 345,
+        (20 << 10) | 0,
+        (0  << 10) | 200,
+};
+
+static const uint16_t rf_ramp_pwm_cband_7090e_aci[] = {
+        86,
+        40,
+        345,
+        (0 << 10) | 0,
+        (0 << 10) | 0,
+        (0 << 10) | 0,
+        (0 << 10) | 0,
+        (28 << 10) | 200,
+        (0  << 10) | 345,
+        (20 << 10) | 0,
+        (0  << 10) | 200,
+};
+
 static const u16 rf_ramp_pwm_cband_8090[] = {
         345,                    /* max RF gain in 10th of dB */
         29,                     /* ramp_slope = 1dB of gain -> clock_ticks_per_db = clk_khz / ramp_slope -> RF_RAMP2 */
@@ -1076,8 +1104,16 @@ void dib0090_pwm_gain_reset(struct dvb_frontend *fe)
                                 dib0090_set_bbramp_pwm(state, bb_ramp_pwm_normal_socs);
                                 if (state->identity.version == SOC_8090_P1G_11R1 || state->identity.version == SOC_8090_P1G_21R1)
                                         dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_8090);
-                                else if (state->identity.version == SOC_7090_P1G_11R1 || state->identity.version == SOC_7090_P1G_21R1)
-                                        dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_7090);
+                                else if (state->identity.version == SOC_7090_P1G_11R1
+                                                || state->identity.version == SOC_7090_P1G_21R1) {
+                                        if (state->config->is_dib7090e) {
+                                                if (state->rf_ramp == NULL)
+                                                        dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_7090e_sensitivity);
+                                                else
+                                                        dib0090_set_rframp_pwm(state, state->rf_ramp);
+                                        } else
+                                                dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_7090);
+                                }
                         } else {
                                 dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband);
                                 dib0090_set_bbramp_pwm(state, bb_ramp_pwm_normal);
@@ -1313,7 +1349,7 @@ void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u16 * bb, u16 *
 
 EXPORT_SYMBOL(dib0090_get_current_gain);
 
-u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)
+u16 dib0090_get_wbd_target(struct dvb_frontend *fe)
 {
         struct dib0090_state *state = fe->tuner_priv;
         u32 f_MHz = state->fe->dtv_property_cache.frequency / 1000000;
@@ -1350,9 +1386,57 @@ u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)
 
         return state->wbd_offset + wbd_tcold;
 }
+EXPORT_SYMBOL(dib0090_get_wbd_target);
 
+u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        return state->wbd_offset;
+}
 EXPORT_SYMBOL(dib0090_get_wbd_offset);
 
+int dib0090_set_switch(struct dvb_frontend *fe, u8 sw1, u8 sw2, u8 sw3)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+
+        dib0090_write_reg(state, 0x0b, (dib0090_read_reg(state, 0x0b) & 0xfff8)
+                        | ((sw3 & 1) << 2) | ((sw2 & 1) << 1) | (sw1 & 1));
+
+        return 0;
+}
+EXPORT_SYMBOL(dib0090_set_switch);
+
+int dib0090_set_vga(struct dvb_frontend *fe, u8 onoff)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+
+        dib0090_write_reg(state, 0x09, (dib0090_read_reg(state, 0x09) & 0x7fff)
+                        | ((onoff & 1) << 15));
+        return 0;
+}
+EXPORT_SYMBOL(dib0090_set_vga);
+
+int dib0090_update_rframp_7090(struct dvb_frontend *fe, u8 cfg_sensitivity)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+
+        if ((!state->identity.p1g) || (!state->identity.in_soc)
+                        || ((state->identity.version != SOC_7090_P1G_21R1)
+                                && (state->identity.version != SOC_7090_P1G_11R1))) {
+                dprintk("%s() function can only be used for dib7090P", __func__);
+                return -ENODEV;
+        }
+
+        if (cfg_sensitivity)
+                state->rf_ramp = (const u16 *)&rf_ramp_pwm_cband_7090e_sensitivity;
+        else
+                state->rf_ramp = (const u16 *)&rf_ramp_pwm_cband_7090e_aci;
+        dib0090_pwm_gain_reset(fe);
+
+        return 0;
+}
+EXPORT_SYMBOL(dib0090_update_rframp_7090);
+
 static const u16 dib0090_defaults[] = {
 
         25, 0x01,
@@ -1962,6 +2046,52 @@ static const struct dib0090_tuning dib0090_tuning_table_cband_7090[] = {
 #endif
 };
 
+static const struct dib0090_tuning dib0090_tuning_table_cband_7090e_sensitivity[] = {
+#ifdef CONFIG_BAND_CBAND
+        { 300000,  0 ,  3,  0x8105, 0x2c0, 0x2d12, 0xb84e, EN_CAB },
+        { 380000,  0 ,  10, 0x810F, 0x2c0, 0x2d12, 0xb84e, EN_CAB },
+        { 600000,  0 ,  10, 0x815E, 0x280, 0x2d12, 0xb84e, EN_CAB },
+        { 660000,  0 ,  5,  0x85E3, 0x280, 0x2d12, 0xb84e, EN_CAB },
+        { 720000,  0 ,  5,  0x852E, 0x280, 0x2d12, 0xb84e, EN_CAB },
+        { 860000,  0 ,  4,  0x85E5, 0x280, 0x2d12, 0xb84e, EN_CAB },
+#endif
+};
+
+int dib0090_update_tuning_table_7090(struct dvb_frontend *fe,
+                u8 cfg_sensitivity)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        const struct dib0090_tuning *tune =
+                dib0090_tuning_table_cband_7090e_sensitivity;
+        const struct dib0090_tuning dib0090_tuning_table_cband_7090e_aci[] = {
+                { 300000,  0 ,  3,  0x8165, 0x2c0, 0x2d12, 0xb84e, EN_CAB },
+                { 650000,  0 ,  4,  0x815B, 0x280, 0x2d12, 0xb84e, EN_CAB },
+                { 860000,  0 ,  5,  0x84EF, 0x280, 0x2d12, 0xb84e, EN_CAB },
+        };
+
+        if ((!state->identity.p1g) || (!state->identity.in_soc)
+                        || ((state->identity.version != SOC_7090_P1G_21R1)
+                                && (state->identity.version != SOC_7090_P1G_11R1))) {
+                dprintk("%s() function can only be used for dib7090", __func__);
+                return -ENODEV;
+        }
+
+        if (cfg_sensitivity)
+                tune = dib0090_tuning_table_cband_7090e_sensitivity;
+        else
+                tune = dib0090_tuning_table_cband_7090e_aci;
+
+        while (state->rf_request > tune->max_freq)
+                tune++;
+
+        dib0090_write_reg(state, 0x09, (dib0090_read_reg(state, 0x09) & 0x8000)
+                        | (tune->lna_bias & 0x7fff));
+        dib0090_write_reg(state, 0x0b, (dib0090_read_reg(state, 0x0b) & 0xf83f)
+                        | ((tune->lna_tune << 6) & 0x07c0));
+        return 0;
+}
+EXPORT_SYMBOL(dib0090_update_tuning_table_7090);
+
 static int dib0090_captrim_search(struct dib0090_state *state, enum frontend_tune_state *tune_state)
 {
         int ret = 0;
@@ -2210,12 +2340,18 @@ static int dib0090_tune(struct dvb_frontend *fe)
                                         if (state->current_band & BAND_CBAND || state->current_band & BAND_FM || state->current_band & BAND_VHF
                                                         || state->current_band & BAND_UHF) {
                                                 state->current_band = BAND_CBAND;
-                                                tune = dib0090_tuning_table_cband_7090;
+                                                if (state->config->is_dib7090e)
+                                                        tune = dib0090_tuning_table_cband_7090e_sensitivity;
+                                                else
+                                                        tune = dib0090_tuning_table_cband_7090;
                                         }
                                 } else {        /* Use the CBAND input for all band under UHF */
                                         if (state->current_band & BAND_CBAND || state->current_band & BAND_FM || state->current_band & BAND_VHF) {
                                                 state->current_band = BAND_CBAND;
-                                                tune = dib0090_tuning_table_cband_7090;
+                                                if (state->config->is_dib7090e)
+                                                        tune = dib0090_tuning_table_cband_7090e_sensitivity;
+                                                else
+                                                        tune = dib0090_tuning_table_cband_7090;
                                         }
                                 }
                         } else
diff --git a/drivers/media/dvb/frontends/dib0090.h b/drivers/media/dvb/frontends/dib0090.h
index 648318ae40d2..781dc49de45b 100644
--- a/drivers/media/dvb/frontends/dib0090.h
+++ b/drivers/media/dvb/frontends/dib0090.h
@@ -80,14 +80,21 @@ extern struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c
 extern struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config);
 extern void dib0090_dcc_freq(struct dvb_frontend *fe, u8 fast);
 extern void dib0090_pwm_gain_reset(struct dvb_frontend *fe);
-extern u16 dib0090_get_wbd_offset(struct dvb_frontend *tuner);
+extern u16 dib0090_get_wbd_target(struct dvb_frontend *tuner);
+extern u16 dib0090_get_wbd_offset(struct dvb_frontend *fe);
 extern int dib0090_gain_control(struct dvb_frontend *fe);
 extern enum frontend_tune_state dib0090_get_tune_state(struct dvb_frontend *fe);
 extern int dib0090_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state);
 extern void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u16 * bb, u16 * rf_gain_limit, u16 * rflt);
 extern void dib0090_set_dc_servo(struct dvb_frontend *fe, u8 DC_servo_cutoff);
+extern int dib0090_set_switch(struct dvb_frontend *fe, u8 sw1, u8 sw2, u8 sw3);
+extern int dib0090_set_vga(struct dvb_frontend *fe, u8 onoff);
+extern int dib0090_update_rframp_7090(struct dvb_frontend *fe,
+                u8 cfg_sensitivity);
+extern int dib0090_update_tuning_table_7090(struct dvb_frontend *fe,
+                u8 cfg_sensitivity);
 #else
-static inline struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0090_config *config)
+static inline struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
@@ -109,7 +116,13 @@ static inline void dib0090_pwm_gain_reset(struct dvb_frontend *fe)
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 }
 
-static inline u16 dib0090_get_wbd_offset(struct dvb_frontend *tuner)
+static inline u16 dib0090_get_wbd_target(struct dvb_frontend *tuner)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return 0;
+}
+
+static inline u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return 0;
@@ -142,6 +155,33 @@ static inline void dib0090_set_dc_servo(struct dvb_frontend *fe, u8 DC_servo_cut
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 }
+
+static inline int dib0090_set_switch(struct dvb_frontend *fe,
+                u8 sw1, u8 sw2, u8 sw3)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+
+static inline int dib0090_set_vga(struct dvb_frontend *fe, u8 onoff)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+
+static inline int dib0090_update_rframp_7090(struct dvb_frontend *fe,
+                u8 cfg_sensitivity)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+
+static inline int dib0090_update_tuning_table_7090(struct dvb_frontend *fe,
+                u8 cfg_sensitivity)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
 #endif
 
 #endif
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 08e62a4c9603..2b52542cf5fe 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -418,6 +418,24 @@ int dib7000p_set_wbd_ref(struct dvb_frontend *demod, u16 value)
 }
 EXPORT_SYMBOL(dib7000p_set_wbd_ref);
 
+int dib7000p_get_agc_values(struct dvb_frontend *fe,
+                u16 *agc_global, u16 *agc1, u16 *agc2, u16 *wbd)
+{
+        struct dib7000p_state *state = fe->demodulator_priv;
+
+        if (agc_global != NULL)
+                *agc_global = dib7000p_read_word(state, 394);
+        if (agc1 != NULL)
+                *agc1 = dib7000p_read_word(state, 392);
+        if (agc2 != NULL)
+                *agc2 = dib7000p_read_word(state, 393);
+        if (wbd != NULL)
+                *wbd = dib7000p_read_word(state, 397);
+
+        return 0;
+}
+EXPORT_SYMBOL(dib7000p_get_agc_values);
+
 static void dib7000p_reset_pll(struct dib7000p_state *state)
 {
         struct dibx000_bandwidth_config *bw = &state->cfg.bw[0];
diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h
index 58f907ccf845..b61b03a6e1ed 100644
--- a/drivers/media/dvb/frontends/dib7000p.h
+++ b/drivers/media/dvb/frontends/dib7000p.h
@@ -60,6 +60,8 @@ extern int dib7090_tuner_sleep(struct dvb_frontend *fe, int onoff);
 extern int dib7090_get_adc_power(struct dvb_frontend *fe);
 extern struct i2c_adapter *dib7090_get_i2c_tuner(struct dvb_frontend *fe);
 extern int dib7090_slave_reset(struct dvb_frontend *fe);
+extern int dib7000p_get_agc_values(struct dvb_frontend *fe,
+                u16 *agc_global, u16 *agc1, u16 *agc2, u16 *wbd);
 #else
 static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg)
 {
@@ -144,6 +146,13 @@ static inline int dib7090_slave_reset(struct dvb_frontend *fe)
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return -ENODEV;
 }
+
+static inline int dib7000p_get_agc_values(struct dvb_frontend *fe,
+                u16 *agc_global, u16 *agc1, u16 *agc2, u16 *wbd)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
 #endif
 
 #endif