1 files changed, 40 insertions, 20 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 6a97a40d3dfb..f0ba8b07b84f 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -27,9 +27,7 @@
 #include "qt1010.h"
 #include "tda18271.h"
 #include "mxl5005s.h"
-#if 0
-#include "mc44s80x.h"
-#endif
+#include "mc44s803.h"
 
 static int dvb_usb_af9015_debug;
 module_param_named(debug, dvb_usb_af9015_debug, int, 0644);
@@ -37,9 +35,6 @@ MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
 static int dvb_usb_af9015_remote;
 module_param_named(remote, dvb_usb_af9015_remote, int, 0644);
 MODULE_PARM_DESC(remote, "select remote");
-static int dvb_usb_af9015_dual_mode;
-module_param_named(dual_mode, dvb_usb_af9015_dual_mode, int, 0644);
-MODULE_PARM_DESC(dual_mode, "enable dual mode");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static DEFINE_MUTEX(af9015_usb_mutex);
@@ -283,6 +278,21 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.
                         req.data = &msg[i+1].buf[0];
                         ret = af9015_ctrl_msg(d, &req);
                         i += 2;
+                } else if (msg[i].flags & I2C_M_RD) {
+                        ret = -EINVAL;
+                        if (msg[i].addr ==
+                                af9015_af9013_config[0].demod_address)
+                                goto error;
+                        else
+                                req.cmd = READ_I2C;
+                        req.i2c_addr = msg[i].addr;
+                        req.addr = addr;
+                        req.mbox = mbox;
+                        req.addr_len = addr_len;
+                        req.data_len = msg[i].len;
+                        req.data = &msg[i].buf[0];
+                        ret = af9015_ctrl_msg(d, &req);
+                        i += 1;
                 } else {
                         if (msg[i].addr ==
                                 af9015_af9013_config[0].demod_address)
@@ -748,6 +758,16 @@ static int af9015_read_config(struct usb_device *udev)
                                 af9015_config.ir_table_size =
                                   ARRAY_SIZE(af9015_ir_table_digittrade);
                                 break;
+                        case AF9015_REMOTE_AVERMEDIA_KS:
+                                af9015_properties[i].rc_key_map =
+                                  af9015_rc_keys_avermedia;
+                                af9015_properties[i].rc_key_map_size =
+                                  ARRAY_SIZE(af9015_rc_keys_avermedia);
+                                af9015_config.ir_table =
+                                  af9015_ir_table_avermedia_ks;
+                                af9015_config.ir_table_size =
+                                  ARRAY_SIZE(af9015_ir_table_avermedia_ks);
+                                break;
                         }
                 } else {
                         switch (le16_to_cpu(udev->descriptor.idVendor)) {
@@ -836,9 +856,6 @@ static int af9015_read_config(struct usb_device *udev)
                 goto error;
         af9015_config.dual_mode = val;
         deb_info("%s: TS mode:%d\n", __func__, af9015_config.dual_mode);
-        /* disable dual mode by default because it is buggy */
-        if (!dvb_usb_af9015_dual_mode)
-                af9015_config.dual_mode = 0;
 
         /* Set adapter0 buffer size according to USB port speed, adapter1 buffer
            size can be static because it is enabled only USB2.0 */
@@ -935,7 +952,6 @@ static int af9015_read_config(struct usb_device *udev)
                 switch (val) {
                 case AF9013_TUNER_ENV77H11D5:
                 case AF9013_TUNER_MT2060:
-                case AF9013_TUNER_MC44S803:
                 case AF9013_TUNER_QT1010:
                 case AF9013_TUNER_UNKNOWN:
                 case AF9013_TUNER_MT2060_2:
@@ -948,6 +964,10 @@ static int af9015_read_config(struct usb_device *udev)
                 case AF9013_TUNER_MXL5005R:
                         af9015_af9013_config[i].rf_spec_inv = 0;
                         break;
+                case AF9013_TUNER_MC44S803:
+                        af9015_af9013_config[i].gpio[1] = AF9013_GPIO_LO;
+                        af9015_af9013_config[i].rf_spec_inv = 1;
+                        break;
                 default:
                         warn("tuner id:%d not supported, please report!", val);
                         return -ENODEV;
@@ -1135,6 +1155,11 @@ static struct mxl5005s_config af9015_mxl5005_config = {
         .AgcMasterByte   = 0x00,
 };
 
+static struct mc44s803_config af9015_mc44s803_config = {
+        .i2c_address = 0xc0,
+        .dig_out = 1,
+};
+
 static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
 {
         struct af9015_state *state = adap->dev->priv;
@@ -1179,15 +1204,8 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
                         DVB_PLL_TDA665X) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_MC44S803:
-#if 0
-                ret = dvb_attach(mc44s80x_attach, adap->fe, i2c_adap)
-                        == NULL ? -ENODEV : 0;
-#else
-                ret = -ENODEV;
-                info("Freescale MC44S803 tuner found but no driver for that" \
-                        "tuner. Look at the Linuxtv.org for tuner driver" \
-                        "status.");
-#endif
+                ret = dvb_attach(mc44s803_attach, adap->fe, i2c_adap,
+                        &af9015_mc44s803_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_UNKNOWN:
         default:
@@ -1218,6 +1236,7 @@ static struct usb_device_id af9015_usb_table[] = {
         {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},
 /* 15 */{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGI_VOX_MINI_III)},
         {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U)},
+        {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_2)},
         {0},
 };
 MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1417,7 +1436,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                         {
                                 .name = "KWorld USB DVB-T TV Stick II " \
                                         "(VS-DVB-T 395U)",
-                                .cold_ids = {&af9015_usb_table[16], NULL},
+                                .cold_ids = {&af9015_usb_table[16],
+                                             &af9015_usb_table[17], NULL},
                                 .warm_ids = {NULL},
                         },
                 }