]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
[media] rtl28xxu: convert to new DVB USB
authorAntti Palosaari <crope@iki.fi>
Mon, 13 Aug 2012 01:27:07 +0000 (22:27 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 13 Aug 2012 18:58:12 +0000 (15:58 -0300)
Tested-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-usb-v2/Kconfig
drivers/media/dvb/dvb-usb-v2/Makefile
drivers/media/dvb/dvb-usb-v2/rtl28xxu.c [new file with mode: 0644]
drivers/media/dvb/dvb-usb-v2/rtl28xxu.h [new file with mode: 0644]
drivers/media/dvb/dvb-usb/Kconfig
drivers/media/dvb/dvb-usb/Makefile
drivers/media/dvb/dvb-usb/rtl28xxu.c [deleted file]
drivers/media/dvb/dvb-usb/rtl28xxu.h [deleted file]

index 14a635b97b0ba52afc2cd789aec051ea24d3dd1c..ed87935dc8d44c4d8b5b9964bd648c176b9d24dc 100644 (file)
@@ -124,3 +124,16 @@ config DVB_USB_MXL111SF
        help
          Say Y here to support the MxL111SF USB2.0 DTV receiver.
 
+config DVB_USB_RTL28XXU
+       tristate "Realtek RTL28xxU DVB USB support"
+       depends on DVB_USB_V2 && EXPERIMENTAL
+       select DVB_RTL2830
+       select DVB_RTL2832
+       select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
+       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
+       select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
+       select MEDIA_TUNER_FC0012 if !MEDIA_TUNER_CUSTOMISE
+       select MEDIA_TUNER_FC0013 if !MEDIA_TUNER_CUSTOMISE
+       help
+         Say Y here to support the Realtek RTL28xxU DVB USB receiver.
+
index 26659bc7fa600c934a14ca0ce63c611ed2ed9b0f..002e88883827c72e63039a6c590e42871cd9ed42 100644 (file)
@@ -36,6 +36,9 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
 
+dvb-usb-rtl28xxu-objs = rtl28xxu.o
+obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
+
 ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
 ccflags-y += -I$(srctree)/drivers/media/common/tuners
diff --git a/drivers/media/dvb/dvb-usb-v2/rtl28xxu.c b/drivers/media/dvb/dvb-usb-v2/rtl28xxu.c
new file mode 100644 (file)
index 0000000..493d531
--- /dev/null
@@ -0,0 +1,1293 @@
+/*
+ * Realtek RTL28xxU DVB USB driver
+ *
+ * Copyright (C) 2009 Antti Palosaari <crope@iki.fi>
+ * Copyright (C) 2011 Antti Palosaari <crope@iki.fi>
+ * Copyright (C) 2012 Thomas Mair <thomas.mair86@googlemail.com>
+ *
+ *    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; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License along
+ *    with this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "rtl28xxu.h"
+
+#include "rtl2830.h"
+#include "rtl2832.h"
+
+#include "qt1010.h"
+#include "mt2060.h"
+#include "mxl5005s.h"
+#include "fc0012.h"
+#include "fc0013.h"
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
+{
+       int ret;
+       unsigned int pipe;
+       u8 requesttype;
+       u8 *buf;
+
+       buf = kmalloc(req->size, GFP_KERNEL);
+       if (!buf) {
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       if (req->index & CMD_WR_FLAG) {
+               /* write */
+               memcpy(buf, req->data, req->size);
+               requesttype = (USB_TYPE_VENDOR | USB_DIR_OUT);
+               pipe = usb_sndctrlpipe(d->udev, 0);
+       } else {
+               /* read */
+               requesttype = (USB_TYPE_VENDOR | USB_DIR_IN);
+               pipe = usb_rcvctrlpipe(d->udev, 0);
+       }
+
+       ret = usb_control_msg(d->udev, pipe, 0, requesttype, req->value,
+                       req->index, buf, req->size, 1000);
+       if (ret > 0)
+               ret = 0;
+
+       deb_dump(0, requesttype, req->value, req->index, buf, req->size);
+
+       /* read request, copy returned data to return buf */
+       if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN))
+               memcpy(req->data, buf, req->size);
+
+       kfree(buf);
+
+       if (ret)
+               goto err;
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl28xx_wr_regs(struct dvb_usb_device *d, u16 reg, u8 *val, int len)
+{
+       struct rtl28xxu_req req;
+
+       if (reg < 0x3000)
+               req.index = CMD_USB_WR;
+       else if (reg < 0x4000)
+               req.index = CMD_SYS_WR;
+       else
+               req.index = CMD_IR_WR;
+
+       req.value = reg;
+       req.size = len;
+       req.data = val;
+
+       return rtl28xxu_ctrl_msg(d, &req);
+}
+
+static int rtl2831_rd_regs(struct dvb_usb_device *d, u16 reg, u8 *val, int len)
+{
+       struct rtl28xxu_req req;
+
+       if (reg < 0x3000)
+               req.index = CMD_USB_RD;
+       else if (reg < 0x4000)
+               req.index = CMD_SYS_RD;
+       else
+               req.index = CMD_IR_RD;
+
+       req.value = reg;
+       req.size = len;
+       req.data = val;
+
+       return rtl28xxu_ctrl_msg(d, &req);
+}
+
+static int rtl28xx_wr_reg(struct dvb_usb_device *d, u16 reg, u8 val)
+{
+       return rtl28xx_wr_regs(d, reg, &val, 1);
+}
+
+static int rtl28xx_rd_reg(struct dvb_usb_device *d, u16 reg, u8 *val)
+{
+       return rtl2831_rd_regs(d, reg, val, 1);
+}
+
+/* I2C */
+static int rtl28xxu_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+       int num)
+{
+       int ret;
+       struct dvb_usb_device *d = i2c_get_adapdata(adap);
+       struct rtl28xxu_priv *priv = d->priv;
+       struct rtl28xxu_req req;
+
+       /*
+        * It is not known which are real I2C bus xfer limits, but testing
+        * with RTL2831U + MT2060 gives max RD 24 and max WR 22 bytes.
+        * TODO: find out RTL2832U lens
+        */
+
+       /*
+        * I2C adapter logic looks rather complicated due to fact it handles
+        * three different access methods. Those methods are;
+        * 1) integrated demod access
+        * 2) old I2C access
+        * 3) new I2C access
+        *
+        * Used method is selected in order 1, 2, 3. Method 3 can handle all
+        * requests but there is two reasons why not use it always;
+        * 1) It is most expensive, usually two USB messages are needed
+        * 2) At least RTL2831U does not support it
+        *
+        * Method 3 is needed in case of I2C write+read (typical register read)
+        * where write is more than one byte.
+        */
+
+       if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+               return -EAGAIN;
+
+       if (num == 2 && !(msg[0].flags & I2C_M_RD) &&
+               (msg[1].flags & I2C_M_RD)) {
+               if (msg[0].len > 24 || msg[1].len > 24) {
+                       /* TODO: check msg[0].len max */
+                       ret = -EOPNOTSUPP;
+                       goto err_mutex_unlock;
+               } else if (msg[0].addr == 0x10) {
+                       /* method 1 - integrated demod */
+                       req.value = (msg[0].buf[0] << 8) | (msg[0].addr << 1);
+                       req.index = CMD_DEMOD_RD | priv->page;
+                       req.size = msg[1].len;
+                       req.data = &msg[1].buf[0];
+                       ret = rtl28xxu_ctrl_msg(d, &req);
+               } else if (msg[0].len < 2) {
+                       /* method 2 - old I2C */
+                       req.value = (msg[0].buf[0] << 8) | (msg[0].addr << 1);
+                       req.index = CMD_I2C_RD;
+                       req.size = msg[1].len;
+                       req.data = &msg[1].buf[0];
+                       ret = rtl28xxu_ctrl_msg(d, &req);
+               } else {
+                       /* method 3 - new I2C */
+                       req.value = (msg[0].addr << 1);
+                       req.index = CMD_I2C_DA_WR;
+                       req.size = msg[0].len;
+                       req.data = msg[0].buf;
+                       ret = rtl28xxu_ctrl_msg(d, &req);
+                       if (ret)
+                               goto err_mutex_unlock;
+
+                       req.value = (msg[0].addr << 1);
+                       req.index = CMD_I2C_DA_RD;
+                       req.size = msg[1].len;
+                       req.data = msg[1].buf;
+                       ret = rtl28xxu_ctrl_msg(d, &req);
+               }
+       } else if (num == 1 && !(msg[0].flags & I2C_M_RD)) {
+               if (msg[0].len > 22) {
+                       /* TODO: check msg[0].len max */
+                       ret = -EOPNOTSUPP;
+                       goto err_mutex_unlock;
+               } else if (msg[0].addr == 0x10) {
+                       /* method 1 - integrated demod */
+                       if (msg[0].buf[0] == 0x00) {
+                               /* save demod page for later demod access */
+                               priv->page = msg[0].buf[1];
+                               ret = 0;
+                       } else {
+                               req.value = (msg[0].buf[0] << 8) |
+                                       (msg[0].addr << 1);
+                               req.index = CMD_DEMOD_WR | priv->page;
+                               req.size = msg[0].len-1;
+                               req.data = &msg[0].buf[1];
+                               ret = rtl28xxu_ctrl_msg(d, &req);
+                       }
+               } else if (msg[0].len < 23) {
+                       /* method 2 - old I2C */
+                       req.value = (msg[0].buf[0] << 8) | (msg[0].addr << 1);
+                       req.index = CMD_I2C_WR;
+                       req.size = msg[0].len-1;
+                       req.data = &msg[0].buf[1];
+                       ret = rtl28xxu_ctrl_msg(d, &req);
+               } else {
+                       /* method 3 - new I2C */
+                       req.value = (msg[0].addr << 1);
+                       req.index = CMD_I2C_DA_WR;
+                       req.size = msg[0].len;
+                       req.data = msg[0].buf;
+                       ret = rtl28xxu_ctrl_msg(d, &req);
+               }
+       } else {
+               ret = -EINVAL;
+       }
+
+err_mutex_unlock:
+       mutex_unlock(&d->i2c_mutex);
+
+       return ret ? ret : num;
+}
+
+static u32 rtl28xxu_i2c_func(struct i2c_adapter *adapter)
+{
+       return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm rtl28xxu_i2c_algo = {
+       .master_xfer   = rtl28xxu_i2c_xfer,
+       .functionality = rtl28xxu_i2c_func,
+};
+
+static struct rtl2830_config rtl28xxu_rtl2830_mt2060_config = {
+       .i2c_addr = 0x10, /* 0x20 */
+       .xtal = 28800000,
+       .ts_mode = 0,
+       .spec_inv = 1,
+       .if_dvbt = 36150000,
+       .vtop = 0x20,
+       .krf = 0x04,
+       .agc_targ_val = 0x2d,
+
+};
+
+static struct rtl2830_config rtl28xxu_rtl2830_qt1010_config = {
+       .i2c_addr = 0x10, /* 0x20 */
+       .xtal = 28800000,
+       .ts_mode = 0,
+       .spec_inv = 1,
+       .if_dvbt = 36125000,
+       .vtop = 0x20,
+       .krf = 0x04,
+       .agc_targ_val = 0x2d,
+};
+
+static struct rtl2830_config rtl28xxu_rtl2830_mxl5005s_config = {
+       .i2c_addr = 0x10, /* 0x20 */
+       .xtal = 28800000,
+       .ts_mode = 0,
+       .spec_inv = 0,
+       .if_dvbt = 4570000,
+       .vtop = 0x3f,
+       .krf = 0x04,
+       .agc_targ_val = 0x3e,
+};
+
+static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
+{
+       int ret;
+       struct dvb_usb_device *d = adap_to_d(adap);
+       struct rtl28xxu_priv *priv = d_to_priv(d);
+       u8 buf[1];
+       struct rtl2830_config *rtl2830_config;
+       /* open RTL2831U/RTL2830 I2C gate */
+       struct rtl28xxu_req req_gate = { 0x0120, 0x0011, 0x0001, "\x08" };
+       /* for MT2060 tuner probe */
+       struct rtl28xxu_req req_mt2060 = { 0x00c0, CMD_I2C_RD, 1, buf };
+       /* for QT1010 tuner probe */
+       struct rtl28xxu_req req_qt1010 = { 0x0fc4, CMD_I2C_RD, 1, buf };
+
+       dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+       /*
+        * RTL2831U GPIOs
+        * =========================================================
+        * GPIO0 | tuner#0 | 0 off | 1 on  | MXL5005S (?)
+        * GPIO2 | LED     | 0 off | 1 on  |
+        * GPIO4 | tuner#1 | 0 on  | 1 off | MT2060
+        */
+
+       /* GPIO direction */
+       ret = rtl28xx_wr_reg(d, SYS_GPIO_DIR, 0x0a);
+       if (ret)
+               goto err;
+
+       /* enable as output GPIO0, GPIO2, GPIO4 */
+       ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_EN, 0x15);
+       if (ret)
+               goto err;
+
+       /*
+        * Probe used tuner. We need to know used tuner before demod attach
+        * since there is some demod params needed to set according to tuner.
+        */
+
+       /* demod needs some time to wake up */
+       msleep(20);
+
+       /* open demod I2C gate */
+       ret = rtl28xxu_ctrl_msg(d, &req_gate);
+       if (ret)
+               goto err;
+
+       /* check QT1010 ID(?) register; reg=0f val=2c */
+       ret = rtl28xxu_ctrl_msg(d, &req_qt1010);
+       if (ret == 0 && buf[0] == 0x2c) {
+               priv->tuner = TUNER_RTL2830_QT1010;
+               rtl2830_config = &rtl28xxu_rtl2830_qt1010_config;
+               dev_dbg(&d->udev->dev, "%s: QT1010\n", __func__);
+               goto found;
+       } else {
+               dev_dbg(&d->udev->dev, "%s: QT1010 probe failed=%d - %02x\n",
+                               __func__, ret, buf[0]);
+       }
+
+       /* open demod I2C gate */
+       ret = rtl28xxu_ctrl_msg(d, &req_gate);
+       if (ret)
+               goto err;
+
+       /* check MT2060 ID register; reg=00 val=63 */
+       ret = rtl28xxu_ctrl_msg(d, &req_mt2060);
+       if (ret == 0 && buf[0] == 0x63) {
+               priv->tuner = TUNER_RTL2830_MT2060;
+               rtl2830_config = &rtl28xxu_rtl2830_mt2060_config;
+               dev_dbg(&d->udev->dev, "%s: MT2060\n", __func__);
+               goto found;
+       } else {
+               dev_dbg(&d->udev->dev, "%s: MT2060 probe failed=%d - %02x\n",
+                               __func__, ret, buf[0]);
+       }
+
+       /* assume MXL5005S */
+       ret = 0;
+       priv->tuner = TUNER_RTL2830_MXL5005S;
+       rtl2830_config = &rtl28xxu_rtl2830_mxl5005s_config;
+       dev_dbg(&d->udev->dev, "%s: MXL5005S\n", __func__);
+       goto found;
+
+found:
+       /* attach demodulator */
+       adap->fe[0] = dvb_attach(rtl2830_attach, rtl2830_config,
+               &d->i2c_adap);
+       if (adap->fe[0] == NULL) {
+               ret = -ENODEV;
+               goto err;
+       }
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static struct rtl2832_config rtl28xxu_rtl2832_fc0012_config = {
+       .i2c_addr = 0x10, /* 0x20 */
+       .xtal = 28800000,
+       .if_dvbt = 0,
+       .tuner = TUNER_RTL2832_FC0012
+};
+
+static struct rtl2832_config rtl28xxu_rtl2832_fc0013_config = {
+       .i2c_addr = 0x10, /* 0x20 */
+       .xtal = 28800000,
+       .if_dvbt = 0,
+       .tuner = TUNER_RTL2832_FC0013
+};
+
+static int rtl2832u_fc0012_tuner_callback(struct dvb_usb_device *d,
+               int cmd, int arg)
+{
+       int ret;
+       u8 val;
+
+       dev_dbg(&d->udev->dev, "%s: cmd=%d arg=%d\n", __func__, cmd, arg);
+
+       switch (cmd) {
+       case FC_FE_CALLBACK_VHF_ENABLE:
+               /* set output values */
+               ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &val);
+               if (ret)
+                       goto err;
+
+               if (arg)
+                       val &= 0xbf; /* set GPIO6 low */
+               else
+                       val |= 0x40; /* set GPIO6 high */
+
+
+               ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
+               if (ret)
+                       goto err;
+               break;
+       default:
+               ret = -EINVAL;
+               goto err;
+       }
+       return 0;
+
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+
+static int rtl2832u_fc0013_tuner_callback(struct dvb_usb_device *d,
+               int cmd, int arg)
+{
+       /* TODO implement*/
+       return 0;
+}
+
+static int rtl2832u_tuner_callback(struct dvb_usb_device *d, int cmd, int arg)
+{
+       struct rtl28xxu_priv *priv = d->priv;
+
+       switch (priv->tuner) {
+       case TUNER_RTL2832_FC0012:
+               return rtl2832u_fc0012_tuner_callback(d, cmd, arg);
+
+       case TUNER_RTL2832_FC0013:
+               return rtl2832u_fc0013_tuner_callback(d, cmd, arg);
+       default:
+               break;
+       }
+
+       return -ENODEV;
+}
+
+static int rtl2832u_frontend_callback(void *adapter_priv, int component,
+                                   int cmd, int arg)
+{
+       struct i2c_adapter *adap = adapter_priv;
+       struct dvb_usb_device *d = i2c_get_adapdata(adap);
+
+       switch (component) {
+       case DVB_FRONTEND_COMPONENT_TUNER:
+               return rtl2832u_tuner_callback(d, cmd, arg);
+       default:
+               break;
+       }
+
+       return -EINVAL;
+}
+
+static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
+{
+       int ret;
+       struct dvb_usb_device *d = adap_to_d(adap);
+       struct rtl28xxu_priv *priv = d_to_priv(d);
+       struct rtl2832_config *rtl2832_config;
+       u8 buf[2], val;
+       /* open RTL2832U/RTL2832 I2C gate */
+       struct rtl28xxu_req req_gate_open = {0x0120, 0x0011, 0x0001, "\x18"};
+       /* close RTL2832U/RTL2832 I2C gate */
+       struct rtl28xxu_req req_gate_close = {0x0120, 0x0011, 0x0001, "\x10"};
+       /* for FC0012 tuner probe */
+       struct rtl28xxu_req req_fc0012 = {0x00c6, CMD_I2C_RD, 1, buf};
+       /* for FC0013 tuner probe */
+       struct rtl28xxu_req req_fc0013 = {0x00c6, CMD_I2C_RD, 1, buf};
+       /* for MT2266 tuner probe */
+       struct rtl28xxu_req req_mt2266 = {0x00c0, CMD_I2C_RD, 1, buf};
+       /* for FC2580 tuner probe */
+       struct rtl28xxu_req req_fc2580 = {0x01ac, CMD_I2C_RD, 1, buf};
+       /* for MT2063 tuner probe */
+       struct rtl28xxu_req req_mt2063 = {0x00c0, CMD_I2C_RD, 1, buf};
+       /* for MAX3543 tuner probe */
+       struct rtl28xxu_req req_max3543 = {0x00c0, CMD_I2C_RD, 1, buf};
+       /* for TUA9001 tuner probe */
+       struct rtl28xxu_req req_tua9001 = {0x7ec0, CMD_I2C_RD, 2, buf};
+       /* for MXL5007T tuner probe */
+       struct rtl28xxu_req req_mxl5007t = {0xd9c0, CMD_I2C_RD, 1, buf};
+       /* for E4000 tuner probe */
+       struct rtl28xxu_req req_e4000 = {0x02c8, CMD_I2C_RD, 1, buf};
+       /* for TDA18272 tuner probe */
+       struct rtl28xxu_req req_tda18272 = {0x00c0, CMD_I2C_RD, 2, buf};
+
+       dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+       ret = rtl28xx_rd_reg(d, SYS_GPIO_DIR, &val);
+       if (ret)
+               goto err;
+
+       val &= 0xbf;
+
+       ret = rtl28xx_wr_reg(d, SYS_GPIO_DIR, val);
+       if (ret)
+               goto err;
+
+       /* enable as output GPIO3 and GPIO6*/
+       ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_EN, &val);
+       if (ret)
+               goto err;
+
+       val |= 0x48;
+
+       ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_EN, val);
+       if (ret)
+               goto err;
+
+       /*
+        * Probe used tuner. We need to know used tuner before demod attach
+        * since there is some demod params needed to set according to tuner.
+        */
+
+       /* open demod I2C gate */
+       ret = rtl28xxu_ctrl_msg(d, &req_gate_open);
+       if (ret)
+               goto err;
+
+       priv->tuner = TUNER_NONE;
+
+       /* check FC0012 ID register; reg=00 val=a1 */
+       ret = rtl28xxu_ctrl_msg(d, &req_fc0012);
+       if (ret == 0 && buf[0] == 0xa1) {
+               priv->tuner = TUNER_RTL2832_FC0012;
+               rtl2832_config = &rtl28xxu_rtl2832_fc0012_config;
+               dev_info(&d->udev->dev, "%s: FC0012 tuner found",
+                               KBUILD_MODNAME);
+               goto found;
+       }
+
+       /* check FC0013 ID register; reg=00 val=a3 */
+       ret = rtl28xxu_ctrl_msg(d, &req_fc0013);
+       if (ret == 0 && buf[0] == 0xa3) {
+               priv->tuner = TUNER_RTL2832_FC0013;
+               rtl2832_config = &rtl28xxu_rtl2832_fc0013_config;
+               dev_info(&d->udev->dev, "%s: FC0013 tuner found",
+                               KBUILD_MODNAME);
+               goto found;
+       }
+
+       /* check MT2266 ID register; reg=00 val=85 */
+       ret = rtl28xxu_ctrl_msg(d, &req_mt2266);
+       if (ret == 0 && buf[0] == 0x85) {
+               priv->tuner = TUNER_RTL2832_MT2266;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: MT2266 tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+       /* check FC2580 ID register; reg=01 val=56 */
+       ret = rtl28xxu_ctrl_msg(d, &req_fc2580);
+       if (ret == 0 && buf[0] == 0x56) {
+               priv->tuner = TUNER_RTL2832_FC2580;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: FC2580 tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+       /* check MT2063 ID register; reg=00 val=9e || 9c */
+       ret = rtl28xxu_ctrl_msg(d, &req_mt2063);
+       if (ret == 0 && (buf[0] == 0x9e || buf[0] == 0x9c)) {
+               priv->tuner = TUNER_RTL2832_MT2063;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: MT2063 tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+       /* check MAX3543 ID register; reg=00 val=38 */
+       ret = rtl28xxu_ctrl_msg(d, &req_max3543);
+       if (ret == 0 && buf[0] == 0x38) {
+               priv->tuner = TUNER_RTL2832_MAX3543;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: MAX3534 tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+       /* check TUA9001 ID register; reg=7e val=2328 */
+       ret = rtl28xxu_ctrl_msg(d, &req_tua9001);
+       if (ret == 0 && buf[0] == 0x23 && buf[1] == 0x28) {
+               priv->tuner = TUNER_RTL2832_TUA9001;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: TUA9001 tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+       /* check MXL5007R ID register; reg=d9 val=14 */
+       ret = rtl28xxu_ctrl_msg(d, &req_mxl5007t);
+       if (ret == 0 && buf[0] == 0x14) {
+               priv->tuner = TUNER_RTL2832_MXL5007T;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: MXL5007T tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+       /* check E4000 ID register; reg=02 val=40 */
+       ret = rtl28xxu_ctrl_msg(d, &req_e4000);
+       if (ret == 0 && buf[0] == 0x40) {
+               priv->tuner = TUNER_RTL2832_E4000;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: E4000 tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+       /* check TDA18272 ID register; reg=00 val=c760  */
+       ret = rtl28xxu_ctrl_msg(d, &req_tda18272);
+       if (ret == 0 && (buf[0] == 0xc7 || buf[1] == 0x60)) {
+               priv->tuner = TUNER_RTL2832_TDA18272;
+               /* TODO implement tuner */
+               dev_info(&d->udev->dev, "%s: TDA18272 tuner found",
+                               KBUILD_MODNAME);
+               goto unsupported;
+       }
+
+unsupported:
+       /* close demod I2C gate */
+       ret = rtl28xxu_ctrl_msg(d, &req_gate_close);
+       if (ret)
+               goto err;
+
+       /* tuner not found */
+       dev_dbg(&d->udev->dev, "%s: No compatible tuner found\n", __func__);
+       ret = -ENODEV;
+       return ret;
+
+found:
+       /* close demod I2C gate */
+       ret = rtl28xxu_ctrl_msg(d, &req_gate_close);
+       if (ret)
+               goto err;
+
+       /* attach demodulator */
+       adap->fe[0] = dvb_attach(rtl2832_attach, rtl2832_config,
+               &d->i2c_adap);
+               if (adap->fe[0] == NULL) {
+                       ret = -ENODEV;
+                       goto err;
+               }
+
+       /* set fe callbacks */
+       adap->fe[0]->callback = rtl2832u_frontend_callback;
+
+       return ret;
+
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static struct qt1010_config rtl28xxu_qt1010_config = {
+       .i2c_address = 0x62, /* 0xc4 */
+};
+
+static struct mt2060_config rtl28xxu_mt2060_config = {
+       .i2c_address = 0x60, /* 0xc0 */
+       .clock_out = 0,
+};
+
+static struct mxl5005s_config rtl28xxu_mxl5005s_config = {
+       .i2c_address     = 0x63, /* 0xc6 */
+       .if_freq         = IF_FREQ_4570000HZ,
+       .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
+       .agc_mode        = MXL_SINGLE_AGC,
+       .tracking_filter = MXL_TF_C_H,
+       .rssi_enable     = MXL_RSSI_ENABLE,
+       .cap_select      = MXL_CAP_SEL_ENABLE,
+       .div_out         = MXL_DIV_OUT_4,
+       .clock_out       = MXL_CLOCK_OUT_DISABLE,
+       .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
+       .top             = MXL5005S_TOP_25P2,
+       .mod_mode        = MXL_DIGITAL_MODE,
+       .if_mode         = MXL_ZERO_IF,
+       .AgcMasterByte   = 0x00,
+};
+
+static int rtl2831u_tuner_attach(struct dvb_usb_adapter *adap)
+{
+       int ret;
+       struct dvb_usb_device *d = adap_to_d(adap);
+       struct rtl28xxu_priv *priv = d_to_priv(d);
+       struct i2c_adapter *rtl2830_tuner_i2c;
+       struct dvb_frontend *fe;
+
+       dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+       /* use rtl2830 driver I2C adapter, for more info see rtl2830 driver */
+       rtl2830_tuner_i2c = rtl2830_get_tuner_i2c_adapter(adap->fe[0]);
+
+       switch (priv->tuner) {
+       case TUNER_RTL2830_QT1010:
+               fe = dvb_attach(qt1010_attach, adap->fe[0],
+                               rtl2830_tuner_i2c, &rtl28xxu_qt1010_config);
+               break;
+       case TUNER_RTL2830_MT2060:
+               fe = dvb_attach(mt2060_attach, adap->fe[0],
+                               rtl2830_tuner_i2c, &rtl28xxu_mt2060_config,
+                               1220);
+               break;
+       case TUNER_RTL2830_MXL5005S:
+               fe = dvb_attach(mxl5005s_attach, adap->fe[0],
+                               rtl2830_tuner_i2c, &rtl28xxu_mxl5005s_config);
+               break;
+       default:
+               fe = NULL;
+               dev_err(&d->udev->dev, "%s: unknown tuner=%d\n", KBUILD_MODNAME,
+                               priv->tuner);
+       }
+
+       if (fe == NULL) {
+               ret = -ENODEV;
+               goto err;
+       }
+
+       return 0;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
+{
+       int ret;
+       struct dvb_usb_device *d = adap_to_d(adap);
+       struct rtl28xxu_priv *priv = d_to_priv(d);
+       struct dvb_frontend *fe;
+
+       dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+       switch (priv->tuner) {
+       case TUNER_RTL2832_FC0012:
+               fe = dvb_attach(fc0012_attach, adap->fe[0],
+                       &d->i2c_adap, 0xc6>>1, 0, FC_XTAL_28_8_MHZ);
+
+               /* since fc0012 includs reading the signal strength delegate
+                * that to the tuner driver */
+               adap->fe[0]->ops.read_signal_strength =
+                               adap->fe[0]->ops.tuner_ops.get_rf_strength;
+               return 0;
+               break;
+       case TUNER_RTL2832_FC0013:
+               fe = dvb_attach(fc0013_attach, adap->fe[0],
+                       &d->i2c_adap, 0xc6>>1, 0, FC_XTAL_28_8_MHZ);
+
+               /* fc0013 also supports signal strength reading */
+               adap->fe[0]->ops.read_signal_strength =
+                               adap->fe[0]->ops.tuner_ops.get_rf_strength;
+               return 0;
+       default:
+               fe = NULL;
+               dev_err(&d->udev->dev, "%s: unknown tuner=%d\n", KBUILD_MODNAME,
+                               priv->tuner);
+       }
+
+       if (fe == NULL) {
+               ret = -ENODEV;
+               goto err;
+       }
+
+       return 0;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl28xxu_init(struct dvb_usb_device *d)
+{
+       int ret;
+       u8 val;
+
+       dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+       /* init USB endpoints */
+       ret = rtl28xx_rd_reg(d, USB_SYSCTL_0, &val);
+       if (ret)
+               goto err;
+
+       /* enable DMA and Full Packet Mode*/
+       val |= 0x09;
+       ret = rtl28xx_wr_reg(d, USB_SYSCTL_0, val);
+       if (ret)
+               goto err;
+
+       /* set EPA maximum packet size to 0x0200 */
+       ret = rtl28xx_wr_regs(d, USB_EPA_MAXPKT, "\x00\x02\x00\x00", 4);
+       if (ret)
+               goto err;
+
+       /* change EPA FIFO length */
+       ret = rtl28xx_wr_regs(d, USB_EPA_FIFO_CFG, "\x14\x00\x00\x00", 4);
+       if (ret)
+               goto err;
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl2831u_streaming_ctrl(struct dvb_frontend *fe , int onoff)
+{
+       int ret;
+       u8 buf[2], gpio;
+       struct dvb_usb_device *d = fe_to_d(fe);
+
+       dev_dbg(&d->udev->dev, "%s: onoff=%d\n", __func__, onoff);
+
+       ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &gpio);
+       if (ret)
+               goto err;
+
+       if (onoff) {
+               buf[0] = 0x00;
+               buf[1] = 0x00;
+               gpio |= 0x04; /* LED on */
+       } else {
+               buf[0] = 0x10; /* stall EPA */
+               buf[1] = 0x02; /* reset EPA */
+               gpio &= (~0x04); /* LED off */
+       }
+
+       ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, gpio);
+       if (ret)
+               goto err;
+
+       ret = rtl28xx_wr_regs(d, USB_EPA_CTL, buf, 2);
+       if (ret)
+               goto err;
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl2832u_streaming_ctrl(struct dvb_frontend *fe , int onoff)
+{
+       int ret;
+       u8 buf[2];
+       struct dvb_usb_device *d = fe_to_d(fe);
+
+       dev_dbg(&d->udev->dev, "%s: onoff=%d\n", __func__, onoff);
+
+       if (onoff) {
+               buf[0] = 0x00;
+               buf[1] = 0x00;
+       } else {
+               buf[0] = 0x10; /* stall EPA */
+               buf[1] = 0x02; /* reset EPA */
+       }
+
+       ret = rtl28xx_wr_regs(d, USB_EPA_CTL, buf, 2);
+       if (ret)
+               goto err;
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl2831u_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+       int ret;
+       u8 gpio, sys0;
+
+       dev_dbg(&d->udev->dev, "%s: onoff=%d\n", __func__, onoff);
+
+       /* demod adc */
+       ret = rtl28xx_rd_reg(d, SYS_SYS0, &sys0);
+       if (ret)
+               goto err;
+
+       /* tuner power, read GPIOs */
+       ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &gpio);
+       if (ret)
+               goto err;
+
+       dev_dbg(&d->udev->dev, "%s: RD SYS0=%02x GPIO_OUT_VAL=%02x\n", __func__,
+                       sys0, gpio);
+
+       if (onoff) {
+               gpio |= 0x01; /* GPIO0 = 1 */
+               gpio &= (~0x10); /* GPIO4 = 0 */
+               sys0 = sys0 & 0x0f;
+               sys0 |= 0xe0;
+       } else {
+               gpio &= (~0x01); /* GPIO0 = 0 */
+               gpio |= 0x10; /* GPIO4 = 1 */
+               sys0 = sys0 & (~0xc0);
+       }
+
+       dev_dbg(&d->udev->dev, "%s: WR SYS0=%02x GPIO_OUT_VAL=%02x\n", __func__,
+                       sys0, gpio);
+
+       /* demod adc */
+       ret = rtl28xx_wr_reg(d, SYS_SYS0, sys0);
+       if (ret)
+               goto err;
+
+       /* tuner power, write GPIOs */
+       ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, gpio);
+       if (ret)
+               goto err;
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl2832u_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+       int ret;
+       u8 val;
+
+       dev_dbg(&d->udev->dev, "%s: onoff=%d\n", __func__, onoff);
+
+       if (onoff) {
+               /* set output values */
+               ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &val);
+               if (ret)
+                       goto err;
+
+               val |= 0x08;
+               val &= 0xef;
+
+               ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
+               if (ret)
+                       goto err;
+
+               /* demod_ctl_1 */
+               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL1, &val);
+               if (ret)
+                       goto err;
+
+               val &= 0xef;
+
+               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL1, val);
+               if (ret)
+                       goto err;
+
+               /* demod control */
+               /* PLL enable */
+               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
+               if (ret)
+                       goto err;
+
+               /* bit 7 to 1 */
+               val |= 0x80;
+
+               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
+               if (ret)
+                       goto err;
+
+               /* demod HW reset */
+               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
+               if (ret)
+                       goto err;
+               /* bit 5 to 0 */
+               val &= 0xdf;
+
+               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
+               if (ret)
+                       goto err;
+
+               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
+               if (ret)
+                       goto err;
+
+               val |= 0x20;
+
+               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
+               if (ret)
+                       goto err;
+
+               mdelay(5);
+
+               /*enable ADC_Q and ADC_I */
+               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
+               if (ret)
+                       goto err;
+
+               val |= 0x48;
+
+               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
+               if (ret)
+                       goto err;
+
+
+       } else {
+               /* demod_ctl_1 */
+               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL1, &val);
+               if (ret)
+                       goto err;
+
+               val |= 0x0c;
+
+               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL1, val);
+               if (ret)
+                       goto err;
+
+               /* set output values */
+               ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &val);
+               if (ret)
+                               goto err;
+
+               val |= 0x10;
+
+               ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
+               if (ret)
+                       goto err;
+
+               /* demod control */
+               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
+               if (ret)
+                       goto err;
+
+               val &= 0x37;
+
+               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
+               if (ret)
+                       goto err;
+
+       }
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+
+static int rtl2831u_rc_query(struct dvb_usb_device *d)
+{
+       int ret, i;
+       struct rtl28xxu_priv *priv = d->priv;
+       u8 buf[5];
+       u32 rc_code;
+       struct rtl28xxu_reg_val rc_nec_tab[] = {
+               { 0x3033, 0x80 },
+               { 0x3020, 0x43 },
+               { 0x3021, 0x16 },
+               { 0x3022, 0x16 },
+               { 0x3023, 0x5a },
+               { 0x3024, 0x2d },
+               { 0x3025, 0x16 },
+               { 0x3026, 0x01 },
+               { 0x3028, 0xb0 },
+               { 0x3029, 0x04 },
+               { 0x302c, 0x88 },
+               { 0x302e, 0x13 },
+               { 0x3030, 0xdf },
+               { 0x3031, 0x05 },
+       };
+
+       /* init remote controller */
+       if (!priv->rc_active) {
+               for (i = 0; i < ARRAY_SIZE(rc_nec_tab); i++) {
+                       ret = rtl28xx_wr_reg(d, rc_nec_tab[i].reg,
+                                       rc_nec_tab[i].val);
+                       if (ret)
+                               goto err;
+               }
+               priv->rc_active = true;
+       }
+
+       ret = rtl2831_rd_regs(d, SYS_IRRC_RP, buf, 5);
+       if (ret)
+               goto err;
+
+       if (buf[4] & 0x01) {
+               if (buf[2] == (u8) ~buf[3]) {
+                       if (buf[0] == (u8) ~buf[1]) {
+                               /* NEC standard (16 bit) */
+                               rc_code = buf[0] << 8 | buf[2];
+                       } else {
+                               /* NEC extended (24 bit) */
+                               rc_code = buf[0] << 16 |
+                                               buf[1] << 8 | buf[2];
+                       }
+               } else {
+                       /* NEC full (32 bit) */
+                       rc_code = buf[0] << 24 | buf[1] << 16 |
+                                       buf[2] << 8 | buf[3];
+               }
+
+               rc_keydown(d->rc_dev, rc_code, 0);
+
+               ret = rtl28xx_wr_reg(d, SYS_IRRC_SR, 1);
+               if (ret)
+                       goto err;
+
+               /* repeated intentionally to avoid extra keypress */
+               ret = rtl28xx_wr_reg(d, SYS_IRRC_SR, 1);
+               if (ret)
+                       goto err;
+       }
+
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl2831u_get_rc_config(struct dvb_usb_device *d,
+               struct dvb_usb_rc *rc)
+{
+       rc->map_name = RC_MAP_EMPTY;
+       rc->allowed_protos = RC_TYPE_NEC;
+       rc->query = rtl2831u_rc_query;
+       rc->interval = 400;
+
+       return 0;
+}
+
+static int rtl2832u_rc_query(struct dvb_usb_device *d)
+{
+       int ret, i;
+       struct rtl28xxu_priv *priv = d->priv;
+       u8 buf[128];
+       int len;
+       struct rtl28xxu_reg_val rc_nec_tab[] = {
+               { IR_RX_CTRL,             0x20 },
+               { IR_RX_BUF_CTRL,         0x80 },
+               { IR_RX_IF,               0xff },
+               { IR_RX_IE,               0xff },
+               { IR_MAX_DURATION0,       0xd0 },
+               { IR_MAX_DURATION1,       0x07 },
+               { IR_IDLE_LEN0,           0xc0 },
+               { IR_IDLE_LEN1,           0x00 },
+               { IR_GLITCH_LEN,          0x03 },
+               { IR_RX_CLK,              0x09 },
+               { IR_RX_CFG,              0x1c },
+               { IR_MAX_H_TOL_LEN,       0x1e },
+               { IR_MAX_L_TOL_LEN,       0x1e },
+               { IR_RX_CTRL,             0x80 },
+       };
+
+       /* init remote controller */
+       if (!priv->rc_active) {
+               for (i = 0; i < ARRAY_SIZE(rc_nec_tab); i++) {
+                       ret = rtl28xx_wr_reg(d, rc_nec_tab[i].reg,
+                                       rc_nec_tab[i].val);
+                       if (ret)
+                               goto err;
+               }
+               priv->rc_active = true;
+       }
+
+       ret = rtl28xx_rd_reg(d, IR_RX_IF, &buf[0]);
+       if (ret)
+               goto err;
+
+       if (buf[0] != 0x83)
+               goto exit;
+
+       ret = rtl28xx_rd_reg(d, IR_RX_BC, &buf[0]);
+       if (ret)
+               goto err;
+
+       len = buf[0];
+       ret = rtl2831_rd_regs(d, IR_RX_BUF, buf, len);
+
+       /* TODO: pass raw IR to Kernel IR decoder */
+
+       ret = rtl28xx_wr_reg(d, IR_RX_IF, 0x03);
+       ret = rtl28xx_wr_reg(d, IR_RX_BUF_CTRL, 0x80);
+       ret = rtl28xx_wr_reg(d, IR_RX_CTRL, 0x80);
+
+exit:
+       return ret;
+err:
+       dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+       return ret;
+}
+
+static int rtl2832u_get_rc_config(struct dvb_usb_device *d,
+               struct dvb_usb_rc *rc)
+{
+       rc->map_name = RC_MAP_EMPTY;
+       rc->allowed_protos = RC_TYPE_NEC;
+       rc->query = rtl2832u_rc_query;
+       rc->interval = 400;
+
+       return 0;
+}
+
+static const struct dvb_usb_device_properties rtl2831u_props = {
+       .driver_name = KBUILD_MODNAME,
+       .owner = THIS_MODULE,
+       .adapter_nr = adapter_nr,
+       .size_of_priv = sizeof(struct rtl28xxu_priv),
+
+       .power_ctrl = rtl2831u_power_ctrl,
+       .i2c_algo = &rtl28xxu_i2c_algo,
+       .frontend_attach = rtl2831u_frontend_attach,
+       .tuner_attach = rtl2831u_tuner_attach,
+       .init = rtl28xxu_init,
+       .get_rc_config = rtl2831u_get_rc_config,
+       .streaming_ctrl = rtl2831u_streaming_ctrl,
+
+       .num_adapters = 1,
+       .adapter = {
+               {
+                       .stream = DVB_USB_STREAM_BULK(0x81, 6, 8 * 512),
+               },
+       },
+};
+
+static const struct dvb_usb_device_properties rtl2832u_props = {
+       .driver_name = KBUILD_MODNAME,
+       .owner = THIS_MODULE,
+       .adapter_nr = adapter_nr,
+       .size_of_priv = sizeof(struct rtl28xxu_priv),
+
+       .power_ctrl = rtl2832u_power_ctrl,
+       .i2c_algo = &rtl28xxu_i2c_algo,
+       .frontend_attach = rtl2832u_frontend_attach,
+       .tuner_attach = rtl2832u_tuner_attach,
+       .init = rtl28xxu_init,
+       .get_rc_config = rtl2832u_get_rc_config,
+       .streaming_ctrl = rtl2832u_streaming_ctrl,
+
+       .num_adapters = 1,
+       .adapter = {
+               {
+                       .stream = DVB_USB_STREAM_BULK(0x81, 6, 8 * 512),
+               },
+       },
+};
+
+static const struct usb_device_id rtl28xxu_id_table[] = {
+       { DVB_USB_DEVICE(USB_VID_REALTEK, USB_PID_REALTEK_RTL2831U,
+               &rtl2831u_props, "Realtek RTL2831U reference design", NULL) },
+       { DVB_USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT,
+               &rtl2831u_props, "Freecom USB2.0 DVB-T", NULL) },
+       { DVB_USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT_2,
+               &rtl2831u_props, "Freecom USB2.0 DVB-T", NULL) },
+
+       { DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1,
+               &rtl2832u_props, "Terratec Cinergy T Stick Black", NULL) },
+       { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_DELOCK_USB2_DVBT,
+               &rtl2832u_props, "G-Tek Electronics Group Lifeview LV5TDLX DVB-T", NULL) },
+       { DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK,
+               &rtl2832u_props, "NOXON DAB/DAB+ USB dongle", NULL) },
+       { }
+};
+MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);
+
+static struct usb_driver rtl28xxu_usb_driver = {
+       .name = KBUILD_MODNAME,
+       .id_table = rtl28xxu_id_table,
+       .probe = dvb_usbv2_probe,
+       .disconnect = dvb_usbv2_disconnect,
+       .suspend = dvb_usbv2_suspend,
+       .resume = dvb_usbv2_resume,
+       .no_dynamic_id = 1,
+       .soft_unbind = 1,
+};
+
+module_usb_driver(rtl28xxu_usb_driver);
+
+MODULE_DESCRIPTION("Realtek RTL28xxU DVB USB driver");
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
+MODULE_AUTHOR("Thomas Mair <thomas.mair86@googlemail.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb-v2/rtl28xxu.h b/drivers/media/dvb/dvb-usb-v2/rtl28xxu.h
new file mode 100644 (file)
index 0000000..575edbf
--- /dev/null
@@ -0,0 +1,254 @@
+/*
+ * Realtek RTL28xxU DVB USB driver
+ *
+ * Copyright (C) 2009 Antti Palosaari <crope@iki.fi>
+ * Copyright (C) 2011 Antti Palosaari <crope@iki.fi>
+ *
+ *    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; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License along
+ *    with this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef RTL28XXU_H
+#define RTL28XXU_H
+
+#include "dvb_usb.h"
+
+#define deb_dump(r, t, v, i, b, l) { \
+       char *direction; \
+       if (t == (USB_TYPE_VENDOR | USB_DIR_OUT)) \
+               direction = ">>>"; \
+       else \
+               direction = "<<<"; \
+       dev_dbg(&d->udev->dev, "%s: %02x %02x %02x %02x %02x %02x %02x %02x " \
+                       "%s [%d bytes]\n",  __func__, t, r, v & 0xff, v >> 8, \
+                       i & 0xff, i >> 8, l & 0xff, l >> 8, direction, l); \
+}
+
+/*
+ * USB commands
+ * (usb_control_msg() index parameter)
+ */
+
+#define DEMOD            0x0000
+#define USB              0x0100
+#define SYS              0x0200
+#define I2C              0x0300
+#define I2C_DA           0x0600
+
+#define CMD_WR_FLAG      0x0010
+#define CMD_DEMOD_RD     0x0000
+#define CMD_DEMOD_WR     0x0010
+#define CMD_USB_RD       0x0100
+#define CMD_USB_WR       0x0110
+#define CMD_SYS_RD       0x0200
+#define CMD_IR_RD        0x0201
+#define CMD_IR_WR        0x0211
+#define CMD_SYS_WR       0x0210
+#define CMD_I2C_RD       0x0300
+#define CMD_I2C_WR       0x0310
+#define CMD_I2C_DA_RD    0x0600
+#define CMD_I2C_DA_WR    0x0610
+
+
+struct rtl28xxu_priv {
+       u8 chip_id;
+       u8 tuner;
+       u8 page; /* integrated demod active register page */
+       bool rc_active;
+};
+
+enum rtl28xxu_chip_id {
+       CHIP_ID_NONE,
+       CHIP_ID_RTL2831U,
+       CHIP_ID_RTL2832U,
+};
+
+enum rtl28xxu_tuner {
+       TUNER_NONE,
+
+       TUNER_RTL2830_QT1010,
+       TUNER_RTL2830_MT2060,
+       TUNER_RTL2830_MXL5005S,
+
+       TUNER_RTL2832_MT2266,
+       TUNER_RTL2832_FC2580,
+       TUNER_RTL2832_MT2063,
+       TUNER_RTL2832_MAX3543,
+       TUNER_RTL2832_TUA9001,
+       TUNER_RTL2832_MXL5007T,
+       TUNER_RTL2832_FC0012,
+       TUNER_RTL2832_E4000,
+       TUNER_RTL2832_TDA18272,
+       TUNER_RTL2832_FC0013,
+};
+
+struct rtl28xxu_req {
+       u16 value;
+       u16 index;
+       u16 size;
+       u8 *data;
+};
+
+struct rtl28xxu_reg_val {
+       u16 reg;
+       u8 val;
+};
+
+/*
+ * memory map
+ *
+ * 0x0000 DEMOD : demodulator
+ * 0x2000 USB   : SIE, USB endpoint, debug, DMA
+ * 0x3000 SYS   : system
+ * 0xfc00 RC    : remote controller (not RTL2831U)
+ */
+
+/*
+ * USB registers
+ */
+/* SIE Control Registers */
+#define USB_SYSCTL         0x2000 /* USB system control */
+#define USB_SYSCTL_0       0x2000 /* USB system control */
+#define USB_SYSCTL_1       0x2001 /* USB system control */
+#define USB_SYSCTL_2       0x2002 /* USB system control */
+#define USB_SYSCTL_3       0x2003 /* USB system control */
+#define USB_IRQSTAT        0x2008 /* SIE interrupt status */
+#define USB_IRQEN          0x200C /* SIE interrupt enable */
+#define USB_CTRL           0x2010 /* USB control */
+#define USB_STAT           0x2014 /* USB status */
+#define USB_DEVADDR        0x2018 /* USB device address */
+#define USB_TEST           0x201C /* USB test mode */
+#define USB_FRAME_NUMBER   0x2020 /* frame number */
+#define USB_FIFO_ADDR      0x2028 /* address of SIE FIFO RAM */
+#define USB_FIFO_CMD       0x202A /* SIE FIFO RAM access command */
+#define USB_FIFO_DATA      0x2030 /* SIE FIFO RAM data */
+/* Endpoint Registers */
+#define EP0_SETUPA         0x20F8 /* EP 0 setup packet lower byte */
+#define EP0_SETUPB         0x20FC /* EP 0 setup packet higher byte */
+#define USB_EP0_CFG        0x2104 /* EP 0 configure */
+#define USB_EP0_CTL        0x2108 /* EP 0 control */
+#define USB_EP0_STAT       0x210C /* EP 0 status */
+#define USB_EP0_IRQSTAT    0x2110 /* EP 0 interrupt status */
+#define USB_EP0_IRQEN      0x2114 /* EP 0 interrupt enable */
+#define USB_EP0_MAXPKT     0x2118 /* EP 0 max packet size */
+#define USB_EP0_BC         0x2120 /* EP 0 FIFO byte counter */
+#define USB_EPA_CFG        0x2144 /* EP A configure */
+#define USB_EPA_CFG_0      0x2144 /* EP A configure */
+#define USB_EPA_CFG_1      0x2145 /* EP A configure */
+#define USB_EPA_CFG_2      0x2146 /* EP A configure */
+#define USB_EPA_CFG_3      0x2147 /* EP A configure */
+#define USB_EPA_CTL        0x2148 /* EP A control */
+#define USB_EPA_CTL_0      0x2148 /* EP A control */
+#define USB_EPA_CTL_1      0x2149 /* EP A control */
+#define USB_EPA_CTL_2      0x214A /* EP A control */
+#define USB_EPA_CTL_3      0x214B /* EP A control */
+#define USB_EPA_STAT       0x214C /* EP A status */
+#define USB_EPA_IRQSTAT    0x2150 /* EP A interrupt status */
+#define USB_EPA_IRQEN      0x2154 /* EP A interrupt enable */
+#define USB_EPA_MAXPKT     0x2158 /* EP A max packet size */
+#define USB_EPA_MAXPKT_0   0x2158 /* EP A max packet size */
+#define USB_EPA_MAXPKT_1   0x2159 /* EP A max packet size */
+#define USB_EPA_MAXPKT_2   0x215A /* EP A max packet size */
+#define USB_EPA_MAXPKT_3   0x215B /* EP A max packet size */
+#define USB_EPA_FIFO_CFG   0x2160 /* EP A FIFO configure */
+#define USB_EPA_FIFO_CFG_0 0x2160 /* EP A FIFO configure */
+#define USB_EPA_FIFO_CFG_1 0x2161 /* EP A FIFO configure */
+#define USB_EPA_FIFO_CFG_2 0x2162 /* EP A FIFO configure */
+#define USB_EPA_FIFO_CFG_3 0x2163 /* EP A FIFO configure */
+/* Debug Registers */
+#define USB_PHYTSTDIS      0x2F04 /* PHY test disable */
+#define USB_TOUT_VAL       0x2F08 /* USB time-out time */
+#define USB_VDRCTRL        0x2F10 /* UTMI vendor signal control */
+#define USB_VSTAIN         0x2F14 /* UTMI vendor signal status in */
+#define USB_VLOADM         0x2F18 /* UTMI load vendor signal status in */
+#define USB_VSTAOUT        0x2F1C /* UTMI vendor signal status out */
+#define USB_UTMI_TST       0x2F80 /* UTMI test */
+#define USB_UTMI_STATUS    0x2F84 /* UTMI status */
+#define USB_TSTCTL         0x2F88 /* test control */
+#define USB_TSTCTL2        0x2F8C /* test control 2 */
+#define USB_PID_FORCE      0x2F90 /* force PID */
+#define USB_PKTERR_CNT     0x2F94 /* packet error counter */
+#define USB_RXERR_CNT      0x2F98 /* RX error counter */
+#define USB_MEM_BIST       0x2F9C /* MEM BIST test */
+#define USB_SLBBIST        0x2FA0 /* self-loop-back BIST */
+#define USB_CNTTEST        0x2FA4 /* counter test */
+#define USB_PHYTST         0x2FC0 /* USB PHY test */
+#define USB_DBGIDX         0x2FF0 /* select individual block debug signal */
+#define USB_DBGMUX         0x2FF4 /* debug signal module mux */
+
+/*
+ * SYS registers
+ */
+/* demod control registers */
+#define SYS_SYS0           0x3000 /* include DEMOD_CTL, GPO, GPI, GPOE */
+#define SYS_DEMOD_CTL      0x3000 /* control register for DVB-T demodulator */
+/* GPIO registers */
+#define SYS_GPIO_OUT_VAL   0x3001 /* output value of GPIO */
+#define SYS_GPIO_IN_VAL    0x3002 /* input value of GPIO */
+#define SYS_GPIO_OUT_EN    0x3003 /* output enable of GPIO */
+#define SYS_SYS1           0x3004 /* include GPD, SYSINTE, SYSINTS, GP_CFG0 */
+#define SYS_GPIO_DIR       0x3004 /* direction control for GPIO */
+#define SYS_SYSINTE        0x3005 /* system interrupt enable */
+#define SYS_SYSINTS        0x3006 /* system interrupt status */
+#define SYS_GPIO_CFG0      0x3007 /* PAD configuration for GPIO0-GPIO3 */
+#define SYS_SYS2           0x3008 /* include GP_CFG1 and 3 reserved bytes */
+#define SYS_GPIO_CFG1      0x3008 /* PAD configuration for GPIO4 */
+#define SYS_DEMOD_CTL1     0x300B
+
+/* IrDA registers */
+#define SYS_IRRC_PSR       0x3020 /* IR protocol selection */
+#define SYS_IRRC_PER       0x3024 /* IR protocol extension */
+#define SYS_IRRC_SF        0x3028 /* IR sampling frequency */
+#define SYS_IRRC_DPIR      0x302C /* IR data package interval */
+#define SYS_IRRC_CR        0x3030 /* IR control */
+#define SYS_IRRC_RP        0x3034 /* IR read port */
+#define SYS_IRRC_SR        0x3038 /* IR status */
+/* I2C master registers */
+#define SYS_I2CCR          0x3040 /* I2C clock */
+#define SYS_I2CMCR         0x3044 /* I2C master control */
+#define SYS_I2CMSTR        0x3048 /* I2C master SCL timing */
+#define SYS_I2CMSR         0x304C /* I2C master status */
+#define SYS_I2CMFR         0x3050 /* I2C master FIFO */
+
+/*
+ * IR registers
+ */
+#define IR_RX_BUF          0xFC00
+#define IR_RX_IE           0xFD00
+#define IR_RX_IF           0xFD01
+#define IR_RX_CTRL         0xFD02
+#define IR_RX_CFG          0xFD03
+#define IR_MAX_DURATION0   0xFD04
+#define IR_MAX_DURATION1   0xFD05
+#define IR_IDLE_LEN0       0xFD06
+#define IR_IDLE_LEN1       0xFD07
+#define IR_GLITCH_LEN      0xFD08
+#define IR_RX_BUF_CTRL     0xFD09
+#define IR_RX_BUF_DATA     0xFD0A
+#define IR_RX_BC           0xFD0B
+#define IR_RX_CLK          0xFD0C
+#define IR_RX_C_COUNT_L    0xFD0D
+#define IR_RX_C_COUNT_H    0xFD0E
+#define IR_SUSPEND_CTRL    0xFD10
+#define IR_ERR_TOL_CTRL    0xFD11
+#define IR_UNIT_LEN        0xFD12
+#define IR_ERR_TOL_LEN     0xFD13
+#define IR_MAX_H_TOL_LEN   0xFD14
+#define IR_MAX_L_TOL_LEN   0xFD15
+#define IR_MASK_CTRL       0xFD16
+#define IR_MASK_DATA       0xFD17
+#define IR_RES_MASK_ADDR   0xFD18
+#define IR_RES_MASK_T_LEN  0xFD19
+
+#endif
index 8e13877a5c2ca666259ea0abc6cab2531dd01c4e..ec10c0f2f5545cf1c284f72f48d3d1a9d2eb54f1 100644 (file)
@@ -319,16 +319,3 @@ config DVB_USB_IT913X
        help
          Say Y here to support the it913x device
 
-config DVB_USB_RTL28XXU
-       tristate "Realtek RTL28xxU DVB USB support"
-       depends on DVB_USB && EXPERIMENTAL
-       select DVB_RTL2830
-       select DVB_RTL2832
-       select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
-       select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
-       select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
-       select MEDIA_TUNER_FC0012 if !MEDIA_TUNER_CUSTOMISE
-       select MEDIA_TUNER_FC0013 if !MEDIA_TUNER_CUSTOMISE
-       help
-         Say Y here to support the Realtek RTL28xxU DVB USB receiver.
-
index 859baf9c8e0c68b48fb4c106b9ff7acedc6b6c38..d1912e0e1681e8fdf712cbee5340fb01d2927fb4 100644 (file)
@@ -78,9 +78,6 @@ obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o
 dvb-usb-it913x-objs := it913x.o
 obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o
 
-dvb-usb-rtl28xxu-objs = rtl28xxu.o
-obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
-
 ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
 # due to tuner-xc3028
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb/rtl28xxu.c
deleted file mode 100644 (file)
index 6bd0bd7..0000000
+++ /dev/null
@@ -1,1428 +0,0 @@
-/*
- * Realtek RTL28xxU DVB USB driver
- *
- * Copyright (C) 2009 Antti Palosaari <crope@iki.fi>
- * Copyright (C) 2011 Antti Palosaari <crope@iki.fi>
- * Copyright (C) 2012 Thomas Mair <thomas.mair86@googlemail.com>
- *
- *    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; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License along
- *    with this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "rtl28xxu.h"
-
-#include "rtl2830.h"
-#include "rtl2832.h"
-
-#include "qt1010.h"
-#include "mt2060.h"
-#include "mxl5005s.h"
-#include "fc0012.h"
-#include "fc0013.h"
-
-/* debug */
-static int dvb_usb_rtl28xxu_debug;
-module_param_named(debug, dvb_usb_rtl28xxu_debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
-DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
-
-static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
-{
-       int ret;
-       unsigned int pipe;
-       u8 requesttype;
-       u8 *buf;
-
-       buf = kmalloc(req->size, GFP_KERNEL);
-       if (!buf) {
-               ret = -ENOMEM;
-               goto err;
-       }
-
-       if (req->index & CMD_WR_FLAG) {
-               /* write */
-               memcpy(buf, req->data, req->size);
-               requesttype = (USB_TYPE_VENDOR | USB_DIR_OUT);
-               pipe = usb_sndctrlpipe(d->udev, 0);
-       } else {
-               /* read */
-               requesttype = (USB_TYPE_VENDOR | USB_DIR_IN);
-               pipe = usb_rcvctrlpipe(d->udev, 0);
-       }
-
-       ret = usb_control_msg(d->udev, pipe, 0, requesttype, req->value,
-                       req->index, buf, req->size, 1000);
-       if (ret > 0)
-               ret = 0;
-
-       deb_dump(0, requesttype, req->value, req->index, buf, req->size,
-                       deb_xfer);
-
-       /* read request, copy returned data to return buf */
-       if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN))
-               memcpy(req->data, buf, req->size);
-
-       kfree(buf);
-
-       if (ret)
-               goto err;
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static int rtl28xx_wr_regs(struct dvb_usb_device *d, u16 reg, u8 *val, int len)
-{
-       struct rtl28xxu_req req;
-
-       if (reg < 0x3000)
-               req.index = CMD_USB_WR;
-       else if (reg < 0x4000)
-               req.index = CMD_SYS_WR;
-       else
-               req.index = CMD_IR_WR;
-
-       req.value = reg;
-       req.size = len;
-       req.data = val;
-
-       return rtl28xxu_ctrl_msg(d, &req);
-}
-
-static int rtl2831_rd_regs(struct dvb_usb_device *d, u16 reg, u8 *val, int len)
-{
-       struct rtl28xxu_req req;
-
-       if (reg < 0x3000)
-               req.index = CMD_USB_RD;
-       else if (reg < 0x4000)
-               req.index = CMD_SYS_RD;
-       else
-               req.index = CMD_IR_RD;
-
-       req.value = reg;
-       req.size = len;
-       req.data = val;
-
-       return rtl28xxu_ctrl_msg(d, &req);
-}
-
-static int rtl28xx_wr_reg(struct dvb_usb_device *d, u16 reg, u8 val)
-{
-       return rtl28xx_wr_regs(d, reg, &val, 1);
-}
-
-static int rtl28xx_rd_reg(struct dvb_usb_device *d, u16 reg, u8 *val)
-{
-       return rtl2831_rd_regs(d, reg, val, 1);
-}
-
-/* I2C */
-static int rtl28xxu_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
-       int num)
-{
-       int ret;
-       struct dvb_usb_device *d = i2c_get_adapdata(adap);
-       struct rtl28xxu_priv *priv = d->priv;
-       struct rtl28xxu_req req;
-
-       /*
-        * It is not known which are real I2C bus xfer limits, but testing
-        * with RTL2831U + MT2060 gives max RD 24 and max WR 22 bytes.
-        * TODO: find out RTL2832U lens
-        */
-
-       /*
-        * I2C adapter logic looks rather complicated due to fact it handles
-        * three different access methods. Those methods are;
-        * 1) integrated demod access
-        * 2) old I2C access
-        * 3) new I2C access
-        *
-        * Used method is selected in order 1, 2, 3. Method 3 can handle all
-        * requests but there is two reasons why not use it always;
-        * 1) It is most expensive, usually two USB messages are needed
-        * 2) At least RTL2831U does not support it
-        *
-        * Method 3 is needed in case of I2C write+read (typical register read)
-        * where write is more than one byte.
-        */
-
-       if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
-               return -EAGAIN;
-
-       if (num == 2 && !(msg[0].flags & I2C_M_RD) &&
-               (msg[1].flags & I2C_M_RD)) {
-               if (msg[0].len > 24 || msg[1].len > 24) {
-                       /* TODO: check msg[0].len max */
-                       ret = -EOPNOTSUPP;
-                       goto err_mutex_unlock;
-               } else if (msg[0].addr == 0x10) {
-                       /* method 1 - integrated demod */
-                       req.value = (msg[0].buf[0] << 8) | (msg[0].addr << 1);
-                       req.index = CMD_DEMOD_RD | priv->page;
-                       req.size = msg[1].len;
-                       req.data = &msg[1].buf[0];
-                       ret = rtl28xxu_ctrl_msg(d, &req);
-               } else if (msg[0].len < 2) {
-                       /* method 2 - old I2C */
-                       req.value = (msg[0].buf[0] << 8) | (msg[0].addr << 1);
-                       req.index = CMD_I2C_RD;
-                       req.size = msg[1].len;
-                       req.data = &msg[1].buf[0];
-                       ret = rtl28xxu_ctrl_msg(d, &req);
-               } else {
-                       /* method 3 - new I2C */
-                       req.value = (msg[0].addr << 1);
-                       req.index = CMD_I2C_DA_WR;
-                       req.size = msg[0].len;
-                       req.data = msg[0].buf;
-                       ret = rtl28xxu_ctrl_msg(d, &req);
-                       if (ret)
-                               goto err_mutex_unlock;
-
-                       req.value = (msg[0].addr << 1);
-                       req.index = CMD_I2C_DA_RD;
-                       req.size = msg[1].len;
-                       req.data = msg[1].buf;
-                       ret = rtl28xxu_ctrl_msg(d, &req);
-               }
-       } else if (num == 1 && !(msg[0].flags & I2C_M_RD)) {
-               if (msg[0].len > 22) {
-                       /* TODO: check msg[0].len max */
-                       ret = -EOPNOTSUPP;
-                       goto err_mutex_unlock;
-               } else if (msg[0].addr == 0x10) {
-                       /* method 1 - integrated demod */
-                       if (msg[0].buf[0] == 0x00) {
-                               /* save demod page for later demod access */
-                               priv->page = msg[0].buf[1];
-                               ret = 0;
-                       } else {
-                               req.value = (msg[0].buf[0] << 8) |
-                                       (msg[0].addr << 1);
-                               req.index = CMD_DEMOD_WR | priv->page;
-                               req.size = msg[0].len-1;
-                               req.data = &msg[0].buf[1];
-                               ret = rtl28xxu_ctrl_msg(d, &req);
-                       }
-               } else if (msg[0].len < 23) {
-                       /* method 2 - old I2C */
-                       req.value = (msg[0].buf[0] << 8) | (msg[0].addr << 1);
-                       req.index = CMD_I2C_WR;
-                       req.size = msg[0].len-1;
-                       req.data = &msg[0].buf[1];
-                       ret = rtl28xxu_ctrl_msg(d, &req);
-               } else {
-                       /* method 3 - new I2C */
-                       req.value = (msg[0].addr << 1);
-                       req.index = CMD_I2C_DA_WR;
-                       req.size = msg[0].len;
-                       req.data = msg[0].buf;
-                       ret = rtl28xxu_ctrl_msg(d, &req);
-               }
-       } else {
-               ret = -EINVAL;
-       }
-
-err_mutex_unlock:
-       mutex_unlock(&d->i2c_mutex);
-
-       return ret ? ret : num;
-}
-
-static u32 rtl28xxu_i2c_func(struct i2c_adapter *adapter)
-{
-       return I2C_FUNC_I2C;
-}
-
-static struct i2c_algorithm rtl28xxu_i2c_algo = {
-       .master_xfer   = rtl28xxu_i2c_xfer,
-       .functionality = rtl28xxu_i2c_func,
-};
-
-static struct rtl2830_config rtl28xxu_rtl2830_mt2060_config = {
-       .i2c_addr = 0x10, /* 0x20 */
-       .xtal = 28800000,
-       .ts_mode = 0,
-       .spec_inv = 1,
-       .if_dvbt = 36150000,
-       .vtop = 0x20,
-       .krf = 0x04,
-       .agc_targ_val = 0x2d,
-
-};
-
-static struct rtl2830_config rtl28xxu_rtl2830_qt1010_config = {
-       .i2c_addr = 0x10, /* 0x20 */
-       .xtal = 28800000,
-       .ts_mode = 0,
-       .spec_inv = 1,
-       .if_dvbt = 36125000,
-       .vtop = 0x20,
-       .krf = 0x04,
-       .agc_targ_val = 0x2d,
-};
-
-static struct rtl2830_config rtl28xxu_rtl2830_mxl5005s_config = {
-       .i2c_addr = 0x10, /* 0x20 */
-       .xtal = 28800000,
-       .ts_mode = 0,
-       .spec_inv = 0,
-       .if_dvbt = 4570000,
-       .vtop = 0x3f,
-       .krf = 0x04,
-       .agc_targ_val = 0x3e,
-};
-
-static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
-{
-       int ret;
-       struct rtl28xxu_priv *priv = adap->dev->priv;
-       u8 buf[1];
-       struct rtl2830_config *rtl2830_config;
-       /* open RTL2831U/RTL2830 I2C gate */
-       struct rtl28xxu_req req_gate = { 0x0120, 0x0011, 0x0001, "\x08" };
-       /* for MT2060 tuner probe */
-       struct rtl28xxu_req req_mt2060 = { 0x00c0, CMD_I2C_RD, 1, buf };
-       /* for QT1010 tuner probe */
-       struct rtl28xxu_req req_qt1010 = { 0x0fc4, CMD_I2C_RD, 1, buf };
-
-       deb_info("%s:\n", __func__);
-
-       /*
-        * RTL2831U GPIOs
-        * =========================================================
-        * GPIO0 | tuner#0 | 0 off | 1 on  | MXL5005S (?)
-        * GPIO2 | LED     | 0 off | 1 on  |
-        * GPIO4 | tuner#1 | 0 on  | 1 off | MT2060
-        */
-
-       /* GPIO direction */
-       ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_DIR, 0x0a);
-       if (ret)
-               goto err;
-
-       /* enable as output GPIO0, GPIO2, GPIO4 */
-       ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_OUT_EN, 0x15);
-       if (ret)
-               goto err;
-
-       /*
-        * Probe used tuner. We need to know used tuner before demod attach
-        * since there is some demod params needed to set according to tuner.
-        */
-
-       /* demod needs some time to wake up */
-       msleep(20);
-
-       /* open demod I2C gate */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_gate);
-       if (ret)
-               goto err;
-
-       /* check QT1010 ID(?) register; reg=0f val=2c */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_qt1010);
-       if (ret == 0 && buf[0] == 0x2c) {
-               priv->tuner = TUNER_RTL2830_QT1010;
-               rtl2830_config = &rtl28xxu_rtl2830_qt1010_config;
-               deb_info("%s: QT1010\n", __func__);
-               goto found;
-       } else {
-               deb_info("%s: QT1010 probe failed=%d - %02x\n",
-                       __func__, ret, buf[0]);
-       }
-
-       /* open demod I2C gate */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_gate);
-       if (ret)
-               goto err;
-
-       /* check MT2060 ID register; reg=00 val=63 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_mt2060);
-       if (ret == 0 && buf[0] == 0x63) {
-               priv->tuner = TUNER_RTL2830_MT2060;
-               rtl2830_config = &rtl28xxu_rtl2830_mt2060_config;
-               deb_info("%s: MT2060\n", __func__);
-               goto found;
-       } else {
-               deb_info("%s: MT2060 probe failed=%d - %02x\n",
-                       __func__, ret, buf[0]);
-       }
-
-       /* assume MXL5005S */
-       ret = 0;
-       priv->tuner = TUNER_RTL2830_MXL5005S;
-       rtl2830_config = &rtl28xxu_rtl2830_mxl5005s_config;
-       deb_info("%s: MXL5005S\n", __func__);
-       goto found;
-
-found:
-       /* attach demodulator */
-       adap->fe_adap[0].fe = dvb_attach(rtl2830_attach, rtl2830_config,
-               &adap->dev->i2c_adap);
-       if (adap->fe_adap[0].fe == NULL) {
-               ret = -ENODEV;
-               goto err;
-       }
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static struct rtl2832_config rtl28xxu_rtl2832_fc0012_config = {
-       .i2c_addr = 0x10, /* 0x20 */
-       .xtal = 28800000,
-       .if_dvbt = 0,
-       .tuner = TUNER_RTL2832_FC0012
-};
-
-static struct rtl2832_config rtl28xxu_rtl2832_fc0013_config = {
-       .i2c_addr = 0x10, /* 0x20 */
-       .xtal = 28800000,
-       .if_dvbt = 0,
-       .tuner = TUNER_RTL2832_FC0013
-};
-
-static int rtl2832u_fc0012_tuner_callback(struct dvb_usb_device *d,
-               int cmd, int arg)
-{
-       int ret;
-       u8 val;
-
-       deb_info("%s cmd=%d arg=%d\n", __func__, cmd, arg);
-       switch (cmd) {
-       case FC_FE_CALLBACK_VHF_ENABLE:
-               /* set output values */
-               ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &val);
-               if (ret)
-                       goto err;
-
-               if (arg)
-                       val &= 0xbf; /* set GPIO6 low */
-               else
-                       val |= 0x40; /* set GPIO6 high */
-
-
-               ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
-               if (ret)
-                       goto err;
-               break;
-       default:
-               ret = -EINVAL;
-               goto err;
-       }
-       return 0;
-
-err:
-       err("%s: failed=%d\n", __func__, ret);
-
-       return ret;
-}
-
-
-static int rtl2832u_fc0013_tuner_callback(struct dvb_usb_device *d,
-               int cmd, int arg)
-{
-       /* TODO implement*/
-       return 0;
-}
-
-static int rtl2832u_tuner_callback(struct dvb_usb_device *d, int cmd, int arg)
-{
-       struct rtl28xxu_priv *priv = d->priv;
-
-       switch (priv->tuner) {
-       case TUNER_RTL2832_FC0012:
-               return rtl2832u_fc0012_tuner_callback(d, cmd, arg);
-
-       case TUNER_RTL2832_FC0013:
-               return rtl2832u_fc0013_tuner_callback(d, cmd, arg);
-       default:
-               break;
-       }
-
-       return -ENODEV;
-}
-
-static int rtl2832u_frontend_callback(void *adapter_priv, int component,
-                                   int cmd, int arg)
-{
-       struct i2c_adapter *adap = adapter_priv;
-       struct dvb_usb_device *d = i2c_get_adapdata(adap);
-
-       switch (component) {
-       case DVB_FRONTEND_COMPONENT_TUNER:
-               return rtl2832u_tuner_callback(d, cmd, arg);
-       default:
-               break;
-       }
-
-       return -EINVAL;
-}
-
-
-
-
-static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
-{
-       int ret;
-       struct rtl28xxu_priv *priv = adap->dev->priv;
-       struct rtl2832_config *rtl2832_config;
-
-       u8 buf[2], val;
-       /* open RTL2832U/RTL2832 I2C gate */
-       struct rtl28xxu_req req_gate_open = {0x0120, 0x0011, 0x0001, "\x18"};
-       /* close RTL2832U/RTL2832 I2C gate */
-       struct rtl28xxu_req req_gate_close = {0x0120, 0x0011, 0x0001, "\x10"};
-       /* for FC0012 tuner probe */
-       struct rtl28xxu_req req_fc0012 = {0x00c6, CMD_I2C_RD, 1, buf};
-       /* for FC0013 tuner probe */
-       struct rtl28xxu_req req_fc0013 = {0x00c6, CMD_I2C_RD, 1, buf};
-       /* for MT2266 tuner probe */
-       struct rtl28xxu_req req_mt2266 = {0x00c0, CMD_I2C_RD, 1, buf};
-       /* for FC2580 tuner probe */
-       struct rtl28xxu_req req_fc2580 = {0x01ac, CMD_I2C_RD, 1, buf};
-       /* for MT2063 tuner probe */
-       struct rtl28xxu_req req_mt2063 = {0x00c0, CMD_I2C_RD, 1, buf};
-       /* for MAX3543 tuner probe */
-       struct rtl28xxu_req req_max3543 = {0x00c0, CMD_I2C_RD, 1, buf};
-       /* for TUA9001 tuner probe */
-       struct rtl28xxu_req req_tua9001 = {0x7ec0, CMD_I2C_RD, 2, buf};
-       /* for MXL5007T tuner probe */
-       struct rtl28xxu_req req_mxl5007t = {0xd9c0, CMD_I2C_RD, 1, buf};
-       /* for E4000 tuner probe */
-       struct rtl28xxu_req req_e4000 = {0x02c8, CMD_I2C_RD, 1, buf};
-       /* for TDA18272 tuner probe */
-       struct rtl28xxu_req req_tda18272 = {0x00c0, CMD_I2C_RD, 2, buf};
-
-       deb_info("%s:\n", __func__);
-
-
-       ret = rtl28xx_rd_reg(adap->dev, SYS_GPIO_DIR, &val);
-       if (ret)
-               goto err;
-
-       val &= 0xbf;
-
-       ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_DIR, val);
-       if (ret)
-               goto err;
-
-
-       /* enable as output GPIO3 and GPIO6*/
-       ret = rtl28xx_rd_reg(adap->dev, SYS_GPIO_OUT_EN, &val);
-       if (ret)
-               goto err;
-
-       val |= 0x48;
-
-       ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_OUT_EN, val);
-       if (ret)
-               goto err;
-
-
-
-       /*
-        * Probe used tuner. We need to know used tuner before demod attach
-        * since there is some demod params needed to set according to tuner.
-        */
-
-       /* open demod I2C gate */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_gate_open);
-       if (ret)
-               goto err;
-
-       priv->tuner = TUNER_NONE;
-
-       /* check FC0012 ID register; reg=00 val=a1 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_fc0012);
-       if (ret == 0 && buf[0] == 0xa1) {
-               priv->tuner = TUNER_RTL2832_FC0012;
-               rtl2832_config = &rtl28xxu_rtl2832_fc0012_config;
-               info("%s: FC0012 tuner found", __func__);
-               goto found;
-       }
-
-       /* check FC0013 ID register; reg=00 val=a3 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_fc0013);
-       if (ret == 0 && buf[0] == 0xa3) {
-               priv->tuner = TUNER_RTL2832_FC0013;
-               rtl2832_config = &rtl28xxu_rtl2832_fc0013_config;
-               info("%s: FC0013 tuner found", __func__);
-               goto found;
-       }
-
-       /* check MT2266 ID register; reg=00 val=85 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_mt2266);
-       if (ret == 0 && buf[0] == 0x85) {
-               priv->tuner = TUNER_RTL2832_MT2266;
-               /* TODO implement tuner */
-               info("%s: MT2266 tuner found", __func__);
-               goto unsupported;
-       }
-
-       /* check FC2580 ID register; reg=01 val=56 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_fc2580);
-       if (ret == 0 && buf[0] == 0x56) {
-               priv->tuner = TUNER_RTL2832_FC2580;
-               /* TODO implement tuner */
-               info("%s: FC2580 tuner found", __func__);
-               goto unsupported;
-       }
-
-       /* check MT2063 ID register; reg=00 val=9e || 9c */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_mt2063);
-       if (ret == 0 && (buf[0] == 0x9e || buf[0] == 0x9c)) {
-               priv->tuner = TUNER_RTL2832_MT2063;
-               /* TODO implement tuner */
-               info("%s: MT2063 tuner found", __func__);
-               goto unsupported;
-       }
-
-       /* check MAX3543 ID register; reg=00 val=38 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_max3543);
-       if (ret == 0 && buf[0] == 0x38) {
-               priv->tuner = TUNER_RTL2832_MAX3543;
-               /* TODO implement tuner */
-               info("%s: MAX3534 tuner found", __func__);
-               goto unsupported;
-       }
-
-       /* check TUA9001 ID register; reg=7e val=2328 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_tua9001);
-       if (ret == 0 && buf[0] == 0x23 && buf[1] == 0x28) {
-               priv->tuner = TUNER_RTL2832_TUA9001;
-               /* TODO implement tuner */
-               info("%s: TUA9001 tuner found", __func__);
-               goto unsupported;
-       }
-
-       /* check MXL5007R ID register; reg=d9 val=14 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_mxl5007t);
-       if (ret == 0 && buf[0] == 0x14) {
-               priv->tuner = TUNER_RTL2832_MXL5007T;
-               /* TODO implement tuner */
-               info("%s: MXL5007T tuner found", __func__);
-               goto unsupported;
-       }
-
-       /* check E4000 ID register; reg=02 val=40 */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_e4000);
-       if (ret == 0 && buf[0] == 0x40) {
-               priv->tuner = TUNER_RTL2832_E4000;
-               /* TODO implement tuner */
-               info("%s: E4000 tuner found", __func__);
-               goto unsupported;
-       }
-
-       /* check TDA18272 ID register; reg=00 val=c760  */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_tda18272);
-       if (ret == 0 && (buf[0] == 0xc7 || buf[1] == 0x60)) {
-               priv->tuner = TUNER_RTL2832_TDA18272;
-               /* TODO implement tuner */
-               info("%s: TDA18272 tuner found", __func__);
-               goto unsupported;
-       }
-
-unsupported:
-       /* close demod I2C gate */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_gate_close);
-       if (ret)
-               goto err;
-
-       /* tuner not found */
-       deb_info("No compatible tuner found");
-       ret = -ENODEV;
-       return ret;
-
-found:
-       /* close demod I2C gate */
-       ret = rtl28xxu_ctrl_msg(adap->dev, &req_gate_close);
-       if (ret)
-               goto err;
-
-       /* attach demodulator */
-       adap->fe_adap[0].fe = dvb_attach(rtl2832_attach, rtl2832_config,
-               &adap->dev->i2c_adap);
-               if (adap->fe_adap[0].fe == NULL) {
-                       ret = -ENODEV;
-                       goto err;
-               }
-
-       /* set fe callbacks */
-       adap->fe_adap[0].fe->callback = rtl2832u_frontend_callback;
-
-       return ret;
-
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static struct qt1010_config rtl28xxu_qt1010_config = {
-       .i2c_address = 0x62, /* 0xc4 */
-};
-
-static struct mt2060_config rtl28xxu_mt2060_config = {
-       .i2c_address = 0x60, /* 0xc0 */
-       .clock_out = 0,
-};
-
-static struct mxl5005s_config rtl28xxu_mxl5005s_config = {
-       .i2c_address     = 0x63, /* 0xc6 */
-       .if_freq         = IF_FREQ_4570000HZ,
-       .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
-       .agc_mode        = MXL_SINGLE_AGC,
-       .tracking_filter = MXL_TF_C_H,
-       .rssi_enable     = MXL_RSSI_ENABLE,
-       .cap_select      = MXL_CAP_SEL_ENABLE,
-       .div_out         = MXL_DIV_OUT_4,
-       .clock_out       = MXL_CLOCK_OUT_DISABLE,
-       .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
-       .top             = MXL5005S_TOP_25P2,
-       .mod_mode        = MXL_DIGITAL_MODE,
-       .if_mode         = MXL_ZERO_IF,
-       .AgcMasterByte   = 0x00,
-};
-
-static int rtl2831u_tuner_attach(struct dvb_usb_adapter *adap)
-{
-       int ret;
-       struct rtl28xxu_priv *priv = adap->dev->priv;
-       struct i2c_adapter *rtl2830_tuner_i2c;
-       struct dvb_frontend *fe;
-
-       deb_info("%s:\n", __func__);
-
-       /* use rtl2830 driver I2C adapter, for more info see rtl2830 driver */
-       rtl2830_tuner_i2c = rtl2830_get_tuner_i2c_adapter(adap->fe_adap[0].fe);
-
-       switch (priv->tuner) {
-       case TUNER_RTL2830_QT1010:
-               fe = dvb_attach(qt1010_attach, adap->fe_adap[0].fe,
-                               rtl2830_tuner_i2c, &rtl28xxu_qt1010_config);
-               break;
-       case TUNER_RTL2830_MT2060:
-               fe = dvb_attach(mt2060_attach, adap->fe_adap[0].fe,
-                               rtl2830_tuner_i2c, &rtl28xxu_mt2060_config,
-                               1220);
-               break;
-       case TUNER_RTL2830_MXL5005S:
-               fe = dvb_attach(mxl5005s_attach, adap->fe_adap[0].fe,
-                               rtl2830_tuner_i2c, &rtl28xxu_mxl5005s_config);
-               break;
-       default:
-               fe = NULL;
-               err("unknown tuner=%d", priv->tuner);
-       }
-
-       if (fe == NULL) {
-               ret = -ENODEV;
-               goto err;
-       }
-
-       return 0;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
-{
-       int ret;
-       struct rtl28xxu_priv *priv = adap->dev->priv;
-       struct dvb_frontend *fe;
-
-       deb_info("%s:\n", __func__);
-
-       switch (priv->tuner) {
-       case TUNER_RTL2832_FC0012:
-               fe = dvb_attach(fc0012_attach, adap->fe_adap[0].fe,
-                       &adap->dev->i2c_adap, 0xc6>>1, 0, FC_XTAL_28_8_MHZ);
-
-               /* since fc0012 includs reading the signal strength delegate
-                * that to the tuner driver */
-               adap->fe_adap[0].fe->ops.read_signal_strength = adap->fe_adap[0].
-                               fe->ops.tuner_ops.get_rf_strength;
-               return 0;
-               break;
-       case TUNER_RTL2832_FC0013:
-               fe = dvb_attach(fc0013_attach, adap->fe_adap[0].fe,
-                       &adap->dev->i2c_adap, 0xc6>>1, 0, FC_XTAL_28_8_MHZ);
-
-               /* fc0013 also supports signal strength reading */
-               adap->fe_adap[0].fe->ops.read_signal_strength = adap->fe_adap[0]
-                       .fe->ops.tuner_ops.get_rf_strength;
-               return 0;
-       default:
-               fe = NULL;
-               err("unknown tuner=%d", priv->tuner);
-       }
-
-       if (fe == NULL) {
-               ret = -ENODEV;
-               goto err;
-       }
-
-       return 0;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static int rtl2831u_streaming_ctrl(struct dvb_usb_adapter *adap , int onoff)
-{
-       int ret;
-       u8 buf[2], gpio;
-
-       deb_info("%s: onoff=%d\n", __func__, onoff);
-
-       ret = rtl28xx_rd_reg(adap->dev, SYS_GPIO_OUT_VAL, &gpio);
-       if (ret)
-               goto err;
-
-       if (onoff) {
-               buf[0] = 0x00;
-               buf[1] = 0x00;
-               gpio |= 0x04; /* LED on */
-       } else {
-               buf[0] = 0x10; /* stall EPA */
-               buf[1] = 0x02; /* reset EPA */
-               gpio &= (~0x04); /* LED off */
-       }
-
-       ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_OUT_VAL, gpio);
-       if (ret)
-               goto err;
-
-       ret = rtl28xx_wr_regs(adap->dev, USB_EPA_CTL, buf, 2);
-       if (ret)
-               goto err;
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static int rtl2832u_streaming_ctrl(struct dvb_usb_adapter *adap , int onoff)
-{
-       int ret;
-       u8 buf[2];
-
-       deb_info("%s: onoff=%d\n", __func__, onoff);
-
-
-       if (onoff) {
-               buf[0] = 0x00;
-               buf[1] = 0x00;
-       } else {
-               buf[0] = 0x10; /* stall EPA */
-               buf[1] = 0x02; /* reset EPA */
-       }
-
-       ret = rtl28xx_wr_regs(adap->dev, USB_EPA_CTL, buf, 2);
-       if (ret)
-               goto err;
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static int rtl2831u_power_ctrl(struct dvb_usb_device *d, int onoff)
-{
-       int ret;
-       u8 gpio, sys0;
-
-       deb_info("%s: onoff=%d\n", __func__, onoff);
-
-       /* demod adc */
-       ret = rtl28xx_rd_reg(d, SYS_SYS0, &sys0);
-       if (ret)
-               goto err;
-
-       /* tuner power, read GPIOs */
-       ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &gpio);
-       if (ret)
-               goto err;
-
-       deb_info("%s: RD SYS0=%02x GPIO_OUT_VAL=%02x\n", __func__, sys0, gpio);
-
-       if (onoff) {
-               gpio |= 0x01; /* GPIO0 = 1 */
-               gpio &= (~0x10); /* GPIO4 = 0 */
-               sys0 = sys0 & 0x0f;
-               sys0 |= 0xe0;
-       } else {
-               gpio &= (~0x01); /* GPIO0 = 0 */
-               gpio |= 0x10; /* GPIO4 = 1 */
-               sys0 = sys0 & (~0xc0);
-       }
-
-       deb_info("%s: WR SYS0=%02x GPIO_OUT_VAL=%02x\n", __func__, sys0, gpio);
-
-       /* demod adc */
-       ret = rtl28xx_wr_reg(d, SYS_SYS0, sys0);
-       if (ret)
-               goto err;
-
-       /* tuner power, write GPIOs */
-       ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, gpio);
-       if (ret)
-               goto err;
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static int rtl2832u_power_ctrl(struct dvb_usb_device *d, int onoff)
-{
-       int ret;
-       u8 val;
-
-       deb_info("%s: onoff=%d\n", __func__, onoff);
-
-       if (onoff) {
-               /* set output values */
-               ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &val);
-               if (ret)
-                       goto err;
-
-               val |= 0x08;
-               val &= 0xef;
-
-               ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
-               if (ret)
-                       goto err;
-
-               /* demod_ctl_1 */
-               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL1, &val);
-               if (ret)
-                       goto err;
-
-               val &= 0xef;
-
-               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL1, val);
-               if (ret)
-                       goto err;
-
-               /* demod control */
-               /* PLL enable */
-               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
-               if (ret)
-                       goto err;
-
-               /* bit 7 to 1 */
-               val |= 0x80;
-
-               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
-               if (ret)
-                       goto err;
-
-               /* demod HW reset */
-               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
-               if (ret)
-                       goto err;
-               /* bit 5 to 0 */
-               val &= 0xdf;
-
-               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
-               if (ret)
-                       goto err;
-
-               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
-               if (ret)
-                       goto err;
-
-               val |= 0x20;
-
-               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
-               if (ret)
-                       goto err;
-
-               mdelay(5);
-
-               /*enable ADC_Q and ADC_I */
-               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
-               if (ret)
-                       goto err;
-
-               val |= 0x48;
-
-               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
-               if (ret)
-                       goto err;
-
-
-       } else {
-               /* demod_ctl_1 */
-               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL1, &val);
-               if (ret)
-                       goto err;
-
-               val |= 0x0c;
-
-               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL1, val);
-               if (ret)
-                       goto err;
-
-               /* set output values */
-               ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL, &val);
-               if (ret)
-                               goto err;
-
-               val |= 0x10;
-
-               ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
-               if (ret)
-                       goto err;
-
-               /* demod control */
-               ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL, &val);
-               if (ret)
-                       goto err;
-
-               val &= 0x37;
-
-               ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
-               if (ret)
-                       goto err;
-
-       }
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-
-static int rtl2831u_rc_query(struct dvb_usb_device *d)
-{
-       int ret, i;
-       struct rtl28xxu_priv *priv = d->priv;
-       u8 buf[5];
-       u32 rc_code;
-       struct rtl28xxu_reg_val rc_nec_tab[] = {
-               { 0x3033, 0x80 },
-               { 0x3020, 0x43 },
-               { 0x3021, 0x16 },
-               { 0x3022, 0x16 },
-               { 0x3023, 0x5a },
-               { 0x3024, 0x2d },
-               { 0x3025, 0x16 },
-               { 0x3026, 0x01 },
-               { 0x3028, 0xb0 },
-               { 0x3029, 0x04 },
-               { 0x302c, 0x88 },
-               { 0x302e, 0x13 },
-               { 0x3030, 0xdf },
-               { 0x3031, 0x05 },
-       };
-
-       /* init remote controller */
-       if (!priv->rc_active) {
-               for (i = 0; i < ARRAY_SIZE(rc_nec_tab); i++) {
-                       ret = rtl28xx_wr_reg(d, rc_nec_tab[i].reg,
-                                       rc_nec_tab[i].val);
-                       if (ret)
-                               goto err;
-               }
-               priv->rc_active = true;
-       }
-
-       ret = rtl2831_rd_regs(d, SYS_IRRC_RP, buf, 5);
-       if (ret)
-               goto err;
-
-       if (buf[4] & 0x01) {
-               if (buf[2] == (u8) ~buf[3]) {
-                       if (buf[0] == (u8) ~buf[1]) {
-                               /* NEC standard (16 bit) */
-                               rc_code = buf[0] << 8 | buf[2];
-                       } else {
-                               /* NEC extended (24 bit) */
-                               rc_code = buf[0] << 16 |
-                                               buf[1] << 8 | buf[2];
-                       }
-               } else {
-                       /* NEC full (32 bit) */
-                       rc_code = buf[0] << 24 | buf[1] << 16 |
-                                       buf[2] << 8 | buf[3];
-               }
-
-               rc_keydown(d->rc_dev, rc_code, 0);
-
-               ret = rtl28xx_wr_reg(d, SYS_IRRC_SR, 1);
-               if (ret)
-                       goto err;
-
-               /* repeated intentionally to avoid extra keypress */
-               ret = rtl28xx_wr_reg(d, SYS_IRRC_SR, 1);
-               if (ret)
-                       goto err;
-       }
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static int rtl2832u_rc_query(struct dvb_usb_device *d)
-{
-       int ret, i;
-       struct rtl28xxu_priv *priv = d->priv;
-       u8 buf[128];
-       int len;
-       struct rtl28xxu_reg_val rc_nec_tab[] = {
-               { IR_RX_CTRL,             0x20 },
-               { IR_RX_BUF_CTRL,         0x80 },
-               { IR_RX_IF,               0xff },
-               { IR_RX_IE,               0xff },
-               { IR_MAX_DURATION0,       0xd0 },
-               { IR_MAX_DURATION1,       0x07 },
-               { IR_IDLE_LEN0,           0xc0 },
-               { IR_IDLE_LEN1,           0x00 },
-               { IR_GLITCH_LEN,          0x03 },
-               { IR_RX_CLK,              0x09 },
-               { IR_RX_CFG,              0x1c },
-               { IR_MAX_H_TOL_LEN,       0x1e },
-               { IR_MAX_L_TOL_LEN,       0x1e },
-               { IR_RX_CTRL,             0x80 },
-       };
-
-       /* init remote controller */
-       if (!priv->rc_active) {
-               for (i = 0; i < ARRAY_SIZE(rc_nec_tab); i++) {
-                       ret = rtl28xx_wr_reg(d, rc_nec_tab[i].reg,
-                                       rc_nec_tab[i].val);
-                       if (ret)
-                               goto err;
-               }
-               priv->rc_active = true;
-       }
-
-       ret = rtl28xx_rd_reg(d, IR_RX_IF, &buf[0]);
-       if (ret)
-               goto err;
-
-       if (buf[0] != 0x83)
-               goto exit;
-
-       ret = rtl28xx_rd_reg(d, IR_RX_BC, &buf[0]);
-       if (ret)
-               goto err;
-
-       len = buf[0];
-       ret = rtl2831_rd_regs(d, IR_RX_BUF, buf, len);
-
-       /* TODO: pass raw IR to Kernel IR decoder */
-
-       ret = rtl28xx_wr_reg(d, IR_RX_IF, 0x03);
-       ret = rtl28xx_wr_reg(d, IR_RX_BUF_CTRL, 0x80);
-       ret = rtl28xx_wr_reg(d, IR_RX_CTRL, 0x80);
-
-exit:
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-enum rtl28xxu_usb_table_entry {
-       RTL2831U_0BDA_2831,
-       RTL2831U_14AA_0160,
-       RTL2831U_14AA_0161,
-       RTL2832U_0CCD_00A9,
-       RTL2832U_1F4D_B803,
-       RTL2832U_0CCD_00B3,
-};
-
-static struct usb_device_id rtl28xxu_table[] = {
-       /* RTL2831U */
-       [RTL2831U_0BDA_2831] = {
-               USB_DEVICE(USB_VID_REALTEK, USB_PID_REALTEK_RTL2831U)},
-       [RTL2831U_14AA_0160] = {
-               USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT)},
-       [RTL2831U_14AA_0161] = {
-               USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT_2)},
-
-       /* RTL2832U */
-       [RTL2832U_0CCD_00A9] = {
-               USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1)},
-       [RTL2832U_1F4D_B803] = {
-               USB_DEVICE(USB_VID_GTEK, USB_PID_DELOCK_USB2_DVBT)},
-       [RTL2832U_0CCD_00B3] = {
-               USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK)},
-       {} /* terminating entry */
-};
-
-MODULE_DEVICE_TABLE(usb, rtl28xxu_table);
-
-static struct dvb_usb_device_properties rtl28xxu_properties[] = {
-       {
-               .caps = DVB_USB_IS_AN_I2C_ADAPTER,
-
-               .usb_ctrl = DEVICE_SPECIFIC,
-               .no_reconnect = 1,
-
-               .size_of_priv = sizeof(struct rtl28xxu_priv),
-
-               .num_adapters = 1,
-               .adapter = {
-                       {
-                               .num_frontends = 1,
-                               .fe = {
-                                       {
-                                               .frontend_attach = rtl2831u_frontend_attach,
-                                               .tuner_attach    = rtl2831u_tuner_attach,
-                                               .streaming_ctrl  = rtl2831u_streaming_ctrl,
-                                               .stream = {
-                                                       .type = USB_BULK,
-                                                       .count = 6,
-                                                       .endpoint = 0x81,
-                                                       .u = {
-                                                               .bulk = {
-                                                                       .buffersize = 8*512,
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               },
-
-               .power_ctrl = rtl2831u_power_ctrl,
-
-               .rc.core = {
-                       .protocol       = RC_TYPE_NEC,
-                       .module_name    = "rtl28xxu",
-                       .rc_query       = rtl2831u_rc_query,
-                       .rc_interval    = 400,
-                       .allowed_protos = RC_TYPE_NEC,
-                       .rc_codes       = RC_MAP_EMPTY,
-               },
-
-               .i2c_algo = &rtl28xxu_i2c_algo,
-
-               .num_device_descs = 2,
-               .devices = {
-                       {
-                               .name = "Realtek RTL2831U reference design",
-                               .warm_ids = {
-                                       &rtl28xxu_table[RTL2831U_0BDA_2831],
-                               },
-                       },
-                       {
-                               .name = "Freecom USB2.0 DVB-T",
-                               .warm_ids = {
-                                       &rtl28xxu_table[RTL2831U_14AA_0160],
-                                       &rtl28xxu_table[RTL2831U_14AA_0161],
-                               },
-                       },
-               }
-       },
-       {
-               .caps = DVB_USB_IS_AN_I2C_ADAPTER,
-
-               .usb_ctrl = DEVICE_SPECIFIC,
-               .no_reconnect = 1,
-
-               .size_of_priv = sizeof(struct rtl28xxu_priv),
-
-               .num_adapters = 1,
-               .adapter = {
-                       {
-                               .num_frontends = 1,
-                               .fe = {
-                                       {
-                                               .frontend_attach = rtl2832u_frontend_attach,
-                                               .tuner_attach    = rtl2832u_tuner_attach,
-                                               .streaming_ctrl  = rtl2832u_streaming_ctrl,
-                                               .stream = {
-                                                       .type = USB_BULK,
-                                                       .count = 6,
-                                                       .endpoint = 0x81,
-                                                       .u = {
-                                                               .bulk = {
-                                                                       .buffersize = 8*512,
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               },
-
-               .power_ctrl = rtl2832u_power_ctrl,
-
-               .rc.core = {
-                       .protocol       = RC_TYPE_NEC,
-                       .module_name    = "rtl28xxu",
-                       .rc_query       = rtl2832u_rc_query,
-                       .rc_interval    = 400,
-                       .allowed_protos = RC_TYPE_NEC,
-                       .rc_codes       = RC_MAP_EMPTY,
-               },
-
-               .i2c_algo = &rtl28xxu_i2c_algo,
-
-               .num_device_descs = 3,
-               .devices = {
-                       {
-                               .name = "Terratec Cinergy T Stick Black",
-                               .warm_ids = {
-                                       &rtl28xxu_table[RTL2832U_0CCD_00A9],
-                               },
-                       },
-                       {
-                               .name = "G-Tek Electronics Group Lifeview LV5TDLX DVB-T",
-                               .warm_ids = {
-                                       &rtl28xxu_table[RTL2832U_1F4D_B803],
-                               },
-                       },
-                       {
-                               .name = "NOXON DAB/DAB+ USB dongle",
-                               .warm_ids = {
-                                       &rtl28xxu_table[RTL2832U_0CCD_00B3],
-                               },
-                       },
-               }
-       },
-
-};
-
-static int rtl28xxu_probe(struct usb_interface *intf,
-               const struct usb_device_id *id)
-{
-       int ret, i;
-       u8 val;
-       int properties_count = ARRAY_SIZE(rtl28xxu_properties);
-       struct dvb_usb_device *d;
-       struct usb_device *udev;
-       bool found;
-
-       deb_info("%s: interface=%d\n", __func__,
-               intf->cur_altsetting->desc.bInterfaceNumber);
-
-       if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
-               return 0;
-
-       /* Dynamic USB ID support. Replaces first device ID with current one .*/
-       udev = interface_to_usbdev(intf);
-
-       for (i = 0, found = false; i < ARRAY_SIZE(rtl28xxu_table) - 1; i++) {
-               if (rtl28xxu_table[i].idVendor ==
-                               le16_to_cpu(udev->descriptor.idVendor) &&
-                               rtl28xxu_table[i].idProduct ==
-                               le16_to_cpu(udev->descriptor.idProduct)) {
-                       found = true;
-                       break;
-               }
-       }
-
-       if (!found) {
-               deb_info("%s: using dynamic ID %04x:%04x\n", __func__,
-                               le16_to_cpu(udev->descriptor.idVendor),
-                               le16_to_cpu(udev->descriptor.idProduct));
-               rtl28xxu_properties[0].devices[0].warm_ids[0]->idVendor =
-                               le16_to_cpu(udev->descriptor.idVendor);
-               rtl28xxu_properties[0].devices[0].warm_ids[0]->idProduct =
-                               le16_to_cpu(udev->descriptor.idProduct);
-       }
-
-       for (i = 0; i < properties_count; i++) {
-               ret = dvb_usb_device_init(intf, &rtl28xxu_properties[i],
-                               THIS_MODULE, &d, adapter_nr);
-               if (ret == 0 || ret != -ENODEV)
-                       break;
-       }
-
-       if (ret)
-               goto err;
-
-
-       /* init USB endpoints */
-       ret = rtl28xx_rd_reg(d, USB_SYSCTL_0, &val);
-       if (ret)
-                       goto err;
-
-       /* enable DMA and Full Packet Mode*/
-       val |= 0x09;
-       ret = rtl28xx_wr_reg(d, USB_SYSCTL_0, val);
-       if (ret)
-               goto err;
-
-       /* set EPA maximum packet size to 0x0200 */
-       ret = rtl28xx_wr_regs(d, USB_EPA_MAXPKT, "\x00\x02\x00\x00", 4);
-       if (ret)
-               goto err;
-
-       /* change EPA FIFO length */
-       ret = rtl28xx_wr_regs(d, USB_EPA_FIFO_CFG, "\x14\x00\x00\x00", 4);
-       if (ret)
-               goto err;
-
-       return ret;
-err:
-       deb_info("%s: failed=%d\n", __func__, ret);
-       return ret;
-}
-
-static struct usb_driver rtl28xxu_driver = {
-       .name       = "dvb_usb_rtl28xxu",
-       .probe      = rtl28xxu_probe,
-       .disconnect = dvb_usb_device_exit,
-       .id_table   = rtl28xxu_table,
-};
-
-/* module stuff */
-static int __init rtl28xxu_module_init(void)
-{
-       int ret;
-
-       deb_info("%s:\n", __func__);
-
-       ret = usb_register(&rtl28xxu_driver);
-       if (ret)
-               err("usb_register failed=%d", ret);
-
-       return ret;
-}
-
-static void __exit rtl28xxu_module_exit(void)
-{
-       deb_info("%s:\n", __func__);
-
-       /* deregister this driver from the USB subsystem */
-       usb_deregister(&rtl28xxu_driver);
-}
-
-module_init(rtl28xxu_module_init);
-module_exit(rtl28xxu_module_exit);
-
-MODULE_DESCRIPTION("Realtek RTL28xxU DVB USB driver");
-MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
-MODULE_AUTHOR("Thomas Mair <thomas.mair86@googlemail.com>");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.h b/drivers/media/dvb/dvb-usb/rtl28xxu.h
deleted file mode 100644 (file)
index 90f3bb4..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Realtek RTL28xxU DVB USB driver
- *
- * Copyright (C) 2009 Antti Palosaari <crope@iki.fi>
- * Copyright (C) 2011 Antti Palosaari <crope@iki.fi>
- *
- *    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; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License along
- *    with this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef RTL28XXU_H
-#define RTL28XXU_H
-
-#define DVB_USB_LOG_PREFIX "rtl28xxu"
-#include "dvb-usb.h"
-
-#define deb_info(args...) dprintk(dvb_usb_rtl28xxu_debug, 0x01, args)
-#define deb_rc(args...)   dprintk(dvb_usb_rtl28xxu_debug, 0x02, args)
-#define deb_xfer(args...) dprintk(dvb_usb_rtl28xxu_debug, 0x04, args)
-#define deb_reg(args...)  dprintk(dvb_usb_rtl28xxu_debug, 0x08, args)
-#define deb_i2c(args...)  dprintk(dvb_usb_rtl28xxu_debug, 0x10, args)
-#define deb_fw(args...)   dprintk(dvb_usb_rtl28xxu_debug, 0x20, args)
-
-#define deb_dump(r, t, v, i, b, l, func) { \
-       int loop_; \
-       func("%02x %02x %02x %02x %02x %02x %02x %02x", \
-               t, r, v & 0xff, v >> 8, i & 0xff, i >> 8, l & 0xff, l >> 8); \
-       if (t == (USB_TYPE_VENDOR | USB_DIR_OUT)) \
-               func(" >>> "); \
-       else \
-               func(" <<< "); \
-       for (loop_ = 0; loop_ < l; loop_++) \
-               func("%02x ", b[loop_]); \
-       func("\n");\
-}
-
-/*
- * USB commands
- * (usb_control_msg() index parameter)
- */
-
-#define DEMOD            0x0000
-#define USB              0x0100
-#define SYS              0x0200
-#define I2C              0x0300
-#define I2C_DA           0x0600
-
-#define CMD_WR_FLAG      0x0010
-#define CMD_DEMOD_RD     0x0000
-#define CMD_DEMOD_WR     0x0010
-#define CMD_USB_RD       0x0100
-#define CMD_USB_WR       0x0110
-#define CMD_SYS_RD       0x0200
-#define CMD_IR_RD        0x0201
-#define CMD_IR_WR        0x0211
-#define CMD_SYS_WR       0x0210
-#define CMD_I2C_RD       0x0300
-#define CMD_I2C_WR       0x0310
-#define CMD_I2C_DA_RD    0x0600
-#define CMD_I2C_DA_WR    0x0610
-
-
-struct rtl28xxu_priv {
-       u8 chip_id;
-       u8 tuner;
-       u8 page; /* integrated demod active register page */
-       bool rc_active;
-};
-
-enum rtl28xxu_chip_id {
-       CHIP_ID_NONE,
-       CHIP_ID_RTL2831U,
-       CHIP_ID_RTL2832U,
-};
-
-enum rtl28xxu_tuner {
-       TUNER_NONE,
-
-       TUNER_RTL2830_QT1010,
-       TUNER_RTL2830_MT2060,
-       TUNER_RTL2830_MXL5005S,
-
-       TUNER_RTL2832_MT2266,
-       TUNER_RTL2832_FC2580,
-       TUNER_RTL2832_MT2063,
-       TUNER_RTL2832_MAX3543,
-       TUNER_RTL2832_TUA9001,
-       TUNER_RTL2832_MXL5007T,
-       TUNER_RTL2832_FC0012,
-       TUNER_RTL2832_E4000,
-       TUNER_RTL2832_TDA18272,
-       TUNER_RTL2832_FC0013,
-};
-
-struct rtl28xxu_req {
-       u16 value;
-       u16 index;
-       u16 size;
-       u8 *data;
-};
-
-struct rtl28xxu_reg_val {
-       u16 reg;
-       u8 val;
-};
-
-/*
- * memory map
- *
- * 0x0000 DEMOD : demodulator
- * 0x2000 USB   : SIE, USB endpoint, debug, DMA
- * 0x3000 SYS   : system
- * 0xfc00 RC    : remote controller (not RTL2831U)
- */
-
-/*
- * USB registers
- */
-/* SIE Control Registers */
-#define USB_SYSCTL         0x2000 /* USB system control */
-#define USB_SYSCTL_0       0x2000 /* USB system control */
-#define USB_SYSCTL_1       0x2001 /* USB system control */
-#define USB_SYSCTL_2       0x2002 /* USB system control */
-#define USB_SYSCTL_3       0x2003 /* USB system control */
-#define USB_IRQSTAT        0x2008 /* SIE interrupt status */
-#define USB_IRQEN          0x200C /* SIE interrupt enable */
-#define USB_CTRL           0x2010 /* USB control */
-#define USB_STAT           0x2014 /* USB status */
-#define USB_DEVADDR        0x2018 /* USB device address */
-#define USB_TEST           0x201C /* USB test mode */
-#define USB_FRAME_NUMBER   0x2020 /* frame number */
-#define USB_FIFO_ADDR      0x2028 /* address of SIE FIFO RAM */
-#define USB_FIFO_CMD       0x202A /* SIE FIFO RAM access command */
-#define USB_FIFO_DATA      0x2030 /* SIE FIFO RAM data */
-/* Endpoint Registers */
-#define EP0_SETUPA         0x20F8 /* EP 0 setup packet lower byte */
-#define EP0_SETUPB         0x20FC /* EP 0 setup packet higher byte */
-#define USB_EP0_CFG        0x2104 /* EP 0 configure */
-#define USB_EP0_CTL        0x2108 /* EP 0 control */
-#define USB_EP0_STAT       0x210C /* EP 0 status */
-#define USB_EP0_IRQSTAT    0x2110 /* EP 0 interrupt status */
-#define USB_EP0_IRQEN      0x2114 /* EP 0 interrupt enable */
-#define USB_EP0_MAXPKT     0x2118 /* EP 0 max packet size */
-#define USB_EP0_BC         0x2120 /* EP 0 FIFO byte counter */
-#define USB_EPA_CFG        0x2144 /* EP A configure */
-#define USB_EPA_CFG_0      0x2144 /* EP A configure */
-#define USB_EPA_CFG_1      0x2145 /* EP A configure */
-#define USB_EPA_CFG_2      0x2146 /* EP A configure */
-#define USB_EPA_CFG_3      0x2147 /* EP A configure */
-#define USB_EPA_CTL        0x2148 /* EP A control */
-#define USB_EPA_CTL_0      0x2148 /* EP A control */
-#define USB_EPA_CTL_1      0x2149 /* EP A control */
-#define USB_EPA_CTL_2      0x214A /* EP A control */
-#define USB_EPA_CTL_3      0x214B /* EP A control */
-#define USB_EPA_STAT       0x214C /* EP A status */
-#define USB_EPA_IRQSTAT    0x2150 /* EP A interrupt status */
-#define USB_EPA_IRQEN      0x2154 /* EP A interrupt enable */
-#define USB_EPA_MAXPKT     0x2158 /* EP A max packet size */
-#define USB_EPA_MAXPKT_0   0x2158 /* EP A max packet size */
-#define USB_EPA_MAXPKT_1   0x2159 /* EP A max packet size */
-#define USB_EPA_MAXPKT_2   0x215A /* EP A max packet size */
-#define USB_EPA_MAXPKT_3   0x215B /* EP A max packet size */
-#define USB_EPA_FIFO_CFG   0x2160 /* EP A FIFO configure */
-#define USB_EPA_FIFO_CFG_0 0x2160 /* EP A FIFO configure */
-#define USB_EPA_FIFO_CFG_1 0x2161 /* EP A FIFO configure */
-#define USB_EPA_FIFO_CFG_2 0x2162 /* EP A FIFO configure */
-#define USB_EPA_FIFO_CFG_3 0x2163 /* EP A FIFO configure */
-/* Debug Registers */
-#define USB_PHYTSTDIS      0x2F04 /* PHY test disable */
-#define USB_TOUT_VAL       0x2F08 /* USB time-out time */
-#define USB_VDRCTRL        0x2F10 /* UTMI vendor signal control */
-#define USB_VSTAIN         0x2F14 /* UTMI vendor signal status in */
-#define USB_VLOADM         0x2F18 /* UTMI load vendor signal status in */
-#define USB_VSTAOUT        0x2F1C /* UTMI vendor signal status out */
-#define USB_UTMI_TST       0x2F80 /* UTMI test */
-#define USB_UTMI_STATUS    0x2F84 /* UTMI status */
-#define USB_TSTCTL         0x2F88 /* test control */
-#define USB_TSTCTL2        0x2F8C /* test control 2 */
-#define USB_PID_FORCE      0x2F90 /* force PID */
-#define USB_PKTERR_CNT     0x2F94 /* packet error counter */
-#define USB_RXERR_CNT      0x2F98 /* RX error counter */
-#define USB_MEM_BIST       0x2F9C /* MEM BIST test */
-#define USB_SLBBIST        0x2FA0 /* self-loop-back BIST */
-#define USB_CNTTEST        0x2FA4 /* counter test */
-#define USB_PHYTST         0x2FC0 /* USB PHY test */
-#define USB_DBGIDX         0x2FF0 /* select individual block debug signal */
-#define USB_DBGMUX         0x2FF4 /* debug signal module mux */
-
-/*
- * SYS registers
- */
-/* demod control registers */
-#define SYS_SYS0           0x3000 /* include DEMOD_CTL, GPO, GPI, GPOE */
-#define SYS_DEMOD_CTL      0x3000 /* control register for DVB-T demodulator */
-/* GPIO registers */
-#define SYS_GPIO_OUT_VAL   0x3001 /* output value of GPIO */
-#define SYS_GPIO_IN_VAL    0x3002 /* input value of GPIO */
-#define SYS_GPIO_OUT_EN    0x3003 /* output enable of GPIO */
-#define SYS_SYS1           0x3004 /* include GPD, SYSINTE, SYSINTS, GP_CFG0 */
-#define SYS_GPIO_DIR       0x3004 /* direction control for GPIO */
-#define SYS_SYSINTE        0x3005 /* system interrupt enable */
-#define SYS_SYSINTS        0x3006 /* system interrupt status */
-#define SYS_GPIO_CFG0      0x3007 /* PAD configuration for GPIO0-GPIO3 */
-#define SYS_SYS2           0x3008 /* include GP_CFG1 and 3 reserved bytes */
-#define SYS_GPIO_CFG1      0x3008 /* PAD configuration for GPIO4 */
-#define SYS_DEMOD_CTL1     0x300B
-
-/* IrDA registers */
-#define SYS_IRRC_PSR       0x3020 /* IR protocol selection */
-#define SYS_IRRC_PER       0x3024 /* IR protocol extension */
-#define SYS_IRRC_SF        0x3028 /* IR sampling frequency */
-#define SYS_IRRC_DPIR      0x302C /* IR data package interval */
-#define SYS_IRRC_CR        0x3030 /* IR control */
-#define SYS_IRRC_RP        0x3034 /* IR read port */
-#define SYS_IRRC_SR        0x3038 /* IR status */
-/* I2C master registers */
-#define SYS_I2CCR          0x3040 /* I2C clock */
-#define SYS_I2CMCR         0x3044 /* I2C master control */
-#define SYS_I2CMSTR        0x3048 /* I2C master SCL timing */
-#define SYS_I2CMSR         0x304C /* I2C master status */
-#define SYS_I2CMFR         0x3050 /* I2C master FIFO */
-
-/*
- * IR registers
- */
-#define IR_RX_BUF          0xFC00
-#define IR_RX_IE           0xFD00
-#define IR_RX_IF           0xFD01
-#define IR_RX_CTRL         0xFD02
-#define IR_RX_CFG          0xFD03
-#define IR_MAX_DURATION0   0xFD04
-#define IR_MAX_DURATION1   0xFD05
-#define IR_IDLE_LEN0       0xFD06
-#define IR_IDLE_LEN1       0xFD07
-#define IR_GLITCH_LEN      0xFD08
-#define IR_RX_BUF_CTRL     0xFD09
-#define IR_RX_BUF_DATA     0xFD0A
-#define IR_RX_BC           0xFD0B
-#define IR_RX_CLK          0xFD0C
-#define IR_RX_C_COUNT_L    0xFD0D
-#define IR_RX_C_COUNT_H    0xFD0E
-#define IR_SUSPEND_CTRL    0xFD10
-#define IR_ERR_TOL_CTRL    0xFD11
-#define IR_UNIT_LEN        0xFD12
-#define IR_ERR_TOL_LEN     0xFD13
-#define IR_MAX_H_TOL_LEN   0xFD14
-#define IR_MAX_L_TOL_LEN   0xFD15
-#define IR_MASK_CTRL       0xFD16
-#define IR_MASK_DATA       0xFD17
-#define IR_RES_MASK_ADDR   0xFD18
-#define IR_RES_MASK_T_LEN  0xFD19
-
-#endif