6 files changed, 133 insertions, 11 deletions

diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index cf57c0659d5b..f53fb3c8530e 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -429,6 +429,7 @@ config DVB_USB_AF9035
         select DVB_AF9033
         select MEDIA_TUNER_TUA9001 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_FC0011 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Afatech AF9035 based DVB USB receiver.
 
diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/dvb/dvb-usb/af9035.c
index a7e05a18c35f..3f2891abcba7 100644
--- a/drivers/media/dvb/dvb-usb/af9035.c
+++ b/drivers/media/dvb/dvb-usb/af9035.c
@@ -23,6 +23,7 @@
 #include "af9033.h"
 #include "tua9001.h"
 #include "fc0011.h"
+#include "mxl5007t.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 static DEFINE_MUTEX(af9035_usb_mutex);
@@ -500,6 +501,7 @@ static int af9035_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
                 switch (tmp) {
                 case AF9033_TUNER_TUA9001:
                 case AF9033_TUNER_FC0011:
+                case AF9033_TUNER_MXL5007T:
                         af9035_af9033_config[i].spec_inv = 1;
                         break;
                 default:
@@ -667,6 +669,15 @@ static const struct fc0011_config af9035_fc0011_config = {
         .i2c_address = 0x60,
 };
 
+static struct mxl5007t_config af9035_mxl5007t_config = {
+        .xtal_freq_hz = MxL_XTAL_24_MHZ,
+        .if_freq_hz = MxL_IF_4_57_MHZ,
+        .invert_if = 0,
+        .loop_thru_enable = 0,
+        .clk_out_enable = 0,
+        .clk_out_amp = MxL_CLKOUT_AMP_0_94V,
+};
+
 static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
 {
         int ret;
@@ -719,6 +730,48 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
                 fe = dvb_attach(fc0011_attach, adap->fe_adap[0].fe,
                                 &adap->dev->i2c_adap, &af9035_fc0011_config);
                 break;
+        case AF9033_TUNER_MXL5007T:
+                ret = af9035_wr_reg(adap->dev, 0x00d8e0, 1);
+                if (ret < 0)
+                        goto err;
+                ret = af9035_wr_reg(adap->dev, 0x00d8e1, 1);
+                if (ret < 0)
+                        goto err;
+                ret = af9035_wr_reg(adap->dev, 0x00d8df, 0);
+                if (ret < 0)
+                        goto err;
+
+                msleep(30);
+
+                ret = af9035_wr_reg(adap->dev, 0x00d8df, 1);
+                if (ret < 0)
+                        goto err;
+
+                msleep(300);
+
+                ret = af9035_wr_reg(adap->dev, 0x00d8c0, 1);
+                if (ret < 0)
+                        goto err;
+                ret = af9035_wr_reg(adap->dev, 0x00d8c1, 1);
+                if (ret < 0)
+                        goto err;
+                ret = af9035_wr_reg(adap->dev, 0x00d8bf, 0);
+                if (ret < 0)
+                        goto err;
+                ret = af9035_wr_reg(adap->dev, 0x00d8b4, 1);
+                if (ret < 0)
+                        goto err;
+                ret = af9035_wr_reg(adap->dev, 0x00d8b5, 1);
+                if (ret < 0)
+                        goto err;
+                ret = af9035_wr_reg(adap->dev, 0x00d8b3, 1);
+                if (ret < 0)
+                        goto err;
+
+                /* attach tuner */
+                fe = dvb_attach(mxl5007t_attach, adap->fe_adap[0].fe,
+                                &adap->dev->i2c_adap, 0x60, &af9035_mxl5007t_config);
+                break;
         default:
                 fe = NULL;
         }
@@ -740,6 +793,7 @@ enum af9035_id_entry {
         AF9035_0CCD_0093,
         AF9035_15A4_9035,
         AF9035_15A4_1001,
+        AF9035_07CA_1867,
 };
 
 static struct usb_device_id af9035_id[] = {
@@ -749,6 +803,8 @@ static struct usb_device_id af9035_id[] = {
                 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)},
         [AF9035_15A4_1001] = {
                 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)},
+        [AF9035_07CA_1867] = {
+                USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_1867)},
         {},
 };
 
@@ -791,7 +847,7 @@ static struct dvb_usb_device_properties af9035_properties[] = {
 
                 .i2c_algo = &af9035_i2c_algo,
 
-                .num_device_descs = 2,
+                .num_device_descs = 3,
                 .devices = {
                         {
                                 .name = "TerraTec Cinergy T Stick",
@@ -804,7 +860,12 @@ static struct dvb_usb_device_properties af9035_properties[] = {
                                         &af9035_id[AF9035_15A4_9035],
                                         &af9035_id[AF9035_15A4_1001],
                                 },
-                        }
+                        }, {
+                                .name = "AVerMedia HD Volar",
+                                .cold_ids = {
+                                        &af9035_id[AF9035_07CA_1867],
+                                },
+                        },
                 }
         },
 };
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index c817a98017d4..8f77a6c608f4 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -224,6 +224,7 @@
 #define USB_PID_AVERMEDIA_A850T                         0x850b
 #define USB_PID_AVERMEDIA_A805                          0xa805
 #define USB_PID_AVERMEDIA_A815M                         0x815a
+#define USB_PID_AVERMEDIA_1867                          0x1867
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
 #define USB_PID_TECHNOTREND_CONNECT_CT3650              0x300d
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
diff --git a/drivers/media/dvb/frontends/af9033.c b/drivers/media/dvb/frontends/af9033.c
index 9eedf93c6384..8c0f4a3ef0f0 100644
--- a/drivers/media/dvb/frontends/af9033.c
+++ b/drivers/media/dvb/frontends/af9033.c
@@ -301,6 +301,10 @@ static int af9033_init(struct dvb_frontend *fe)
                 len = ARRAY_SIZE(tuner_init_fc0011);
                 init = tuner_init_fc0011;
                 break;
+        case AF9033_TUNER_MXL5007T:
+                len = ARRAY_SIZE(tuner_init_mxl5007t);
+                init = tuner_init_mxl5007t;
+                break;
         default:
                 pr_debug("%s: unsupported tuner ID=%d\n", __func__,
                                 state->cfg.tuner);
@@ -391,9 +395,9 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
 {
         struct af9033_state *state = fe->demodulator_priv;
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
-        int ret, i;
+        int ret, i, spec_inv;
         u8 tmp, buf[3], bandwidth_reg_val;
-        u32 if_frequency, freq_cw;
+        u32 if_frequency, freq_cw, adc_freq;
 
         pr_debug("%s: frequency=%d bandwidth_hz=%d\n", __func__, c->frequency,
                         c->bandwidth_hz);
@@ -433,22 +437,41 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
 
         /* program frequency control */
         if (c->bandwidth_hz != state->bandwidth_hz) {
+                spec_inv = state->cfg.spec_inv ? -1 : 1;
+
+                for (i = 0; i < ARRAY_SIZE(clock_adc_lut); i++) {
+                        if (clock_adc_lut[i].clock == state->cfg.clock)
+                                break;
+                }
+                adc_freq = clock_adc_lut[i].adc;
+
                 /* get used IF frequency */
                 if (fe->ops.tuner_ops.get_if_frequency)
                         fe->ops.tuner_ops.get_if_frequency(fe, &if_frequency);
                 else
                         if_frequency = 0;
 
-                /* FIXME: we support only Zero-IF currently */
-                if (if_frequency != 0) {
-                        pr_debug("%s: only Zero-IF supported currently\n",
-                                __func__);
+                while (if_frequency > (adc_freq / 2))
+                        if_frequency -= adc_freq;
 
-                        ret = -ENODEV;
+                if (if_frequency >= 0)
+                        spec_inv *= -1;
+                else
+                        if_frequency *= -1;
+
+                freq_cw = af9033_div(if_frequency, adc_freq, 23ul);
+
+                if (spec_inv == -1)
+                        freq_cw *= -1;
+
+                /* get adc multiplies */
+                ret = af9033_rd_reg(state, 0x800045, &tmp);
+                if (ret < 0)
                         goto err;
-                }
 
-                freq_cw = 0;
+                if (tmp == 1)
+                        freq_cw /= 2;
+
                 buf[0] = (freq_cw >>  0) & 0xff;
                 buf[1] = (freq_cw >>  8) & 0xff;
                 buf[2] = (freq_cw >> 16) & 0x7f;
diff --git a/drivers/media/dvb/frontends/af9033.h b/drivers/media/dvb/frontends/af9033.h
index af8c1e3e30d0..dcf7e290b6fe 100644
--- a/drivers/media/dvb/frontends/af9033.h
+++ b/drivers/media/dvb/frontends/af9033.h
@@ -40,6 +40,7 @@ struct af9033_config {
          */
 #define AF9033_TUNER_TUA9001     0x27 /* Infineon TUA 9001 */
 #define AF9033_TUNER_FC0011      0x28 /* Fitipower FC0011 */
+#define AF9033_TUNER_MXL5007T    0xa0 /* MaxLinear MxL5007T */
         u8 tuner;
 
         /*
diff --git a/drivers/media/dvb/frontends/af9033_priv.h b/drivers/media/dvb/frontends/af9033_priv.h
index 337964257dab..e6041bc7c2fc 100644
--- a/drivers/media/dvb/frontends/af9033_priv.h
+++ b/drivers/media/dvb/frontends/af9033_priv.h
@@ -397,5 +397,40 @@ static const struct reg_val tuner_init_fc0011[] = {
         { 0x80F1E6, 0x00 },
 };
 
+/* MaxLinear MxL5007T tuner init
+   AF9033_TUNER_MXL5007T    = 0xa0 */
+static const struct reg_val tuner_init_mxl5007t[] = {
+        { 0x800046, 0x1b },
+        { 0x800057, 0x01 },
+        { 0x800058, 0x01 },
+        { 0x80005f, 0x00 },
+        { 0x800060, 0x00 },
+        { 0x800068, 0x96 },
+        { 0x800071, 0x05 },
+        { 0x800072, 0x02 },
+        { 0x800074, 0x01 },
+        { 0x800079, 0x01 },
+        { 0x800093, 0x00 },
+        { 0x800094, 0x00 },
+        { 0x800095, 0x00 },
+        { 0x800096, 0x00 },
+        { 0x8000b3, 0x01 },
+        { 0x8000c1, 0x01 },
+        { 0x8000c2, 0x00 },
+        { 0x80f007, 0x00 },
+        { 0x80f00c, 0x19 },
+        { 0x80f00d, 0x1a },
+        { 0x80f012, 0xda },
+        { 0x80f013, 0x00 },
+        { 0x80f014, 0x00 },
+        { 0x80f015, 0x02 },
+        { 0x80f01f, 0x82 },
+        { 0x80f020, 0x00 },
+        { 0x80f029, 0x82 },
+        { 0x80f02a, 0x00 },
+        { 0x80f077, 0x02 },
+        { 0x80f1e6, 0x00 },
+};
+
 #endif /* AF9033_PRIV_H */