V4L/DVB (5955): Add support for DiB7070-based devices

This changeset adds support for DiB7070P-based devices by adding the
dib0070-driver and putting the appropriate layouts into
dib0700_devices.c

It also includes a new firmware for the dib0700 which is necessary to
make the DiB7070-boards work and it also should fix the i2c-problems
on some boards.

Signed-off-by: Jean-Philippe Sibers <jpsibers@dibcom.fr>
Signed-off-by: Patrick Boettcher <pboettcher@dibcom.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

8 files changed, 681 insertions, 20 deletions

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index faf9fe3c9cce..53e775539649 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -344,6 +344,15 @@ config DVB_TUNER_MT2131
         help
           A driver for the silicon baseband tuner MT2131 from Microtune.
 
+config DVB_TUNER_DIB0070
+        tristate "DiBcom DiB0070 silicon base-band tuner"
+        depends on I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A driver for the silicon baseband tuner DiB0070 from DiBcom.
+          This device is only used inside a SiP called togther with a
+          demodulator for now.
+
 comment "Miscellaneous devices"
         depends on DVB_CORE
 
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index c46b9d8e9313..4b8ad1f132aa 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_DVB_TDA826X) += tda826x.o
 obj-$(CONFIG_DVB_TDA827X) += tda827x.o
 obj-$(CONFIG_DVB_TUNER_MT2060) += mt2060.o
 obj-$(CONFIG_DVB_TUNER_MT2266) += mt2266.o
+obj-$(CONFIG_DVB_TUNER_DIB0070) += dib0070.o
 obj-$(CONFIG_DVB_TUNER_QT1010) += qt1010.o
 obj-$(CONFIG_DVB_TUA6100) += tua6100.o
 obj-$(CONFIG_DVB_TUNER_MT2131) += mt2131.o
diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c
new file mode 100644
index 000000000000..481eaa684157
--- /dev/null
+++ b/drivers/media/dvb/frontends/dib0070.c
@@ -0,0 +1,580 @@
+/*
+ * Linux-DVB Driver for DiBcom's DiB0070 base-band RF Tuner.
+ *
+ * Copyright (C) 2005-7 DiBcom (http://www.dibcom.fr/)
+ *
+ * This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation, version 2.
+ */
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+
+#include "dvb_frontend.h"
+
+#include "dib0070.h"
+#include "dibx000_common.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
+
+#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB0070: "); printk(args); printk("\n"); } } while (0)
+
+#define DIB0070_P1D  0x00
+#define DIB0070_P1F  0x01
+#define DIB0070_P1G  0x03
+#define DIB0070S_P1A 0x02
+
+struct dib0070_state {
+        struct i2c_adapter *i2c;
+        struct dvb_frontend *fe;
+        const struct dib0070_config *cfg;
+        u16 wbd_ff_offset;
+        u8 revision;
+};
+
+static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
+{
+        u8 b[2];
+        struct i2c_msg msg[2] = {
+                { .addr = state->cfg->i2c_address, .flags = 0,        .buf = &reg, .len = 1 },
+                { .addr = state->cfg->i2c_address, .flags = I2C_M_RD, .buf = b,  .len = 2 },
+        };
+        if (i2c_transfer(state->i2c, msg, 2) != 2) {
+                printk(KERN_WARNING "DiB0070 I2C read failed\n");
+                return 0;
+        }
+        return (b[0] << 8) | b[1];
+}
+
+static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
+{
+        u8 b[3] = { reg, val >> 8, val & 0xff };
+        struct i2c_msg msg = { .addr = state->cfg->i2c_address, .flags = 0, .buf = b, .len = 3 };
+        if (i2c_transfer(state->i2c, &msg, 1) != 1) {
+                printk(KERN_WARNING "DiB0070 I2C write failed\n");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+#define HARD_RESET(state) do { if (state->cfg->reset) { state->cfg->reset(state->fe,1); msleep(10); state->cfg->reset(state->fe,0); msleep(10); } } while (0)
+
+static int dib0070_set_bandwidth(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
+{
+        struct dib0070_state *st = fe->tuner_priv;
+        u16 tmp = 0;
+        tmp = dib0070_read_reg(st, 0x02) & 0x3fff;
+
+    switch(BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth)) {
+                case  8000:
+                        tmp |= (0 << 14);
+                        break;
+                case  7000:
+                        tmp |= (1 << 14);
+                        break;
+        case  6000:
+                        tmp |= (2 << 14);
+                        break;
+        case 5000:
+                default:
+                        tmp |= (3 << 14);
+                        break;
+        }
+        dib0070_write_reg(st, 0x02, tmp);
+        return 0;
+}
+
+static void dib0070_captrim(struct dib0070_state *st, u16 LO4)
+{
+        int8_t captrim, fcaptrim, step_sign, step;
+        u16 adc, adc_diff = 3000;
+
+
+
+        dib0070_write_reg(st, 0x0f, 0xed10);
+        dib0070_write_reg(st, 0x17,    0x0034);
+
+        dib0070_write_reg(st, 0x18, 0x0032);
+        msleep(2);
+
+        step = captrim = fcaptrim = 64;
+
+        do {
+                step /= 2;
+                dib0070_write_reg(st, 0x14, LO4 | captrim);
+                msleep(1);
+                adc = dib0070_read_reg(st, 0x19);
+
+                dprintk( "CAPTRIM=%hd; ADC = %hd (ADC) & %dmV", captrim, adc, (u32) adc*(u32)1800/(u32)1024);
+
+                if (adc >= 400) {
+                        adc -= 400;
+                        step_sign = -1;
+                } else {
+                        adc = 400 - adc;
+                        step_sign = 1;
+                }
+
+                if (adc < adc_diff) {
+                        dprintk( "CAPTRIM=%hd is closer to target (%hd/%hd)", captrim, adc, adc_diff);
+                        adc_diff = adc;
+                        fcaptrim = captrim;
+
+
+
+                }
+                captrim += (step_sign * step);
+        } while (step >= 1);
+
+        dib0070_write_reg(st, 0x14, LO4 | fcaptrim);
+        dib0070_write_reg(st, 0x18, 0x07ff);
+}
+
+#define LPF     100                       // define for the loop filter 100kHz by default 16-07-06
+#define LO4_SET_VCO_HFDIV(l, v, h)   l |= ((v) << 11) | ((h) << 7)
+#define LO4_SET_SD(l, s)             l |= ((s) << 14) | ((s) << 12)
+#define LO4_SET_CTRIM(l, c)          l |=  (c) << 10
+static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
+{
+        struct dib0070_state *st = fe->tuner_priv;
+        u32 freq = ch->frequency/1000 + (BAND_OF_FREQUENCY(ch->frequency/1000) == BAND_VHF ? st->cfg->freq_offset_khz_vhf : st->cfg->freq_offset_khz_uhf);
+
+        u8 band = BAND_OF_FREQUENCY(freq), c;
+
+        /*******************VCO***********************************/
+        u16 lo4 = 0;
+
+        u8 REFDIV, PRESC = 2;
+        u32 FBDiv, Rest, FREF, VCOF_kHz;
+        u16 Num, Den;
+        /*******************FrontEnd******************************/
+        u16 value = 0;
+
+        dprintk( "Tuning for Band: %hd (%d kHz)", band, freq);
+
+
+        dib0070_write_reg(st, 0x17, 0x30);
+
+        dib0070_set_bandwidth(fe, ch);  /* c is used as HF */
+        switch (st->revision) {
+                case DIB0070S_P1A:
+                        switch (band) {
+                                case BAND_LBAND:
+                                        LO4_SET_VCO_HFDIV(lo4, 1, 1);
+                                        c = 2;
+                                        break;
+                                case BAND_SBAND:
+                                        LO4_SET_VCO_HFDIV(lo4, 0, 0);
+                                        LO4_SET_CTRIM(lo4, 1);;
+                                        c = 1;
+                                        break;
+                                case BAND_UHF:
+                                default:
+                                        if (freq < 570000) {
+                                                LO4_SET_VCO_HFDIV(lo4, 1, 3);
+                                                PRESC = 6; c = 6;
+                                        } else if (freq < 680000) {
+                                                LO4_SET_VCO_HFDIV(lo4, 0, 2);
+                                                c = 4;
+                                        } else {
+                                                LO4_SET_VCO_HFDIV(lo4, 1, 2);
+                                                c = 4;
+                                        }
+                                        break;
+                        } break;
+
+                case DIB0070_P1G:
+                case DIB0070_P1F:
+                default:
+                        switch (band) {
+                                case BAND_FM:
+                                                LO4_SET_VCO_HFDIV(lo4, 0, 7);
+                                                c = 24;
+                                        break;
+                                case BAND_LBAND:
+                                                LO4_SET_VCO_HFDIV(lo4, 1, 0);
+                                                c = 2;
+                                        break;
+                                case BAND_VHF:
+                                        if (freq < 180000) {
+                                                LO4_SET_VCO_HFDIV(lo4, 0, 3);
+                                                c = 16;
+                                        } else if (freq < 190000) {
+                                                LO4_SET_VCO_HFDIV(lo4, 1, 3);
+                                                c = 16;
+                                        } else {
+                                                LO4_SET_VCO_HFDIV(lo4, 0, 6);
+                                                c = 12;
+                                        }
+                                        break;
+
+                                case BAND_UHF:
+                                default:
+                                        if (freq < 570000) {
+                                                LO4_SET_VCO_HFDIV(lo4, 1, 5);
+                                                c = 6;
+                                        } else if (freq < 700000) {
+                                                LO4_SET_VCO_HFDIV(lo4, 0, 1);
+                                                c = 4;
+                                        } else {
+                                                LO4_SET_VCO_HFDIV(lo4, 1, 1);
+                                                c = 4;
+                                        }
+                                        break;
+                        }
+                break;
+        }
+
+        dprintk( "HFDIV code: %hd", (lo4 >> 7) & 0xf);
+        dprintk( "VCO = %hd", (lo4 >> 11) & 0x3);
+
+
+        VCOF_kHz = (c * freq) * 2;
+        dprintk( "VCOF in kHz: %d ((%hd*%d) << 1))",VCOF_kHz, c, freq);
+
+        switch (band) {
+                case BAND_VHF:
+                        REFDIV = (u8) ((st->cfg->clock_khz + 9999) / 10000);
+                        break;
+                case BAND_FM:
+                        REFDIV = (u8) ((st->cfg->clock_khz) / 1000);
+                        break;
+                default:
+                        REFDIV = (u8) ( st->cfg->clock_khz  / 10000);
+                        break;
+        }
+        FREF = st->cfg->clock_khz / REFDIV;
+
+        dprintk( "REFDIV: %hd, FREF: %d", REFDIV, FREF);
+
+
+
+        switch (st->revision) {
+                case DIB0070S_P1A:
+                        FBDiv = (VCOF_kHz / PRESC / FREF);
+                        Rest  = (VCOF_kHz / PRESC) - FBDiv * FREF;
+                        break;
+
+                case DIB0070_P1G:
+                case DIB0070_P1F:
+                default:
+                        FBDiv = (freq / (FREF / 2));
+                        Rest  = 2 * freq - FBDiv * FREF;
+                        break;
+        }
+
+
+             if (Rest < LPF)              Rest = 0;
+        else if (Rest < 2 * LPF)          Rest = 2 * LPF;
+        else if (Rest > (FREF - LPF))   { Rest = 0 ; FBDiv += 1; }
+        else if (Rest > (FREF - 2 * LPF)) Rest = FREF - 2 * LPF;
+        Rest = (Rest * 6528) / (FREF / 10);
+        dprintk( "FBDIV: %d, Rest: %d", FBDiv, Rest);
+
+        Num = 0;
+        Den = 1;
+
+        if (Rest > 0) {
+                LO4_SET_SD(lo4, 1);
+                Den = 255;
+                Num = (u16)Rest;
+        }
+        dprintk( "Num: %hd, Den: %hd, SD: %hd",Num, Den, (lo4 >> 12) & 0x1);
+
+
+
+        dib0070_write_reg(st, 0x11, (u16)FBDiv);
+
+
+        dib0070_write_reg(st, 0x12, (Den << 8) | REFDIV);
+
+
+        dib0070_write_reg(st, 0x13, Num);
+
+
+        value = 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001;
+
+        switch (band) {
+                case BAND_UHF:   value |= 0x4000 | 0x0800; break;
+                case BAND_LBAND: value |= 0x2000 | 0x0400; break;
+                default:         value |= 0x8000 | 0x1000; break;
+        }
+        dib0070_write_reg(st, 0x20, value);
+
+        dib0070_captrim(st, lo4);
+        if (st->revision == DIB0070S_P1A) {
+                if (band == BAND_SBAND)
+                        dib0070_write_reg(st, 0x15, 0x16e2);
+                else
+                        dib0070_write_reg(st, 0x15, 0x56e5);
+        }
+
+
+
+        switch (band) {
+                case BAND_UHF:   value = 0x7c82; break;
+                case BAND_LBAND: value = 0x7c84; break;
+                default:         value = 0x7c81; break;
+        }
+        dib0070_write_reg(st, 0x0f, value);
+        dib0070_write_reg(st, 0x06, 0x3fff);
+
+        /* Front End */
+        /* c == TUNE, value = SWITCH */
+        c = 0;
+        value = 0;
+        switch (band) {
+                case BAND_FM:
+                        c = 0; value = 1;
+                break;
+
+                case BAND_VHF:
+                        if (freq <= 180000) c = 0;
+                        else if (freq <= 188200) c = 1;
+                        else if (freq <= 196400) c = 2;
+                        else c = 3;
+                        value = 1;
+                break;
+
+                case BAND_LBAND:
+                        if (freq <= 1500000) c = 0;
+                        else if (freq <= 1600000) c = 1;
+                        else c = 3;
+                break;
+
+                case BAND_SBAND:
+                        c = 7;
+                        dib0070_write_reg(st, 0x1d,0xFFFF);
+                break;
+
+                case BAND_UHF:
+                default:
+                        if (st->cfg->flip_chip) {
+                                if (freq <= 550000) c = 0;
+                                else if (freq <= 590000) c = 1;
+                                else if (freq <= 666000) c = 3;
+                                else c = 5;
+                        } else {
+                                if (freq <= 550000) c = 2;
+                                else if (freq <= 650000) c = 3;
+                                else if (freq <= 750000) c = 5;
+                                else if (freq <= 850000) c = 6;
+                                else c = 7;
+                        }
+                        value = 2;
+                break;
+        }
+
+        /* default: LNA_MATCH=7, BIAS=3 */
+        dib0070_write_reg(st, 0x07, (value << 11) | (7 << 8) | (c << 3) | (3 << 0));
+        dib0070_write_reg(st, 0x08, (c << 10) | (3 << 7) | (127));
+        dib0070_write_reg(st, 0x0d, 0x0d80);
+
+
+        dib0070_write_reg(st, 0x18,   0x07ff);
+        dib0070_write_reg(st, 0x17, 0x0033);
+
+        return 0;
+}
+
+static int dib0070_wakeup(struct dvb_frontend *fe)
+{
+        struct dib0070_state *st = fe->tuner_priv;
+        if (st->cfg->sleep)
+                st->cfg->sleep(fe, 0);
+        return 0;
+}
+
+static int dib0070_sleep(struct dvb_frontend *fe)
+{
+        struct dib0070_state *st = fe->tuner_priv;
+        if (st->cfg->sleep)
+                st->cfg->sleep(fe, 1);
+        return 0;
+}
+
+static u16 dib0070_p1f_defaults[] =
+
+{
+        7, 0x02,
+                0x0008,
+                0x0000,
+                0x0000,
+                0x0000,
+                0x0000,
+                0x0002,
+                0x0100,
+
+        3, 0x0d,
+                0x0d80,
+                0x0001,
+                0x0000,
+
+        4, 0x11,
+                0x0000,
+                0x0103,
+                0x0000,
+                0x0000,
+
+        3, 0x16,
+                0x0004 | 0x0040,
+                0x0030,
+                0x07ff,
+
+        6, 0x1b,
+                0x4112,
+                0xff00,
+                0xc07f,
+                0x0000,
+                0x0180,
+                0x4000 | 0x0800 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001,
+
+        0,
+};
+
+static void dib0070_wbd_calibration(struct dib0070_state *state)
+{
+        u16 wbd_offs;
+        dib0070_write_reg(state, 0x0f, 0x6d81);
+        dib0070_write_reg(state, 0x20, 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001);
+        msleep(9);
+        wbd_offs = dib0070_read_reg(state, 0x19);
+        dib0070_write_reg(state, 0x20, 0);
+        state->wbd_ff_offset = ((wbd_offs * 8 * 18 / 33 + 1) / 2);
+        dprintk( "WBDStart = %d (Vargen) - FF = %hd", (u32) wbd_offs * 1800/1024, state->wbd_ff_offset);
+}
+
+u16 dib0070_wbd_offset(struct dvb_frontend *fe)
+{
+        struct dib0070_state *st = fe->tuner_priv;
+        return st->wbd_ff_offset;
+}
+
+EXPORT_SYMBOL(dib0070_wbd_offset);
+static int dib0070_set_ctrl_lo5(struct dvb_frontend *fe, u8 vco_bias_trim, u8 hf_div_trim, u8 cp_current, u8 third_order_filt)
+{
+        struct dib0070_state *state = fe->tuner_priv;
+    u16 lo5 = (third_order_filt << 14) | (0 << 13) | (1 << 12) | (3 << 9) | (cp_current << 6) | (hf_div_trim << 3) | (vco_bias_trim << 0);
+        dprintk( "CTRL_LO5: 0x%x", lo5);
+        return dib0070_write_reg(state, 0x15, lo5);
+}
+
+#define pgm_read_word(w) (*w)
+static int dib0070_reset(struct dib0070_state *state)
+{
+        u16 l, r, *n;
+
+        HARD_RESET(state);
+
+
+#ifndef FORCE_SBAND_TUNER
+        if ((dib0070_read_reg(state, 0x22) >> 9) & 0x1)
+                state->revision = (dib0070_read_reg(state, 0x1f) >> 8) & 0xff;
+        else
+#endif
+                state->revision = DIB0070S_P1A;
+
+        /* P1F or not */
+        dprintk( "Revision: %x", state->revision);
+
+        if (state->revision == DIB0070_P1D) {
+                dprintk( "Error: this driver is not to be used meant for P1D or earlier");
+                return -EINVAL;
+        }
+
+        n = (u16 *) dib0070_p1f_defaults;
+        l = pgm_read_word(n++);
+        while (l) {
+                r = pgm_read_word(n++);
+                do {
+                        dib0070_write_reg(state, (u8)r, pgm_read_word(n++));
+                        r++;
+                } while (--l);
+                l = pgm_read_word(n++);
+        }
+
+        if (state->cfg->force_crystal_mode != 0)
+                r = state->cfg->force_crystal_mode;
+        else if (state->cfg->clock_khz >= 24000)
+                r = 1;
+        else
+                r = 2;
+
+        r |= state->cfg->osc_buffer_state << 3;
+
+        dib0070_write_reg(state, 0x10, r);
+        dib0070_write_reg(state, 0x1f, (1 << 8) | ((state->cfg->clock_pad_drive & 0xf) << 4));
+
+        if (state->cfg->invert_iq) {
+                r = dib0070_read_reg(state, 0x02) & 0xffdf;
+                dib0070_write_reg(state, 0x02, r | (1 << 5));
+        }
+
+
+        if (state->revision == DIB0070S_P1A)
+                dib0070_set_ctrl_lo5(state->fe, 4, 7, 3, 1);
+        else
+                dib0070_set_ctrl_lo5(state->fe, 4, 4, 2, 0);
+
+        dib0070_write_reg(state, 0x01, (54 << 9) | 0xc8);
+        return 0;
+}
+
+
+static int dib0070_release(struct dvb_frontend *fe)
+{
+        kfree(fe->tuner_priv);
+        fe->tuner_priv = NULL;
+        return 0;
+}
+
+static struct dvb_tuner_ops dib0070_ops = {
+        .info = {
+                .name           = "DiBcom DiB0070",
+                .frequency_min  =  45000000,
+                .frequency_max  = 860000000,
+                .frequency_step =      1000,
+        },
+        .release       = dib0070_release,
+
+        .init          = dib0070_wakeup,
+        .sleep         = dib0070_sleep,
+        .set_params    = dib0070_tune_digital,
+//      .get_frequency = dib0070_get_frequency,
+//      .get_bandwidth = dib0070_get_bandwidth
+};
+
+struct dvb_frontend * dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg)
+{
+        struct dib0070_state *state = kzalloc(sizeof(struct dib0070_state), GFP_KERNEL);
+        if (state == NULL)
+                return NULL;
+
+        state->cfg = cfg;
+        state->i2c = i2c;
+        state->fe  = fe;
+        fe->tuner_priv = state;
+
+        if (dib0070_reset(state) != 0)
+                goto free_mem;
+
+        dib0070_wbd_calibration(state);
+
+        printk(KERN_INFO "DiB0070: successfully identified\n");
+        memcpy(&fe->ops.tuner_ops, &dib0070_ops, sizeof(struct dvb_tuner_ops));
+
+        fe->tuner_priv = state;
+        return fe;
+
+free_mem:
+        kfree(state);
+        fe->tuner_priv = NULL;
+        return NULL;
+}
+EXPORT_SYMBOL(dib0070_attach);
+
+MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_DESCRIPTION("Driver for the DiBcom 0070 base-band RF Tuner");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/dib0070.h b/drivers/media/dvb/frontends/dib0070.h
new file mode 100644
index 000000000000..786e37d33889
--- /dev/null
+++ b/drivers/media/dvb/frontends/dib0070.h
@@ -0,0 +1,44 @@
+/*
+ * Linux-DVB Driver for DiBcom's DiB0070 base-band RF Tuner.
+ *
+ * Copyright (C) 2005-7 DiBcom (http://www.dibcom.fr/)
+ *
+ * This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation, version 2.
+ */
+#ifndef DIB0070_H
+#define DIB0070_H
+
+struct dvb_frontend;
+struct i2c_adapter;
+
+#define DEFAULT_DIB0070_I2C_ADDRESS 0x60
+
+struct dib0070_config {
+        u8 i2c_address;
+
+        /* tuner pins controlled externally */
+        int (*reset) (struct dvb_frontend *, int);
+        int (*sleep) (struct dvb_frontend *, int);
+
+        /*  offset in kHz */
+        int freq_offset_khz_uhf;
+        int freq_offset_khz_vhf;
+
+        u8 osc_buffer_state; /* 0= normal, 1= tri-state */
+        u32  clock_khz;
+        u8 clock_pad_drive; /* (Drive + 1) * 2mA */
+
+        u8 invert_iq; /* invert Q - in case I or Q is inverted on the board */
+
+        u8 force_crystal_mode; /* if == 0 -> decision is made in the driver default: <24 -> 2, >=24 -> 1 */
+
+        u8 flip_chip;
+};
+
+extern struct dvb_frontend * dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg);
+extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, uint8_t open);
+extern u16 dib0070_wbd_offset(struct dvb_frontend *);
+
+#endif
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index cbbe2c2f05dc..38d2322cbaf6 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -593,7 +593,7 @@ static int dib3000mc_tune(struct dvb_frontend *demod, struct dvb_frontend_parame
         // activates isi
         dib3000mc_write_word(state, 29, 0x1073);
 
-        dib3000mc_set_adp_cfg(state, (uint8_t)ch->u.ofdm.constellation);
+        dib3000mc_set_adp_cfg(state, (u8)ch->u.ofdm.constellation);
         if (ch->u.ofdm.transmission_mode == TRANSMISSION_MODE_8K) {
                 dib3000mc_write_word(state, 26, 38528);
                 dib3000mc_write_word(state, 33, 8);
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c
index 608156a691de..0ad9f3eb20a6 100644
--- a/drivers/media/dvb/frontends/dib7000m.c
+++ b/drivers/media/dvb/frontends/dib7000m.c
@@ -42,9 +42,9 @@ struct dib7000m_state {
         u32 timf_default;
         u32 internal_clk;
 
-        uint8_t div_force_off : 1;
-        uint8_t div_state : 1;
-        uint16_t div_sync_wait;
+        u8 div_force_off : 1;
+        u8 div_state : 1;
+        u16 div_sync_wait;
 
         u16 revision;
 
@@ -302,7 +302,7 @@ static int dib7000m_set_diversity_in(struct dvb_frontend *demod, int onoff)
                 dprintk( "diversity combination deactivated - forced by COFDM parameters");
                 onoff = 0;
         }
-        state->div_state = (uint8_t)onoff;
+        state->div_state = (u8)onoff;
 
         if (onoff) {
                 dib7000m_write_word(state, 263 + state->reg_offs, 6);
@@ -620,7 +620,7 @@ static int dib7000m_update_lna(struct dib7000m_state *state)
         u16 dyn_gain;
 
         if (state->cfg.update_lna) {
-                // read dyn_gain here (because it is demod-dependent and not tuner)
+                // read dyn_gain here (because it is demod-dependent and not fe)
                 dyn_gain = dib7000m_read_word(state, 390);
 
                 if (state->cfg.update_lna(&state->demod,dyn_gain)) { // LNA has changed
@@ -754,7 +754,7 @@ static int dib7000m_agc_startup(struct dvb_frontend *demod, struct dvb_frontend_
                         break;
 
         case 3: /* split search ended */
-                        agc_split = (uint8_t)dib7000m_read_word(state, 392); /* store the split value for the next time */
+                        agc_split = (u8)dib7000m_read_word(state, 392); /* store the split value for the next time */
                         dib7000m_write_word(state, 75, dib7000m_read_word(state, 390)); /* set AGC gain start value */
 
                         dib7000m_write_word(state, 72,  cfg_72 & ~(1 << 4));   /* std AGC loop */
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 156c53ab56db..1175ab9a4532 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -36,9 +36,9 @@ struct dib7000p_state {
         struct dibx000_agc_config *current_agc;
         u32 timf;
 
-        uint8_t div_force_off : 1;
-        uint8_t div_state : 1;
-        uint16_t div_sync_wait;
+        u8 div_force_off : 1;
+        u8 div_state : 1;
+        u16 div_sync_wait;
 
         u8 agc_state;
 
@@ -156,7 +156,7 @@ static int dib7000p_set_diversity_in(struct dvb_frontend *demod, int onoff)
                 dprintk( "diversity combination deactivated - forced by COFDM parameters");
                 onoff = 0;
         }
-        state->div_state = (uint8_t)onoff;
+        state->div_state = (u8)onoff;
 
         if (onoff) {
                 dib7000p_write_word(state, 204, 6);
@@ -294,6 +294,16 @@ static int dib7000p_sad_calib(struct dib7000p_state *state)
         return 0;
 }
 
+int dib7000p_set_wbd_ref(struct dvb_frontend *demod, u16 value)
+{
+        struct dib7000p_state *state = demod->demodulator_priv;
+        if (value > 4095)
+                value = 4095;
+        state->wbd_ref = value;
+        return dib7000p_write_word(state, 105, (dib7000p_read_word(state, 105) & 0xf000) | value);
+}
+
+EXPORT_SYMBOL(dib7000p_set_wbd_ref);
 static void dib7000p_reset_pll(struct dib7000p_state *state)
 {
         struct dibx000_bandwidth_config *bw = &state->cfg.bw[0];
@@ -335,6 +345,28 @@ static int dib7000p_reset_gpio(struct dib7000p_state *st)
         return 0;
 }
 
+static int dib7000p_cfg_gpio(struct dib7000p_state *st, u8 num, u8 dir, u8 val)
+{
+        st->gpio_dir = dib7000p_read_word(st, 1029);
+        st->gpio_dir &= ~(1 << num);         /* reset the direction bit */
+        st->gpio_dir |=  (dir & 0x1) << num; /* set the new direction */
+        dib7000p_write_word(st, 1029, st->gpio_dir);
+
+        st->gpio_val = dib7000p_read_word(st, 1030);
+        st->gpio_val &= ~(1 << num);          /* reset the direction bit */
+        st->gpio_val |=  (val & 0x01) << num; /* set the new value */
+        dib7000p_write_word(st, 1030, st->gpio_val);
+
+        return 0;
+}
+
+int dib7000p_set_gpio(struct dvb_frontend *demod, u8 num, u8 dir, u8 val)
+{
+        struct dib7000p_state *state = demod->demodulator_priv;
+        return dib7000p_cfg_gpio(state, num, dir, val);
+}
+
+EXPORT_SYMBOL(dib7000p_set_gpio);
 static u16 dib7000p_defaults[] =
 
 {
@@ -501,7 +533,7 @@ static int dib7000p_update_lna(struct dib7000p_state *state)
 
         // when there is no LNA to program return immediatly
         if (state->cfg.update_lna) {
-                // read dyn_gain here (because it is demod-dependent and not tuner)
+                // read dyn_gain here (because it is demod-dependent and not fe)
                 dyn_gain = dib7000p_read_word(state, 394);
                 if (state->cfg.update_lna(&state->demod,dyn_gain)) { // LNA has changed
                         dib7000p_restart_agc(state);
@@ -617,7 +649,7 @@ static int dib7000p_agc_startup(struct dvb_frontend *demod, struct dvb_frontend_
                         break;
 
         case 3: /* split search ended */
-                        agc_split = (uint8_t)dib7000p_read_word(state, 396); /* store the split value for the next time */
+                        agc_split = (u8)dib7000p_read_word(state, 396); /* store the split value for the next time */
                         dib7000p_write_word(state, 78, dib7000p_read_word(state, 394)); /* set AGC gain start value */
 
                         dib7000p_write_word(state, 75,  state->current_agc->setup);   /* std AGC loop */
diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h
index e7769e7cd92a..eefcac8b5244 100644
--- a/drivers/media/dvb/frontends/dib7000p.h
+++ b/drivers/media/dvb/frontends/dib7000p.h
@@ -40,12 +40,7 @@ extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u
 
 extern struct i2c_adapter * dib7000p_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int);
 extern int dib7000pc_detection(struct i2c_adapter *i2c_adap);
-
-/* TODO
-extern INT dib7000p_set_gpio(struct dibDemod *demod, UCHAR num, UCHAR dir, UCHAR val);
-extern INT dib7000p_enable_vbg_voltage(struct dibDemod *demod);
-extern void dib7000p_set_hostbus_diversity(struct dibDemod *demod, UCHAR onoff);
-extern USHORT dib7000p_get_current_agc_global(struct dibDemod *demod);
-*/
+extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);
+extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);
 
 #endif