165 files changed, 9692 insertions, 2943 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 624b21cef5b3..d9d033e07e19 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -80,8 +80,12 @@ config VIDEO_BUF_DVB
 config VIDEO_BTCX
         tristate
 
+config VIDEO_IR_I2C
+        tristate
+
 config VIDEO_IR
         tristate
+        select VIDEO_IR_I2C if I2C
 
 config VIDEO_TVEEPROM
         tristate
diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
index fcb194135627..fe447a06e24e 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/common/ir-functions.c
@@ -107,21 +107,20 @@ void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
 }
 
 /* -------------------------------------------------------------------------- */
-
+/* extract mask bits out of data and pack them into the result */
 u32 ir_extract_bits(u32 data, u32 mask)
 {
-        int mbit, vbit;
-        u32 value;
+        u32 vbit = 1, value = 0;
+
+        do {
+            if (mask&1) {
+                if (data&1)
+                        value |= vbit;
+                vbit<<=1;
+            }
+            data>>=1;
+        } while (mask>>=1);
 
-        value = 0;
-        vbit  = 0;
-        for (mbit = 0; mbit < 32; mbit++) {
-                if (!(mask & ((u32)1 << mbit)))
-                        continue;
-                if (data & ((u32)1 << mbit))
-                        value |= (1 << vbit);
-                vbit++;
-        }
         return value;
 }
 
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index ef3e54cd9407..ba6701e97671 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -27,7 +27,7 @@ static int saa7146_num;
 
 unsigned int saa7146_debug;
 
-module_param(saa7146_debug, int, 0644);
+module_param(saa7146_debug, uint, 0644);
 MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)");
 
 #if 0
@@ -130,10 +130,10 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
 /********************************************************************************/
 /* common page table functions */
 
-char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt)
+void *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt)
 {
         int pages = (length+PAGE_SIZE-1)/PAGE_SIZE;
-        char *mem = vmalloc_32(length);
+        void *mem = vmalloc_32(length);
         int slen = 0;
 
         if (NULL == mem)
@@ -168,7 +168,7 @@ err_null:
         return NULL;
 }
 
-void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt)
+void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, void *mem, struct saa7146_pgtable *pt)
 {
         pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE);
         saa7146_pgtable_free(pci, pt);
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index e3d04a4cef4d..664280c78ff2 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -889,9 +889,9 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 
                 DEB_EE(("VIDIOC_QUERYCAP\n"));
 
-                strcpy(cap->driver, "saa7146 v4l2");
-                strlcpy(cap->card, dev->ext->name, sizeof(cap->card));
-                sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
+                strcpy((char *)cap->driver, "saa7146 v4l2");
+                strlcpy((char *)cap->card, dev->ext->name, sizeof(cap->card));
+                sprintf((char *)cap->bus_info,"PCI:%s", pci_name(dev->pci));
                 cap->version = SAA7146_VERSION_CODE;
                 cap->capabilities =
                         V4L2_CAP_VIDEO_CAPTURE |
@@ -968,7 +968,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                         }
                         memset(f,0,sizeof(*f));
                         f->index = index;
-                        strlcpy(f->description,formats[index].name,sizeof(f->description));
+                        strlcpy((char *)f->description,formats[index].name,sizeof(f->description));
                         f->pixelformat = formats[index].pixelformat;
                         break;
                 }
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index a0dcd59da76e..3197aeb61d1f 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -1,7 +1,7 @@
 config DVB_B2C2_FLEXCOP
         tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
         depends on DVB_CORE && I2C
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_MT312 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile
index bff00b58bf65..e97ff60a1eff 100644
--- a/drivers/media/dvb/b2c2/Makefile
+++ b/drivers/media/dvb/b2c2/Makefile
@@ -12,4 +12,4 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
 b2c2-flexcop-usb-objs = flexcop-usb.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index b02c2fd65baa..0378fd646591 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -500,13 +500,13 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         /* try the air atsc 2nd generation (nxt2002) */
         if ((fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
                 fc->dev_type          = FC_AIR_ATSC2;
-                dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, &dvb_pll_samsung_tbmv);
+                dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, DVB_PLL_SAMSUNG_TBMV);
                 info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);
         } else
         /* try the air atsc 3nd generation (lgdt3303) */
         if ((fc->fe = dvb_attach(lgdt330x_attach, &air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {
                 fc->dev_type          = FC_AIR_ATSC3;
-                dvb_attach(dvb_pll_attach, fc->fe, 0x61, &fc->i2c_adap, &dvb_pll_lg_tdvs_h06xf);
+                dvb_attach(dvb_pll_attach, fc->fe, 0x61, &fc->i2c_adap, DVB_PLL_LG_TDVS_H06XF);
                 info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);
         } else
         /* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index cfd6fb729a61..ea666174e988 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -7,7 +7,7 @@ config DVB_BT8XX
         select DVB_CX24110 if !DVB_FE_CUSTOMISE
         select DVB_OR51211 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select FW_LOADER
         help
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index 9d197efb481d..84cf70504d17 100644
--- a/drivers/media/dvb/bt8xx/Makefile
+++ b/drivers/media/dvb/bt8xx/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video/bt8xx -Idrivers/media/dvb/frontends
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video/bt8xx -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index e908e3cf1e50..b7a17e69ca4d 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1652,7 +1652,7 @@ static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_paramet
 static int dst_tune_frontend(struct dvb_frontend* fe,
                             struct dvb_frontend_parameters* p,
                             unsigned int mode_flags,
-                            int *delay,
+                            unsigned int *delay,
                             fe_status_t *status)
 {
         struct dst_state *state = fe->demodulator_priv;
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 4f1c09bee538..67613eb6fa3d 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -611,7 +611,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 card->fe = dvb_attach(lgdt330x_attach, &tdvs_tua6034_config, card->i2c_adapter);
                 if (card->fe != NULL) {
                         dvb_attach(dvb_pll_attach, card->fe, 0x61,
-                                   card->i2c_adapter, &dvb_pll_lg_tdvs_h06xf);
+                                   card->i2c_adapter, DVB_PLL_LG_TDVS_H06XF);
                         dprintk ("dvb_bt8xx: lgdt330x detected\n");
                 }
                 break;
@@ -692,6 +692,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 
         case BTTV_BOARD_PC_HDTV:
                 card->fe = dvb_attach(or51211_attach, &or51211_config, card->i2c_adapter);
+                if (card->fe != NULL)
+                        dvb_attach(dvb_pll_attach, card->fe, 0x61,
+                                   card->i2c_adapter, DVB_PLL_FCV1236D);
                 break;
         }
 
diff --git a/drivers/media/dvb/cinergyT2/Makefile b/drivers/media/dvb/cinergyT2/Makefile
index c51aece20f9f..d762d8cb0cf1 100644
--- a/drivers/media/dvb/cinergyT2/Makefile
+++ b/drivers/media/dvb/cinergyT2/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_CINERGYT2) += cinergyT2.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index b40af48a2edb..5a1449f485cf 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -829,7 +829,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
         input_dev->id.vendor = cinergyt2->udev->descriptor.idVendor;
         input_dev->id.product = cinergyt2->udev->descriptor.idProduct;
         input_dev->id.version = 1;
-        input_dev->cdev.dev = &cinergyt2->udev->dev;
+        input_dev->dev.parent = &cinergyt2->udev->dev;
 
         err = input_register_device(input_dev);
         if (err) {
@@ -1000,18 +1000,15 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
         if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
                 return -ERESTARTSYS;
 
-        if (1) {
-                cinergyt2_suspend_rc(cinergyt2);
-                cancel_rearming_delayed_work(&cinergyt2->query_work);
+        cinergyt2_suspend_rc(cinergyt2);
+        cancel_rearming_delayed_work(&cinergyt2->query_work);
 
-                mutex_lock(&cinergyt2->sem);
-                if (cinergyt2->streaming)
-                        cinergyt2_stop_stream_xfer(cinergyt2);
-                cinergyt2_sleep(cinergyt2, 1);
-                mutex_unlock(&cinergyt2->sem);
-        }
+        mutex_lock(&cinergyt2->sem);
+        if (cinergyt2->streaming)
+                cinergyt2_stop_stream_xfer(cinergyt2);
+        cinergyt2_sleep(cinergyt2, 1);
+        mutex_unlock(&cinergyt2->sem);
 
-        mutex_unlock(&cinergyt2->wq_sem);
         return 0;
 }
 
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 275df65fde99..5394de2e4ce0 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -97,7 +97,7 @@ static ssize_t dvb_dmxdev_buffer_read(struct dvb_ringbuffer *src,
                 if (avail > todo)
                         avail = todo;
 
-                ret = dvb_ringbuffer_read(src, buf, avail, 1);
+                ret = dvb_ringbuffer_read(src, (u8 *)buf, avail, 1);
                 if (ret < 0)
                         break;
 
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 2a03bf53cb29..4fadddb264d6 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -175,7 +175,7 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * e
  * @param nlen Number of bytes in needle.
  * @return Pointer into haystack needle was found at, or NULL if not found.
  */
-static u8 *findstr(u8 * haystack, int hlen, u8 * needle, int nlen)
+static char *findstr(char * haystack, int hlen, char * needle, int nlen)
 {
         int i;
 
@@ -482,7 +482,7 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot)
         }
 
         /* check it contains the correct DVB string */
-        dvb_str = findstr(tuple, tupleLength, "DVB_CI_V", 8);
+        dvb_str = findstr((char *)tuple, tupleLength, "DVB_CI_V", 8);
         if (dvb_str == NULL)
                 return -EINVAL;
         if (tupleLength < ((dvb_str - (char *) tuple) + 12))
@@ -513,8 +513,8 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot)
                         ca->slot_info[slot].config_option = tuple[0] & 0x3f;
 
                         /* OK, check it contains the correct strings */
-                        if ((findstr(tuple, tupleLength, "DVB_HOST", 8) == NULL) ||
-                            (findstr(tuple, tupleLength, "DVB_CI_MODULE", 13) == NULL))
+                        if ((findstr((char *)tuple, tupleLength, "DVB_HOST", 8) == NULL) ||
+                            (findstr((char *)tuple, tupleLength, "DVB_CI_MODULE", 13) == NULL))
                                 break;
 
                         got_cftableentry = 1;
@@ -1300,7 +1300,7 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
         struct dvb_ca_private *ca = dvbdev->priv;
         u8 slot, connection_id;
         int status;
-        char fragbuf[HOST_LINK_BUF_SIZE];
+        u8 fragbuf[HOST_LINK_BUF_SIZE];
         int fragpos = 0;
         int fraglen;
         unsigned long timeout;
@@ -1486,7 +1486,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
                                 }
 
                                 if ((status = dvb_ringbuffer_pkt_read(&ca->slot_info[slot].rx_buffer, idx, 2,
-                                                                      buf + pktlen, fraglen, 1)) < 0) {
+                                                                      (u8 *)buf + pktlen, fraglen, 1)) < 0) {
                                         goto exit;
                                 }
                                 pktlen += fraglen;
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index 6d8d1c3df863..cb6987fce26c 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -1068,7 +1068,7 @@ static int dvbdmx_write(struct dmx_demux *demux, const char *buf, size_t count)
 
         if (mutex_lock_interruptible(&dvbdemux->mutex))
                 return -ERESTARTSYS;
-        dvb_dmx_swfilter(dvbdemux, buf, count);
+        dvb_dmx_swfilter(dvbdemux, (u8 *)buf, count);
         mutex_unlock(&dvbdemux->mutex);
 
         if (signal_pending(current))
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index f233d78bc364..a770a87b9a93 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -103,7 +103,7 @@ struct dvb_frontend_ops {
         int (*tune)(struct dvb_frontend* fe,
                     struct dvb_frontend_parameters* params,
                     unsigned int mode_flags,
-                    int *delay,
+                    unsigned int *delay,
                     fe_status_t *status);
         /* get frontend tuning algorithm from the module */
         int (*get_frontend_algo)(struct dvb_frontend *fe);
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index 4ebf33a5ffa2..acf026342ec5 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -347,7 +347,8 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
 {
         struct dvb_net_priv *priv = dev->priv;
         unsigned long skipped = 0L;
-        u8 *ts, *ts_end, *from_where = NULL, ts_remain = 0, how_much = 0, new_ts = 1;
+        const u8 *ts, *ts_end, *from_where = NULL;
+        u8 ts_remain = 0, how_much = 0, new_ts = 1;
         struct ethhdr *ethh = NULL;
 
 #ifdef ULE_DEBUG
@@ -364,7 +365,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
         /* For all TS cells in current buffer.
          * Appearently, we are called for every single TS cell.
          */
-        for (ts = (char *)buf, ts_end = (char *)buf + buf_len; ts < ts_end; /* no default incr. */ ) {
+        for (ts = buf, ts_end = buf + buf_len; ts < ts_end; /* no default incr. */ ) {
 
                 if (new_ts) {
                         /* We are about to process a new TS cell. */
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index a9fa3337dd81..9ef0c00605ee 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -208,7 +208,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
         if ((id = dvbdev_get_free_id (adap, type)) < 0){
                 mutex_unlock(&dvbdev_register_lock);
                 *pdvbdev = NULL;
-                printk ("%s: could get find free device id...\n", __FUNCTION__);
+                printk(KERN_ERR "%s: couldn't find free device id\n", __FUNCTION__);
                 return -ENFILE;
         }
 
@@ -252,7 +252,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
                 return PTR_ERR(clsdev);
         }
 
-        dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
+        dprintk(KERN_DEBUG "DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
                 adap->num, dnames[type], id, nums2minor(adap->num, type, id),
                 nums2minor(adap->num, type, id));
 
@@ -311,7 +311,7 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu
         memset (adap, 0, sizeof(struct dvb_adapter));
         INIT_LIST_HEAD (&adap->device_list);
 
-        printk ("DVB: registering new adapter (%s).\n", name);
+        printk(KERN_INFO "DVB: registering new adapter (%s)\n", name);
 
         adap->num = num;
         adap->name = name;
@@ -407,13 +407,13 @@ static int __init init_dvbdev(void)
         dev_t dev = MKDEV(DVB_MAJOR, 0);
 
         if ((retval = register_chrdev_region(dev, MAX_DVB_MINORS, "DVB")) != 0) {
-                printk("dvb-core: unable to get major %d\n", DVB_MAJOR);
+                printk(KERN_ERR "dvb-core: unable to get major %d\n", DVB_MAJOR);
                 return retval;
         }
 
         cdev_init(&dvb_device_cdev, &dvb_device_fops);
         if ((retval = cdev_add(&dvb_device_cdev, dev, MAX_DVB_MINORS)) != 0) {
-                printk("dvb-core: unable to get major %d\n", DVB_MAJOR);
+                printk(KERN_ERR "dvb-core: unable register character device\n");
                 goto error;
         }
 
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 54488737a08f..40e41f2f5afe 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -2,7 +2,6 @@ config DVB_USB
         tristate "Support for various USB DVB devices"
         depends on DVB_CORE && USB && I2C
         select FW_LOADER
-        select DVB_PLL
         help
           By enabling this you will be able to choose the various supported
           USB1.1 and USB2.0 DVB devices.
@@ -27,13 +26,14 @@ config DVB_USB_A800
         depends on DVB_USB
         select DVB_DIB3000MC
         select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
 
 config DVB_USB_DIBUSB_MB
         tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"
         depends on DVB_USB
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MB
         select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         help
@@ -89,7 +89,7 @@ config DVB_USB_DIB0700
 config DVB_USB_UMT_010
         tristate "HanfTek UMT-010 DVB-T USB2.0 support"
         depends on DVB_USB
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MC
         select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         help
@@ -98,7 +98,7 @@ config DVB_USB_UMT_010
 config DVB_USB_CXUSB
         tristate "Conexant USB2.0 hybrid reference design support"
         depends on DVB_USB
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_CX22702 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
@@ -142,7 +142,7 @@ config DVB_USB_AU6610
 config DVB_USB_DIGITV
         tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
         depends on DVB_USB
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_NXT6000 if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         help
@@ -188,6 +188,7 @@ config DVB_USB_NOVA_T_USB2
         depends on DVB_USB
         select DVB_DIB3000MC
         select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
 
@@ -216,5 +217,23 @@ config DVB_USB_OPERA1
         tristate "Opera1 DVB-S USB2.0 receiver"
         depends on DVB_USB
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the Opera DVB-S USB2.0 receiver.
+
+config DVB_USB_AF9005
+        tristate "Afatech AF9005 DVB-T USB1.1 support"
+        depends on DVB_USB && EXPERIMENTAL
+        select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        help
+          Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
+          and the TerraTec Cinergy T USB XE (Rev.1)
+
+config DVB_USB_AF9005_REMOTE
+        tristate "Afatech AF9005 default remote control support"
+        depends on DVB_USB_AF9005
+        help
+          Say Y here to support the default remote control decoding for the
+          Afatech AF9005 based receiver.
+
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 976f840cc904..73ac0a93fdeb 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -55,4 +55,10 @@ dvb-usb-opera-objs = opera1.o
 obj-$(CONFIG_DVB_USB_OPERA1) += dvb-usb-opera.o
 
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+dvb-usb-af9005-objs = af9005.o af9005-fe.o
+obj-$(CONFIG_DVB_USB_AF9005) += dvb-usb-af9005.o
+
+dvb-usb-af9005-remote-objs = af9005-remote.o
+obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o
+
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c
new file mode 100644
index 000000000000..7195c9461524
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/af9005-fe.c
@@ -0,0 +1,1503 @@
+/* Frontend part of the Linux driver for the Afatech 9005
+ * USB1.1 DVB-T receiver.
+ *
+ * Copyright (C) 2007 Luca Olivetti (luca@ventoso.org)
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "af9005.h"
+#include "af9005-script.h"
+#include "mt2060.h"
+#include "qt1010.h"
+#include <asm/div64.h>
+
+struct af9005_fe_state {
+        struct dvb_usb_device *d;
+        struct dvb_frontend *tuner;
+
+        fe_status_t stat;
+
+        /* retraining parameters */
+        u32 original_fcw;
+        u16 original_rf_top;
+        u16 original_if_top;
+        u16 original_if_min;
+        u16 original_aci0_if_top;
+        u16 original_aci1_if_top;
+        u16 original_aci0_if_min;
+        u8 original_if_unplug_th;
+        u8 original_rf_unplug_th;
+        u8 original_dtop_if_unplug_th;
+        u8 original_dtop_rf_unplug_th;
+
+        /* statistics */
+        u32 pre_vit_error_count;
+        u32 pre_vit_bit_count;
+        u32 ber;
+        u32 post_vit_error_count;
+        u32 post_vit_bit_count;
+        u32 unc;
+        u16 abort_count;
+
+        int opened;
+        int strong;
+        unsigned long next_status_check;
+        struct dvb_frontend frontend;
+};
+
+static int af9005_write_word_agc(struct dvb_usb_device *d, u16 reghi,
+                                 u16 reglo, u8 pos, u8 len, u16 value)
+{
+        int ret;
+        u8 temp;
+
+        if ((ret = af9005_write_ofdm_register(d, reglo, (u8) (value & 0xff))))
+                return ret;
+        temp = (u8) ((value & 0x0300) >> 8);
+        return af9005_write_register_bits(d, reghi, pos, len,
+                                          (u8) ((value & 0x300) >> 8));
+}
+
+static int af9005_read_word_agc(struct dvb_usb_device *d, u16 reghi,
+                                u16 reglo, u8 pos, u8 len, u16 * value)
+{
+        int ret;
+        u8 temp0, temp1;
+
+        if ((ret = af9005_read_ofdm_register(d, reglo, &temp0)))
+                return ret;
+        if ((ret = af9005_read_ofdm_register(d, reghi, &temp1)))
+                return ret;
+        switch (pos) {
+        case 0:
+                *value = ((u16) (temp1 & 0x03) << 8) + (u16) temp0;
+                break;
+        case 2:
+                *value = ((u16) (temp1 & 0x0C) << 6) + (u16) temp0;
+                break;
+        case 4:
+                *value = ((u16) (temp1 & 0x30) << 4) + (u16) temp0;
+                break;
+        case 6:
+                *value = ((u16) (temp1 & 0xC0) << 2) + (u16) temp0;
+                break;
+        default:
+                err("invalid pos in read word agc");
+                return -EINVAL;
+        }
+        return 0;
+
+}
+
+static int af9005_is_fecmon_available(struct dvb_frontend *fe, int *available)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret;
+        u8 temp;
+
+        *available = false;
+
+        ret = af9005_read_register_bits(state->d, xd_p_fec_vtb_rsd_mon_en,
+                                        fec_vtb_rsd_mon_en_pos,
+                                        fec_vtb_rsd_mon_en_len, &temp);
+        if (ret)
+                return ret;
+        if (temp & 1) {
+                ret =
+                    af9005_read_register_bits(state->d,
+                                              xd_p_reg_ofsm_read_rbc_en,
+                                              reg_ofsm_read_rbc_en_pos,
+                                              reg_ofsm_read_rbc_en_len, &temp);
+                if (ret)
+                        return ret;
+                if ((temp & 1) == 0)
+                        *available = true;
+
+        }
+        return 0;
+}
+
+static int af9005_get_post_vit_err_cw_count(struct dvb_frontend *fe,
+                                            u32 * post_err_count,
+                                            u32 * post_cw_count,
+                                            u16 * abort_count)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret;
+        u32 err_count;
+        u32 cw_count;
+        u8 temp, temp0, temp1, temp2;
+        u16 loc_abort_count;
+
+        *post_err_count = 0;
+        *post_cw_count = 0;
+
+        /* check if error bit count is ready */
+        ret =
+            af9005_read_register_bits(state->d, xd_r_fec_rsd_ber_rdy,
+                                      fec_rsd_ber_rdy_pos, fec_rsd_ber_rdy_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        if (!temp) {
+                deb_info("rsd counter not ready\n");
+                return 100;
+        }
+        /* get abort count */
+        ret =
+            af9005_read_ofdm_register(state->d,
+                                      xd_r_fec_rsd_abort_packet_cnt_7_0,
+                                      &temp0);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d,
+                                      xd_r_fec_rsd_abort_packet_cnt_15_8,
+                                      &temp1);
+        if (ret)
+                return ret;
+        loc_abort_count = ((u16) temp1 << 8) + temp0;
+
+        /* get error count */
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_fec_rsd_bit_err_cnt_7_0,
+                                      &temp0);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_fec_rsd_bit_err_cnt_15_8,
+                                      &temp1);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_fec_rsd_bit_err_cnt_23_16,
+                                      &temp2);
+        if (ret)
+                return ret;
+        err_count = ((u32) temp2 << 16) + ((u32) temp1 << 8) + temp0;
+        *post_err_count = err_count - (u32) loc_abort_count *8 * 8;
+
+        /* get RSD packet number */
+        ret =
+            af9005_read_ofdm_register(state->d, xd_p_fec_rsd_packet_unit_7_0,
+                                      &temp0);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_p_fec_rsd_packet_unit_15_8,
+                                      &temp1);
+        if (ret)
+                return ret;
+        cw_count = ((u32) temp1 << 8) + temp0;
+        if (cw_count == 0) {
+                err("wrong RSD packet count");
+                return -EIO;
+        }
+        deb_info("POST abort count %d err count %d rsd packets %d\n",
+                 loc_abort_count, err_count, cw_count);
+        *post_cw_count = cw_count - (u32) loc_abort_count;
+        *abort_count = loc_abort_count;
+        return 0;
+
+}
+
+static int af9005_get_post_vit_ber(struct dvb_frontend *fe,
+                                   u32 * post_err_count, u32 * post_cw_count,
+                                   u16 * abort_count)
+{
+        u32 loc_cw_count = 0, loc_err_count;
+        u16 loc_abort_count;
+        int ret;
+
+        ret =
+            af9005_get_post_vit_err_cw_count(fe, &loc_err_count, &loc_cw_count,
+                                             &loc_abort_count);
+        if (ret)
+                return ret;
+        *post_err_count = loc_err_count;
+        *post_cw_count = loc_cw_count * 204 * 8;
+        *abort_count = loc_abort_count;
+
+        return 0;
+}
+
+static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe,
+                                            u32 * pre_err_count,
+                                            u32 * pre_bit_count)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        u8 temp, temp0, temp1, temp2;
+        u32 super_frame_count, x, bits;
+        int ret;
+
+        ret =
+            af9005_read_register_bits(state->d, xd_r_fec_vtb_ber_rdy,
+                                      fec_vtb_ber_rdy_pos, fec_vtb_ber_rdy_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        if (!temp) {
+                deb_info("viterbi counter not ready\n");
+                return 101;     /* ERR_APO_VTB_COUNTER_NOT_READY; */
+        }
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_fec_vtb_err_bit_cnt_7_0,
+                                      &temp0);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_fec_vtb_err_bit_cnt_15_8,
+                                      &temp1);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_fec_vtb_err_bit_cnt_23_16,
+                                      &temp2);
+        if (ret)
+                return ret;
+        *pre_err_count = ((u32) temp2 << 16) + ((u32) temp1 << 8) + temp0;
+
+        ret =
+            af9005_read_ofdm_register(state->d, xd_p_fec_super_frm_unit_7_0,
+                                      &temp0);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
+                                      &temp1);
+        if (ret)
+                return ret;
+        super_frame_count = ((u32) temp1 << 8) + temp0;
+        if (super_frame_count == 0) {
+                deb_info("super frame count 0\n");
+                return 102;
+        }
+
+        /* read fft mode */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_txmod,
+                                      reg_tpsd_txmod_pos, reg_tpsd_txmod_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        if (temp == 0) {
+                /* 2K */
+                x = 1512;
+        } else if (temp == 1) {
+                /* 8k */
+                x = 6048;
+        } else {
+                err("Invalid fft mode");
+                return -EINVAL;
+        }
+
+        /* read constellation mode */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_const,
+                                      reg_tpsd_const_pos, reg_tpsd_const_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        switch (temp) {
+        case 0:         /* QPSK */
+                bits = 2;
+                break;
+        case 1:         /* QAM_16 */
+                bits = 4;
+                break;
+        case 2:         /* QAM_64 */
+                bits = 6;
+                break;
+        default:
+                err("invalid constellation mode");
+                return -EINVAL;
+        }
+        *pre_bit_count = super_frame_count * 68 * 4 * x * bits;
+        deb_info("PRE err count %d frame count %d bit count %d\n",
+                 *pre_err_count, super_frame_count, *pre_bit_count);
+        return 0;
+}
+
+static int af9005_reset_pre_viterbi(struct dvb_frontend *fe)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret;
+
+        /* set super frame count to 1 */
+        ret =
+            af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_7_0,
+                                       1 & 0xff);
+        if (ret)
+                return ret;
+        af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
+                                   1 >> 8);
+        if (ret)
+                return ret;
+        /* reset pre viterbi error count */
+        ret =
+            af9005_write_register_bits(state->d, xd_p_fec_vtb_ber_rst,
+                                       fec_vtb_ber_rst_pos, fec_vtb_ber_rst_len,
+                                       1);
+
+        return ret;
+}
+
+static int af9005_reset_post_viterbi(struct dvb_frontend *fe)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret;
+
+        /* set packet unit */
+        ret =
+            af9005_write_ofdm_register(state->d, xd_p_fec_rsd_packet_unit_7_0,
+                                       10000 & 0xff);
+        if (ret)
+                return ret;
+        ret =
+            af9005_write_ofdm_register(state->d, xd_p_fec_rsd_packet_unit_15_8,
+                                       10000 >> 8);
+        if (ret)
+                return ret;
+        /* reset post viterbi error count */
+        ret =
+            af9005_write_register_bits(state->d, xd_p_fec_rsd_ber_rst,
+                                       fec_rsd_ber_rst_pos, fec_rsd_ber_rst_len,
+                                       1);
+
+        return ret;
+}
+
+static int af9005_get_statistic(struct dvb_frontend *fe)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret, fecavailable;
+        u64 numerator, denominator;
+
+        deb_info("GET STATISTIC\n");
+        ret = af9005_is_fecmon_available(fe, &fecavailable);
+        if (ret)
+                return ret;
+        if (!fecavailable) {
+                deb_info("fecmon not available\n");
+                return 0;
+        }
+
+        ret = af9005_get_pre_vit_err_bit_count(fe, &state->pre_vit_error_count,
+                                               &state->pre_vit_bit_count);
+        if (ret == 0) {
+                af9005_reset_pre_viterbi(fe);
+                if (state->pre_vit_bit_count > 0) {
+                        /* according to v 0.0.4 of the dvb api ber should be a multiple
+                           of 10E-9 so we have to multiply the error count by
+                           10E9=1000000000 */
+                        numerator =
+                            (u64) state->pre_vit_error_count * (u64) 1000000000;
+                        denominator = (u64) state->pre_vit_bit_count;
+                        state->ber = do_div(numerator, denominator);
+                } else {
+                        state->ber = 0xffffffff;
+                }
+        }
+
+        ret = af9005_get_post_vit_ber(fe, &state->post_vit_error_count,
+                                      &state->post_vit_bit_count,
+                                      &state->abort_count);
+        if (ret == 0) {
+                ret = af9005_reset_post_viterbi(fe);
+                state->unc += state->abort_count;
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+
+static int af9005_fe_refresh_state(struct dvb_frontend *fe)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        if (time_after(jiffies, state->next_status_check)) {
+                deb_info("REFRESH STATE\n");
+
+                /* statistics */
+                if (af9005_get_statistic(fe))
+                        err("get_statistic_failed");
+                state->next_status_check = jiffies + 250 * HZ / 1000;
+        }
+        return 0;
+}
+
+static int af9005_fe_read_status(struct dvb_frontend *fe, fe_status_t * stat)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        u8 temp;
+        int ret;
+
+        if (state->tuner == NULL)
+                return -ENODEV;
+
+        *stat = 0;
+        ret = af9005_read_register_bits(state->d, xd_p_agc_lock,
+                                        agc_lock_pos, agc_lock_len, &temp);
+        if (ret)
+                return ret;
+        if (temp)
+                *stat |= FE_HAS_SIGNAL;
+
+        ret = af9005_read_register_bits(state->d, xd_p_fd_tpsd_lock,
+                                        fd_tpsd_lock_pos, fd_tpsd_lock_len,
+                                        &temp);
+        if (ret)
+                return ret;
+        if (temp)
+                *stat |= FE_HAS_CARRIER;
+
+        ret = af9005_read_register_bits(state->d,
+                                        xd_r_mp2if_sync_byte_locked,
+                                        mp2if_sync_byte_locked_pos,
+                                        mp2if_sync_byte_locked_pos, &temp);
+        if (ret)
+                return ret;
+        if (temp)
+                *stat |= FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_LOCK;
+        if (state->opened)
+                af9005_led_control(state->d, *stat & FE_HAS_LOCK);
+
+        ret =
+            af9005_read_register_bits(state->d, xd_p_reg_strong_sginal_detected,
+                                      reg_strong_sginal_detected_pos,
+                                      reg_strong_sginal_detected_len, &temp);
+        if (ret)
+                return ret;
+        if (temp != state->strong) {
+                deb_info("adjust for strong signal %d\n", temp);
+                        state->strong = temp;
+        }
+        return 0;
+}
+
+static int af9005_fe_read_ber(struct dvb_frontend *fe, u32 * ber)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        if (state->tuner == NULL)
+                return -ENODEV;
+        af9005_fe_refresh_state(fe);
+        *ber = state->ber;
+        return 0;
+}
+
+static int af9005_fe_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        if (state->tuner == NULL)
+                return -ENODEV;
+        af9005_fe_refresh_state(fe);
+        *unc = state->unc;
+        return 0;
+}
+
+static int af9005_fe_read_signal_strength(struct dvb_frontend *fe,
+                                          u16 * strength)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret;
+        u8 if_gain, rf_gain;
+
+        if (state->tuner == NULL)
+                return -ENODEV;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_reg_aagc_rf_gain,
+                                      &rf_gain);
+        if (ret)
+                return ret;
+        ret =
+            af9005_read_ofdm_register(state->d, xd_r_reg_aagc_if_gain,
+                                      &if_gain);
+        if (ret)
+                return ret;
+        /* this value has no real meaning, but i don't have the tables that relate
+           the rf and if gain with the dbm, so I just scale the value */
+        *strength = (512 - rf_gain - if_gain) << 7;
+        return 0;
+}
+
+static int af9005_fe_read_snr(struct dvb_frontend *fe, u16 * snr)
+{
+        /* the snr can be derived from the ber and the constellation
+           but I don't think this kind of complex calculations belong
+           in the driver. I may be wrong.... */
+        return -ENOSYS;
+}
+
+static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)
+{
+        u8 temp0, temp1, temp2, temp3, buf[4];
+        int ret;
+        u32 NS_coeff1_2048Nu;
+        u32 NS_coeff1_8191Nu;
+        u32 NS_coeff1_8192Nu;
+        u32 NS_coeff1_8193Nu;
+        u32 NS_coeff2_2k;
+        u32 NS_coeff2_8k;
+
+        switch (bw) {
+        case BANDWIDTH_6_MHZ:
+                NS_coeff1_2048Nu = 0x2ADB6DC;
+                NS_coeff1_8191Nu = 0xAB7313;
+                NS_coeff1_8192Nu = 0xAB6DB7;
+                NS_coeff1_8193Nu = 0xAB685C;
+                NS_coeff2_2k = 0x156DB6E;
+                NS_coeff2_8k = 0x55B6DC;
+                break;
+
+        case BANDWIDTH_7_MHZ:
+                NS_coeff1_2048Nu = 0x3200001;
+                NS_coeff1_8191Nu = 0xC80640;
+                NS_coeff1_8192Nu = 0xC80000;
+                NS_coeff1_8193Nu = 0xC7F9C0;
+                NS_coeff2_2k = 0x1900000;
+                NS_coeff2_8k = 0x640000;
+                break;
+
+        case BANDWIDTH_8_MHZ:
+                NS_coeff1_2048Nu = 0x3924926;
+                NS_coeff1_8191Nu = 0xE4996E;
+                NS_coeff1_8192Nu = 0xE49249;
+                NS_coeff1_8193Nu = 0xE48B25;
+                NS_coeff2_2k = 0x1C92493;
+                NS_coeff2_8k = 0x724925;
+                break;
+        default:
+                err("Invalid bandwith %d.", bw);
+                return -EINVAL;
+        }
+
+        /*
+         *  write NS_coeff1_2048Nu
+         */
+
+        temp0 = (u8) (NS_coeff1_2048Nu & 0x000000FF);
+        temp1 = (u8) ((NS_coeff1_2048Nu & 0x0000FF00) >> 8);
+        temp2 = (u8) ((NS_coeff1_2048Nu & 0x00FF0000) >> 16);
+        temp3 = (u8) ((NS_coeff1_2048Nu & 0x03000000) >> 24);
+
+        /*  big endian to make 8051 happy */
+        buf[0] = temp3;
+        buf[1] = temp2;
+        buf[2] = temp1;
+        buf[3] = temp0;
+
+        /*  cfoe_NS_2k_coeff1_25_24 */
+        ret = af9005_write_ofdm_register(d, 0xAE00, buf[0]);
+        if (ret)
+                return ret;
+
+        /*  cfoe_NS_2k_coeff1_23_16 */
+        ret = af9005_write_ofdm_register(d, 0xAE01, buf[1]);
+        if (ret)
+                return ret;
+
+        /*  cfoe_NS_2k_coeff1_15_8 */
+        ret = af9005_write_ofdm_register(d, 0xAE02, buf[2]);
+        if (ret)
+                return ret;
+
+        /*  cfoe_NS_2k_coeff1_7_0 */
+        ret = af9005_write_ofdm_register(d, 0xAE03, buf[3]);
+        if (ret)
+                return ret;
+
+        /*
+         *  write NS_coeff2_2k
+         */
+
+        temp0 = (u8) ((NS_coeff2_2k & 0x0000003F));
+        temp1 = (u8) ((NS_coeff2_2k & 0x00003FC0) >> 6);
+        temp2 = (u8) ((NS_coeff2_2k & 0x003FC000) >> 14);
+        temp3 = (u8) ((NS_coeff2_2k & 0x01C00000) >> 22);
+
+        /*  big endian to make 8051 happy */
+        buf[0] = temp3;
+        buf[1] = temp2;
+        buf[2] = temp1;
+        buf[3] = temp0;
+
+        ret = af9005_write_ofdm_register(d, 0xAE04, buf[0]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE05, buf[1]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE06, buf[2]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE07, buf[3]);
+        if (ret)
+                return ret;
+
+        /*
+         *  write NS_coeff1_8191Nu
+         */
+
+        temp0 = (u8) ((NS_coeff1_8191Nu & 0x000000FF));
+        temp1 = (u8) ((NS_coeff1_8191Nu & 0x0000FF00) >> 8);
+        temp2 = (u8) ((NS_coeff1_8191Nu & 0x00FFC000) >> 16);
+        temp3 = (u8) ((NS_coeff1_8191Nu & 0x03000000) >> 24);
+
+        /*  big endian to make 8051 happy */
+        buf[0] = temp3;
+        buf[1] = temp2;
+        buf[2] = temp1;
+        buf[3] = temp0;
+
+        ret = af9005_write_ofdm_register(d, 0xAE08, buf[0]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE09, buf[1]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE0A, buf[2]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE0B, buf[3]);
+        if (ret)
+                return ret;
+
+        /*
+         *  write NS_coeff1_8192Nu
+         */
+
+        temp0 = (u8) (NS_coeff1_8192Nu & 0x000000FF);
+        temp1 = (u8) ((NS_coeff1_8192Nu & 0x0000FF00) >> 8);
+        temp2 = (u8) ((NS_coeff1_8192Nu & 0x00FFC000) >> 16);
+        temp3 = (u8) ((NS_coeff1_8192Nu & 0x03000000) >> 24);
+
+        /*  big endian to make 8051 happy */
+        buf[0] = temp3;
+        buf[1] = temp2;
+        buf[2] = temp1;
+        buf[3] = temp0;
+
+        ret = af9005_write_ofdm_register(d, 0xAE0C, buf[0]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE0D, buf[1]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE0E, buf[2]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE0F, buf[3]);
+        if (ret)
+                return ret;
+
+        /*
+         *  write NS_coeff1_8193Nu
+         */
+
+        temp0 = (u8) ((NS_coeff1_8193Nu & 0x000000FF));
+        temp1 = (u8) ((NS_coeff1_8193Nu & 0x0000FF00) >> 8);
+        temp2 = (u8) ((NS_coeff1_8193Nu & 0x00FFC000) >> 16);
+        temp3 = (u8) ((NS_coeff1_8193Nu & 0x03000000) >> 24);
+
+        /*  big endian to make 8051 happy */
+        buf[0] = temp3;
+        buf[1] = temp2;
+        buf[2] = temp1;
+        buf[3] = temp0;
+
+        ret = af9005_write_ofdm_register(d, 0xAE10, buf[0]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE11, buf[1]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE12, buf[2]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE13, buf[3]);
+        if (ret)
+                return ret;
+
+        /*
+         *  write NS_coeff2_8k
+         */
+
+        temp0 = (u8) ((NS_coeff2_8k & 0x0000003F));
+        temp1 = (u8) ((NS_coeff2_8k & 0x00003FC0) >> 6);
+        temp2 = (u8) ((NS_coeff2_8k & 0x003FC000) >> 14);
+        temp3 = (u8) ((NS_coeff2_8k & 0x01C00000) >> 22);
+
+        /*  big endian to make 8051 happy */
+        buf[0] = temp3;
+        buf[1] = temp2;
+        buf[2] = temp1;
+        buf[3] = temp0;
+
+        ret = af9005_write_ofdm_register(d, 0xAE14, buf[0]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE15, buf[1]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE16, buf[2]);
+        if (ret)
+                return ret;
+
+        ret = af9005_write_ofdm_register(d, 0xAE17, buf[3]);
+        return ret;
+
+}
+
+static int af9005_fe_select_bw(struct dvb_usb_device *d, fe_bandwidth_t bw)
+{
+        u8 temp;
+        switch (bw) {
+        case BANDWIDTH_6_MHZ:
+                temp = 0;
+                break;
+        case BANDWIDTH_7_MHZ:
+                temp = 1;
+                break;
+        case BANDWIDTH_8_MHZ:
+                temp = 2;
+                break;
+        default:
+                err("Invalid bandwith %d.", bw);
+                return -EINVAL;
+        }
+        return af9005_write_register_bits(d, xd_g_reg_bw, reg_bw_pos,
+                                          reg_bw_len, temp);
+}
+
+static int af9005_fe_power(struct dvb_frontend *fe, int on)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        u8 temp = on;
+        int ret;
+        deb_info("power %s tuner\n", on ? "on" : "off");
+        ret = af9005_send_command(state->d, 0x03, &temp, 1, NULL, 0);
+        return ret;
+}
+
+static struct mt2060_config af9005_mt2060_config = {
+        0xC0
+};
+
+static struct qt1010_config af9005_qt1010_config = {
+        0xC4
+};
+
+static int af9005_fe_init(struct dvb_frontend *fe)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        struct dvb_usb_adapter *adap = fe->dvb->priv;
+        int ret, i, scriptlen;
+        u8 temp, temp0 = 0, temp1 = 0, temp2 = 0;
+        u8 buf[2];
+        u16 if1;
+
+        deb_info("in af9005_fe_init\n");
+
+        /* reset */
+        deb_info("reset\n");
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst_en,
+                                        4, 1, 0x01)))
+                return ret;
+        if ((ret = af9005_write_ofdm_register(state->d, APO_REG_RESET, 0)))
+                return ret;
+        /* clear ofdm reset */
+        deb_info("clear ofdm reset\n");
+        for (i = 0; i < 150; i++) {
+                if ((ret =
+                     af9005_read_ofdm_register(state->d,
+                                               xd_I2C_reg_ofdm_rst, &temp)))
+                        return ret;
+                if (temp & (regmask[reg_ofdm_rst_len - 1] << reg_ofdm_rst_pos))
+                        break;
+                msleep(10);
+        }
+        if (i == 150)
+                return -ETIMEDOUT;
+
+        /*FIXME in the dump
+           write B200 A9
+           write xd_g_reg_ofsm_clk 7
+           read eepr c6 (2)
+           read eepr c7 (2)
+           misc ctrl 3 -> 1
+           read eepr ca (6)
+           write xd_g_reg_ofsm_clk 0
+           write B200 a1
+         */
+        ret = af9005_write_ofdm_register(state->d, 0xb200, 0xa9);
+        if (ret)
+                return ret;
+        ret = af9005_write_ofdm_register(state->d, xd_g_reg_ofsm_clk, 0x07);
+        if (ret)
+                return ret;
+        temp = 0x01;
+        ret = af9005_send_command(state->d, 0x03, &temp, 1, NULL, 0);
+        if (ret)
+                return ret;
+        ret = af9005_write_ofdm_register(state->d, xd_g_reg_ofsm_clk, 0x00);
+        if (ret)
+                return ret;
+        ret = af9005_write_ofdm_register(state->d, 0xb200, 0xa1);
+        if (ret)
+                return ret;
+
+        temp = regmask[reg_ofdm_rst_len - 1] << reg_ofdm_rst_pos;
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
+                                        reg_ofdm_rst_pos, reg_ofdm_rst_len, 1)))
+                return ret;
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
+                                        reg_ofdm_rst_pos, reg_ofdm_rst_len, 0)))
+                return ret;
+
+        if (ret)
+                return ret;
+        /* don't know what register aefc is, but this is what the windows driver does */
+        ret = af9005_write_ofdm_register(state->d, 0xaefc, 0);
+        if (ret)
+                return ret;
+
+        /* set stand alone chip */
+        deb_info("set stand alone chip\n");
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_p_reg_dca_stand_alone,
+                                        reg_dca_stand_alone_pos,
+                                        reg_dca_stand_alone_len, 1)))
+                return ret;
+
+        /* set dca upper & lower chip */
+        deb_info("set dca upper & lower chip\n");
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_p_reg_dca_upper_chip,
+                                        reg_dca_upper_chip_pos,
+                                        reg_dca_upper_chip_len, 0)))
+                return ret;
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_p_reg_dca_lower_chip,
+                                        reg_dca_lower_chip_pos,
+                                        reg_dca_lower_chip_len, 0)))
+                return ret;
+
+        /* set 2wire master clock to 0x14 (for 60KHz) */
+        deb_info("set 2wire master clock to 0x14 (for 60KHz)\n");
+        if ((ret =
+             af9005_write_ofdm_register(state->d, xd_I2C_i2c_m_period, 0x14)))
+                return ret;
+
+        /* clear dca enable chip */
+        deb_info("clear dca enable chip\n");
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_p_reg_dca_en,
+                                        reg_dca_en_pos, reg_dca_en_len, 0)))
+                return ret;
+        /* FIXME these are register bits, but I don't know which ones */
+        ret = af9005_write_ofdm_register(state->d, 0xa16c, 1);
+        if (ret)
+                return ret;
+        ret = af9005_write_ofdm_register(state->d, 0xa3c1, 0);
+        if (ret)
+                return ret;
+
+        /* init other parameters: program cfoe and select bandwith */
+        deb_info("program cfoe\n");
+        if ((ret = af9005_fe_program_cfoe(state->d, BANDWIDTH_6_MHZ)))
+                return ret;
+        /* set read-update bit for constellation */
+        deb_info("set read-update bit for constellation\n");
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_p_reg_feq_read_update,
+                                        reg_feq_read_update_pos,
+                                        reg_feq_read_update_len, 1)))
+                return ret;
+
+        /* sample code has a set MPEG TS code here
+           but sniffing reveals that it doesn't do it */
+
+        /* set read-update bit to 1 for DCA constellation */
+        deb_info("set read-update bit 1 for DCA constellation\n");
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_p_reg_dca_read_update,
+                                        reg_dca_read_update_pos,
+                                        reg_dca_read_update_len, 1)))
+                return ret;
+
+        /* enable fec monitor */
+        deb_info("enable fec monitor\n");
+        if ((ret =
+             af9005_write_register_bits(state->d, xd_p_fec_vtb_rsd_mon_en,
+                                        fec_vtb_rsd_mon_en_pos,
+                                        fec_vtb_rsd_mon_en_len, 1)))
+                return ret;
+
+        /* FIXME should be register bits, I don't know which ones */
+        ret = af9005_write_ofdm_register(state->d, 0xa601, 0);
+
+        /* set api_retrain_never_freeze */
+        deb_info("set api_retrain_never_freeze\n");
+        if ((ret = af9005_write_ofdm_register(state->d, 0xaefb, 0x01)))
+                return ret;
+
+        /* load init script */
+        deb_info("load init script\n");
+        scriptlen = sizeof(script) / sizeof(RegDesc);
+        for (i = 0; i < scriptlen; i++) {
+                if ((ret =
+                     af9005_write_register_bits(state->d, script[i].reg,
+                                                script[i].pos,
+                                                script[i].len, script[i].val)))
+                        return ret;
+                /* save 3 bytes of original fcw */
+                if (script[i].reg == 0xae18)
+                        temp2 = script[i].val;
+                if (script[i].reg == 0xae19)
+                        temp1 = script[i].val;
+                if (script[i].reg == 0xae1a)
+                        temp0 = script[i].val;
+
+                /* save original unplug threshold */
+                if (script[i].reg == xd_p_reg_unplug_th)
+                        state->original_if_unplug_th = script[i].val;
+                if (script[i].reg == xd_p_reg_unplug_rf_gain_th)
+                        state->original_rf_unplug_th = script[i].val;
+                if (script[i].reg == xd_p_reg_unplug_dtop_if_gain_th)
+                        state->original_dtop_if_unplug_th = script[i].val;
+                if (script[i].reg == xd_p_reg_unplug_dtop_rf_gain_th)
+                        state->original_dtop_rf_unplug_th = script[i].val;
+
+        }
+        state->original_fcw =
+            ((u32) temp2 << 16) + ((u32) temp1 << 8) + (u32) temp0;
+
+
+        /* save original TOPs */
+        deb_info("save original TOPs\n");
+
+        /*  RF TOP */
+        ret =
+            af9005_read_word_agc(state->d,
+                                 xd_p_reg_aagc_rf_top_numerator_9_8,
+                                 xd_p_reg_aagc_rf_top_numerator_7_0, 0, 2,
+                                 &state->original_rf_top);
+        if (ret)
+                return ret;
+
+        /*  IF TOP */
+        ret =
+            af9005_read_word_agc(state->d,
+                                 xd_p_reg_aagc_if_top_numerator_9_8,
+                                 xd_p_reg_aagc_if_top_numerator_7_0, 0, 2,
+                                 &state->original_if_top);
+        if (ret)
+                return ret;
+
+        /*  ACI 0 IF TOP */
+        ret =
+            af9005_read_word_agc(state->d, 0xA60E, 0xA60A, 4, 2,
+                                 &state->original_aci0_if_top);
+        if (ret)
+                return ret;
+
+        /*  ACI 1 IF TOP */
+        ret =
+            af9005_read_word_agc(state->d, 0xA60E, 0xA60B, 6, 2,
+                                 &state->original_aci1_if_top);
+        if (ret)
+                return ret;
+
+        /* attach tuner and init */
+        if (state->tuner == NULL) {
+                /* read tuner and board id from eeprom */
+                ret = af9005_read_eeprom(adap->dev, 0xc6, buf, 2);
+                if (ret) {
+                        err("Impossible to read EEPROM\n");
+                        return ret;
+                }
+                deb_info("Tuner id %d, board id %d\n", buf[0], buf[1]);
+                switch (buf[0]) {
+                case 2: /* MT2060 */
+                        /* read if1 from eeprom */
+                        ret = af9005_read_eeprom(adap->dev, 0xc8, buf, 2);
+                        if (ret) {
+                                err("Impossible to read EEPROM\n");
+                                return ret;
+                        }
+                        if1 = (u16) (buf[0] << 8) + buf[1];
+                        state->tuner =
+                            dvb_attach(mt2060_attach, fe, &adap->dev->i2c_adap,
+                                       &af9005_mt2060_config, if1);
+                        if (state->tuner == NULL) {
+                                deb_info("MT2060 attach failed\n");
+                                return -ENODEV;
+                        }
+                        break;
+                case 3: /* QT1010 */
+                case 9: /* QT1010B */
+                        state->tuner =
+                            dvb_attach(qt1010_attach, fe, &adap->dev->i2c_adap,
+                                       &af9005_qt1010_config);
+                        if (state->tuner == NULL) {
+                                deb_info("QT1010 attach failed\n");
+                                return -ENODEV;
+                        }
+                        break;
+                default:
+                        err("Unsupported tuner type %d", buf[0]);
+                        return -ENODEV;
+                }
+                ret = state->tuner->ops.tuner_ops.init(state->tuner);
+                if (ret)
+                        return ret;
+        }
+
+        deb_info("profit!\n");
+        return 0;
+}
+
+static int af9005_fe_sleep(struct dvb_frontend *fe)
+{
+        return af9005_fe_power(fe, 0);
+}
+
+static int af9005_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+
+        if (acquire) {
+                state->opened++;
+        } else {
+
+                state->opened--;
+                if (!state->opened)
+                        af9005_led_control(state->d, 0);
+        }
+        return 0;
+}
+
+static int af9005_fe_set_frontend(struct dvb_frontend *fe,
+                                  struct dvb_frontend_parameters *fep)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret;
+        u8 temp, temp0, temp1, temp2;
+
+        deb_info("af9005_fe_set_frontend freq %d bw %d\n", fep->frequency,
+                 fep->u.ofdm.bandwidth);
+        if (state->tuner == NULL) {
+                err("Tuner not attached");
+                return -ENODEV;
+        }
+
+        deb_info("turn off led\n");
+        /* not in the log */
+        ret = af9005_led_control(state->d, 0);
+        if (ret)
+                return ret;
+        /* not sure about the bits */
+        ret = af9005_write_register_bits(state->d, XD_MP2IF_MISC, 2, 1, 0);
+        if (ret)
+                return ret;
+
+        /* set FCW to default value */
+        deb_info("set FCW to default value\n");
+        temp0 = (u8) (state->original_fcw & 0x000000ff);
+        temp1 = (u8) ((state->original_fcw & 0x0000ff00) >> 8);
+        temp2 = (u8) ((state->original_fcw & 0x00ff0000) >> 16);
+        ret = af9005_write_ofdm_register(state->d, 0xae1a, temp0);
+        if (ret)
+                return ret;
+        ret = af9005_write_ofdm_register(state->d, 0xae19, temp1);
+        if (ret)
+                return ret;
+        ret = af9005_write_ofdm_register(state->d, 0xae18, temp2);
+        if (ret)
+                return ret;
+
+        /* restore original TOPs */
+        deb_info("restore original TOPs\n");
+        ret =
+            af9005_write_word_agc(state->d,
+                                  xd_p_reg_aagc_rf_top_numerator_9_8,
+                                  xd_p_reg_aagc_rf_top_numerator_7_0, 0, 2,
+                                  state->original_rf_top);
+        if (ret)
+                return ret;
+        ret =
+            af9005_write_word_agc(state->d,
+                                  xd_p_reg_aagc_if_top_numerator_9_8,
+                                  xd_p_reg_aagc_if_top_numerator_7_0, 0, 2,
+                                  state->original_if_top);
+        if (ret)
+                return ret;
+        ret =
+            af9005_write_word_agc(state->d, 0xA60E, 0xA60A, 4, 2,
+                                  state->original_aci0_if_top);
+        if (ret)
+                return ret;
+        ret =
+            af9005_write_word_agc(state->d, 0xA60E, 0xA60B, 6, 2,
+                                  state->original_aci1_if_top);
+        if (ret)
+                return ret;
+
+        /* select bandwith */
+        deb_info("select bandwidth");
+        ret = af9005_fe_select_bw(state->d, fep->u.ofdm.bandwidth);
+        if (ret)
+                return ret;
+        ret = af9005_fe_program_cfoe(state->d, fep->u.ofdm.bandwidth);
+        if (ret)
+                return ret;
+
+        /* clear easy mode flag */
+        deb_info("clear easy mode flag\n");
+        ret = af9005_write_ofdm_register(state->d, 0xaefd, 0);
+        if (ret)
+                return ret;
+
+        /* set unplug threshold to original value */
+        deb_info("set unplug threshold to original value\n");
+        ret =
+            af9005_write_ofdm_register(state->d, xd_p_reg_unplug_th,
+                                       state->original_if_unplug_th);
+        if (ret)
+                return ret;
+        /* set tuner */
+        deb_info("set tuner\n");
+        ret = state->tuner->ops.tuner_ops.set_params(state->tuner, fep);
+        if (ret)
+                return ret;
+
+        /* trigger ofsm */
+        deb_info("trigger ofsm\n");
+        temp = 0;
+        ret = af9005_write_tuner_registers(state->d, 0xffff, &temp, 1);
+        if (ret)
+                return ret;
+
+        /* clear retrain and freeze flag */
+        deb_info("clear retrain and freeze flag\n");
+        ret =
+            af9005_write_register_bits(state->d,
+                                       xd_p_reg_api_retrain_request,
+                                       reg_api_retrain_request_pos, 2, 0);
+        if (ret)
+                return ret;
+
+        /* reset pre viterbi and post viterbi registers and statistics */
+        af9005_reset_pre_viterbi(fe);
+        af9005_reset_post_viterbi(fe);
+        state->pre_vit_error_count = 0;
+        state->pre_vit_bit_count = 0;
+        state->ber = 0;
+        state->post_vit_error_count = 0;
+        /* state->unc = 0; commented out since it should be ever increasing */
+        state->abort_count = 0;
+
+        state->next_status_check = jiffies;
+        state->strong = -1;
+
+        return 0;
+}
+
+static int af9005_fe_get_frontend(struct dvb_frontend *fe,
+                                  struct dvb_frontend_parameters *fep)
+{
+        struct af9005_fe_state *state = fe->demodulator_priv;
+        int ret;
+        u8 temp;
+
+        /* mode */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_const,
+                                      reg_tpsd_const_pos, reg_tpsd_const_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        deb_info("===== fe_get_frontend ==============\n");
+        deb_info("CONSTELLATION ");
+        switch (temp) {
+        case 0:
+                fep->u.ofdm.constellation = QPSK;
+                deb_info("QPSK\n");
+                break;
+        case 1:
+                fep->u.ofdm.constellation = QAM_16;
+                deb_info("QAM_16\n");
+                break;
+        case 2:
+                fep->u.ofdm.constellation = QAM_64;
+                deb_info("QAM_64\n");
+                break;
+        }
+
+        /* tps hierarchy and alpha value */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_hier,
+                                      reg_tpsd_hier_pos, reg_tpsd_hier_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        deb_info("HIERARCHY ");
+        switch (temp) {
+        case 0:
+                fep->u.ofdm.hierarchy_information = HIERARCHY_NONE;
+                deb_info("NONE\n");
+                break;
+        case 1:
+                fep->u.ofdm.hierarchy_information = HIERARCHY_1;
+                deb_info("1\n");
+                break;
+        case 2:
+                fep->u.ofdm.hierarchy_information = HIERARCHY_2;
+                deb_info("2\n");
+                break;
+        case 3:
+                fep->u.ofdm.hierarchy_information = HIERARCHY_4;
+                deb_info("4\n");
+                break;
+        }
+
+        /*  high/low priority     */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_dec_pri,
+                                      reg_dec_pri_pos, reg_dec_pri_len, &temp);
+        if (ret)
+                return ret;
+        /* if temp is set = high priority */
+        deb_info("PRIORITY %s\n", temp ? "high" : "low");
+
+        /* high coderate */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_hpcr,
+                                      reg_tpsd_hpcr_pos, reg_tpsd_hpcr_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        deb_info("CODERATE HP ");
+        switch (temp) {
+        case 0:
+                fep->u.ofdm.code_rate_HP = FEC_1_2;
+                deb_info("FEC_1_2\n");
+                break;
+        case 1:
+                fep->u.ofdm.code_rate_HP = FEC_2_3;
+                deb_info("FEC_2_3\n");
+                break;
+        case 2:
+                fep->u.ofdm.code_rate_HP = FEC_3_4;
+                deb_info("FEC_3_4\n");
+                break;
+        case 3:
+                fep->u.ofdm.code_rate_HP = FEC_5_6;
+                deb_info("FEC_5_6\n");
+                break;
+        case 4:
+                fep->u.ofdm.code_rate_HP = FEC_7_8;
+                deb_info("FEC_7_8\n");
+                break;
+        }
+
+        /* low coderate */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_lpcr,
+                                      reg_tpsd_lpcr_pos, reg_tpsd_lpcr_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        deb_info("CODERATE LP ");
+        switch (temp) {
+        case 0:
+                fep->u.ofdm.code_rate_LP = FEC_1_2;
+                deb_info("FEC_1_2\n");
+                break;
+        case 1:
+                fep->u.ofdm.code_rate_LP = FEC_2_3;
+                deb_info("FEC_2_3\n");
+                break;
+        case 2:
+                fep->u.ofdm.code_rate_LP = FEC_3_4;
+                deb_info("FEC_3_4\n");
+                break;
+        case 3:
+                fep->u.ofdm.code_rate_LP = FEC_5_6;
+                deb_info("FEC_5_6\n");
+                break;
+        case 4:
+                fep->u.ofdm.code_rate_LP = FEC_7_8;
+                deb_info("FEC_7_8\n");
+                break;
+        }
+
+        /* guard interval */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_gi,
+                                      reg_tpsd_gi_pos, reg_tpsd_gi_len, &temp);
+        if (ret)
+                return ret;
+        deb_info("GUARD INTERVAL ");
+        switch (temp) {
+        case 0:
+                fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
+                deb_info("1_32\n");
+                break;
+        case 1:
+                fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_16;
+                deb_info("1_16\n");
+                break;
+        case 2:
+                fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_8;
+                deb_info("1_8\n");
+                break;
+        case 3:
+                fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_4;
+                deb_info("1_4\n");
+                break;
+        }
+
+        /* fft */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_tpsd_txmod,
+                                      reg_tpsd_txmod_pos, reg_tpsd_txmod_len,
+                                      &temp);
+        if (ret)
+                return ret;
+        deb_info("TRANSMISSION MODE ");
+        switch (temp) {
+        case 0:
+                fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
+                deb_info("2K\n");
+                break;
+        case 1:
+                fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;
+                deb_info("8K\n");
+                break;
+        }
+
+        /* bandwidth      */
+        ret =
+            af9005_read_register_bits(state->d, xd_g_reg_bw, reg_bw_pos,
+                                      reg_bw_len, &temp);
+        deb_info("BANDWIDTH ");
+        switch (temp) {
+        case 0:
+                fep->u.ofdm.bandwidth = BANDWIDTH_6_MHZ;
+                deb_info("6\n");
+                break;
+        case 1:
+                fep->u.ofdm.bandwidth = BANDWIDTH_7_MHZ;
+                deb_info("7\n");
+                break;
+        case 2:
+                fep->u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
+                deb_info("8\n");
+                break;
+        }
+        return 0;
+}
+
+static void af9005_fe_release(struct dvb_frontend *fe)
+{
+        struct af9005_fe_state *state =
+            (struct af9005_fe_state *)fe->demodulator_priv;
+        if (state->tuner != NULL && state->tuner->ops.tuner_ops.release != NULL) {
+                state->tuner->ops.tuner_ops.release(state->tuner);
+#ifdef CONFIG_DVB_CORE_ATTACH
+                symbol_put_addr(state->tuner->ops.tuner_ops.release);
+#endif
+        }
+        kfree(state);
+}
+
+static struct dvb_frontend_ops af9005_fe_ops;
+
+struct dvb_frontend *af9005_fe_attach(struct dvb_usb_device *d)
+{
+        struct af9005_fe_state *state = NULL;
+
+        /* allocate memory for the internal state */
+        state = kzalloc(sizeof(struct af9005_fe_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+
+        deb_info("attaching frontend af9005\n");
+
+        state->d = d;
+        state->tuner = NULL;
+        state->opened = 0;
+
+        memcpy(&state->frontend.ops, &af9005_fe_ops,
+               sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+
+        return &state->frontend;
+      error:
+        return NULL;
+}
+
+static struct dvb_frontend_ops af9005_fe_ops = {
+        .info = {
+                 .name = "AF9005 USB DVB-T",
+                 .type = FE_OFDM,
+                 .frequency_min = 44250000,
+                 .frequency_max = 867250000,
+                 .frequency_stepsize = 250000,
+                 .caps = FE_CAN_INVERSION_AUTO |
+                 FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+                 FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+                 FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
+                 FE_CAN_QAM_AUTO | FE_CAN_TRANSMISSION_MODE_AUTO |
+                 FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_RECOVER |
+                 FE_CAN_HIERARCHY_AUTO,
+                 },
+
+        .release = af9005_fe_release,
+
+        .init = af9005_fe_init,
+        .sleep = af9005_fe_sleep,
+        .ts_bus_ctrl = af9005_ts_bus_ctrl,
+
+        .set_frontend = af9005_fe_set_frontend,
+        .get_frontend = af9005_fe_get_frontend,
+
+        .read_status = af9005_fe_read_status,
+        .read_ber = af9005_fe_read_ber,
+        .read_signal_strength = af9005_fe_read_signal_strength,
+        .read_snr = af9005_fe_read_snr,
+        .read_ucblocks = af9005_fe_read_unc_blocks,
+};
diff --git a/drivers/media/dvb/dvb-usb/af9005-remote.c b/drivers/media/dvb/dvb-usb/af9005-remote.c
new file mode 100644
index 000000000000..ff00c0e8f4a1
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/af9005-remote.c
@@ -0,0 +1,157 @@
+/* DVB USB compliant Linux driver for the Afatech 9005
+ * USB1.1 DVB-T receiver.
+ *
+ * Standard remote decode function
+ *
+ * Copyright (C) 2007 Luca Olivetti (luca@ventoso.org)
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * see Documentation/dvb/REDME.dvb-usb for more information
+ */
+#include "af9005.h"
+/* debug */
+int dvb_usb_af9005_remote_debug;
+module_param_named(debug, dvb_usb_af9005_remote_debug, int, 0644);
+MODULE_PARM_DESC(debug,
+                 "enable (1) or disable (0) debug messages."
+                 DVB_USB_DEBUG_STATUS);
+
+#define deb_decode(args...)   dprintk(dvb_usb_af9005_remote_debug,0x01,args)
+
+struct dvb_usb_rc_key af9005_rc_keys[] = {
+
+        {0x01, 0xb7, KEY_POWER},
+        {0x01, 0xa7, KEY_VOLUMEUP},
+        {0x01, 0x87, KEY_CHANNELUP},
+        {0x01, 0x7f, KEY_MUTE},
+        {0x01, 0xbf, KEY_VOLUMEDOWN},
+        {0x01, 0x3f, KEY_CHANNELDOWN},
+        {0x01, 0xdf, KEY_1},
+        {0x01, 0x5f, KEY_2},
+        {0x01, 0x9f, KEY_3},
+        {0x01, 0x1f, KEY_4},
+        {0x01, 0xef, KEY_5},
+        {0x01, 0x6f, KEY_6},
+        {0x01, 0xaf, KEY_7},
+        {0x01, 0x27, KEY_8},
+        {0x01, 0x07, KEY_9},
+        {0x01, 0xcf, KEY_ZOOM},
+        {0x01, 0x4f, KEY_0},
+        {0x01, 0x8f, KEY_GOTO}, /* marked jump on the remote */
+
+        {0x00, 0xbd, KEY_POWER},
+        {0x00, 0x7d, KEY_VOLUMEUP},
+        {0x00, 0xfd, KEY_CHANNELUP},
+        {0x00, 0x9d, KEY_MUTE},
+        {0x00, 0x5d, KEY_VOLUMEDOWN},
+        {0x00, 0xdd, KEY_CHANNELDOWN},
+        {0x00, 0xad, KEY_1},
+        {0x00, 0x6d, KEY_2},
+        {0x00, 0xed, KEY_3},
+        {0x00, 0x8d, KEY_4},
+        {0x00, 0x4d, KEY_5},
+        {0x00, 0xcd, KEY_6},
+        {0x00, 0xb5, KEY_7},
+        {0x00, 0x75, KEY_8},
+        {0x00, 0xf5, KEY_9},
+        {0x00, 0x95, KEY_ZOOM},
+        {0x00, 0x55, KEY_0},
+        {0x00, 0xd5, KEY_GOTO}, /* marked jump on the remote */
+};
+
+int af9005_rc_keys_size = ARRAY_SIZE(af9005_rc_keys);
+
+static int repeatable_keys[] = {
+        KEY_VOLUMEUP,
+        KEY_VOLUMEDOWN,
+        KEY_CHANNELUP,
+        KEY_CHANNELDOWN
+};
+
+int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event,
+                     int *state)
+{
+        u16 mark, space;
+        u32 result;
+        u8 cust, dat, invdat;
+        int i;
+
+        if (len >= 6) {
+                mark = (u16) (data[0] << 8) + data[1];
+                space = (u16) (data[2] << 8) + data[3];
+                if (space * 3 < mark) {
+                        for (i = 0; i < ARRAY_SIZE(repeatable_keys); i++) {
+                                if (d->last_event == repeatable_keys[i]) {
+                                        *state = REMOTE_KEY_REPEAT;
+                                        *event = d->last_event;
+                                        deb_decode("repeat key, event %x\n",
+                                                   *event);
+                                        return 0;
+                                }
+                        }
+                        deb_decode("repeated key ignored (non repeatable)\n");
+                        return 0;
+                } else if (len >= 33 * 4) {     /*32 bits + start code */
+                        result = 0;
+                        for (i = 4; i < 4 + 32 * 4; i += 4) {
+                                result <<= 1;
+                                mark = (u16) (data[i] << 8) + data[i + 1];
+                                mark >>= 1;
+                                space = (u16) (data[i + 2] << 8) + data[i + 3];
+                                space >>= 1;
+                                if (mark * 2 > space)
+                                        result += 1;
+                        }
+                        deb_decode("key pressed, raw value %x\n", result);
+                        if ((result & 0xff000000) != 0xfe000000) {
+                                deb_decode
+                                    ("doesn't start with 0xfe, ignored\n");
+                                return 0;
+                        }
+                        cust = (result >> 16) & 0xff;
+                        dat = (result >> 8) & 0xff;
+                        invdat = (~result) & 0xff;
+                        if (dat != invdat) {
+                                deb_decode("code != inverted code\n");
+                                return 0;
+                        }
+                        for (i = 0; i < af9005_rc_keys_size; i++) {
+                                if (af9005_rc_keys[i].custom == cust
+                                    && af9005_rc_keys[i].data == dat) {
+                                        *event = af9005_rc_keys[i].event;
+                                        *state = REMOTE_KEY_PRESSED;
+                                        deb_decode
+                                            ("key pressed, event %x\n", *event);
+                                        return 0;
+                                }
+                        }
+                        deb_decode("not found in table\n");
+                }
+        }
+        return 0;
+}
+
+EXPORT_SYMBOL(af9005_rc_keys);
+EXPORT_SYMBOL(af9005_rc_keys_size);
+EXPORT_SYMBOL(af9005_rc_decode);
+
+MODULE_AUTHOR("Luca Olivetti <luca@ventoso.org>");
+MODULE_DESCRIPTION
+    ("Standard remote control decoder for Afatech 9005 DVB-T USB1.1 stick");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/af9005-script.h b/drivers/media/dvb/dvb-usb/af9005-script.h
new file mode 100644
index 000000000000..6eeaae51b1ca
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/af9005-script.h
@@ -0,0 +1,203 @@
+/*
+File automatically generated by createinit.py using data
+extracted from AF05BDA.sys (windows driver):
+
+dd if=AF05BDA.sys of=initsequence bs=1 skip=88316 count=1110
+python createinit.py > af9005-script.h
+
+*/
+
+typedef struct {
+        u16 reg;
+        u8 pos;
+        u8 len;
+        u8 val;
+} RegDesc;
+
+RegDesc script[] = {
+        {0xa180, 0x0, 0x8, 0xa},
+        {0xa181, 0x0, 0x8, 0xd7},
+        {0xa182, 0x0, 0x8, 0xa3},
+        {0xa0a0, 0x0, 0x8, 0x0},
+        {0xa0a1, 0x0, 0x5, 0x0},
+        {0xa0a1, 0x5, 0x1, 0x1},
+        {0xa0c0, 0x0, 0x4, 0x1},
+        {0xa20e, 0x4, 0x4, 0xa},
+        {0xa20f, 0x0, 0x8, 0x40},
+        {0xa210, 0x0, 0x8, 0x8},
+        {0xa32a, 0x0, 0x4, 0xa},
+        {0xa32c, 0x0, 0x8, 0x20},
+        {0xa32b, 0x0, 0x8, 0x15},
+        {0xa1a0, 0x1, 0x1, 0x1},
+        {0xa000, 0x0, 0x1, 0x1},
+        {0xa000, 0x1, 0x1, 0x0},
+        {0xa001, 0x1, 0x1, 0x1},
+        {0xa001, 0x0, 0x1, 0x0},
+        {0xa001, 0x5, 0x1, 0x0},
+        {0xa00e, 0x0, 0x5, 0x10},
+        {0xa00f, 0x0, 0x3, 0x4},
+        {0xa00f, 0x3, 0x3, 0x5},
+        {0xa010, 0x0, 0x3, 0x4},
+        {0xa010, 0x3, 0x3, 0x5},
+        {0xa016, 0x4, 0x4, 0x3},
+        {0xa01f, 0x0, 0x6, 0xa},
+        {0xa020, 0x0, 0x6, 0xa},
+        {0xa2bc, 0x0, 0x1, 0x1},
+        {0xa2bc, 0x5, 0x1, 0x1},
+        {0xa015, 0x0, 0x8, 0x50},
+        {0xa016, 0x0, 0x1, 0x0},
+        {0xa02a, 0x0, 0x8, 0x50},
+        {0xa029, 0x0, 0x8, 0x4b},
+        {0xa614, 0x0, 0x8, 0x46},
+        {0xa002, 0x0, 0x5, 0x19},
+        {0xa003, 0x0, 0x5, 0x1a},
+        {0xa004, 0x0, 0x5, 0x19},
+        {0xa005, 0x0, 0x5, 0x1a},
+        {0xa008, 0x0, 0x8, 0x69},
+        {0xa009, 0x0, 0x2, 0x2},
+        {0xae1b, 0x0, 0x8, 0x69},
+        {0xae1c, 0x0, 0x8, 0x2},
+        {0xae1d, 0x0, 0x8, 0x2a},
+        {0xa022, 0x0, 0x8, 0xaa},
+        {0xa006, 0x0, 0x8, 0xc8},
+        {0xa007, 0x0, 0x2, 0x0},
+        {0xa00c, 0x0, 0x8, 0xba},
+        {0xa00d, 0x0, 0x2, 0x2},
+        {0xa608, 0x0, 0x8, 0xba},
+        {0xa60e, 0x0, 0x2, 0x2},
+        {0xa609, 0x0, 0x8, 0x80},
+        {0xa60e, 0x2, 0x2, 0x3},
+        {0xa00a, 0x0, 0x8, 0xb6},
+        {0xa00b, 0x0, 0x2, 0x0},
+        {0xa011, 0x0, 0x8, 0xb9},
+        {0xa012, 0x0, 0x2, 0x0},
+        {0xa013, 0x0, 0x8, 0xbd},
+        {0xa014, 0x0, 0x2, 0x2},
+        {0xa366, 0x0, 0x1, 0x1},
+        {0xa2bc, 0x3, 0x1, 0x0},
+        {0xa2bd, 0x0, 0x8, 0xa},
+        {0xa2be, 0x0, 0x8, 0x14},
+        {0xa2bf, 0x0, 0x8, 0x8},
+        {0xa60a, 0x0, 0x8, 0xbd},
+        {0xa60e, 0x4, 0x2, 0x2},
+        {0xa60b, 0x0, 0x8, 0x86},
+        {0xa60e, 0x6, 0x2, 0x3},
+        {0xa001, 0x2, 0x2, 0x1},
+        {0xa1c7, 0x0, 0x8, 0xf5},
+        {0xa03d, 0x0, 0x8, 0xb1},
+        {0xa616, 0x0, 0x8, 0xff},
+        {0xa617, 0x0, 0x8, 0xad},
+        {0xa618, 0x0, 0x8, 0xad},
+        {0xa61e, 0x3, 0x1, 0x1},
+        {0xae1a, 0x0, 0x8, 0x0},
+        {0xae19, 0x0, 0x8, 0xc8},
+        {0xae18, 0x0, 0x8, 0x61},
+        {0xa140, 0x0, 0x8, 0x0},
+        {0xa141, 0x0, 0x8, 0xc8},
+        {0xa142, 0x0, 0x7, 0x61},
+        {0xa023, 0x0, 0x8, 0xff},
+        {0xa021, 0x0, 0x8, 0xad},
+        {0xa026, 0x0, 0x1, 0x0},
+        {0xa024, 0x0, 0x8, 0xff},
+        {0xa025, 0x0, 0x8, 0xff},
+        {0xa1c8, 0x0, 0x8, 0xf},
+        {0xa2bc, 0x1, 0x1, 0x0},
+        {0xa60c, 0x0, 0x4, 0x5},
+        {0xa60c, 0x4, 0x4, 0x6},
+        {0xa60d, 0x0, 0x8, 0xa},
+        {0xa371, 0x0, 0x1, 0x1},
+        {0xa366, 0x1, 0x3, 0x7},
+        {0xa338, 0x0, 0x8, 0x10},
+        {0xa339, 0x0, 0x6, 0x7},
+        {0xa33a, 0x0, 0x6, 0x1f},
+        {0xa33b, 0x0, 0x8, 0xf6},
+        {0xa33c, 0x3, 0x5, 0x4},
+        {0xa33d, 0x4, 0x4, 0x0},
+        {0xa33d, 0x1, 0x1, 0x1},
+        {0xa33d, 0x2, 0x1, 0x1},
+        {0xa33d, 0x3, 0x1, 0x1},
+        {0xa16d, 0x0, 0x4, 0xf},
+        {0xa161, 0x0, 0x5, 0x5},
+        {0xa162, 0x0, 0x4, 0x5},
+        {0xa165, 0x0, 0x8, 0xff},
+        {0xa166, 0x0, 0x8, 0x9c},
+        {0xa2c3, 0x0, 0x4, 0x5},
+        {0xa61a, 0x0, 0x6, 0xf},
+        {0xb200, 0x0, 0x8, 0xa1},
+        {0xb201, 0x0, 0x8, 0x7},
+        {0xa093, 0x0, 0x1, 0x0},
+        {0xa093, 0x1, 0x5, 0xf},
+        {0xa094, 0x0, 0x8, 0xff},
+        {0xa095, 0x0, 0x8, 0xf},
+        {0xa080, 0x2, 0x5, 0x3},
+        {0xa081, 0x0, 0x4, 0x0},
+        {0xa081, 0x4, 0x4, 0x9},
+        {0xa082, 0x0, 0x5, 0x1f},
+        {0xa08d, 0x0, 0x8, 0x1},
+        {0xa083, 0x0, 0x8, 0x32},
+        {0xa084, 0x0, 0x1, 0x0},
+        {0xa08e, 0x0, 0x8, 0x3},
+        {0xa085, 0x0, 0x8, 0x32},
+        {0xa086, 0x0, 0x3, 0x0},
+        {0xa087, 0x0, 0x8, 0x6e},
+        {0xa088, 0x0, 0x5, 0x15},
+        {0xa089, 0x0, 0x8, 0x0},
+        {0xa08a, 0x0, 0x5, 0x19},
+        {0xa08b, 0x0, 0x8, 0x92},
+        {0xa08c, 0x0, 0x5, 0x1c},
+        {0xa120, 0x0, 0x8, 0x0},
+        {0xa121, 0x0, 0x5, 0x10},
+        {0xa122, 0x0, 0x8, 0x0},
+        {0xa123, 0x0, 0x7, 0x40},
+        {0xa123, 0x7, 0x1, 0x0},
+        {0xa124, 0x0, 0x8, 0x13},
+        {0xa125, 0x0, 0x7, 0x10},
+        {0xa1c0, 0x0, 0x8, 0x0},
+        {0xa1c1, 0x0, 0x5, 0x4},
+        {0xa1c2, 0x0, 0x8, 0x0},
+        {0xa1c3, 0x0, 0x5, 0x10},
+        {0xa1c3, 0x5, 0x3, 0x0},
+        {0xa1c4, 0x0, 0x6, 0x0},
+        {0xa1c5, 0x0, 0x7, 0x10},
+        {0xa100, 0x0, 0x8, 0x0},
+        {0xa101, 0x0, 0x5, 0x10},
+        {0xa102, 0x0, 0x8, 0x0},
+        {0xa103, 0x0, 0x7, 0x40},
+        {0xa103, 0x7, 0x1, 0x0},
+        {0xa104, 0x0, 0x8, 0x18},
+        {0xa105, 0x0, 0x7, 0xa},
+        {0xa106, 0x0, 0x8, 0x20},
+        {0xa107, 0x0, 0x8, 0x40},
+        {0xa108, 0x0, 0x4, 0x0},
+        {0xa38c, 0x0, 0x8, 0xfc},
+        {0xa38d, 0x0, 0x8, 0x0},
+        {0xa38e, 0x0, 0x8, 0x7e},
+        {0xa38f, 0x0, 0x8, 0x0},
+        {0xa390, 0x0, 0x8, 0x2f},
+        {0xa60f, 0x5, 0x1, 0x1},
+        {0xa170, 0x0, 0x8, 0xdc},
+        {0xa171, 0x0, 0x2, 0x0},
+        {0xa2ae, 0x0, 0x1, 0x1},
+        {0xa2ae, 0x1, 0x1, 0x1},
+        {0xa392, 0x0, 0x1, 0x1},
+        {0xa391, 0x2, 0x1, 0x0},
+        {0xabc1, 0x0, 0x8, 0xff},
+        {0xabc2, 0x0, 0x8, 0x0},
+        {0xabc8, 0x0, 0x8, 0x8},
+        {0xabca, 0x0, 0x8, 0x10},
+        {0xabcb, 0x0, 0x1, 0x0},
+        {0xabc3, 0x5, 0x3, 0x7},
+        {0xabc0, 0x6, 0x1, 0x0},
+        {0xabc0, 0x4, 0x2, 0x0},
+        {0xa344, 0x4, 0x4, 0x1},
+        {0xabc0, 0x7, 0x1, 0x1},
+        {0xabc0, 0x2, 0x1, 0x1},
+        {0xa345, 0x0, 0x8, 0x66},
+        {0xa346, 0x0, 0x8, 0x66},
+        {0xa347, 0x0, 0x4, 0x0},
+        {0xa343, 0x0, 0x4, 0xa},
+        {0xa347, 0x4, 0x4, 0x2},
+        {0xa348, 0x0, 0x4, 0xc},
+        {0xa348, 0x4, 0x4, 0x7},
+        {0xa349, 0x0, 0x6, 0x2},
+};
diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c
new file mode 100644
index 000000000000..7db6eee50e39
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/af9005.c
@@ -0,0 +1,1141 @@
+/* DVB USB compliant Linux driver for the Afatech 9005
+ * USB1.1 DVB-T receiver.
+ *
+ * Copyright (C) 2007 Luca Olivetti (luca@ventoso.org)
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * see Documentation/dvb/REDME.dvb-usb for more information
+ */
+#include "af9005.h"
+
+/* debug */
+int dvb_usb_af9005_debug;
+module_param_named(debug, dvb_usb_af9005_debug, int, 0644);
+MODULE_PARM_DESC(debug,
+                 "set debugging level (1=info,xfer=2,rc=4,reg=8,i2c=16,fw=32 (or-able))."
+                 DVB_USB_DEBUG_STATUS);
+/* enable obnoxious led */
+int dvb_usb_af9005_led = 1;
+module_param_named(led, dvb_usb_af9005_led, bool, 0644);
+MODULE_PARM_DESC(led, "enable led (default: 1).");
+
+/* eeprom dump */
+int dvb_usb_af9005_dump_eeprom = 0;
+module_param_named(dump_eeprom, dvb_usb_af9005_dump_eeprom, int, 0);
+MODULE_PARM_DESC(dump_eeprom, "dump contents of the eeprom.");
+
+/* remote control decoder */
+int (*rc_decode) (struct dvb_usb_device * d, u8 * data, int len, u32 * event,
+                  int *state);
+void *rc_keys;
+int *rc_keys_size;
+
+u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
+
+struct af9005_device_state {
+        u8 sequence;
+        int led_state;
+};
+
+int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 * wbuf, u16 wlen,
+                          u8 * rbuf, u16 rlen, int delay_ms)
+{
+        int actlen, ret = -ENOMEM;
+
+        if (wbuf == NULL || wlen == 0)
+                return -EINVAL;
+
+        if ((ret = mutex_lock_interruptible(&d->usb_mutex)))
+                return ret;
+
+        deb_xfer(">>> ");
+        debug_dump(wbuf, wlen, deb_xfer);
+
+        ret = usb_bulk_msg(d->udev, usb_sndbulkpipe(d->udev,
+                                                    2), wbuf, wlen,
+                           &actlen, 2000);
+
+        if (ret)
+                err("bulk message failed: %d (%d/%d)", ret, wlen, actlen);
+        else
+                ret = actlen != wlen ? -1 : 0;
+
+        /* an answer is expected, and no error before */
+        if (!ret && rbuf && rlen) {
+                if (delay_ms)
+                        msleep(delay_ms);
+
+                ret = usb_bulk_msg(d->udev, usb_rcvbulkpipe(d->udev,
+                                                            0x01), rbuf,
+                                   rlen, &actlen, 2000);
+
+                if (ret)
+                        err("recv bulk message failed: %d", ret);
+                else {
+                        deb_xfer("<<< ");
+                        debug_dump(rbuf, actlen, deb_xfer);
+                }
+        }
+
+        mutex_unlock(&d->usb_mutex);
+        return ret;
+}
+
+int af9005_usb_generic_write(struct dvb_usb_device *d, u8 * buf, u16 len)
+{
+        return af9005_usb_generic_rw(d, buf, len, NULL, 0, 0);
+}
+
+int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
+                              int readwrite, int type, u8 * values, int len)
+{
+        struct af9005_device_state *st = d->priv;
+        u8 obuf[16] = { 0 };
+        u8 ibuf[17] = { 0 };
+        u8 command;
+        int i;
+        int ret;
+
+        if (len < 1) {
+                err("generic read/write, less than 1 byte. Makes no sense.");
+                return -EINVAL;
+        }
+        if (len > 8) {
+                err("generic read/write, more than 8 bytes. Not supported.");
+                return -EINVAL;
+        }
+
+        obuf[0] = 14;           /* rest of buffer length low */
+        obuf[1] = 0;            /* rest of buffer length high */
+
+        obuf[2] = AF9005_REGISTER_RW;   /* register operation */
+        obuf[3] = 12;           /* rest of buffer length */
+
+        obuf[4] = st->sequence++;       /* sequence number */
+
+        obuf[5] = (u8) (reg >> 8);      /* register address */
+        obuf[6] = (u8) (reg & 0xff);
+
+        if (type == AF9005_OFDM_REG) {
+                command = AF9005_CMD_OFDM_REG;
+        } else {
+                command = AF9005_CMD_TUNER;
+        }
+
+        if (len > 1)
+                command |=
+                    AF9005_CMD_BURST | AF9005_CMD_AUTOINC | (len - 1) << 3;
+        command |= readwrite;
+        if (readwrite == AF9005_CMD_WRITE)
+                for (i = 0; i < len; i++)
+                        obuf[8 + i] = values[i];
+        else if (type == AF9005_TUNER_REG)
+                /* read command for tuner, the first byte contains the i2c address */
+                obuf[8] = values[0];
+        obuf[7] = command;
+
+        ret = af9005_usb_generic_rw(d, obuf, 16, ibuf, 17, 0);
+        if (ret)
+                return ret;
+
+        /* sanity check */
+        if (ibuf[2] != AF9005_REGISTER_RW_ACK) {
+                err("generic read/write, wrong reply code.");
+                return -EIO;
+        }
+        if (ibuf[3] != 0x0d) {
+                err("generic read/write, wrong length in reply.");
+                return -EIO;
+        }
+        if (ibuf[4] != obuf[4]) {
+                err("generic read/write, wrong sequence in reply.");
+                return -EIO;
+        }
+        /*
+           Windows driver doesn't check these fields, in fact sometimes
+           the register in the reply is different that what has been sent
+
+           if (ibuf[5] != obuf[5] || ibuf[6] != obuf[6]) {
+           err("generic read/write, wrong register in reply.");
+           return -EIO;
+           }
+           if (ibuf[7] != command) {
+           err("generic read/write wrong command in reply.");
+           return -EIO;
+           }
+         */
+        if (ibuf[16] != 0x01) {
+                err("generic read/write wrong status code in reply.");
+                return -EIO;
+        }
+        if (readwrite == AF9005_CMD_READ)
+                for (i = 0; i < len; i++)
+                        values[i] = ibuf[8 + i];
+
+        return 0;
+
+}
+
+int af9005_read_ofdm_register(struct dvb_usb_device *d, u16 reg, u8 * value)
+{
+        int ret;
+        deb_reg("read register %x ", reg);
+        ret = af9005_generic_read_write(d, reg,
+                                        AF9005_CMD_READ, AF9005_OFDM_REG,
+                                        value, 1);
+        if (ret)
+                deb_reg("failed\n");
+        else
+                deb_reg("value %x\n", *value);
+        return ret;
+}
+
+int af9005_read_ofdm_registers(struct dvb_usb_device *d, u16 reg,
+                               u8 * values, int len)
+{
+        int ret;
+        deb_reg("read %d registers %x ", len, reg);
+        ret = af9005_generic_read_write(d, reg,
+                                        AF9005_CMD_READ, AF9005_OFDM_REG,
+                                        values, len);
+        if (ret)
+                deb_reg("failed\n");
+        else
+                debug_dump(values, len, deb_reg);
+        return ret;
+}
+
+int af9005_write_ofdm_register(struct dvb_usb_device *d, u16 reg, u8 value)
+{
+        int ret;
+        u8 temp = value;
+        deb_reg("write register %x value %x ", reg, value);
+        ret = af9005_generic_read_write(d, reg,
+                                        AF9005_CMD_WRITE, AF9005_OFDM_REG,
+                                        &temp, 1);
+        if (ret)
+                deb_reg("failed\n");
+        else
+                deb_reg("ok\n");
+        return ret;
+}
+
+int af9005_write_ofdm_registers(struct dvb_usb_device *d, u16 reg,
+                                u8 * values, int len)
+{
+        int ret;
+        deb_reg("write %d registers %x values ", len, reg);
+        debug_dump(values, len, deb_reg);
+
+        ret = af9005_generic_read_write(d, reg,
+                                        AF9005_CMD_WRITE, AF9005_OFDM_REG,
+                                        values, len);
+        if (ret)
+                deb_reg("failed\n");
+        else
+                deb_reg("ok\n");
+        return ret;
+}
+
+int af9005_read_register_bits(struct dvb_usb_device *d, u16 reg, u8 pos,
+                              u8 len, u8 * value)
+{
+        u8 temp;
+        int ret;
+        deb_reg("read bits %x %x %x", reg, pos, len);
+        ret = af9005_read_ofdm_register(d, reg, &temp);
+        if (ret) {
+                deb_reg(" failed\n");
+                return ret;
+        }
+        *value = (temp >> pos) & regmask[len - 1];
+        deb_reg(" value %x\n", *value);
+        return 0;
+
+}
+
+int af9005_write_register_bits(struct dvb_usb_device *d, u16 reg, u8 pos,
+                               u8 len, u8 value)
+{
+        u8 temp, mask;
+        int ret;
+        deb_reg("write bits %x %x %x value %x\n", reg, pos, len, value);
+        if (pos == 0 && len == 8)
+                return af9005_write_ofdm_register(d, reg, value);
+        ret = af9005_read_ofdm_register(d, reg, &temp);
+        if (ret)
+                return ret;
+        mask = regmask[len - 1] << pos;
+        temp = (temp & ~mask) | ((value << pos) & mask);
+        return af9005_write_ofdm_register(d, reg, temp);
+
+}
+
+static int af9005_usb_read_tuner_registers(struct dvb_usb_device *d,
+                                           u16 reg, u8 * values, int len)
+{
+        return af9005_generic_read_write(d, reg,
+                                         AF9005_CMD_READ, AF9005_TUNER_REG,
+                                         values, len);
+}
+
+static int af9005_usb_write_tuner_registers(struct dvb_usb_device *d,
+                                            u16 reg, u8 * values, int len)
+{
+        return af9005_generic_read_write(d, reg,
+                                         AF9005_CMD_WRITE,
+                                         AF9005_TUNER_REG, values, len);
+}
+
+int af9005_write_tuner_registers(struct dvb_usb_device *d, u16 reg,
+                                 u8 * values, int len)
+{
+        /* don't let the name of this function mislead you: it's just used
+           as an interface from the firmware to the i2c bus. The actual
+           i2c addresses are contained in the data */
+        int ret, i, done = 0, fail = 0;
+        u8 temp;
+        ret = af9005_usb_write_tuner_registers(d, reg, values, len);
+        if (ret)
+                return ret;
+        if (reg != 0xffff) {
+                /* check if write done (0xa40d bit 1) or fail (0xa40d bit 2) */
+                for (i = 0; i < 200; i++) {
+                        ret =
+                            af9005_read_ofdm_register(d,
+                                                      xd_I2C_i2c_m_status_wdat_done,
+                                                      &temp);
+                        if (ret)
+                                return ret;
+                        done = temp & (regmask[i2c_m_status_wdat_done_len - 1]
+                                       << i2c_m_status_wdat_done_pos);
+                        if (done)
+                                break;
+                        fail = temp & (regmask[i2c_m_status_wdat_fail_len - 1]
+                                       << i2c_m_status_wdat_fail_pos);
+                        if (fail)
+                                break;
+                        msleep(50);
+                }
+                if (i == 200)
+                        return -ETIMEDOUT;
+                if (fail) {
+                        /* clear write fail bit */
+                        af9005_write_register_bits(d,
+                                                   xd_I2C_i2c_m_status_wdat_fail,
+                                                   i2c_m_status_wdat_fail_pos,
+                                                   i2c_m_status_wdat_fail_len,
+                                                   1);
+                        return -EIO;
+                }
+                /* clear write done bit */
+                ret =
+                    af9005_write_register_bits(d,
+                                               xd_I2C_i2c_m_status_wdat_fail,
+                                               i2c_m_status_wdat_done_pos,
+                                               i2c_m_status_wdat_done_len, 1);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+
+int af9005_read_tuner_registers(struct dvb_usb_device *d, u16 reg, u8 addr,
+                                u8 * values, int len)
+{
+        /* don't let the name of this function mislead you: it's just used
+           as an interface from the firmware to the i2c bus. The actual
+           i2c addresses are contained in the data */
+        int ret, i;
+        u8 temp, buf[2];
+
+        buf[0] = addr;          /* tuner i2c address */
+        buf[1] = values[0];     /* tuner register */
+
+        values[0] = addr + 0x01;        /* i2c read address */
+
+        if (reg == APO_REG_I2C_RW_SILICON_TUNER) {
+                /* write tuner i2c address to tuner, 0c00c0 undocumented, found by sniffing */
+                ret = af9005_write_tuner_registers(d, 0x00c0, buf, 2);
+                if (ret)
+                        return ret;
+        }
+
+        /* send read command to ofsm */
+        ret = af9005_usb_read_tuner_registers(d, reg, values, 1);
+        if (ret)
+                return ret;
+
+        /* check if read done */
+        for (i = 0; i < 200; i++) {
+                ret = af9005_read_ofdm_register(d, 0xa408, &temp);
+                if (ret)
+                        return ret;
+                if (temp & 0x01)
+                        break;
+                msleep(50);
+        }
+        if (i == 200)
+                return -ETIMEDOUT;
+
+        /* clear read done bit (by writing 1) */
+        ret = af9005_write_ofdm_register(d, xd_I2C_i2c_m_data8, 1);
+        if (ret)
+                return ret;
+
+        /* get read data (available from 0xa400) */
+        for (i = 0; i < len; i++) {
+                ret = af9005_read_ofdm_register(d, 0xa400 + i, &temp);
+                if (ret)
+                        return ret;
+                values[i] = temp;
+        }
+        return 0;
+}
+
+static int af9005_i2c_write(struct dvb_usb_device *d, u8 i2caddr, u8 reg,
+                            u8 * data, int len)
+{
+        int ret, i;
+        u8 buf[3];
+        deb_i2c("i2c_write i2caddr %x, reg %x, len %d data ", i2caddr,
+                reg, len);
+        debug_dump(data, len, deb_i2c);
+
+        for (i = 0; i < len; i++) {
+                buf[0] = i2caddr;
+                buf[1] = reg + (u8) i;
+                buf[2] = data[i];
+                ret =
+                    af9005_write_tuner_registers(d,
+                                                 APO_REG_I2C_RW_SILICON_TUNER,
+                                                 buf, 3);
+                if (ret) {
+                        deb_i2c("i2c_write failed\n");
+                        return ret;
+                }
+        }
+        deb_i2c("i2c_write ok\n");
+        return 0;
+}
+
+static int af9005_i2c_read(struct dvb_usb_device *d, u8 i2caddr, u8 reg,
+                           u8 * data, int len)
+{
+        int ret, i;
+        u8 temp;
+        deb_i2c("i2c_read i2caddr %x, reg %x, len %d\n ", i2caddr, reg, len);
+        for (i = 0; i < len; i++) {
+                temp = reg + i;
+                ret =
+                    af9005_read_tuner_registers(d,
+                                                APO_REG_I2C_RW_SILICON_TUNER,
+                                                i2caddr, &temp, 1);
+                if (ret) {
+                        deb_i2c("i2c_read failed\n");
+                        return ret;
+                }
+                data[i] = temp;
+        }
+        deb_i2c("i2c data read: ");
+        debug_dump(data, len, deb_i2c);
+        return 0;
+}
+
+static int af9005_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                           int num)
+{
+        /* only implements what the mt2060 module does, don't know how
+           to make it really generic */
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int ret;
+        u8 reg, addr;
+        u8 *value;
+
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        if (num > 2)
+                warn("more than 2 i2c messages at a time is not handled yet. TODO.");
+
+        if (num == 2) {
+                /* reads a single register */
+                reg = *msg[0].buf;
+                addr = msg[0].addr;
+                value = msg[1].buf;
+                ret = af9005_i2c_read(d, addr, reg, value, 1);
+                if (ret == 0)
+                        ret = 2;
+        } else {
+                /* write one or more registers */
+                reg = msg[0].buf[0];
+                addr = msg[0].addr;
+                value = &msg[0].buf[1];
+                ret = af9005_i2c_write(d, addr, reg, value, msg[0].len - 1);
+                if (ret == 0)
+                        ret = 1;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return ret;
+}
+
+static u32 af9005_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm af9005_i2c_algo = {
+        .master_xfer = af9005_i2c_xfer,
+        .functionality = af9005_i2c_func,
+};
+
+int af9005_send_command(struct dvb_usb_device *d, u8 command, u8 * wbuf,
+                        int wlen, u8 * rbuf, int rlen)
+{
+        struct af9005_device_state *st = d->priv;
+
+        int ret, i, packet_len;
+        u8 buf[64];
+        u8 ibuf[64];
+
+        if (wlen < 0) {
+                err("send command, wlen less than 0 bytes. Makes no sense.");
+                return -EINVAL;
+        }
+        if (wlen > 54) {
+                err("send command, wlen more than 54 bytes. Not supported.");
+                return -EINVAL;
+        }
+        if (rlen > 54) {
+                err("send command, rlen more than 54 bytes. Not supported.");
+                return -EINVAL;
+        }
+        packet_len = wlen + 5;
+        buf[0] = (u8) (packet_len & 0xff);
+        buf[1] = (u8) ((packet_len & 0xff00) >> 8);
+
+        buf[2] = 0x26;          /* packet type */
+        buf[3] = wlen + 3;
+        buf[4] = st->sequence++;
+        buf[5] = command;
+        buf[6] = wlen;
+        for (i = 0; i < wlen; i++)
+                buf[7 + i] = wbuf[i];
+        ret = af9005_usb_generic_rw(d, buf, wlen + 7, ibuf, rlen + 7, 0);
+        if (ret)
+                return ret;
+        if (ibuf[2] != 0x27) {
+                err("send command, wrong reply code.");
+                return -EIO;
+        }
+        if (ibuf[4] != buf[4]) {
+                err("send command, wrong sequence in reply.");
+                return -EIO;
+        }
+        if (ibuf[5] != 0x01) {
+                err("send command, wrong status code in reply.");
+                return -EIO;
+        }
+        if (ibuf[6] != rlen) {
+                err("send command, invalid data length in reply.");
+                return -EIO;
+        }
+        for (i = 0; i < rlen; i++)
+                rbuf[i] = ibuf[i + 7];
+        return 0;
+}
+
+int af9005_read_eeprom(struct dvb_usb_device *d, u8 address, u8 * values,
+                       int len)
+{
+        struct af9005_device_state *st = d->priv;
+        u8 obuf[16], ibuf[14];
+        int ret, i;
+
+        memset(obuf, 0, sizeof(obuf));
+        memset(ibuf, 0, sizeof(ibuf));
+
+        obuf[0] = 14;           /* length of rest of packet low */
+        obuf[1] = 0;            /* length of rest of packer high */
+
+        obuf[2] = 0x2a;         /* read/write eeprom */
+
+        obuf[3] = 12;           /* size */
+
+        obuf[4] = st->sequence++;
+
+        obuf[5] = 0;            /* read */
+
+        obuf[6] = len;
+        obuf[7] = address;
+        ret = af9005_usb_generic_rw(d, obuf, 16, ibuf, 14, 0);
+        if (ret)
+                return ret;
+        if (ibuf[2] != 0x2b) {
+                err("Read eeprom, invalid reply code");
+                return -EIO;
+        }
+        if (ibuf[3] != 10) {
+                err("Read eeprom, invalid reply length");
+                return -EIO;
+        }
+        if (ibuf[4] != obuf[4]) {
+                err("Read eeprom, wrong sequence in reply ");
+                return -EIO;
+        }
+        if (ibuf[5] != 1) {
+                err("Read eeprom, wrong status in reply ");
+                return -EIO;
+        }
+        for (i = 0; i < len; i++) {
+                values[i] = ibuf[6 + i];
+        }
+        return 0;
+}
+
+static int af9005_boot_packet(struct usb_device *udev, int type, u8 * reply)
+{
+        u8 buf[FW_BULKOUT_SIZE + 2];
+        u16 checksum;
+        int act_len, i, ret;
+        memset(buf, 0, sizeof(buf));
+        buf[0] = (u8) (FW_BULKOUT_SIZE & 0xff);
+        buf[1] = (u8) ((FW_BULKOUT_SIZE >> 8) & 0xff);
+        switch (type) {
+        case FW_CONFIG:
+                buf[2] = 0x11;
+                buf[3] = 0x04;
+                buf[4] = 0x00;  /* sequence number, original driver doesn't increment it here */
+                buf[5] = 0x03;
+                checksum = buf[4] + buf[5];
+                buf[6] = (u8) ((checksum >> 8) & 0xff);
+                buf[7] = (u8) (checksum & 0xff);
+                break;
+        case FW_CONFIRM:
+                buf[2] = 0x11;
+                buf[3] = 0x04;
+                buf[4] = 0x00;  /* sequence number, original driver doesn't increment it here */
+                buf[5] = 0x01;
+                checksum = buf[4] + buf[5];
+                buf[6] = (u8) ((checksum >> 8) & 0xff);
+                buf[7] = (u8) (checksum & 0xff);
+                break;
+        case FW_BOOT:
+                buf[2] = 0x10;
+                buf[3] = 0x08;
+                buf[4] = 0x00;  /* sequence number, original driver doesn't increment it here */
+                buf[5] = 0x97;
+                buf[6] = 0xaa;
+                buf[7] = 0x55;
+                buf[8] = 0xa5;
+                buf[9] = 0x5a;
+                checksum = 0;
+                for (i = 4; i <= 9; i++)
+                        checksum += buf[i];
+                buf[10] = (u8) ((checksum >> 8) & 0xff);
+                buf[11] = (u8) (checksum & 0xff);
+                break;
+        default:
+                err("boot packet invalid boot packet type");
+                return -EINVAL;
+        }
+        deb_fw(">>> ");
+        debug_dump(buf, FW_BULKOUT_SIZE + 2, deb_fw);
+
+        ret = usb_bulk_msg(udev,
+                           usb_sndbulkpipe(udev, 0x02),
+                           buf, FW_BULKOUT_SIZE + 2, &act_len, 2000);
+        if (ret)
+                err("boot packet bulk message failed: %d (%d/%d)", ret,
+                    FW_BULKOUT_SIZE + 2, act_len);
+        else
+                ret = act_len != FW_BULKOUT_SIZE + 2 ? -1 : 0;
+        if (ret)
+                return ret;
+        memset(buf, 0, 9);
+        ret = usb_bulk_msg(udev,
+                           usb_rcvbulkpipe(udev, 0x01), buf, 9, &act_len, 2000);
+        if (ret) {
+                err("boot packet recv bulk message failed: %d", ret);
+                return ret;
+        }
+        deb_fw("<<< ");
+        debug_dump(buf, act_len, deb_fw);
+        checksum = 0;
+        switch (type) {
+        case FW_CONFIG:
+                if (buf[2] != 0x11) {
+                        err("boot bad config header.");
+                        return -EIO;
+                }
+                if (buf[3] != 0x05) {
+                        err("boot bad config size.");
+                        return -EIO;
+                }
+                if (buf[4] != 0x00) {
+                        err("boot bad config sequence.");
+                        return -EIO;
+                }
+                if (buf[5] != 0x04) {
+                        err("boot bad config subtype.");
+                        return -EIO;
+                }
+                for (i = 4; i <= 6; i++)
+                        checksum += buf[i];
+                if (buf[7] * 256 + buf[8] != checksum) {
+                        err("boot bad config checksum.");
+                        return -EIO;
+                }
+                *reply = buf[6];
+                break;
+        case FW_CONFIRM:
+                if (buf[2] != 0x11) {
+                        err("boot bad confirm header.");
+                        return -EIO;
+                }
+                if (buf[3] != 0x05) {
+                        err("boot bad confirm size.");
+                        return -EIO;
+                }
+                if (buf[4] != 0x00) {
+                        err("boot bad confirm sequence.");
+                        return -EIO;
+                }
+                if (buf[5] != 0x02) {
+                        err("boot bad confirm subtype.");
+                        return -EIO;
+                }
+                for (i = 4; i <= 6; i++)
+                        checksum += buf[i];
+                if (buf[7] * 256 + buf[8] != checksum) {
+                        err("boot bad confirm checksum.");
+                        return -EIO;
+                }
+                *reply = buf[6];
+                break;
+        case FW_BOOT:
+                if (buf[2] != 0x10) {
+                        err("boot bad boot header.");
+                        return -EIO;
+                }
+                if (buf[3] != 0x05) {
+                        err("boot bad boot size.");
+                        return -EIO;
+                }
+                if (buf[4] != 0x00) {
+                        err("boot bad boot sequence.");
+                        return -EIO;
+                }
+                if (buf[5] != 0x01) {
+                        err("boot bad boot pattern 01.");
+                        return -EIO;
+                }
+                if (buf[6] != 0x10) {
+                        err("boot bad boot pattern 10.");
+                        return -EIO;
+                }
+                for (i = 4; i <= 6; i++)
+                        checksum += buf[i];
+                if (buf[7] * 256 + buf[8] != checksum) {
+                        err("boot bad boot checksum.");
+                        return -EIO;
+                }
+                break;
+
+        }
+
+        return 0;
+}
+
+int af9005_download_firmware(struct usb_device *udev, const struct firmware *fw)
+{
+        int i, packets, ret, act_len;
+
+        u8 buf[FW_BULKOUT_SIZE + 2];
+        u8 reply;
+
+        ret = af9005_boot_packet(udev, FW_CONFIG, &reply);
+        if (ret)
+                return ret;
+        if (reply != 0x01) {
+                err("before downloading firmware, FW_CONFIG expected 0x01, received 0x%x", reply);
+                return -EIO;
+        }
+        packets = fw->size / FW_BULKOUT_SIZE;
+        buf[0] = (u8) (FW_BULKOUT_SIZE & 0xff);
+        buf[1] = (u8) ((FW_BULKOUT_SIZE >> 8) & 0xff);
+        for (i = 0; i < packets; i++) {
+                memcpy(&buf[2], fw->data + i * FW_BULKOUT_SIZE,
+                       FW_BULKOUT_SIZE);
+                deb_fw(">>> ");
+                debug_dump(buf, FW_BULKOUT_SIZE + 2, deb_fw);
+                ret = usb_bulk_msg(udev,
+                                   usb_sndbulkpipe(udev, 0x02),
+                                   buf, FW_BULKOUT_SIZE + 2, &act_len, 1000);
+                if (ret) {
+                        err("firmware download failed at packet %d with code %d", i, ret);
+                        return ret;
+                }
+        }
+        ret = af9005_boot_packet(udev, FW_CONFIRM, &reply);
+        if (ret)
+                return ret;
+        if (reply != (u8) (packets & 0xff)) {
+                err("after downloading firmware, FW_CONFIRM expected 0x%x, received 0x%x", packets & 0xff, reply);
+                return -EIO;
+        }
+        ret = af9005_boot_packet(udev, FW_BOOT, &reply);
+        if (ret)
+                return ret;
+        ret = af9005_boot_packet(udev, FW_CONFIG, &reply);
+        if (ret)
+                return ret;
+        if (reply != 0x02) {
+                err("after downloading firmware, FW_CONFIG expected 0x02, received 0x%x", reply);
+                return -EIO;
+        }
+
+        return 0;
+
+}
+
+int af9005_led_control(struct dvb_usb_device *d, int onoff)
+{
+        struct af9005_device_state *st = d->priv;
+        int temp, ret;
+
+        if (onoff && dvb_usb_af9005_led)
+                temp = 1;
+        else
+                temp = 0;
+        if (st->led_state != temp) {
+                ret =
+                    af9005_write_register_bits(d, xd_p_reg_top_locken1,
+                                               reg_top_locken1_pos,
+                                               reg_top_locken1_len, temp);
+                if (ret)
+                        return ret;
+                ret =
+                    af9005_write_register_bits(d, xd_p_reg_top_lock1,
+                                               reg_top_lock1_pos,
+                                               reg_top_lock1_len, temp);
+                if (ret)
+                        return ret;
+                st->led_state = temp;
+        }
+        return 0;
+}
+
+static int af9005_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        u8 buf[8];
+        int i;
+
+        /* without these calls the first commands after downloading
+           the firmware fail. I put these calls here to simulate
+           what it is done in dvb-usb-init.c.
+         */
+        struct usb_device *udev = adap->dev->udev;
+        usb_clear_halt(udev, usb_sndbulkpipe(udev, 2));
+        usb_clear_halt(udev, usb_rcvbulkpipe(udev, 1));
+        if (dvb_usb_af9005_dump_eeprom) {
+                printk("EEPROM DUMP\n");
+                for (i = 0; i < 255; i += 8) {
+                        af9005_read_eeprom(adap->dev, i, buf, 8);
+                        printk("ADDR %x ", i);
+                        debug_dump(buf, 8, printk);
+                }
+        }
+        adap->fe = af9005_fe_attach(adap->dev);
+        return 0;
+}
+
+static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
+{
+        struct af9005_device_state *st = d->priv;
+        int ret, len;
+
+        u8 obuf[5];
+        u8 ibuf[256];
+
+        *state = REMOTE_NO_KEY_PRESSED;
+        if (rc_decode == NULL) {
+                /* it shouldn't never come here */
+                return 0;
+        }
+        /* deb_info("rc_query\n"); */
+        obuf[0] = 3;            /* rest of packet length low */
+        obuf[1] = 0;            /* rest of packet lentgh high */
+        obuf[2] = 0x40;         /* read remote */
+        obuf[3] = 1;            /* rest of packet length */
+        obuf[4] = st->sequence++;       /* sequence number */
+        ret = af9005_usb_generic_rw(d, obuf, 5, ibuf, 256, 0);
+        if (ret) {
+                err("rc query failed");
+                return ret;
+        }
+        if (ibuf[2] != 0x41) {
+                err("rc query bad header.");
+                return -EIO;
+        }
+        if (ibuf[4] != obuf[4]) {
+                err("rc query bad sequence.");
+                return -EIO;
+        }
+        len = ibuf[5];
+        if (len > 246) {
+                err("rc query invalid length");
+                return -EIO;
+        }
+        if (len > 0) {
+                deb_rc("rc data (%d) ", len);
+                debug_dump((ibuf + 6), len, deb_rc);
+                ret = rc_decode(d, &ibuf[6], len, event, state);
+                if (ret) {
+                        err("rc_decode failed");
+                        return ret;
+                } else {
+                        deb_rc("rc_decode state %x event %x\n", *state, *event);
+                        if (*state == REMOTE_KEY_REPEAT)
+                                *event = d->last_event;
+                }
+        }
+        return 0;
+}
+
+static int af9005_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+
+        return 0;
+}
+
+static int af9005_pid_filter_control(struct dvb_usb_adapter *adap, int onoff)
+{
+        int ret;
+        deb_info("pid filter control  onoff %d\n", onoff);
+        if (onoff) {
+                ret =
+                    af9005_write_ofdm_register(adap->dev, XD_MP2IF_DMX_CTRL, 1);
+                if (ret)
+                        return ret;
+                ret =
+                    af9005_write_register_bits(adap->dev,
+                                               XD_MP2IF_DMX_CTRL, 1, 1, 1);
+                if (ret)
+                        return ret;
+                ret =
+                    af9005_write_ofdm_register(adap->dev, XD_MP2IF_DMX_CTRL, 1);
+        } else
+                ret =
+                    af9005_write_ofdm_register(adap->dev, XD_MP2IF_DMX_CTRL, 0);
+        if (ret)
+                return ret;
+        deb_info("pid filter control ok\n");
+        return 0;
+}
+
+static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index,
+                             u16 pid, int onoff)
+{
+        u8 cmd = index & 0x1f;
+        int ret;
+        deb_info("set pid filter, index %d, pid %x, onoff %d\n", index,
+                 pid, onoff);
+        if (onoff) {
+                /* cannot use it as pid_filter_ctrl since it has to be done
+                   before setting the first pid */
+                if (adap->feedcount == 1) {
+                        deb_info("first pid set, enable pid table\n");
+                        ret = af9005_pid_filter_control(adap, onoff);
+                        if (ret)
+                                return ret;
+                }
+                ret =
+                    af9005_write_ofdm_register(adap->dev,
+                                               XD_MP2IF_PID_DATA_L,
+                                               (u8) (pid & 0xff));
+                if (ret)
+                        return ret;
+                ret =
+                    af9005_write_ofdm_register(adap->dev,
+                                               XD_MP2IF_PID_DATA_H,
+                                               (u8) (pid >> 8));
+                if (ret)
+                        return ret;
+                cmd |= 0x20 | 0x40;
+        } else {
+                if (adap->feedcount == 0) {
+                        deb_info("last pid unset, disable pid table\n");
+                        ret = af9005_pid_filter_control(adap, onoff);
+                        if (ret)
+                                return ret;
+                }
+        }
+        ret = af9005_write_ofdm_register(adap->dev, XD_MP2IF_PID_IDX, cmd);
+        if (ret)
+                return ret;
+        deb_info("set pid ok\n");
+        return 0;
+}
+
+static int af9005_identify_state(struct usb_device *udev,
+                                 struct dvb_usb_device_properties *props,
+                                 struct dvb_usb_device_description **desc,
+                                 int *cold)
+{
+        int ret;
+        u8 reply;
+        ret = af9005_boot_packet(udev, FW_CONFIG, &reply);
+        if (ret)
+                return ret;
+        deb_info("result of FW_CONFIG in identify state %d\n", reply);
+        if (reply == 0x01)
+                *cold = 1;
+        else if (reply == 0x02)
+                *cold = 0;
+        else
+                return -EIO;
+        deb_info("Identify state cold = %d\n", *cold);
+        return 0;
+}
+
+static struct dvb_usb_device_properties af9005_properties;
+
+static int af9005_usb_probe(struct usb_interface *intf,
+                            const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf, &af9005_properties, THIS_MODULE, NULL);
+}
+
+static struct usb_device_id af9005_usb_table[] = {
+        {USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9005)},
+        {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_USB_XE)},
+        {0},
+};
+
+MODULE_DEVICE_TABLE(usb, af9005_usb_table);
+
+static struct dvb_usb_device_properties af9005_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "af9005.fw",
+        .download_firmware = af9005_download_firmware,
+        .no_reconnect = 1,
+
+        .size_of_priv = sizeof(struct af9005_device_state),
+
+        .num_adapters = 1,
+        .adapter = {
+                    {
+                     .caps =
+                     DVB_USB_ADAP_HAS_PID_FILTER |
+                     DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                     .pid_filter_count = 32,
+                     .pid_filter = af9005_pid_filter,
+                     /* .pid_filter_ctrl = af9005_pid_filter_control, */
+                     .frontend_attach = af9005_frontend_attach,
+                     /* .tuner_attach     = af9005_tuner_attach, */
+                     /* parameter for the MPEG2-data transfer */
+                     .stream = {
+                                .type = USB_BULK,
+                                .count = 10,
+                                .endpoint = 0x04,
+                                .u = {
+                                      .bulk = {
+                                               .buffersize = 4096,      /* actual size seen is 3948 */
+                                               }
+                                      }
+                                },
+                     }
+                    },
+        .power_ctrl = af9005_power_ctrl,
+        .identify_state = af9005_identify_state,
+
+        .i2c_algo = &af9005_i2c_algo,
+
+        .rc_interval = 200,
+        .rc_key_map = NULL,
+        .rc_key_map_size = 0,
+        .rc_query = af9005_rc_query,
+
+        .num_device_descs = 2,
+        .devices = {
+                    {.name = "Afatech DVB-T USB1.1 stick",
+                     .cold_ids = {&af9005_usb_table[0], NULL},
+                     .warm_ids = {NULL},
+                     },
+                    {.name = "TerraTec Cinergy T USB XE",
+                     .cold_ids = {&af9005_usb_table[1], NULL},
+                     .warm_ids = {NULL},
+                     },
+                    {NULL},
+                    }
+};
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver af9005_usb_driver = {
+        .name = "dvb_usb_af9005",
+        .probe = af9005_usb_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table = af9005_usb_table,
+};
+
+/* module stuff */
+static int __init af9005_usb_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&af9005_usb_driver))) {
+                err("usb_register failed. (%d)", result);
+                return result;
+        }
+        rc_decode = symbol_request(af9005_rc_decode);
+        rc_keys = symbol_request(af9005_rc_keys);
+        rc_keys_size = symbol_request(af9005_rc_keys_size);
+        if (rc_decode == NULL || rc_keys == NULL || rc_keys_size == NULL) {
+                err("af9005_rc_decode function not found, disabling remote");
+                af9005_properties.rc_query = NULL;
+        } else {
+                af9005_properties.rc_key_map = rc_keys;
+                af9005_properties.rc_key_map_size = *rc_keys_size;
+        }
+
+        return 0;
+}
+
+static void __exit af9005_usb_module_exit(void)
+{
+        /* release rc decode symbols */
+        if (rc_decode != NULL)
+                symbol_put(af9005_rc_decode);
+        if (rc_keys != NULL)
+                symbol_put(af9005_rc_keys);
+        if (rc_keys_size != NULL)
+                symbol_put(af9005_rc_keys_size);
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&af9005_usb_driver);
+}
+
+module_init(af9005_usb_module_init);
+module_exit(af9005_usb_module_exit);
+
+MODULE_AUTHOR("Luca Olivetti <luca@ventoso.org>");
+MODULE_DESCRIPTION("Driver for Afatech 9005 DVB-T USB1.1 stick");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/af9005.h b/drivers/media/dvb/dvb-usb/af9005.h
new file mode 100644
index 000000000000..0bc48a012187
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/af9005.h
@@ -0,0 +1,3496 @@
+/* Common header-file of the Linux driver for the Afatech 9005
+ * USB1.1 DVB-T receiver.
+ *
+ * Copyright (C) 2007 Luca Olivetti (luca@ventoso.org)
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#ifndef _DVB_USB_AF9005_H_
+#define _DVB_USB_AF9005_H_
+
+#define DVB_USB_LOG_PREFIX "af9005"
+#include "dvb-usb.h"
+
+extern int dvb_usb_af9005_debug;
+#define deb_info(args...) dprintk(dvb_usb_af9005_debug,0x01,args)
+#define deb_xfer(args...) dprintk(dvb_usb_af9005_debug,0x02,args)
+#define deb_rc(args...)   dprintk(dvb_usb_af9005_debug,0x04,args)
+#define deb_reg(args...)  dprintk(dvb_usb_af9005_debug,0x08,args)
+#define deb_i2c(args...)  dprintk(dvb_usb_af9005_debug,0x10,args)
+#define deb_fw(args...)   dprintk(dvb_usb_af9005_debug,0x20,args)
+
+extern int dvb_usb_af9005_led;
+
+/* firmware */
+#define FW_BULKOUT_SIZE 250
+enum {
+        FW_CONFIG,
+        FW_CONFIRM,
+        FW_BOOT
+};
+
+/* af9005 commands */
+#define AF9005_OFDM_REG  0
+#define AF9005_TUNER_REG 1
+
+#define AF9005_REGISTER_RW     0x20
+#define AF9005_REGISTER_RW_ACK 0x21
+
+#define AF9005_CMD_OFDM_REG 0x00
+#define AF9005_CMD_TUNER    0x80
+#define AF9005_CMD_BURST    0x02
+#define AF9005_CMD_AUTOINC  0x04
+#define AF9005_CMD_READ     0x00
+#define AF9005_CMD_WRITE    0x01
+
+/* af9005 registers */
+#define APO_REG_RESET                                   0xAEFF
+
+#define APO_REG_I2C_RW_CAN_TUNER            0xF000
+#define APO_REG_I2C_RW_SILICON_TUNER        0xF001
+#define APO_REG_GPIO_RW_SILICON_TUNER       0xFFFE      /*  also for OFSM */
+#define APO_REG_TRIGGER_OFSM                0xFFFF      /*  also for OFSM */
+
+/***********************************************************************
+ *  Apollo Registers from VLSI                                         *
+ ***********************************************************************/
+#define xd_p_reg_aagc_inverted_agc      0xA000
+#define reg_aagc_inverted_agc_pos 0
+#define reg_aagc_inverted_agc_len 1
+#define reg_aagc_inverted_agc_lsb 0
+#define xd_p_reg_aagc_sign_only 0xA000
+#define reg_aagc_sign_only_pos 1
+#define reg_aagc_sign_only_len 1
+#define reg_aagc_sign_only_lsb 0
+#define xd_p_reg_aagc_slow_adc_en       0xA000
+#define reg_aagc_slow_adc_en_pos 2
+#define reg_aagc_slow_adc_en_len 1
+#define reg_aagc_slow_adc_en_lsb 0
+#define xd_p_reg_aagc_slow_adc_scale    0xA000
+#define reg_aagc_slow_adc_scale_pos 3
+#define reg_aagc_slow_adc_scale_len 5
+#define reg_aagc_slow_adc_scale_lsb 0
+#define xd_p_reg_aagc_check_slow_adc_lock       0xA001
+#define reg_aagc_check_slow_adc_lock_pos 0
+#define reg_aagc_check_slow_adc_lock_len 1
+#define reg_aagc_check_slow_adc_lock_lsb 0
+#define xd_p_reg_aagc_init_control      0xA001
+#define reg_aagc_init_control_pos 1
+#define reg_aagc_init_control_len 1
+#define reg_aagc_init_control_lsb 0
+#define xd_p_reg_aagc_total_gain_sel    0xA001
+#define reg_aagc_total_gain_sel_pos 2
+#define reg_aagc_total_gain_sel_len 2
+#define reg_aagc_total_gain_sel_lsb 0
+#define xd_p_reg_aagc_out_inv   0xA001
+#define reg_aagc_out_inv_pos 5
+#define reg_aagc_out_inv_len 1
+#define reg_aagc_out_inv_lsb 0
+#define xd_p_reg_aagc_int_en    0xA001
+#define reg_aagc_int_en_pos 6
+#define reg_aagc_int_en_len 1
+#define reg_aagc_int_en_lsb 0
+#define xd_p_reg_aagc_lock_change_flag  0xA001
+#define reg_aagc_lock_change_flag_pos 7
+#define reg_aagc_lock_change_flag_len 1
+#define reg_aagc_lock_change_flag_lsb 0
+#define xd_p_reg_aagc_rf_loop_bw_scale_acquire  0xA002
+#define reg_aagc_rf_loop_bw_scale_acquire_pos 0
+#define reg_aagc_rf_loop_bw_scale_acquire_len 5
+#define reg_aagc_rf_loop_bw_scale_acquire_lsb 0
+#define xd_p_reg_aagc_rf_loop_bw_scale_track    0xA003
+#define reg_aagc_rf_loop_bw_scale_track_pos 0
+#define reg_aagc_rf_loop_bw_scale_track_len 5
+#define reg_aagc_rf_loop_bw_scale_track_lsb 0
+#define xd_p_reg_aagc_if_loop_bw_scale_acquire  0xA004
+#define reg_aagc_if_loop_bw_scale_acquire_pos 0
+#define reg_aagc_if_loop_bw_scale_acquire_len 5
+#define reg_aagc_if_loop_bw_scale_acquire_lsb 0
+#define xd_p_reg_aagc_if_loop_bw_scale_track    0xA005
+#define reg_aagc_if_loop_bw_scale_track_pos 0
+#define reg_aagc_if_loop_bw_scale_track_len 5
+#define reg_aagc_if_loop_bw_scale_track_lsb 0
+#define xd_p_reg_aagc_max_rf_agc_7_0    0xA006
+#define reg_aagc_max_rf_agc_7_0_pos 0
+#define reg_aagc_max_rf_agc_7_0_len 8
+#define reg_aagc_max_rf_agc_7_0_lsb 0
+#define xd_p_reg_aagc_max_rf_agc_9_8    0xA007
+#define reg_aagc_max_rf_agc_9_8_pos 0
+#define reg_aagc_max_rf_agc_9_8_len 2
+#define reg_aagc_max_rf_agc_9_8_lsb 8
+#define xd_p_reg_aagc_min_rf_agc_7_0    0xA008
+#define reg_aagc_min_rf_agc_7_0_pos 0
+#define reg_aagc_min_rf_agc_7_0_len 8
+#define reg_aagc_min_rf_agc_7_0_lsb 0
+#define xd_p_reg_aagc_min_rf_agc_9_8    0xA009
+#define reg_aagc_min_rf_agc_9_8_pos 0
+#define reg_aagc_min_rf_agc_9_8_len 2
+#define reg_aagc_min_rf_agc_9_8_lsb 8
+#define xd_p_reg_aagc_max_if_agc_7_0    0xA00A
+#define reg_aagc_max_if_agc_7_0_pos 0
+#define reg_aagc_max_if_agc_7_0_len 8
+#define reg_aagc_max_if_agc_7_0_lsb 0
+#define xd_p_reg_aagc_max_if_agc_9_8    0xA00B
+#define reg_aagc_max_if_agc_9_8_pos 0
+#define reg_aagc_max_if_agc_9_8_len 2
+#define reg_aagc_max_if_agc_9_8_lsb 8
+#define xd_p_reg_aagc_min_if_agc_7_0    0xA00C
+#define reg_aagc_min_if_agc_7_0_pos 0
+#define reg_aagc_min_if_agc_7_0_len 8
+#define reg_aagc_min_if_agc_7_0_lsb 0
+#define xd_p_reg_aagc_min_if_agc_9_8    0xA00D
+#define reg_aagc_min_if_agc_9_8_pos 0
+#define reg_aagc_min_if_agc_9_8_len 2
+#define reg_aagc_min_if_agc_9_8_lsb 8
+#define xd_p_reg_aagc_lock_sample_scale 0xA00E
+#define reg_aagc_lock_sample_scale_pos 0
+#define reg_aagc_lock_sample_scale_len 5
+#define reg_aagc_lock_sample_scale_lsb 0
+#define xd_p_reg_aagc_rf_agc_lock_scale_acquire 0xA00F
+#define reg_aagc_rf_agc_lock_scale_acquire_pos 0
+#define reg_aagc_rf_agc_lock_scale_acquire_len 3
+#define reg_aagc_rf_agc_lock_scale_acquire_lsb 0
+#define xd_p_reg_aagc_rf_agc_lock_scale_track   0xA00F
+#define reg_aagc_rf_agc_lock_scale_track_pos 3
+#define reg_aagc_rf_agc_lock_scale_track_len 3
+#define reg_aagc_rf_agc_lock_scale_track_lsb 0
+#define xd_p_reg_aagc_if_agc_lock_scale_acquire 0xA010
+#define reg_aagc_if_agc_lock_scale_acquire_pos 0
+#define reg_aagc_if_agc_lock_scale_acquire_len 3
+#define reg_aagc_if_agc_lock_scale_acquire_lsb 0
+#define xd_p_reg_aagc_if_agc_lock_scale_track   0xA010
+#define reg_aagc_if_agc_lock_scale_track_pos 3
+#define reg_aagc_if_agc_lock_scale_track_len 3
+#define reg_aagc_if_agc_lock_scale_track_lsb 0
+#define xd_p_reg_aagc_rf_top_numerator_7_0      0xA011
+#define reg_aagc_rf_top_numerator_7_0_pos 0
+#define reg_aagc_rf_top_numerator_7_0_len 8
+#define reg_aagc_rf_top_numerator_7_0_lsb 0
+#define xd_p_reg_aagc_rf_top_numerator_9_8      0xA012
+#define reg_aagc_rf_top_numerator_9_8_pos 0
+#define reg_aagc_rf_top_numerator_9_8_len 2
+#define reg_aagc_rf_top_numerator_9_8_lsb 8
+#define xd_p_reg_aagc_if_top_numerator_7_0      0xA013
+#define reg_aagc_if_top_numerator_7_0_pos 0
+#define reg_aagc_if_top_numerator_7_0_len 8
+#define reg_aagc_if_top_numerator_7_0_lsb 0
+#define xd_p_reg_aagc_if_top_numerator_9_8      0xA014
+#define reg_aagc_if_top_numerator_9_8_pos 0
+#define reg_aagc_if_top_numerator_9_8_len 2
+#define reg_aagc_if_top_numerator_9_8_lsb 8
+#define xd_p_reg_aagc_adc_out_desired_7_0       0xA015
+#define reg_aagc_adc_out_desired_7_0_pos 0
+#define reg_aagc_adc_out_desired_7_0_len 8
+#define reg_aagc_adc_out_desired_7_0_lsb 0
+#define xd_p_reg_aagc_adc_out_desired_8 0xA016
+#define reg_aagc_adc_out_desired_8_pos 0
+#define reg_aagc_adc_out_desired_8_len 1
+#define reg_aagc_adc_out_desired_8_lsb 0
+#define xd_p_reg_aagc_fixed_gain        0xA016
+#define reg_aagc_fixed_gain_pos 3
+#define reg_aagc_fixed_gain_len 1
+#define reg_aagc_fixed_gain_lsb 0
+#define xd_p_reg_aagc_lock_count_th     0xA016
+#define reg_aagc_lock_count_th_pos 4
+#define reg_aagc_lock_count_th_len 4
+#define reg_aagc_lock_count_th_lsb 0
+#define xd_p_reg_aagc_fixed_rf_agc_control_7_0  0xA017
+#define reg_aagc_fixed_rf_agc_control_7_0_pos 0
+#define reg_aagc_fixed_rf_agc_control_7_0_len 8
+#define reg_aagc_fixed_rf_agc_control_7_0_lsb 0
+#define xd_p_reg_aagc_fixed_rf_agc_control_15_8 0xA018
+#define reg_aagc_fixed_rf_agc_control_15_8_pos 0
+#define reg_aagc_fixed_rf_agc_control_15_8_len 8
+#define reg_aagc_fixed_rf_agc_control_15_8_lsb 8
+#define xd_p_reg_aagc_fixed_rf_agc_control_23_16        0xA019
+#define reg_aagc_fixed_rf_agc_control_23_16_pos 0
+#define reg_aagc_fixed_rf_agc_control_23_16_len 8
+#define reg_aagc_fixed_rf_agc_control_23_16_lsb 16
+#define xd_p_reg_aagc_fixed_rf_agc_control_30_24        0xA01A
+#define reg_aagc_fixed_rf_agc_control_30_24_pos 0
+#define reg_aagc_fixed_rf_agc_control_30_24_len 7
+#define reg_aagc_fixed_rf_agc_control_30_24_lsb 24
+#define xd_p_reg_aagc_fixed_if_agc_control_7_0  0xA01B
+#define reg_aagc_fixed_if_agc_control_7_0_pos 0
+#define reg_aagc_fixed_if_agc_control_7_0_len 8
+#define reg_aagc_fixed_if_agc_control_7_0_lsb 0
+#define xd_p_reg_aagc_fixed_if_agc_control_15_8 0xA01C
+#define reg_aagc_fixed_if_agc_control_15_8_pos 0
+#define reg_aagc_fixed_if_agc_control_15_8_len 8
+#define reg_aagc_fixed_if_agc_control_15_8_lsb 8
+#define xd_p_reg_aagc_fixed_if_agc_control_23_16        0xA01D
+#define reg_aagc_fixed_if_agc_control_23_16_pos 0
+#define reg_aagc_fixed_if_agc_control_23_16_len 8
+#define reg_aagc_fixed_if_agc_control_23_16_lsb 16
+#define xd_p_reg_aagc_fixed_if_agc_control_30_24        0xA01E
+#define reg_aagc_fixed_if_agc_control_30_24_pos 0
+#define reg_aagc_fixed_if_agc_control_30_24_len 7
+#define reg_aagc_fixed_if_agc_control_30_24_lsb 24
+#define xd_p_reg_aagc_rf_agc_unlock_numerator   0xA01F
+#define reg_aagc_rf_agc_unlock_numerator_pos 0
+#define reg_aagc_rf_agc_unlock_numerator_len 6
+#define reg_aagc_rf_agc_unlock_numerator_lsb 0
+#define xd_p_reg_aagc_if_agc_unlock_numerator   0xA020
+#define reg_aagc_if_agc_unlock_numerator_pos 0
+#define reg_aagc_if_agc_unlock_numerator_len 6
+#define reg_aagc_if_agc_unlock_numerator_lsb 0
+#define xd_p_reg_unplug_th      0xA021
+#define reg_unplug_th_pos 0
+#define reg_unplug_th_len 8
+#define reg_aagc_rf_x0_lsb 0
+#define xd_p_reg_weak_signal_rfagc_thr 0xA022
+#define reg_weak_signal_rfagc_thr_pos 0
+#define reg_weak_signal_rfagc_thr_len 8
+#define reg_weak_signal_rfagc_thr_lsb 0
+#define xd_p_reg_unplug_rf_gain_th 0xA023
+#define reg_unplug_rf_gain_th_pos 0
+#define reg_unplug_rf_gain_th_len 8
+#define reg_unplug_rf_gain_th_lsb 0
+#define xd_p_reg_unplug_dtop_rf_gain_th 0xA024
+#define reg_unplug_dtop_rf_gain_th_pos 0
+#define reg_unplug_dtop_rf_gain_th_len 8
+#define reg_unplug_dtop_rf_gain_th_lsb 0
+#define xd_p_reg_unplug_dtop_if_gain_th 0xA025
+#define reg_unplug_dtop_if_gain_th_pos 0
+#define reg_unplug_dtop_if_gain_th_len 8
+#define reg_unplug_dtop_if_gain_th_lsb 0
+#define xd_p_reg_top_recover_at_unplug_en 0xA026
+#define reg_top_recover_at_unplug_en_pos 0
+#define reg_top_recover_at_unplug_en_len 1
+#define reg_top_recover_at_unplug_en_lsb 0
+#define xd_p_reg_aagc_rf_x6     0xA027
+#define reg_aagc_rf_x6_pos 0
+#define reg_aagc_rf_x6_len 8
+#define reg_aagc_rf_x6_lsb 0
+#define xd_p_reg_aagc_rf_x7     0xA028
+#define reg_aagc_rf_x7_pos 0
+#define reg_aagc_rf_x7_len 8
+#define reg_aagc_rf_x7_lsb 0
+#define xd_p_reg_aagc_rf_x8     0xA029
+#define reg_aagc_rf_x8_pos 0
+#define reg_aagc_rf_x8_len 8
+#define reg_aagc_rf_x8_lsb 0
+#define xd_p_reg_aagc_rf_x9     0xA02A
+#define reg_aagc_rf_x9_pos 0
+#define reg_aagc_rf_x9_len 8
+#define reg_aagc_rf_x9_lsb 0
+#define xd_p_reg_aagc_rf_x10    0xA02B
+#define reg_aagc_rf_x10_pos 0
+#define reg_aagc_rf_x10_len 8
+#define reg_aagc_rf_x10_lsb 0
+#define xd_p_reg_aagc_rf_x11    0xA02C
+#define reg_aagc_rf_x11_pos 0
+#define reg_aagc_rf_x11_len 8
+#define reg_aagc_rf_x11_lsb 0
+#define xd_p_reg_aagc_rf_x12    0xA02D
+#define reg_aagc_rf_x12_pos 0
+#define reg_aagc_rf_x12_len 8
+#define reg_aagc_rf_x12_lsb 0
+#define xd_p_reg_aagc_rf_x13    0xA02E
+#define reg_aagc_rf_x13_pos 0
+#define reg_aagc_rf_x13_len 8
+#define reg_aagc_rf_x13_lsb 0
+#define xd_p_reg_aagc_if_x0     0xA02F
+#define reg_aagc_if_x0_pos 0
+#define reg_aagc_if_x0_len 8
+#define reg_aagc_if_x0_lsb 0
+#define xd_p_reg_aagc_if_x1     0xA030
+#define reg_aagc_if_x1_pos 0
+#define reg_aagc_if_x1_len 8
+#define reg_aagc_if_x1_lsb 0
+#define xd_p_reg_aagc_if_x2     0xA031
+#define reg_aagc_if_x2_pos 0
+#define reg_aagc_if_x2_len 8
+#define reg_aagc_if_x2_lsb 0
+#define xd_p_reg_aagc_if_x3     0xA032
+#define reg_aagc_if_x3_pos 0
+#define reg_aagc_if_x3_len 8
+#define reg_aagc_if_x3_lsb 0
+#define xd_p_reg_aagc_if_x4     0xA033
+#define reg_aagc_if_x4_pos 0
+#define reg_aagc_if_x4_len 8
+#define reg_aagc_if_x4_lsb 0
+#define xd_p_reg_aagc_if_x5     0xA034
+#define reg_aagc_if_x5_pos 0
+#define reg_aagc_if_x5_len 8
+#define reg_aagc_if_x5_lsb 0
+#define xd_p_reg_aagc_if_x6     0xA035
+#define reg_aagc_if_x6_pos 0
+#define reg_aagc_if_x6_len 8
+#define reg_aagc_if_x6_lsb 0
+#define xd_p_reg_aagc_if_x7     0xA036
+#define reg_aagc_if_x7_pos 0
+#define reg_aagc_if_x7_len 8
+#define reg_aagc_if_x7_lsb 0
+#define xd_p_reg_aagc_if_x8     0xA037
+#define reg_aagc_if_x8_pos 0
+#define reg_aagc_if_x8_len 8
+#define reg_aagc_if_x8_lsb 0
+#define xd_p_reg_aagc_if_x9     0xA038
+#define reg_aagc_if_x9_pos 0
+#define reg_aagc_if_x9_len 8
+#define reg_aagc_if_x9_lsb 0
+#define xd_p_reg_aagc_if_x10    0xA039
+#define reg_aagc_if_x10_pos 0
+#define reg_aagc_if_x10_len 8
+#define reg_aagc_if_x10_lsb 0
+#define xd_p_reg_aagc_if_x11    0xA03A
+#define reg_aagc_if_x11_pos 0
+#define reg_aagc_if_x11_len 8
+#define reg_aagc_if_x11_lsb 0
+#define xd_p_reg_aagc_if_x12    0xA03B
+#define reg_aagc_if_x12_pos 0
+#define reg_aagc_if_x12_len 8
+#define reg_aagc_if_x12_lsb 0
+#define xd_p_reg_aagc_if_x13    0xA03C
+#define reg_aagc_if_x13_pos 0
+#define reg_aagc_if_x13_len 8
+#define reg_aagc_if_x13_lsb 0
+#define xd_p_reg_aagc_min_rf_ctl_8bit_for_dca   0xA03D
+#define reg_aagc_min_rf_ctl_8bit_for_dca_pos 0
+#define reg_aagc_min_rf_ctl_8bit_for_dca_len 8
+#define reg_aagc_min_rf_ctl_8bit_for_dca_lsb 0
+#define xd_p_reg_aagc_min_if_ctl_8bit_for_dca   0xA03E
+#define reg_aagc_min_if_ctl_8bit_for_dca_pos 0
+#define reg_aagc_min_if_ctl_8bit_for_dca_len 8
+#define reg_aagc_min_if_ctl_8bit_for_dca_lsb 0
+#define xd_r_reg_aagc_total_gain_7_0    0xA070
+#define reg_aagc_total_gain_7_0_pos 0
+#define reg_aagc_total_gain_7_0_len 8
+#define reg_aagc_total_gain_7_0_lsb 0
+#define xd_r_reg_aagc_total_gain_15_8   0xA071
+#define reg_aagc_total_gain_15_8_pos 0
+#define reg_aagc_total_gain_15_8_len 8
+#define reg_aagc_total_gain_15_8_lsb 8
+#define xd_p_reg_aagc_in_sat_cnt_7_0    0xA074
+#define reg_aagc_in_sat_cnt_7_0_pos 0
+#define reg_aagc_in_sat_cnt_7_0_len 8
+#define reg_aagc_in_sat_cnt_7_0_lsb 0
+#define xd_p_reg_aagc_in_sat_cnt_15_8   0xA075
+#define reg_aagc_in_sat_cnt_15_8_pos 0
+#define reg_aagc_in_sat_cnt_15_8_len 8
+#define reg_aagc_in_sat_cnt_15_8_lsb 8
+#define xd_p_reg_aagc_in_sat_cnt_23_16  0xA076
+#define reg_aagc_in_sat_cnt_23_16_pos 0
+#define reg_aagc_in_sat_cnt_23_16_len 8
+#define reg_aagc_in_sat_cnt_23_16_lsb 16
+#define xd_p_reg_aagc_in_sat_cnt_31_24  0xA077
+#define reg_aagc_in_sat_cnt_31_24_pos 0
+#define reg_aagc_in_sat_cnt_31_24_len 8
+#define reg_aagc_in_sat_cnt_31_24_lsb 24
+#define xd_r_reg_aagc_digital_rf_volt_7_0       0xA078
+#define reg_aagc_digital_rf_volt_7_0_pos 0
+#define reg_aagc_digital_rf_volt_7_0_len 8
+#define reg_aagc_digital_rf_volt_7_0_lsb 0
+#define xd_r_reg_aagc_digital_rf_volt_9_8       0xA079
+#define reg_aagc_digital_rf_volt_9_8_pos 0
+#define reg_aagc_digital_rf_volt_9_8_len 2
+#define reg_aagc_digital_rf_volt_9_8_lsb 8
+#define xd_r_reg_aagc_digital_if_volt_7_0       0xA07A
+#define reg_aagc_digital_if_volt_7_0_pos 0
+#define reg_aagc_digital_if_volt_7_0_len 8
+#define reg_aagc_digital_if_volt_7_0_lsb 0
+#define xd_r_reg_aagc_digital_if_volt_9_8       0xA07B
+#define reg_aagc_digital_if_volt_9_8_pos 0
+#define reg_aagc_digital_if_volt_9_8_len 2
+#define reg_aagc_digital_if_volt_9_8_lsb 8
+#define xd_r_reg_aagc_rf_gain   0xA07C
+#define reg_aagc_rf_gain_pos 0
+#define reg_aagc_rf_gain_len 8
+#define reg_aagc_rf_gain_lsb 0
+#define xd_r_reg_aagc_if_gain   0xA07D
+#define reg_aagc_if_gain_pos 0
+#define reg_aagc_if_gain_len 8
+#define reg_aagc_if_gain_lsb 0
+#define xd_p_tinr_imp_indicator 0xA080
+#define tinr_imp_indicator_pos 0
+#define tinr_imp_indicator_len 2
+#define tinr_imp_indicator_lsb 0
+#define xd_p_reg_tinr_fifo_size 0xA080
+#define reg_tinr_fifo_size_pos 2
+#define reg_tinr_fifo_size_len 5
+#define reg_tinr_fifo_size_lsb 0
+#define xd_p_reg_tinr_saturation_cnt_th 0xA081
+#define reg_tinr_saturation_cnt_th_pos 0
+#define reg_tinr_saturation_cnt_th_len 4
+#define reg_tinr_saturation_cnt_th_lsb 0
+#define xd_p_reg_tinr_saturation_th_3_0 0xA081
+#define reg_tinr_saturation_th_3_0_pos 4
+#define reg_tinr_saturation_th_3_0_len 4
+#define reg_tinr_saturation_th_3_0_lsb 0
+#define xd_p_reg_tinr_saturation_th_8_4 0xA082
+#define reg_tinr_saturation_th_8_4_pos 0
+#define reg_tinr_saturation_th_8_4_len 5
+#define reg_tinr_saturation_th_8_4_lsb 4
+#define xd_p_reg_tinr_imp_duration_th_2k_7_0    0xA083
+#define reg_tinr_imp_duration_th_2k_7_0_pos 0
+#define reg_tinr_imp_duration_th_2k_7_0_len 8
+#define reg_tinr_imp_duration_th_2k_7_0_lsb 0
+#define xd_p_reg_tinr_imp_duration_th_2k_8      0xA084
+#define reg_tinr_imp_duration_th_2k_8_pos 0
+#define reg_tinr_imp_duration_th_2k_8_len 1
+#define reg_tinr_imp_duration_th_2k_8_lsb 0
+#define xd_p_reg_tinr_imp_duration_th_8k_7_0    0xA085
+#define reg_tinr_imp_duration_th_8k_7_0_pos 0
+#define reg_tinr_imp_duration_th_8k_7_0_len 8
+#define reg_tinr_imp_duration_th_8k_7_0_lsb 0
+#define xd_p_reg_tinr_imp_duration_th_8k_10_8   0xA086
+#define reg_tinr_imp_duration_th_8k_10_8_pos 0
+#define reg_tinr_imp_duration_th_8k_10_8_len 3
+#define reg_tinr_imp_duration_th_8k_10_8_lsb 8
+#define xd_p_reg_tinr_freq_ratio_6m_7_0 0xA087
+#define reg_tinr_freq_ratio_6m_7_0_pos 0
+#define reg_tinr_freq_ratio_6m_7_0_len 8
+#define reg_tinr_freq_ratio_6m_7_0_lsb 0
+#define xd_p_reg_tinr_freq_ratio_6m_12_8        0xA088
+#define reg_tinr_freq_ratio_6m_12_8_pos 0
+#define reg_tinr_freq_ratio_6m_12_8_len 5
+#define reg_tinr_freq_ratio_6m_12_8_lsb 8
+#define xd_p_reg_tinr_freq_ratio_7m_7_0 0xA089
+#define reg_tinr_freq_ratio_7m_7_0_pos 0
+#define reg_tinr_freq_ratio_7m_7_0_len 8
+#define reg_tinr_freq_ratio_7m_7_0_lsb 0
+#define xd_p_reg_tinr_freq_ratio_7m_12_8        0xA08A
+#define reg_tinr_freq_ratio_7m_12_8_pos 0
+#define reg_tinr_freq_ratio_7m_12_8_len 5
+#define reg_tinr_freq_ratio_7m_12_8_lsb 8
+#define xd_p_reg_tinr_freq_ratio_8m_7_0 0xA08B
+#define reg_tinr_freq_ratio_8m_7_0_pos 0
+#define reg_tinr_freq_ratio_8m_7_0_len 8
+#define reg_tinr_freq_ratio_8m_7_0_lsb 0
+#define xd_p_reg_tinr_freq_ratio_8m_12_8        0xA08C
+#define reg_tinr_freq_ratio_8m_12_8_pos 0
+#define reg_tinr_freq_ratio_8m_12_8_len 5
+#define reg_tinr_freq_ratio_8m_12_8_lsb 8
+#define xd_p_reg_tinr_imp_duration_th_low_2k    0xA08D
+#define reg_tinr_imp_duration_th_low_2k_pos 0
+#define reg_tinr_imp_duration_th_low_2k_len 8
+#define reg_tinr_imp_duration_th_low_2k_lsb 0
+#define xd_p_reg_tinr_imp_duration_th_low_8k    0xA08E
+#define reg_tinr_imp_duration_th_low_8k_pos 0
+#define reg_tinr_imp_duration_th_low_8k_len 8
+#define reg_tinr_imp_duration_th_low_8k_lsb 0
+#define xd_r_reg_tinr_counter_7_0       0xA090
+#define reg_tinr_counter_7_0_pos 0
+#define reg_tinr_counter_7_0_len 8
+#define reg_tinr_counter_7_0_lsb 0
+#define xd_r_reg_tinr_counter_15_8      0xA091
+#define reg_tinr_counter_15_8_pos 0
+#define reg_tinr_counter_15_8_len 8
+#define reg_tinr_counter_15_8_lsb 8
+#define xd_p_reg_tinr_adative_tinr_en   0xA093
+#define reg_tinr_adative_tinr_en_pos 0
+#define reg_tinr_adative_tinr_en_len 1
+#define reg_tinr_adative_tinr_en_lsb 0
+#define xd_p_reg_tinr_peak_fifo_size    0xA093
+#define reg_tinr_peak_fifo_size_pos 1
+#define reg_tinr_peak_fifo_size_len 5
+#define reg_tinr_peak_fifo_size_lsb 0
+#define xd_p_reg_tinr_counter_rst       0xA093
+#define reg_tinr_counter_rst_pos 6
+#define reg_tinr_counter_rst_len 1
+#define reg_tinr_counter_rst_lsb 0
+#define xd_p_reg_tinr_search_period_7_0 0xA094
+#define reg_tinr_search_period_7_0_pos 0
+#define reg_tinr_search_period_7_0_len 8
+#define reg_tinr_search_period_7_0_lsb 0
+#define xd_p_reg_tinr_search_period_15_8        0xA095
+#define reg_tinr_search_period_15_8_pos 0
+#define reg_tinr_search_period_15_8_len 8
+#define reg_tinr_search_period_15_8_lsb 8
+#define xd_p_reg_ccifs_fcw_7_0  0xA0A0
+#define reg_ccifs_fcw_7_0_pos 0
+#define reg_ccifs_fcw_7_0_len 8
+#define reg_ccifs_fcw_7_0_lsb 0
+#define xd_p_reg_ccifs_fcw_12_8 0xA0A1
+#define reg_ccifs_fcw_12_8_pos 0
+#define reg_ccifs_fcw_12_8_len 5
+#define reg_ccifs_fcw_12_8_lsb 8
+#define xd_p_reg_ccifs_spec_inv 0xA0A1
+#define reg_ccifs_spec_inv_pos 5
+#define reg_ccifs_spec_inv_len 1
+#define reg_ccifs_spec_inv_lsb 0
+#define xd_p_reg_gp_trigger     0xA0A2
+#define reg_gp_trigger_pos 0
+#define reg_gp_trigger_len 1
+#define reg_gp_trigger_lsb 0
+#define xd_p_reg_trigger_sel    0xA0A2
+#define reg_trigger_sel_pos 1
+#define reg_trigger_sel_len 2
+#define reg_trigger_sel_lsb 0
+#define xd_p_reg_debug_ofdm     0xA0A2
+#define reg_debug_ofdm_pos 3
+#define reg_debug_ofdm_len 2
+#define reg_debug_ofdm_lsb 0
+#define xd_p_reg_trigger_module_sel     0xA0A3
+#define reg_trigger_module_sel_pos 0
+#define reg_trigger_module_sel_len 6
+#define reg_trigger_module_sel_lsb 0
+#define xd_p_reg_trigger_set_sel        0xA0A4
+#define reg_trigger_set_sel_pos 0
+#define reg_trigger_set_sel_len 6
+#define reg_trigger_set_sel_lsb 0
+#define xd_p_reg_fw_int_mask_n  0xA0A4
+#define reg_fw_int_mask_n_pos 6
+#define reg_fw_int_mask_n_len 1
+#define reg_fw_int_mask_n_lsb 0
+#define xd_p_reg_debug_group    0xA0A5
+#define reg_debug_group_pos 0
+#define reg_debug_group_len 4
+#define reg_debug_group_lsb 0
+#define xd_p_reg_odbg_clk_sel   0xA0A5
+#define reg_odbg_clk_sel_pos 4
+#define reg_odbg_clk_sel_len 2
+#define reg_odbg_clk_sel_lsb 0
+#define xd_p_reg_ccif_sc        0xA0C0
+#define reg_ccif_sc_pos 0
+#define reg_ccif_sc_len 4
+#define reg_ccif_sc_lsb 0
+#define xd_r_reg_ccif_saturate  0xA0C1
+#define reg_ccif_saturate_pos 0
+#define reg_ccif_saturate_len 2
+#define reg_ccif_saturate_lsb 0
+#define xd_r_reg_antif_saturate 0xA0C1
+#define reg_antif_saturate_pos 2
+#define reg_antif_saturate_len 4
+#define reg_antif_saturate_lsb 0
+#define xd_r_reg_acif_saturate  0xA0C2
+#define reg_acif_saturate_pos 0
+#define reg_acif_saturate_len 8
+#define reg_acif_saturate_lsb 0
+#define xd_p_reg_tmr_timer0_threshold_7_0       0xA0C8
+#define reg_tmr_timer0_threshold_7_0_pos 0
+#define reg_tmr_timer0_threshold_7_0_len 8
+#define reg_tmr_timer0_threshold_7_0_lsb 0
+#define xd_p_reg_tmr_timer0_threshold_15_8      0xA0C9
+#define reg_tmr_timer0_threshold_15_8_pos 0
+#define reg_tmr_timer0_threshold_15_8_len 8
+#define reg_tmr_timer0_threshold_15_8_lsb 8
+#define xd_p_reg_tmr_timer0_enable      0xA0CA
+#define reg_tmr_timer0_enable_pos 0
+#define reg_tmr_timer0_enable_len 1
+#define reg_tmr_timer0_enable_lsb 0
+#define xd_p_reg_tmr_timer0_clk_sel     0xA0CA
+#define reg_tmr_timer0_clk_sel_pos 1
+#define reg_tmr_timer0_clk_sel_len 1
+#define reg_tmr_timer0_clk_sel_lsb 0
+#define xd_p_reg_tmr_timer0_int 0xA0CA
+#define reg_tmr_timer0_int_pos 2
+#define reg_tmr_timer0_int_len 1
+#define reg_tmr_timer0_int_lsb 0
+#define xd_p_reg_tmr_timer0_rst 0xA0CA
+#define reg_tmr_timer0_rst_pos 3
+#define reg_tmr_timer0_rst_len 1
+#define reg_tmr_timer0_rst_lsb 0
+#define xd_r_reg_tmr_timer0_count_7_0   0xA0CB
+#define reg_tmr_timer0_count_7_0_pos 0
+#define reg_tmr_timer0_count_7_0_len 8
+#define reg_tmr_timer0_count_7_0_lsb 0
+#define xd_r_reg_tmr_timer0_count_15_8  0xA0CC
+#define reg_tmr_timer0_count_15_8_pos 0
+#define reg_tmr_timer0_count_15_8_len 8
+#define reg_tmr_timer0_count_15_8_lsb 8
+#define xd_p_reg_suspend        0xA0CD
+#define reg_suspend_pos 0
+#define reg_suspend_len 1
+#define reg_suspend_lsb 0
+#define xd_p_reg_suspend_rdy    0xA0CD
+#define reg_suspend_rdy_pos 1
+#define reg_suspend_rdy_len 1
+#define reg_suspend_rdy_lsb 0
+#define xd_p_reg_resume 0xA0CD
+#define reg_resume_pos 2
+#define reg_resume_len 1
+#define reg_resume_lsb 0
+#define xd_p_reg_resume_rdy     0xA0CD
+#define reg_resume_rdy_pos 3
+#define reg_resume_rdy_len 1
+#define reg_resume_rdy_lsb 0
+#define xd_p_reg_fmf    0xA0CE
+#define reg_fmf_pos 0
+#define reg_fmf_len 8
+#define reg_fmf_lsb 0
+#define xd_p_ccid_accumulate_num_2k_7_0 0xA100
+#define ccid_accumulate_num_2k_7_0_pos 0
+#define ccid_accumulate_num_2k_7_0_len 8
+#define ccid_accumulate_num_2k_7_0_lsb 0
+#define xd_p_ccid_accumulate_num_2k_12_8        0xA101
+#define ccid_accumulate_num_2k_12_8_pos 0
+#define ccid_accumulate_num_2k_12_8_len 5
+#define ccid_accumulate_num_2k_12_8_lsb 8
+#define xd_p_ccid_accumulate_num_8k_7_0 0xA102
+#define ccid_accumulate_num_8k_7_0_pos 0
+#define ccid_accumulate_num_8k_7_0_len 8
+#define ccid_accumulate_num_8k_7_0_lsb 0
+#define xd_p_ccid_accumulate_num_8k_14_8        0xA103
+#define ccid_accumulate_num_8k_14_8_pos 0
+#define ccid_accumulate_num_8k_14_8_len 7
+#define ccid_accumulate_num_8k_14_8_lsb 8
+#define xd_p_ccid_desired_level_0       0xA103
+#define ccid_desired_level_0_pos 7
+#define ccid_desired_level_0_len 1
+#define ccid_desired_level_0_lsb 0
+#define xd_p_ccid_desired_level_8_1     0xA104
+#define ccid_desired_level_8_1_pos 0
+#define ccid_desired_level_8_1_len 8
+#define ccid_desired_level_8_1_lsb 1
+#define xd_p_ccid_apply_delay   0xA105
+#define ccid_apply_delay_pos 0
+#define ccid_apply_delay_len 7
+#define ccid_apply_delay_lsb 0
+#define xd_p_ccid_CCID_Threshold1       0xA106
+#define ccid_CCID_Threshold1_pos 0
+#define ccid_CCID_Threshold1_len 8
+#define ccid_CCID_Threshold1_lsb 0
+#define xd_p_ccid_CCID_Threshold2       0xA107
+#define ccid_CCID_Threshold2_pos 0
+#define ccid_CCID_Threshold2_len 8
+#define ccid_CCID_Threshold2_lsb 0
+#define xd_p_reg_ccid_gain_scale        0xA108
+#define reg_ccid_gain_scale_pos 0
+#define reg_ccid_gain_scale_len 4
+#define reg_ccid_gain_scale_lsb 0
+#define xd_p_reg_ccid2_passband_gain_set        0xA108
+#define reg_ccid2_passband_gain_set_pos 4
+#define reg_ccid2_passband_gain_set_len 4
+#define reg_ccid2_passband_gain_set_lsb 0
+#define xd_r_ccid_multiplier_7_0        0xA109
+#define ccid_multiplier_7_0_pos 0
+#define ccid_multiplier_7_0_len 8
+#define ccid_multiplier_7_0_lsb 0
+#define xd_r_ccid_multiplier_15_8       0xA10A
+#define ccid_multiplier_15_8_pos 0
+#define ccid_multiplier_15_8_len 8
+#define ccid_multiplier_15_8_lsb 8
+#define xd_r_ccid_right_shift_bits      0xA10B
+#define ccid_right_shift_bits_pos 0
+#define ccid_right_shift_bits_len 4
+#define ccid_right_shift_bits_lsb 0
+#define xd_r_reg_ccid_sx_7_0    0xA10C
+#define reg_ccid_sx_7_0_pos 0
+#define reg_ccid_sx_7_0_len 8
+#define reg_ccid_sx_7_0_lsb 0
+#define xd_r_reg_ccid_sx_15_8   0xA10D
+#define reg_ccid_sx_15_8_pos 0
+#define reg_ccid_sx_15_8_len 8
+#define reg_ccid_sx_15_8_lsb 8
+#define xd_r_reg_ccid_sx_21_16  0xA10E
+#define reg_ccid_sx_21_16_pos 0
+#define reg_ccid_sx_21_16_len 6
+#define reg_ccid_sx_21_16_lsb 16
+#define xd_r_reg_ccid_sy_7_0    0xA110
+#define reg_ccid_sy_7_0_pos 0
+#define reg_ccid_sy_7_0_len 8
+#define reg_ccid_sy_7_0_lsb 0
+#define xd_r_reg_ccid_sy_15_8   0xA111
+#define reg_ccid_sy_15_8_pos 0
+#define reg_ccid_sy_15_8_len 8
+#define reg_ccid_sy_15_8_lsb 8
+#define xd_r_reg_ccid_sy_23_16  0xA112
+#define reg_ccid_sy_23_16_pos 0
+#define reg_ccid_sy_23_16_len 8
+#define reg_ccid_sy_23_16_lsb 16
+#define xd_r_reg_ccid2_sz_7_0   0xA114
+#define reg_ccid2_sz_7_0_pos 0
+#define reg_ccid2_sz_7_0_len 8
+#define reg_ccid2_sz_7_0_lsb 0
+#define xd_r_reg_ccid2_sz_15_8  0xA115
+#define reg_ccid2_sz_15_8_pos 0
+#define reg_ccid2_sz_15_8_len 8
+#define reg_ccid2_sz_15_8_lsb 8
+#define xd_r_reg_ccid2_sz_23_16 0xA116
+#define reg_ccid2_sz_23_16_pos 0
+#define reg_ccid2_sz_23_16_len 8
+#define reg_ccid2_sz_23_16_lsb 16
+#define xd_r_reg_ccid2_sz_25_24 0xA117
+#define reg_ccid2_sz_25_24_pos 0
+#define reg_ccid2_sz_25_24_len 2
+#define reg_ccid2_sz_25_24_lsb 24
+#define xd_r_reg_ccid2_sy_7_0   0xA118
+#define reg_ccid2_sy_7_0_pos 0
+#define reg_ccid2_sy_7_0_len 8
+#define reg_ccid2_sy_7_0_lsb 0
+#define xd_r_reg_ccid2_sy_15_8  0xA119
+#define reg_ccid2_sy_15_8_pos 0
+#define reg_ccid2_sy_15_8_len 8
+#define reg_ccid2_sy_15_8_lsb 8
+#define xd_r_reg_ccid2_sy_23_16 0xA11A
+#define reg_ccid2_sy_23_16_pos 0
+#define reg_ccid2_sy_23_16_len 8
+#define reg_ccid2_sy_23_16_lsb 16
+#define xd_r_reg_ccid2_sy_25_24 0xA11B
+#define reg_ccid2_sy_25_24_pos 0
+#define reg_ccid2_sy_25_24_len 2
+#define reg_ccid2_sy_25_24_lsb 24
+#define xd_p_dagc1_accumulate_num_2k_7_0        0xA120
+#define dagc1_accumulate_num_2k_7_0_pos 0
+#define dagc1_accumulate_num_2k_7_0_len 8
+#define dagc1_accumulate_num_2k_7_0_lsb 0
+#define xd_p_dagc1_accumulate_num_2k_12_8       0xA121
+#define dagc1_accumulate_num_2k_12_8_pos 0
+#define dagc1_accumulate_num_2k_12_8_len 5
+#define dagc1_accumulate_num_2k_12_8_lsb 8
+#define xd_p_dagc1_accumulate_num_8k_7_0        0xA122
+#define dagc1_accumulate_num_8k_7_0_pos 0
+#define dagc1_accumulate_num_8k_7_0_len 8
+#define dagc1_accumulate_num_8k_7_0_lsb 0
+#define xd_p_dagc1_accumulate_num_8k_14_8       0xA123
+#define dagc1_accumulate_num_8k_14_8_pos 0
+#define dagc1_accumulate_num_8k_14_8_len 7
+#define dagc1_accumulate_num_8k_14_8_lsb 8
+#define xd_p_dagc1_desired_level_0      0xA123
+#define dagc1_desired_level_0_pos 7
+#define dagc1_desired_level_0_len 1
+#define dagc1_desired_level_0_lsb 0
+#define xd_p_dagc1_desired_level_8_1    0xA124
+#define dagc1_desired_level_8_1_pos 0
+#define dagc1_desired_level_8_1_len 8
+#define dagc1_desired_level_8_1_lsb 1
+#define xd_p_dagc1_apply_delay  0xA125
+#define dagc1_apply_delay_pos 0
+#define dagc1_apply_delay_len 7
+#define dagc1_apply_delay_lsb 0
+#define xd_p_dagc1_bypass_scale_ctl     0xA126
+#define dagc1_bypass_scale_ctl_pos 0
+#define dagc1_bypass_scale_ctl_len 2
+#define dagc1_bypass_scale_ctl_lsb 0
+#define xd_p_reg_dagc1_in_sat_cnt_7_0   0xA127
+#define reg_dagc1_in_sat_cnt_7_0_pos 0
+#define reg_dagc1_in_sat_cnt_7_0_len 8
+#define reg_dagc1_in_sat_cnt_7_0_lsb 0
+#define xd_p_reg_dagc1_in_sat_cnt_15_8  0xA128
+#define reg_dagc1_in_sat_cnt_15_8_pos 0
+#define reg_dagc1_in_sat_cnt_15_8_len 8
+#define reg_dagc1_in_sat_cnt_15_8_lsb 8
+#define xd_p_reg_dagc1_in_sat_cnt_23_16 0xA129
+#define reg_dagc1_in_sat_cnt_23_16_pos 0
+#define reg_dagc1_in_sat_cnt_23_16_len 8
+#define reg_dagc1_in_sat_cnt_23_16_lsb 16
+#define xd_p_reg_dagc1_in_sat_cnt_31_24 0xA12A
+#define reg_dagc1_in_sat_cnt_31_24_pos 0
+#define reg_dagc1_in_sat_cnt_31_24_len 8
+#define reg_dagc1_in_sat_cnt_31_24_lsb 24
+#define xd_p_reg_dagc1_out_sat_cnt_7_0  0xA12B
+#define reg_dagc1_out_sat_cnt_7_0_pos 0
+#define reg_dagc1_out_sat_cnt_7_0_len 8
+#define reg_dagc1_out_sat_cnt_7_0_lsb 0
+#define xd_p_reg_dagc1_out_sat_cnt_15_8 0xA12C
+#define reg_dagc1_out_sat_cnt_15_8_pos 0
+#define reg_dagc1_out_sat_cnt_15_8_len 8
+#define reg_dagc1_out_sat_cnt_15_8_lsb 8
+#define xd_p_reg_dagc1_out_sat_cnt_23_16        0xA12D
+#define reg_dagc1_out_sat_cnt_23_16_pos 0
+#define reg_dagc1_out_sat_cnt_23_16_len 8
+#define reg_dagc1_out_sat_cnt_23_16_lsb 16
+#define xd_p_reg_dagc1_out_sat_cnt_31_24        0xA12E
+#define reg_dagc1_out_sat_cnt_31_24_pos 0
+#define reg_dagc1_out_sat_cnt_31_24_len 8
+#define reg_dagc1_out_sat_cnt_31_24_lsb 24
+#define xd_r_dagc1_multiplier_7_0       0xA136
+#define dagc1_multiplier_7_0_pos 0
+#define dagc1_multiplier_7_0_len 8
+#define dagc1_multiplier_7_0_lsb 0
+#define xd_r_dagc1_multiplier_15_8      0xA137
+#define dagc1_multiplier_15_8_pos 0
+#define dagc1_multiplier_15_8_len 8
+#define dagc1_multiplier_15_8_lsb 8
+#define xd_r_dagc1_right_shift_bits     0xA138
+#define dagc1_right_shift_bits_pos 0
+#define dagc1_right_shift_bits_len 4
+#define dagc1_right_shift_bits_lsb 0
+#define xd_p_reg_bfs_fcw_7_0    0xA140
+#define reg_bfs_fcw_7_0_pos 0
+#define reg_bfs_fcw_7_0_len 8
+#define reg_bfs_fcw_7_0_lsb 0
+#define xd_p_reg_bfs_fcw_15_8   0xA141
+#define reg_bfs_fcw_15_8_pos 0
+#define reg_bfs_fcw_15_8_len 8
+#define reg_bfs_fcw_15_8_lsb 8
+#define xd_p_reg_bfs_fcw_22_16  0xA142
+#define reg_bfs_fcw_22_16_pos 0
+#define reg_bfs_fcw_22_16_len 7
+#define reg_bfs_fcw_22_16_lsb 16
+#define xd_p_reg_antif_sf_7_0   0xA144
+#define reg_antif_sf_7_0_pos 0
+#define reg_antif_sf_7_0_len 8
+#define reg_antif_sf_7_0_lsb 0
+#define xd_p_reg_antif_sf_11_8  0xA145
+#define reg_antif_sf_11_8_pos 0
+#define reg_antif_sf_11_8_len 4
+#define reg_antif_sf_11_8_lsb 8
+#define xd_r_bfs_fcw_q_7_0      0xA150
+#define bfs_fcw_q_7_0_pos 0
+#define bfs_fcw_q_7_0_len 8
+#define bfs_fcw_q_7_0_lsb 0
+#define xd_r_bfs_fcw_q_15_8     0xA151
+#define bfs_fcw_q_15_8_pos 0
+#define bfs_fcw_q_15_8_len 8
+#define bfs_fcw_q_15_8_lsb 8
+#define xd_r_bfs_fcw_q_22_16    0xA152
+#define bfs_fcw_q_22_16_pos 0
+#define bfs_fcw_q_22_16_len 7
+#define bfs_fcw_q_22_16_lsb 16
+#define xd_p_reg_dca_enu        0xA160
+#define reg_dca_enu_pos 0
+#define reg_dca_enu_len 1
+#define reg_dca_enu_lsb 0
+#define xd_p_reg_dca_enl        0xA160
+#define reg_dca_enl_pos 1
+#define reg_dca_enl_len 1
+#define reg_dca_enl_lsb 0
+#define xd_p_reg_dca_lower_chip 0xA160
+#define reg_dca_lower_chip_pos 2
+#define reg_dca_lower_chip_len 1
+#define reg_dca_lower_chip_lsb 0
+#define xd_p_reg_dca_upper_chip 0xA160
+#define reg_dca_upper_chip_pos 3
+#define reg_dca_upper_chip_len 1
+#define reg_dca_upper_chip_lsb 0
+#define xd_p_reg_dca_platch     0xA160
+#define reg_dca_platch_pos 4
+#define reg_dca_platch_len 1
+#define reg_dca_platch_lsb 0
+#define xd_p_reg_dca_th 0xA161
+#define reg_dca_th_pos 0
+#define reg_dca_th_len 5
+#define reg_dca_th_lsb 0
+#define xd_p_reg_dca_scale      0xA162
+#define reg_dca_scale_pos 0
+#define reg_dca_scale_len 4
+#define reg_dca_scale_lsb 0
+#define xd_p_reg_dca_tone_7_0   0xA163
+#define reg_dca_tone_7_0_pos 0
+#define reg_dca_tone_7_0_len 8
+#define reg_dca_tone_7_0_lsb 0
+#define xd_p_reg_dca_tone_12_8  0xA164
+#define reg_dca_tone_12_8_pos 0
+#define reg_dca_tone_12_8_len 5
+#define reg_dca_tone_12_8_lsb 8
+#define xd_p_reg_dca_time_7_0   0xA165
+#define reg_dca_time_7_0_pos 0
+#define reg_dca_time_7_0_len 8
+#define reg_dca_time_7_0_lsb 0
+#define xd_p_reg_dca_time_15_8  0xA166
+#define reg_dca_time_15_8_pos 0
+#define reg_dca_time_15_8_len 8
+#define reg_dca_time_15_8_lsb 8
+#define xd_r_dcasm      0xA167
+#define dcasm_pos 0
+#define dcasm_len 3
+#define dcasm_lsb 0
+#define xd_p_reg_qnt_valuew_7_0 0xA168
+#define reg_qnt_valuew_7_0_pos 0
+#define reg_qnt_valuew_7_0_len 8
+#define reg_qnt_valuew_7_0_lsb 0
+#define xd_p_reg_qnt_valuew_10_8        0xA169
+#define reg_qnt_valuew_10_8_pos 0
+#define reg_qnt_valuew_10_8_len 3
+#define reg_qnt_valuew_10_8_lsb 8
+#define xd_p_dca_sbx_gain_diff_7_0      0xA16A
+#define dca_sbx_gain_diff_7_0_pos 0
+#define dca_sbx_gain_diff_7_0_len 8
+#define dca_sbx_gain_diff_7_0_lsb 0
+#define xd_p_dca_sbx_gain_diff_9_8      0xA16B
+#define dca_sbx_gain_diff_9_8_pos 0
+#define dca_sbx_gain_diff_9_8_len 2
+#define dca_sbx_gain_diff_9_8_lsb 8
+#define xd_p_reg_dca_stand_alone        0xA16C
+#define reg_dca_stand_alone_pos 0
+#define reg_dca_stand_alone_len 1
+#define reg_dca_stand_alone_lsb 0
+#define xd_p_reg_dca_upper_out_en       0xA16C
+#define reg_dca_upper_out_en_pos 1
+#define reg_dca_upper_out_en_len 1
+#define reg_dca_upper_out_en_lsb 0
+#define xd_p_reg_dca_rc_en      0xA16C
+#define reg_dca_rc_en_pos 2
+#define reg_dca_rc_en_len 1
+#define reg_dca_rc_en_lsb 0
+#define xd_p_reg_dca_retrain_send       0xA16C
+#define reg_dca_retrain_send_pos 3
+#define reg_dca_retrain_send_len 1
+#define reg_dca_retrain_send_lsb 0
+#define xd_p_reg_dca_retrain_rec        0xA16C
+#define reg_dca_retrain_rec_pos 4
+#define reg_dca_retrain_rec_len 1
+#define reg_dca_retrain_rec_lsb 0
+#define xd_p_reg_dca_api_tpsrdy 0xA16C
+#define reg_dca_api_tpsrdy_pos 5
+#define reg_dca_api_tpsrdy_len 1
+#define reg_dca_api_tpsrdy_lsb 0
+#define xd_p_reg_dca_symbol_gap 0xA16D
+#define reg_dca_symbol_gap_pos 0
+#define reg_dca_symbol_gap_len 4
+#define reg_dca_symbol_gap_lsb 0
+#define xd_p_reg_qnt_nfvaluew_7_0       0xA16E
+#define reg_qnt_nfvaluew_7_0_pos 0
+#define reg_qnt_nfvaluew_7_0_len 8
+#define reg_qnt_nfvaluew_7_0_lsb 0
+#define xd_p_reg_qnt_nfvaluew_10_8      0xA16F
+#define reg_qnt_nfvaluew_10_8_pos 0
+#define reg_qnt_nfvaluew_10_8_len 3
+#define reg_qnt_nfvaluew_10_8_lsb 8
+#define xd_p_reg_qnt_flatness_thr_7_0   0xA170
+#define reg_qnt_flatness_thr_7_0_pos 0
+#define reg_qnt_flatness_thr_7_0_len 8
+#define reg_qnt_flatness_thr_7_0_lsb 0
+#define xd_p_reg_qnt_flatness_thr_9_8   0xA171
+#define reg_qnt_flatness_thr_9_8_pos 0
+#define reg_qnt_flatness_thr_9_8_len 2
+#define reg_qnt_flatness_thr_9_8_lsb 8
+#define xd_p_reg_dca_tone_idx_5_0       0xA171
+#define reg_dca_tone_idx_5_0_pos 2
+#define reg_dca_tone_idx_5_0_len 6
+#define reg_dca_tone_idx_5_0_lsb 0
+#define xd_p_reg_dca_tone_idx_12_6      0xA172
+#define reg_dca_tone_idx_12_6_pos 0
+#define reg_dca_tone_idx_12_6_len 7
+#define reg_dca_tone_idx_12_6_lsb 6
+#define xd_p_reg_dca_data_vld   0xA173
+#define reg_dca_data_vld_pos 0
+#define reg_dca_data_vld_len 1
+#define reg_dca_data_vld_lsb 0
+#define xd_p_reg_dca_read_update        0xA173
+#define reg_dca_read_update_pos 1
+#define reg_dca_read_update_len 1
+#define reg_dca_read_update_lsb 0
+#define xd_r_reg_dca_data_re_5_0        0xA173
+#define reg_dca_data_re_5_0_pos 2
+#define reg_dca_data_re_5_0_len 6
+#define reg_dca_data_re_5_0_lsb 0
+#define xd_r_reg_dca_data_re_10_6       0xA174
+#define reg_dca_data_re_10_6_pos 0
+#define reg_dca_data_re_10_6_len 5
+#define reg_dca_data_re_10_6_lsb 6
+#define xd_r_reg_dca_data_im_7_0        0xA175
+#define reg_dca_data_im_7_0_pos 0
+#define reg_dca_data_im_7_0_len 8
+#define reg_dca_data_im_7_0_lsb 0
+#define xd_r_reg_dca_data_im_10_8       0xA176
+#define reg_dca_data_im_10_8_pos 0
+#define reg_dca_data_im_10_8_len 3
+#define reg_dca_data_im_10_8_lsb 8
+#define xd_r_reg_dca_data_h2_7_0        0xA178
+#define reg_dca_data_h2_7_0_pos 0
+#define reg_dca_data_h2_7_0_len 8
+#define reg_dca_data_h2_7_0_lsb 0
+#define xd_r_reg_dca_data_h2_9_8        0xA179
+#define reg_dca_data_h2_9_8_pos 0
+#define reg_dca_data_h2_9_8_len 2
+#define reg_dca_data_h2_9_8_lsb 8
+#define xd_p_reg_f_adc_7_0      0xA180
+#define reg_f_adc_7_0_pos 0
+#define reg_f_adc_7_0_len 8
+#define reg_f_adc_7_0_lsb 0
+#define xd_p_reg_f_adc_15_8     0xA181
+#define reg_f_adc_15_8_pos 0
+#define reg_f_adc_15_8_len 8
+#define reg_f_adc_15_8_lsb 8
+#define xd_p_reg_f_adc_23_16    0xA182
+#define reg_f_adc_23_16_pos 0
+#define reg_f_adc_23_16_len 8
+#define reg_f_adc_23_16_lsb 16
+#define xd_r_intp_mu_7_0        0xA190
+#define intp_mu_7_0_pos 0
+#define intp_mu_7_0_len 8
+#define intp_mu_7_0_lsb 0
+#define xd_r_intp_mu_15_8       0xA191
+#define intp_mu_15_8_pos 0
+#define intp_mu_15_8_len 8
+#define intp_mu_15_8_lsb 8
+#define xd_r_intp_mu_19_16      0xA192
+#define intp_mu_19_16_pos 0
+#define intp_mu_19_16_len 4
+#define intp_mu_19_16_lsb 16
+#define xd_p_reg_agc_rst        0xA1A0
+#define reg_agc_rst_pos 0
+#define reg_agc_rst_len 1
+#define reg_agc_rst_lsb 0
+#define xd_p_rf_agc_en  0xA1A0
+#define rf_agc_en_pos 1
+#define rf_agc_en_len 1
+#define rf_agc_en_lsb 0
+#define xd_p_rf_agc_dis 0xA1A0
+#define rf_agc_dis_pos 2
+#define rf_agc_dis_len 1
+#define rf_agc_dis_lsb 0
+#define xd_p_if_agc_rst 0xA1A0
+#define if_agc_rst_pos 3
+#define if_agc_rst_len 1
+#define if_agc_rst_lsb 0
+#define xd_p_if_agc_en  0xA1A0
+#define if_agc_en_pos 4
+#define if_agc_en_len 1
+#define if_agc_en_lsb 0
+#define xd_p_if_agc_dis 0xA1A0
+#define if_agc_dis_pos 5
+#define if_agc_dis_len 1
+#define if_agc_dis_lsb 0
+#define xd_p_agc_lock   0xA1A0
+#define agc_lock_pos 6
+#define agc_lock_len 1
+#define agc_lock_lsb 0
+#define xd_p_reg_tinr_rst       0xA1A1
+#define reg_tinr_rst_pos 0
+#define reg_tinr_rst_len 1
+#define reg_tinr_rst_lsb 0
+#define xd_p_reg_tinr_en        0xA1A1
+#define reg_tinr_en_pos 1
+#define reg_tinr_en_len 1
+#define reg_tinr_en_lsb 0
+#define xd_p_reg_ccifs_en       0xA1A2
+#define reg_ccifs_en_pos 0
+#define reg_ccifs_en_len 1
+#define reg_ccifs_en_lsb 0
+#define xd_p_reg_ccifs_dis      0xA1A2
+#define reg_ccifs_dis_pos 1
+#define reg_ccifs_dis_len 1
+#define reg_ccifs_dis_lsb 0
+#define xd_p_reg_ccifs_rst      0xA1A2
+#define reg_ccifs_rst_pos 2
+#define reg_ccifs_rst_len 1
+#define reg_ccifs_rst_lsb 0
+#define xd_p_reg_ccifs_byp      0xA1A2
+#define reg_ccifs_byp_pos 3
+#define reg_ccifs_byp_len 1
+#define reg_ccifs_byp_lsb 0
+#define xd_p_reg_ccif_en        0xA1A3
+#define reg_ccif_en_pos 0
+#define reg_ccif_en_len 1
+#define reg_ccif_en_lsb 0
+#define xd_p_reg_ccif_dis       0xA1A3
+#define reg_ccif_dis_pos 1
+#define reg_ccif_dis_len 1
+#define reg_ccif_dis_lsb 0
+#define xd_p_reg_ccif_rst       0xA1A3
+#define reg_ccif_rst_pos 2
+#define reg_ccif_rst_len 1
+#define reg_ccif_rst_lsb 0
+#define xd_p_reg_ccif_byp       0xA1A3
+#define reg_ccif_byp_pos 3
+#define reg_ccif_byp_len 1
+#define reg_ccif_byp_lsb 0
+#define xd_p_dagc1_rst  0xA1A4
+#define dagc1_rst_pos 0
+#define dagc1_rst_len 1
+#define dagc1_rst_lsb 0
+#define xd_p_dagc1_en   0xA1A4
+#define dagc1_en_pos 1
+#define dagc1_en_len 1
+#define dagc1_en_lsb 0
+#define xd_p_dagc1_mode 0xA1A4
+#define dagc1_mode_pos 2
+#define dagc1_mode_len 2
+#define dagc1_mode_lsb 0
+#define xd_p_dagc1_done 0xA1A4
+#define dagc1_done_pos 4
+#define dagc1_done_len 1
+#define dagc1_done_lsb 0
+#define xd_p_ccid_rst   0xA1A5
+#define ccid_rst_pos 0
+#define ccid_rst_len 1
+#define ccid_rst_lsb 0
+#define xd_p_ccid_en    0xA1A5
+#define ccid_en_pos 1
+#define ccid_en_len 1
+#define ccid_en_lsb 0
+#define xd_p_ccid_mode  0xA1A5
+#define ccid_mode_pos 2
+#define ccid_mode_len 2
+#define ccid_mode_lsb 0
+#define xd_p_ccid_done  0xA1A5
+#define ccid_done_pos 4
+#define ccid_done_len 1
+#define ccid_done_lsb 0
+#define xd_r_ccid_deted 0xA1A5
+#define ccid_deted_pos 5
+#define ccid_deted_len 1
+#define ccid_deted_lsb 0
+#define xd_p_ccid2_en   0xA1A5
+#define ccid2_en_pos 6
+#define ccid2_en_len 1
+#define ccid2_en_lsb 0
+#define xd_p_ccid2_done 0xA1A5
+#define ccid2_done_pos 7
+#define ccid2_done_len 1
+#define ccid2_done_lsb 0
+#define xd_p_reg_bfs_en 0xA1A6
+#define reg_bfs_en_pos 0
+#define reg_bfs_en_len 1
+#define reg_bfs_en_lsb 0
+#define xd_p_reg_bfs_dis        0xA1A6
+#define reg_bfs_dis_pos 1
+#define reg_bfs_dis_len 1
+#define reg_bfs_dis_lsb 0
+#define xd_p_reg_bfs_rst        0xA1A6
+#define reg_bfs_rst_pos 2
+#define reg_bfs_rst_len 1
+#define reg_bfs_rst_lsb 0
+#define xd_p_reg_bfs_byp        0xA1A6
+#define reg_bfs_byp_pos 3
+#define reg_bfs_byp_len 1
+#define reg_bfs_byp_lsb 0
+#define xd_p_reg_antif_en       0xA1A7
+#define reg_antif_en_pos 0
+#define reg_antif_en_len 1
+#define reg_antif_en_lsb 0
+#define xd_p_reg_antif_dis      0xA1A7
+#define reg_antif_dis_pos 1
+#define reg_antif_dis_len 1
+#define reg_antif_dis_lsb 0
+#define xd_p_reg_antif_rst      0xA1A7
+#define reg_antif_rst_pos 2
+#define reg_antif_rst_len 1
+#define reg_antif_rst_lsb 0
+#define xd_p_reg_antif_byp      0xA1A7
+#define reg_antif_byp_pos 3
+#define reg_antif_byp_len 1
+#define reg_antif_byp_lsb 0
+#define xd_p_intp_en    0xA1A8
+#define intp_en_pos 0
+#define intp_en_len 1
+#define intp_en_lsb 0
+#define xd_p_intp_dis   0xA1A8
+#define intp_dis_pos 1
+#define intp_dis_len 1
+#define intp_dis_lsb 0
+#define xd_p_intp_rst   0xA1A8
+#define intp_rst_pos 2
+#define intp_rst_len 1
+#define intp_rst_lsb 0
+#define xd_p_intp_byp   0xA1A8
+#define intp_byp_pos 3
+#define intp_byp_len 1
+#define intp_byp_lsb 0
+#define xd_p_reg_acif_en        0xA1A9
+#define reg_acif_en_pos 0
+#define reg_acif_en_len 1
+#define reg_acif_en_lsb 0
+#define xd_p_reg_acif_dis       0xA1A9
+#define reg_acif_dis_pos 1
+#define reg_acif_dis_len 1
+#define reg_acif_dis_lsb 0
+#define xd_p_reg_acif_rst       0xA1A9
+#define reg_acif_rst_pos 2
+#define reg_acif_rst_len 1
+#define reg_acif_rst_lsb 0
+#define xd_p_reg_acif_byp       0xA1A9
+#define reg_acif_byp_pos 3
+#define reg_acif_byp_len 1
+#define reg_acif_byp_lsb 0
+#define xd_p_reg_acif_sync_mode 0xA1A9
+#define reg_acif_sync_mode_pos 4
+#define reg_acif_sync_mode_len 1
+#define reg_acif_sync_mode_lsb 0
+#define xd_p_dagc2_rst  0xA1AA
+#define dagc2_rst_pos 0
+#define dagc2_rst_len 1
+#define dagc2_rst_lsb 0
+#define xd_p_dagc2_en   0xA1AA
+#define dagc2_en_pos 1
+#define dagc2_en_len 1
+#define dagc2_en_lsb 0
+#define xd_p_dagc2_mode 0xA1AA
+#define dagc2_mode_pos 2
+#define dagc2_mode_len 2
+#define dagc2_mode_lsb 0
+#define xd_p_dagc2_done 0xA1AA
+#define dagc2_done_pos 4
+#define dagc2_done_len 1
+#define dagc2_done_lsb 0
+#define xd_p_reg_dca_en 0xA1AB
+#define reg_dca_en_pos 0
+#define reg_dca_en_len 1
+#define reg_dca_en_lsb 0
+#define xd_p_dagc2_accumulate_num_2k_7_0        0xA1C0
+#define dagc2_accumulate_num_2k_7_0_pos 0
+#define dagc2_accumulate_num_2k_7_0_len 8
+#define dagc2_accumulate_num_2k_7_0_lsb 0
+#define xd_p_dagc2_accumulate_num_2k_12_8       0xA1C1
+#define dagc2_accumulate_num_2k_12_8_pos 0
+#define dagc2_accumulate_num_2k_12_8_len 5
+#define dagc2_accumulate_num_2k_12_8_lsb 8
+#define xd_p_dagc2_accumulate_num_8k_7_0        0xA1C2
+#define dagc2_accumulate_num_8k_7_0_pos 0
+#define dagc2_accumulate_num_8k_7_0_len 8
+#define dagc2_accumulate_num_8k_7_0_lsb 0
+#define xd_p_dagc2_accumulate_num_8k_12_8       0xA1C3
+#define dagc2_accumulate_num_8k_12_8_pos 0
+#define dagc2_accumulate_num_8k_12_8_len 5
+#define dagc2_accumulate_num_8k_12_8_lsb 8
+#define xd_p_dagc2_desired_level_2_0    0xA1C3
+#define dagc2_desired_level_2_0_pos 5
+#define dagc2_desired_level_2_0_len 3
+#define dagc2_desired_level_2_0_lsb 0
+#define xd_p_dagc2_desired_level_8_3    0xA1C4
+#define dagc2_desired_level_8_3_pos 0
+#define dagc2_desired_level_8_3_len 6
+#define dagc2_desired_level_8_3_lsb 3
+#define xd_p_dagc2_apply_delay  0xA1C5
+#define dagc2_apply_delay_pos 0
+#define dagc2_apply_delay_len 7
+#define dagc2_apply_delay_lsb 0
+#define xd_p_dagc2_bypass_scale_ctl     0xA1C6
+#define dagc2_bypass_scale_ctl_pos 0
+#define dagc2_bypass_scale_ctl_len 3
+#define dagc2_bypass_scale_ctl_lsb 0
+#define xd_p_dagc2_programmable_shift1  0xA1C7
+#define dagc2_programmable_shift1_pos 0
+#define dagc2_programmable_shift1_len 8
+#define dagc2_programmable_shift1_lsb 0
+#define xd_p_dagc2_programmable_shift2  0xA1C8
+#define dagc2_programmable_shift2_pos 0
+#define dagc2_programmable_shift2_len 8
+#define dagc2_programmable_shift2_lsb 0
+#define xd_p_reg_dagc2_in_sat_cnt_7_0   0xA1C9
+#define reg_dagc2_in_sat_cnt_7_0_pos 0
+#define reg_dagc2_in_sat_cnt_7_0_len 8
+#define reg_dagc2_in_sat_cnt_7_0_lsb 0
+#define xd_p_reg_dagc2_in_sat_cnt_15_8  0xA1CA
+#define reg_dagc2_in_sat_cnt_15_8_pos 0
+#define reg_dagc2_in_sat_cnt_15_8_len 8
+#define reg_dagc2_in_sat_cnt_15_8_lsb 8
+#define xd_p_reg_dagc2_in_sat_cnt_23_16 0xA1CB
+#define reg_dagc2_in_sat_cnt_23_16_pos 0
+#define reg_dagc2_in_sat_cnt_23_16_len 8
+#define reg_dagc2_in_sat_cnt_23_16_lsb 16
+#define xd_p_reg_dagc2_in_sat_cnt_31_24 0xA1CC
+#define reg_dagc2_in_sat_cnt_31_24_pos 0
+#define reg_dagc2_in_sat_cnt_31_24_len 8
+#define reg_dagc2_in_sat_cnt_31_24_lsb 24
+#define xd_p_reg_dagc2_out_sat_cnt_7_0  0xA1CD
+#define reg_dagc2_out_sat_cnt_7_0_pos 0
+#define reg_dagc2_out_sat_cnt_7_0_len 8
+#define reg_dagc2_out_sat_cnt_7_0_lsb 0
+#define xd_p_reg_dagc2_out_sat_cnt_15_8 0xA1CE
+#define reg_dagc2_out_sat_cnt_15_8_pos 0
+#define reg_dagc2_out_sat_cnt_15_8_len 8
+#define reg_dagc2_out_sat_cnt_15_8_lsb 8
+#define xd_p_reg_dagc2_out_sat_cnt_23_16        0xA1CF
+#define reg_dagc2_out_sat_cnt_23_16_pos 0
+#define reg_dagc2_out_sat_cnt_23_16_len 8
+#define reg_dagc2_out_sat_cnt_23_16_lsb 16
+#define xd_p_reg_dagc2_out_sat_cnt_31_24        0xA1D0
+#define reg_dagc2_out_sat_cnt_31_24_pos 0
+#define reg_dagc2_out_sat_cnt_31_24_len 8
+#define reg_dagc2_out_sat_cnt_31_24_lsb 24
+#define xd_r_dagc2_multiplier_7_0       0xA1D6
+#define dagc2_multiplier_7_0_pos 0
+#define dagc2_multiplier_7_0_len 8
+#define dagc2_multiplier_7_0_lsb 0
+#define xd_r_dagc2_multiplier_15_8      0xA1D7
+#define dagc2_multiplier_15_8_pos 0
+#define dagc2_multiplier_15_8_len 8
+#define dagc2_multiplier_15_8_lsb 8
+#define xd_r_dagc2_right_shift_bits     0xA1D8
+#define dagc2_right_shift_bits_pos 0
+#define dagc2_right_shift_bits_len 4
+#define dagc2_right_shift_bits_lsb 0
+#define xd_p_cfoe_NS_coeff1_7_0 0xA200
+#define cfoe_NS_coeff1_7_0_pos 0
+#define cfoe_NS_coeff1_7_0_len 8
+#define cfoe_NS_coeff1_7_0_lsb 0
+#define xd_p_cfoe_NS_coeff1_15_8        0xA201
+#define cfoe_NS_coeff1_15_8_pos 0
+#define cfoe_NS_coeff1_15_8_len 8
+#define cfoe_NS_coeff1_15_8_lsb 8
+#define xd_p_cfoe_NS_coeff1_23_16       0xA202
+#define cfoe_NS_coeff1_23_16_pos 0
+#define cfoe_NS_coeff1_23_16_len 8
+#define cfoe_NS_coeff1_23_16_lsb 16
+#define xd_p_cfoe_NS_coeff1_25_24       0xA203
+#define cfoe_NS_coeff1_25_24_pos 0
+#define cfoe_NS_coeff1_25_24_len 2
+#define cfoe_NS_coeff1_25_24_lsb 24
+#define xd_p_cfoe_NS_coeff2_5_0 0xA203
+#define cfoe_NS_coeff2_5_0_pos 2
+#define cfoe_NS_coeff2_5_0_len 6
+#define cfoe_NS_coeff2_5_0_lsb 0
+#define xd_p_cfoe_NS_coeff2_13_6        0xA204
+#define cfoe_NS_coeff2_13_6_pos 0
+#define cfoe_NS_coeff2_13_6_len 8
+#define cfoe_NS_coeff2_13_6_lsb 6
+#define xd_p_cfoe_NS_coeff2_21_14       0xA205
+#define cfoe_NS_coeff2_21_14_pos 0
+#define cfoe_NS_coeff2_21_14_len 8
+#define cfoe_NS_coeff2_21_14_lsb 14
+#define xd_p_cfoe_NS_coeff2_24_22       0xA206
+#define cfoe_NS_coeff2_24_22_pos 0
+#define cfoe_NS_coeff2_24_22_len 3
+#define cfoe_NS_coeff2_24_22_lsb 22
+#define xd_p_cfoe_lf_c1_4_0     0xA206
+#define cfoe_lf_c1_4_0_pos 3
+#define cfoe_lf_c1_4_0_len 5
+#define cfoe_lf_c1_4_0_lsb 0
+#define xd_p_cfoe_lf_c1_12_5    0xA207
+#define cfoe_lf_c1_12_5_pos 0
+#define cfoe_lf_c1_12_5_len 8
+#define cfoe_lf_c1_12_5_lsb 5
+#define xd_p_cfoe_lf_c1_20_13   0xA208
+#define cfoe_lf_c1_20_13_pos 0
+#define cfoe_lf_c1_20_13_len 8
+#define cfoe_lf_c1_20_13_lsb 13
+#define xd_p_cfoe_lf_c1_25_21   0xA209
+#define cfoe_lf_c1_25_21_pos 0
+#define cfoe_lf_c1_25_21_len 5
+#define cfoe_lf_c1_25_21_lsb 21
+#define xd_p_cfoe_lf_c2_2_0     0xA209
+#define cfoe_lf_c2_2_0_pos 5
+#define cfoe_lf_c2_2_0_len 3
+#define cfoe_lf_c2_2_0_lsb 0
+#define xd_p_cfoe_lf_c2_10_3    0xA20A
+#define cfoe_lf_c2_10_3_pos 0
+#define cfoe_lf_c2_10_3_len 8
+#define cfoe_lf_c2_10_3_lsb 3
+#define xd_p_cfoe_lf_c2_18_11   0xA20B
+#define cfoe_lf_c2_18_11_pos 0
+#define cfoe_lf_c2_18_11_len 8
+#define cfoe_lf_c2_18_11_lsb 11
+#define xd_p_cfoe_lf_c2_25_19   0xA20C
+#define cfoe_lf_c2_25_19_pos 0
+#define cfoe_lf_c2_25_19_len 7
+#define cfoe_lf_c2_25_19_lsb 19
+#define xd_p_cfoe_ifod_7_0      0xA20D
+#define cfoe_ifod_7_0_pos 0
+#define cfoe_ifod_7_0_len 8
+#define cfoe_ifod_7_0_lsb 0
+#define xd_p_cfoe_ifod_10_8     0xA20E
+#define cfoe_ifod_10_8_pos 0
+#define cfoe_ifod_10_8_len 3
+#define cfoe_ifod_10_8_lsb 8
+#define xd_p_cfoe_Divg_ctr_th   0xA20E
+#define cfoe_Divg_ctr_th_pos 4
+#define cfoe_Divg_ctr_th_len 4
+#define cfoe_Divg_ctr_th_lsb 0
+#define xd_p_cfoe_FOT_divg_th   0xA20F
+#define cfoe_FOT_divg_th_pos 0
+#define cfoe_FOT_divg_th_len 8
+#define cfoe_FOT_divg_th_lsb 0
+#define xd_p_cfoe_FOT_cnvg_th   0xA210
+#define cfoe_FOT_cnvg_th_pos 0
+#define cfoe_FOT_cnvg_th_len 8
+#define cfoe_FOT_cnvg_th_lsb 0
+#define xd_p_reg_cfoe_offset_7_0        0xA211
+#define reg_cfoe_offset_7_0_pos 0
+#define reg_cfoe_offset_7_0_len 8
+#define reg_cfoe_offset_7_0_lsb 0
+#define xd_p_reg_cfoe_offset_9_8        0xA212
+#define reg_cfoe_offset_9_8_pos 0
+#define reg_cfoe_offset_9_8_len 2
+#define reg_cfoe_offset_9_8_lsb 8
+#define xd_p_reg_cfoe_ifoe_sign_corr    0xA212
+#define reg_cfoe_ifoe_sign_corr_pos 2
+#define reg_cfoe_ifoe_sign_corr_len 1
+#define reg_cfoe_ifoe_sign_corr_lsb 0
+#define xd_r_cfoe_fot_LF_output_7_0     0xA218
+#define cfoe_fot_LF_output_7_0_pos 0
+#define cfoe_fot_LF_output_7_0_len 8
+#define cfoe_fot_LF_output_7_0_lsb 0
+#define xd_r_cfoe_fot_LF_output_15_8    0xA219
+#define cfoe_fot_LF_output_15_8_pos 0
+#define cfoe_fot_LF_output_15_8_len 8
+#define cfoe_fot_LF_output_15_8_lsb 8
+#define xd_r_cfoe_ifo_metric_7_0        0xA21A
+#define cfoe_ifo_metric_7_0_pos 0
+#define cfoe_ifo_metric_7_0_len 8
+#define cfoe_ifo_metric_7_0_lsb 0
+#define xd_r_cfoe_ifo_metric_15_8       0xA21B
+#define cfoe_ifo_metric_15_8_pos 0
+#define cfoe_ifo_metric_15_8_len 8
+#define cfoe_ifo_metric_15_8_lsb 8
+#define xd_r_cfoe_ifo_metric_23_16      0xA21C
+#define cfoe_ifo_metric_23_16_pos 0
+#define cfoe_ifo_metric_23_16_len 8
+#define cfoe_ifo_metric_23_16_lsb 16
+#define xd_p_ste_Nu     0xA220
+#define ste_Nu_pos 0
+#define ste_Nu_len 2
+#define ste_Nu_lsb 0
+#define xd_p_ste_GI     0xA220
+#define ste_GI_pos 2
+#define ste_GI_len 3
+#define ste_GI_lsb 0
+#define xd_p_ste_symbol_num     0xA221
+#define ste_symbol_num_pos 0
+#define ste_symbol_num_len 2
+#define ste_symbol_num_lsb 0
+#define xd_p_ste_sample_num     0xA221
+#define ste_sample_num_pos 2
+#define ste_sample_num_len 2
+#define ste_sample_num_lsb 0
+#define xd_p_reg_ste_buf_en     0xA221
+#define reg_ste_buf_en_pos 7
+#define reg_ste_buf_en_len 1
+#define reg_ste_buf_en_lsb 0
+#define xd_p_ste_FFT_offset_7_0 0xA222
+#define ste_FFT_offset_7_0_pos 0
+#define ste_FFT_offset_7_0_len 8
+#define ste_FFT_offset_7_0_lsb 0
+#define xd_p_ste_FFT_offset_11_8        0xA223
+#define ste_FFT_offset_11_8_pos 0
+#define ste_FFT_offset_11_8_len 4
+#define ste_FFT_offset_11_8_lsb 8
+#define xd_p_reg_ste_tstmod     0xA223
+#define reg_ste_tstmod_pos 5
+#define reg_ste_tstmod_len 1
+#define reg_ste_tstmod_lsb 0
+#define xd_p_ste_adv_start_7_0  0xA224
+#define ste_adv_start_7_0_pos 0
+#define ste_adv_start_7_0_len 8
+#define ste_adv_start_7_0_lsb 0
+#define xd_p_ste_adv_start_10_8 0xA225
+#define ste_adv_start_10_8_pos 0
+#define ste_adv_start_10_8_len 3
+#define ste_adv_start_10_8_lsb 8
+#define xd_p_ste_adv_stop       0xA226
+#define ste_adv_stop_pos 0
+#define ste_adv_stop_len 8
+#define ste_adv_stop_lsb 0
+#define xd_r_ste_P_value_7_0    0xA228
+#define ste_P_value_7_0_pos 0
+#define ste_P_value_7_0_len 8
+#define ste_P_value_7_0_lsb 0
+#define xd_r_ste_P_value_10_8   0xA229
+#define ste_P_value_10_8_pos 0
+#define ste_P_value_10_8_len 3
+#define ste_P_value_10_8_lsb 8
+#define xd_r_ste_M_value_7_0    0xA22A
+#define ste_M_value_7_0_pos 0
+#define ste_M_value_7_0_len 8
+#define ste_M_value_7_0_lsb 0
+#define xd_r_ste_M_value_10_8   0xA22B
+#define ste_M_value_10_8_pos 0
+#define ste_M_value_10_8_len 3
+#define ste_M_value_10_8_lsb 8
+#define xd_r_ste_H1     0xA22C
+#define ste_H1_pos 0
+#define ste_H1_len 7
+#define ste_H1_lsb 0
+#define xd_r_ste_H2     0xA22D
+#define ste_H2_pos 0
+#define ste_H2_len 7
+#define ste_H2_lsb 0
+#define xd_r_ste_H3     0xA22E
+#define ste_H3_pos 0
+#define ste_H3_len 7
+#define ste_H3_lsb 0
+#define xd_r_ste_H4     0xA22F
+#define ste_H4_pos 0
+#define ste_H4_len 7
+#define ste_H4_lsb 0
+#define xd_r_ste_Corr_value_I_7_0       0xA230
+#define ste_Corr_value_I_7_0_pos 0
+#define ste_Corr_value_I_7_0_len 8
+#define ste_Corr_value_I_7_0_lsb 0
+#define xd_r_ste_Corr_value_I_15_8      0xA231
+#define ste_Corr_value_I_15_8_pos 0
+#define ste_Corr_value_I_15_8_len 8
+#define ste_Corr_value_I_15_8_lsb 8
+#define xd_r_ste_Corr_value_I_23_16     0xA232
+#define ste_Corr_value_I_23_16_pos 0
+#define ste_Corr_value_I_23_16_len 8
+#define ste_Corr_value_I_23_16_lsb 16
+#define xd_r_ste_Corr_value_I_27_24     0xA233
+#define ste_Corr_value_I_27_24_pos 0
+#define ste_Corr_value_I_27_24_len 4
+#define ste_Corr_value_I_27_24_lsb 24
+#define xd_r_ste_Corr_value_Q_7_0       0xA234
+#define ste_Corr_value_Q_7_0_pos 0
+#define ste_Corr_value_Q_7_0_len 8
+#define ste_Corr_value_Q_7_0_lsb 0
+#define xd_r_ste_Corr_value_Q_15_8      0xA235
+#define ste_Corr_value_Q_15_8_pos 0
+#define ste_Corr_value_Q_15_8_len 8
+#define ste_Corr_value_Q_15_8_lsb 8
+#define xd_r_ste_Corr_value_Q_23_16     0xA236
+#define ste_Corr_value_Q_23_16_pos 0
+#define ste_Corr_value_Q_23_16_len 8
+#define ste_Corr_value_Q_23_16_lsb 16
+#define xd_r_ste_Corr_value_Q_27_24     0xA237
+#define ste_Corr_value_Q_27_24_pos 0
+#define ste_Corr_value_Q_27_24_len 4
+#define ste_Corr_value_Q_27_24_lsb 24
+#define xd_r_ste_J_num_7_0      0xA238
+#define ste_J_num_7_0_pos 0
+#define ste_J_num_7_0_len 8
+#define ste_J_num_7_0_lsb 0
+#define xd_r_ste_J_num_15_8     0xA239
+#define ste_J_num_15_8_pos 0
+#define ste_J_num_15_8_len 8
+#define ste_J_num_15_8_lsb 8
+#define xd_r_ste_J_num_23_16    0xA23A
+#define ste_J_num_23_16_pos 0
+#define ste_J_num_23_16_len 8
+#define ste_J_num_23_16_lsb 16
+#define xd_r_ste_J_num_31_24    0xA23B
+#define ste_J_num_31_24_pos 0
+#define ste_J_num_31_24_len 8
+#define ste_J_num_31_24_lsb 24
+#define xd_r_ste_J_den_7_0      0xA23C
+#define ste_J_den_7_0_pos 0
+#define ste_J_den_7_0_len 8
+#define ste_J_den_7_0_lsb 0
+#define xd_r_ste_J_den_15_8     0xA23D
+#define ste_J_den_15_8_pos 0
+#define ste_J_den_15_8_len 8
+#define ste_J_den_15_8_lsb 8
+#define xd_r_ste_J_den_18_16    0xA23E
+#define ste_J_den_18_16_pos 0
+#define ste_J_den_18_16_len 3
+#define ste_J_den_18_16_lsb 16
+#define xd_r_ste_Beacon_Indicator       0xA23E
+#define ste_Beacon_Indicator_pos 4
+#define ste_Beacon_Indicator_len 1
+#define ste_Beacon_Indicator_lsb 0
+#define xd_r_tpsd_Frame_Num     0xA250
+#define tpsd_Frame_Num_pos 0
+#define tpsd_Frame_Num_len 2
+#define tpsd_Frame_Num_lsb 0
+#define xd_r_tpsd_Constel       0xA250
+#define tpsd_Constel_pos 2
+#define tpsd_Constel_len 2
+#define tpsd_Constel_lsb 0
+#define xd_r_tpsd_GI    0xA250
+#define tpsd_GI_pos 4
+#define tpsd_GI_len 2
+#define tpsd_GI_lsb 0
+#define xd_r_tpsd_Mode  0xA250
+#define tpsd_Mode_pos 6
+#define tpsd_Mode_len 2
+#define tpsd_Mode_lsb 0
+#define xd_r_tpsd_CR_HP 0xA251
+#define tpsd_CR_HP_pos 0
+#define tpsd_CR_HP_len 3
+#define tpsd_CR_HP_lsb 0
+#define xd_r_tpsd_CR_LP 0xA251
+#define tpsd_CR_LP_pos 3
+#define tpsd_CR_LP_len 3
+#define tpsd_CR_LP_lsb 0
+#define xd_r_tpsd_Hie   0xA252
+#define tpsd_Hie_pos 0
+#define tpsd_Hie_len 3
+#define tpsd_Hie_lsb 0
+#define xd_r_tpsd_Res_Bits      0xA252
+#define tpsd_Res_Bits_pos 3
+#define tpsd_Res_Bits_len 5
+#define tpsd_Res_Bits_lsb 0
+#define xd_r_tpsd_Res_Bits_0    0xA253
+#define tpsd_Res_Bits_0_pos 0
+#define tpsd_Res_Bits_0_len 1
+#define tpsd_Res_Bits_0_lsb 0
+#define xd_r_tpsd_LengthInd     0xA253
+#define tpsd_LengthInd_pos 1
+#define tpsd_LengthInd_len 6
+#define tpsd_LengthInd_lsb 0
+#define xd_r_tpsd_Cell_Id_7_0   0xA254
+#define tpsd_Cell_Id_7_0_pos 0
+#define tpsd_Cell_Id_7_0_len 8
+#define tpsd_Cell_Id_7_0_lsb 0
+#define xd_r_tpsd_Cell_Id_15_8  0xA255
+#define tpsd_Cell_Id_15_8_pos 0
+#define tpsd_Cell_Id_15_8_len 8
+#define tpsd_Cell_Id_15_8_lsb 0
+#define xd_p_reg_fft_mask_tone0_7_0     0xA260
+#define reg_fft_mask_tone0_7_0_pos 0
+#define reg_fft_mask_tone0_7_0_len 8
+#define reg_fft_mask_tone0_7_0_lsb 0
+#define xd_p_reg_fft_mask_tone0_12_8    0xA261
+#define reg_fft_mask_tone0_12_8_pos 0
+#define reg_fft_mask_tone0_12_8_len 5
+#define reg_fft_mask_tone0_12_8_lsb 8
+#define xd_p_reg_fft_mask_tone1_7_0     0xA262
+#define reg_fft_mask_tone1_7_0_pos 0
+#define reg_fft_mask_tone1_7_0_len 8
+#define reg_fft_mask_tone1_7_0_lsb 0
+#define xd_p_reg_fft_mask_tone1_12_8    0xA263
+#define reg_fft_mask_tone1_12_8_pos 0
+#define reg_fft_mask_tone1_12_8_len 5
+#define reg_fft_mask_tone1_12_8_lsb 8
+#define xd_p_reg_fft_mask_tone2_7_0     0xA264
+#define reg_fft_mask_tone2_7_0_pos 0
+#define reg_fft_mask_tone2_7_0_len 8
+#define reg_fft_mask_tone2_7_0_lsb 0
+#define xd_p_reg_fft_mask_tone2_12_8    0xA265
+#define reg_fft_mask_tone2_12_8_pos 0
+#define reg_fft_mask_tone2_12_8_len 5
+#define reg_fft_mask_tone2_12_8_lsb 8
+#define xd_p_reg_fft_mask_tone3_7_0     0xA266
+#define reg_fft_mask_tone3_7_0_pos 0
+#define reg_fft_mask_tone3_7_0_len 8
+#define reg_fft_mask_tone3_7_0_lsb 0
+#define xd_p_reg_fft_mask_tone3_12_8    0xA267
+#define reg_fft_mask_tone3_12_8_pos 0
+#define reg_fft_mask_tone3_12_8_len 5
+#define reg_fft_mask_tone3_12_8_lsb 8
+#define xd_p_reg_fft_mask_from0_7_0     0xA268
+#define reg_fft_mask_from0_7_0_pos 0
+#define reg_fft_mask_from0_7_0_len 8
+#define reg_fft_mask_from0_7_0_lsb 0
+#define xd_p_reg_fft_mask_from0_12_8    0xA269
+#define reg_fft_mask_from0_12_8_pos 0
+#define reg_fft_mask_from0_12_8_len 5
+#define reg_fft_mask_from0_12_8_lsb 8
+#define xd_p_reg_fft_mask_to0_7_0       0xA26A
+#define reg_fft_mask_to0_7_0_pos 0
+#define reg_fft_mask_to0_7_0_len 8
+#define reg_fft_mask_to0_7_0_lsb 0
+#define xd_p_reg_fft_mask_to0_12_8      0xA26B
+#define reg_fft_mask_to0_12_8_pos 0
+#define reg_fft_mask_to0_12_8_len 5
+#define reg_fft_mask_to0_12_8_lsb 8
+#define xd_p_reg_fft_mask_from1_7_0     0xA26C
+#define reg_fft_mask_from1_7_0_pos 0
+#define reg_fft_mask_from1_7_0_len 8
+#define reg_fft_mask_from1_7_0_lsb 0
+#define xd_p_reg_fft_mask_from1_12_8    0xA26D
+#define reg_fft_mask_from1_12_8_pos 0
+#define reg_fft_mask_from1_12_8_len 5
+#define reg_fft_mask_from1_12_8_lsb 8
+#define xd_p_reg_fft_mask_to1_7_0       0xA26E
+#define reg_fft_mask_to1_7_0_pos 0
+#define reg_fft_mask_to1_7_0_len 8
+#define reg_fft_mask_to1_7_0_lsb 0
+#define xd_p_reg_fft_mask_to1_12_8      0xA26F
+#define reg_fft_mask_to1_12_8_pos 0
+#define reg_fft_mask_to1_12_8_len 5
+#define reg_fft_mask_to1_12_8_lsb 8
+#define xd_p_reg_cge_idx0_7_0   0xA280
+#define reg_cge_idx0_7_0_pos 0
+#define reg_cge_idx0_7_0_len 8
+#define reg_cge_idx0_7_0_lsb 0
+#define xd_p_reg_cge_idx0_12_8  0xA281
+#define reg_cge_idx0_12_8_pos 0
+#define reg_cge_idx0_12_8_len 5
+#define reg_cge_idx0_12_8_lsb 8
+#define xd_p_reg_cge_idx1_7_0   0xA282
+#define reg_cge_idx1_7_0_pos 0
+#define reg_cge_idx1_7_0_len 8
+#define reg_cge_idx1_7_0_lsb 0
+#define xd_p_reg_cge_idx1_12_8  0xA283
+#define reg_cge_idx1_12_8_pos 0
+#define reg_cge_idx1_12_8_len 5
+#define reg_cge_idx1_12_8_lsb 8
+#define xd_p_reg_cge_idx2_7_0   0xA284
+#define reg_cge_idx2_7_0_pos 0
+#define reg_cge_idx2_7_0_len 8
+#define reg_cge_idx2_7_0_lsb 0
+#define xd_p_reg_cge_idx2_12_8  0xA285
+#define reg_cge_idx2_12_8_pos 0
+#define reg_cge_idx2_12_8_len 5
+#define reg_cge_idx2_12_8_lsb 8
+#define xd_p_reg_cge_idx3_7_0   0xA286
+#define reg_cge_idx3_7_0_pos 0
+#define reg_cge_idx3_7_0_len 8
+#define reg_cge_idx3_7_0_lsb 0
+#define xd_p_reg_cge_idx3_12_8  0xA287
+#define reg_cge_idx3_12_8_pos 0
+#define reg_cge_idx3_12_8_len 5
+#define reg_cge_idx3_12_8_lsb 8
+#define xd_p_reg_cge_idx4_7_0   0xA288
+#define reg_cge_idx4_7_0_pos 0
+#define reg_cge_idx4_7_0_len 8
+#define reg_cge_idx4_7_0_lsb 0
+#define xd_p_reg_cge_idx4_12_8  0xA289
+#define reg_cge_idx4_12_8_pos 0
+#define reg_cge_idx4_12_8_len 5
+#define reg_cge_idx4_12_8_lsb 8
+#define xd_p_reg_cge_idx5_7_0   0xA28A
+#define reg_cge_idx5_7_0_pos 0
+#define reg_cge_idx5_7_0_len 8
+#define reg_cge_idx5_7_0_lsb 0
+#define xd_p_reg_cge_idx5_12_8  0xA28B
+#define reg_cge_idx5_12_8_pos 0
+#define reg_cge_idx5_12_8_len 5
+#define reg_cge_idx5_12_8_lsb 8
+#define xd_p_reg_cge_idx6_7_0   0xA28C
+#define reg_cge_idx6_7_0_pos 0
+#define reg_cge_idx6_7_0_len 8
+#define reg_cge_idx6_7_0_lsb 0
+#define xd_p_reg_cge_idx6_12_8  0xA28D
+#define reg_cge_idx6_12_8_pos 0
+#define reg_cge_idx6_12_8_len 5
+#define reg_cge_idx6_12_8_lsb 8
+#define xd_p_reg_cge_idx7_7_0   0xA28E
+#define reg_cge_idx7_7_0_pos 0
+#define reg_cge_idx7_7_0_len 8
+#define reg_cge_idx7_7_0_lsb 0
+#define xd_p_reg_cge_idx7_12_8  0xA28F
+#define reg_cge_idx7_12_8_pos 0
+#define reg_cge_idx7_12_8_len 5
+#define reg_cge_idx7_12_8_lsb 8
+#define xd_p_reg_cge_idx8_7_0   0xA290
+#define reg_cge_idx8_7_0_pos 0
+#define reg_cge_idx8_7_0_len 8
+#define reg_cge_idx8_7_0_lsb 0
+#define xd_p_reg_cge_idx8_12_8  0xA291
+#define reg_cge_idx8_12_8_pos 0
+#define reg_cge_idx8_12_8_len 5
+#define reg_cge_idx8_12_8_lsb 8
+#define xd_p_reg_cge_idx9_7_0   0xA292
+#define reg_cge_idx9_7_0_pos 0
+#define reg_cge_idx9_7_0_len 8
+#define reg_cge_idx9_7_0_lsb 0
+#define xd_p_reg_cge_idx9_12_8  0xA293
+#define reg_cge_idx9_12_8_pos 0
+#define reg_cge_idx9_12_8_len 5
+#define reg_cge_idx9_12_8_lsb 8
+#define xd_p_reg_cge_idx10_7_0  0xA294
+#define reg_cge_idx10_7_0_pos 0
+#define reg_cge_idx10_7_0_len 8
+#define reg_cge_idx10_7_0_lsb 0
+#define xd_p_reg_cge_idx10_12_8 0xA295
+#define reg_cge_idx10_12_8_pos 0
+#define reg_cge_idx10_12_8_len 5
+#define reg_cge_idx10_12_8_lsb 8
+#define xd_p_reg_cge_idx11_7_0  0xA296
+#define reg_cge_idx11_7_0_pos 0
+#define reg_cge_idx11_7_0_len 8
+#define reg_cge_idx11_7_0_lsb 0
+#define xd_p_reg_cge_idx11_12_8 0xA297
+#define reg_cge_idx11_12_8_pos 0
+#define reg_cge_idx11_12_8_len 5
+#define reg_cge_idx11_12_8_lsb 8
+#define xd_p_reg_cge_idx12_7_0  0xA298
+#define reg_cge_idx12_7_0_pos 0
+#define reg_cge_idx12_7_0_len 8
+#define reg_cge_idx12_7_0_lsb 0
+#define xd_p_reg_cge_idx12_12_8 0xA299
+#define reg_cge_idx12_12_8_pos 0
+#define reg_cge_idx12_12_8_len 5
+#define reg_cge_idx12_12_8_lsb 8
+#define xd_p_reg_cge_idx13_7_0  0xA29A
+#define reg_cge_idx13_7_0_pos 0
+#define reg_cge_idx13_7_0_len 8
+#define reg_cge_idx13_7_0_lsb 0
+#define xd_p_reg_cge_idx13_12_8 0xA29B
+#define reg_cge_idx13_12_8_pos 0
+#define reg_cge_idx13_12_8_len 5
+#define reg_cge_idx13_12_8_lsb 8
+#define xd_p_reg_cge_idx14_7_0  0xA29C
+#define reg_cge_idx14_7_0_pos 0
+#define reg_cge_idx14_7_0_len 8
+#define reg_cge_idx14_7_0_lsb 0
+#define xd_p_reg_cge_idx14_12_8 0xA29D
+#define reg_cge_idx14_12_8_pos 0
+#define reg_cge_idx14_12_8_len 5
+#define reg_cge_idx14_12_8_lsb 8
+#define xd_p_reg_cge_idx15_7_0  0xA29E
+#define reg_cge_idx15_7_0_pos 0
+#define reg_cge_idx15_7_0_len 8
+#define reg_cge_idx15_7_0_lsb 0
+#define xd_p_reg_cge_idx15_12_8 0xA29F
+#define reg_cge_idx15_12_8_pos 0
+#define reg_cge_idx15_12_8_len 5
+#define reg_cge_idx15_12_8_lsb 8
+#define xd_r_reg_fft_crc        0xA2A8
+#define reg_fft_crc_pos 0
+#define reg_fft_crc_len 8
+#define reg_fft_crc_lsb 0
+#define xd_p_fd_fft_shift_max   0xA2A9
+#define fd_fft_shift_max_pos 0
+#define fd_fft_shift_max_len 4
+#define fd_fft_shift_max_lsb 0
+#define xd_r_fd_fft_shift       0xA2A9
+#define fd_fft_shift_pos 4
+#define fd_fft_shift_len 4
+#define fd_fft_shift_lsb 0
+#define xd_r_fd_fft_frame_num   0xA2AA
+#define fd_fft_frame_num_pos 0
+#define fd_fft_frame_num_len 2
+#define fd_fft_frame_num_lsb 0
+#define xd_r_fd_fft_symbol_count        0xA2AB
+#define fd_fft_symbol_count_pos 0
+#define fd_fft_symbol_count_len 7
+#define fd_fft_symbol_count_lsb 0
+#define xd_r_reg_fft_idx_max_7_0        0xA2AC
+#define reg_fft_idx_max_7_0_pos 0
+#define reg_fft_idx_max_7_0_len 8
+#define reg_fft_idx_max_7_0_lsb 0
+#define xd_r_reg_fft_idx_max_12_8       0xA2AD
+#define reg_fft_idx_max_12_8_pos 0
+#define reg_fft_idx_max_12_8_len 5
+#define reg_fft_idx_max_12_8_lsb 8
+#define xd_p_reg_cge_program    0xA2AE
+#define reg_cge_program_pos 0
+#define reg_cge_program_len 1
+#define reg_cge_program_lsb 0
+#define xd_p_reg_cge_fixed      0xA2AE
+#define reg_cge_fixed_pos 1
+#define reg_cge_fixed_len 1
+#define reg_cge_fixed_lsb 0
+#define xd_p_reg_fft_rotate_en  0xA2AE
+#define reg_fft_rotate_en_pos 2
+#define reg_fft_rotate_en_len 1
+#define reg_fft_rotate_en_lsb 0
+#define xd_p_reg_fft_rotate_base_4_0    0xA2AE
+#define reg_fft_rotate_base_4_0_pos 3
+#define reg_fft_rotate_base_4_0_len 5
+#define reg_fft_rotate_base_4_0_lsb 0
+#define xd_p_reg_fft_rotate_base_12_5   0xA2AF
+#define reg_fft_rotate_base_12_5_pos 0
+#define reg_fft_rotate_base_12_5_len 8
+#define reg_fft_rotate_base_12_5_lsb 5
+#define xd_p_reg_gp_trigger_fd  0xA2B8
+#define reg_gp_trigger_fd_pos 0
+#define reg_gp_trigger_fd_len 1
+#define reg_gp_trigger_fd_lsb 0
+#define xd_p_reg_trigger_sel_fd 0xA2B8
+#define reg_trigger_sel_fd_pos 1
+#define reg_trigger_sel_fd_len 2
+#define reg_trigger_sel_fd_lsb 0
+#define xd_p_reg_trigger_module_sel_fd  0xA2B9
+#define reg_trigger_module_sel_fd_pos 0
+#define reg_trigger_module_sel_fd_len 6
+#define reg_trigger_module_sel_fd_lsb 0
+#define xd_p_reg_trigger_set_sel_fd     0xA2BA
+#define reg_trigger_set_sel_fd_pos 0
+#define reg_trigger_set_sel_fd_len 6
+#define reg_trigger_set_sel_fd_lsb 0
+#define xd_p_reg_fd_noname_7_0  0xA2BC
+#define reg_fd_noname_7_0_pos 0
+#define reg_fd_noname_7_0_len 8
+#define reg_fd_noname_7_0_lsb 0
+#define xd_p_reg_fd_noname_15_8 0xA2BD
+#define reg_fd_noname_15_8_pos 0
+#define reg_fd_noname_15_8_len 8
+#define reg_fd_noname_15_8_lsb 8
+#define xd_p_reg_fd_noname_23_16        0xA2BE
+#define reg_fd_noname_23_16_pos 0
+#define reg_fd_noname_23_16_len 8
+#define reg_fd_noname_23_16_lsb 16
+#define xd_p_reg_fd_noname_31_24        0xA2BF
+#define reg_fd_noname_31_24_pos 0
+#define reg_fd_noname_31_24_len 8
+#define reg_fd_noname_31_24_lsb 24
+#define xd_r_fd_fpcc_cp_corr_signn      0xA2C0
+#define fd_fpcc_cp_corr_signn_pos 0
+#define fd_fpcc_cp_corr_signn_len 8
+#define fd_fpcc_cp_corr_signn_lsb 0
+#define xd_p_reg_feq_s1 0xA2C1
+#define reg_feq_s1_pos 0
+#define reg_feq_s1_len 5
+#define reg_feq_s1_lsb 0
+#define xd_p_fd_fpcc_cp_corr_tone_th    0xA2C2
+#define fd_fpcc_cp_corr_tone_th_pos 0
+#define fd_fpcc_cp_corr_tone_th_len 6
+#define fd_fpcc_cp_corr_tone_th_lsb 0
+#define xd_p_fd_fpcc_cp_corr_symbol_log_th      0xA2C3
+#define fd_fpcc_cp_corr_symbol_log_th_pos 0
+#define fd_fpcc_cp_corr_symbol_log_th_len 4
+#define fd_fpcc_cp_corr_symbol_log_th_lsb 0
+#define xd_p_fd_fpcc_cp_corr_int        0xA2C4
+#define fd_fpcc_cp_corr_int_pos 0
+#define fd_fpcc_cp_corr_int_len 1
+#define fd_fpcc_cp_corr_int_lsb 0
+#define xd_p_reg_sfoe_ns_7_0    0xA320
+#define reg_sfoe_ns_7_0_pos 0
+#define reg_sfoe_ns_7_0_len 8
+#define reg_sfoe_ns_7_0_lsb 0
+#define xd_p_reg_sfoe_ns_14_8   0xA321
+#define reg_sfoe_ns_14_8_pos 0
+#define reg_sfoe_ns_14_8_len 7
+#define reg_sfoe_ns_14_8_lsb 8
+#define xd_p_reg_sfoe_c1_7_0    0xA322
+#define reg_sfoe_c1_7_0_pos 0
+#define reg_sfoe_c1_7_0_len 8
+#define reg_sfoe_c1_7_0_lsb 0
+#define xd_p_reg_sfoe_c1_15_8   0xA323
+#define reg_sfoe_c1_15_8_pos 0
+#define reg_sfoe_c1_15_8_len 8
+#define reg_sfoe_c1_15_8_lsb 8
+#define xd_p_reg_sfoe_c1_17_16  0xA324
+#define reg_sfoe_c1_17_16_pos 0
+#define reg_sfoe_c1_17_16_len 2
+#define reg_sfoe_c1_17_16_lsb 16
+#define xd_p_reg_sfoe_c2_7_0    0xA325
+#define reg_sfoe_c2_7_0_pos 0
+#define reg_sfoe_c2_7_0_len 8
+#define reg_sfoe_c2_7_0_lsb 0
+#define xd_p_reg_sfoe_c2_15_8   0xA326
+#define reg_sfoe_c2_15_8_pos 0
+#define reg_sfoe_c2_15_8_len 8
+#define reg_sfoe_c2_15_8_lsb 8
+#define xd_p_reg_sfoe_c2_17_16  0xA327
+#define reg_sfoe_c2_17_16_pos 0
+#define reg_sfoe_c2_17_16_len 2
+#define reg_sfoe_c2_17_16_lsb 16
+#define xd_r_reg_sfoe_out_9_2   0xA328
+#define reg_sfoe_out_9_2_pos 0
+#define reg_sfoe_out_9_2_len 8
+#define reg_sfoe_out_9_2_lsb 0
+#define xd_r_reg_sfoe_out_1_0   0xA329
+#define reg_sfoe_out_1_0_pos 0
+#define reg_sfoe_out_1_0_len 2
+#define reg_sfoe_out_1_0_lsb 0
+#define xd_p_reg_sfoe_lm_counter_th     0xA32A
+#define reg_sfoe_lm_counter_th_pos 0
+#define reg_sfoe_lm_counter_th_len 4
+#define reg_sfoe_lm_counter_th_lsb 0
+#define xd_p_reg_sfoe_convg_th  0xA32B
+#define reg_sfoe_convg_th_pos 0
+#define reg_sfoe_convg_th_len 8
+#define reg_sfoe_convg_th_lsb 0
+#define xd_p_reg_sfoe_divg_th   0xA32C
+#define reg_sfoe_divg_th_pos 0
+#define reg_sfoe_divg_th_len 8
+#define reg_sfoe_divg_th_lsb 0
+#define xd_p_fd_tpsd_en 0xA330
+#define fd_tpsd_en_pos 0
+#define fd_tpsd_en_len 1
+#define fd_tpsd_en_lsb 0
+#define xd_p_fd_tpsd_dis        0xA330
+#define fd_tpsd_dis_pos 1
+#define fd_tpsd_dis_len 1
+#define fd_tpsd_dis_lsb 0
+#define xd_p_fd_tpsd_rst        0xA330
+#define fd_tpsd_rst_pos 2
+#define fd_tpsd_rst_len 1
+#define fd_tpsd_rst_lsb 0
+#define xd_p_fd_tpsd_lock       0xA330
+#define fd_tpsd_lock_pos 3
+#define fd_tpsd_lock_len 1
+#define fd_tpsd_lock_lsb 0
+#define xd_r_fd_tpsd_s19        0xA330
+#define fd_tpsd_s19_pos 4
+#define fd_tpsd_s19_len 1
+#define fd_tpsd_s19_lsb 0
+#define xd_r_fd_tpsd_s17        0xA330
+#define fd_tpsd_s17_pos 5
+#define fd_tpsd_s17_len 1
+#define fd_tpsd_s17_lsb 0
+#define xd_p_fd_sfr_ste_en      0xA331
+#define fd_sfr_ste_en_pos 0
+#define fd_sfr_ste_en_len 1
+#define fd_sfr_ste_en_lsb 0
+#define xd_p_fd_sfr_ste_dis     0xA331
+#define fd_sfr_ste_dis_pos 1
+#define fd_sfr_ste_dis_len 1
+#define fd_sfr_ste_dis_lsb 0
+#define xd_p_fd_sfr_ste_rst     0xA331
+#define fd_sfr_ste_rst_pos 2
+#define fd_sfr_ste_rst_len 1
+#define fd_sfr_ste_rst_lsb 0
+#define xd_p_fd_sfr_ste_mode    0xA331
+#define fd_sfr_ste_mode_pos 3
+#define fd_sfr_ste_mode_len 1
+#define fd_sfr_ste_mode_lsb 0
+#define xd_p_fd_sfr_ste_done    0xA331
+#define fd_sfr_ste_done_pos 4
+#define fd_sfr_ste_done_len 1
+#define fd_sfr_ste_done_lsb 0
+#define xd_p_reg_cfoe_ffoe_en   0xA332
+#define reg_cfoe_ffoe_en_pos 0
+#define reg_cfoe_ffoe_en_len 1
+#define reg_cfoe_ffoe_en_lsb 0
+#define xd_p_reg_cfoe_ffoe_dis  0xA332
+#define reg_cfoe_ffoe_dis_pos 1
+#define reg_cfoe_ffoe_dis_len 1
+#define reg_cfoe_ffoe_dis_lsb 0
+#define xd_p_reg_cfoe_ffoe_rst  0xA332
+#define reg_cfoe_ffoe_rst_pos 2
+#define reg_cfoe_ffoe_rst_len 1
+#define reg_cfoe_ffoe_rst_lsb 0
+#define xd_p_reg_cfoe_ifoe_en   0xA332
+#define reg_cfoe_ifoe_en_pos 3
+#define reg_cfoe_ifoe_en_len 1
+#define reg_cfoe_ifoe_en_lsb 0
+#define xd_p_reg_cfoe_ifoe_dis  0xA332
+#define reg_cfoe_ifoe_dis_pos 4
+#define reg_cfoe_ifoe_dis_len 1
+#define reg_cfoe_ifoe_dis_lsb 0
+#define xd_p_reg_cfoe_ifoe_rst  0xA332
+#define reg_cfoe_ifoe_rst_pos 5
+#define reg_cfoe_ifoe_rst_len 1
+#define reg_cfoe_ifoe_rst_lsb 0
+#define xd_p_reg_cfoe_fot_en    0xA332
+#define reg_cfoe_fot_en_pos 6
+#define reg_cfoe_fot_en_len 1
+#define reg_cfoe_fot_en_lsb 0
+#define xd_p_reg_cfoe_fot_lm_en 0xA332
+#define reg_cfoe_fot_lm_en_pos 7
+#define reg_cfoe_fot_lm_en_len 1
+#define reg_cfoe_fot_lm_en_lsb 0
+#define xd_p_reg_cfoe_fot_rst   0xA333
+#define reg_cfoe_fot_rst_pos 0
+#define reg_cfoe_fot_rst_len 1
+#define reg_cfoe_fot_rst_lsb 0
+#define xd_r_fd_cfoe_ffoe_done  0xA333
+#define fd_cfoe_ffoe_done_pos 1
+#define fd_cfoe_ffoe_done_len 1
+#define fd_cfoe_ffoe_done_lsb 0
+#define xd_p_fd_cfoe_metric_vld 0xA333
+#define fd_cfoe_metric_vld_pos 2
+#define fd_cfoe_metric_vld_len 1
+#define fd_cfoe_metric_vld_lsb 0
+#define xd_p_reg_cfoe_ifod_vld  0xA333
+#define reg_cfoe_ifod_vld_pos 3
+#define reg_cfoe_ifod_vld_len 1
+#define reg_cfoe_ifod_vld_lsb 0
+#define xd_r_fd_cfoe_ifoe_done  0xA333
+#define fd_cfoe_ifoe_done_pos 4
+#define fd_cfoe_ifoe_done_len 1
+#define fd_cfoe_ifoe_done_lsb 0
+#define xd_r_fd_cfoe_fot_valid  0xA333
+#define fd_cfoe_fot_valid_pos 5
+#define fd_cfoe_fot_valid_len 1
+#define fd_cfoe_fot_valid_lsb 0
+#define xd_p_reg_cfoe_divg_int  0xA333
+#define reg_cfoe_divg_int_pos 6
+#define reg_cfoe_divg_int_len 1
+#define reg_cfoe_divg_int_lsb 0
+#define xd_r_reg_cfoe_divg_flag 0xA333
+#define reg_cfoe_divg_flag_pos 7
+#define reg_cfoe_divg_flag_len 1
+#define reg_cfoe_divg_flag_lsb 0
+#define xd_p_reg_sfoe_en        0xA334
+#define reg_sfoe_en_pos 0
+#define reg_sfoe_en_len 1
+#define reg_sfoe_en_lsb 0
+#define xd_p_reg_sfoe_dis       0xA334
+#define reg_sfoe_dis_pos 1
+#define reg_sfoe_dis_len 1
+#define reg_sfoe_dis_lsb 0
+#define xd_p_reg_sfoe_rst       0xA334
+#define reg_sfoe_rst_pos 2
+#define reg_sfoe_rst_len 1
+#define reg_sfoe_rst_lsb 0
+#define xd_p_reg_sfoe_vld_int   0xA334
+#define reg_sfoe_vld_int_pos 3
+#define reg_sfoe_vld_int_len 1
+#define reg_sfoe_vld_int_lsb 0
+#define xd_p_reg_sfoe_lm_en     0xA334
+#define reg_sfoe_lm_en_pos 4
+#define reg_sfoe_lm_en_len 1
+#define reg_sfoe_lm_en_lsb 0
+#define xd_p_reg_sfoe_divg_int  0xA334
+#define reg_sfoe_divg_int_pos 5
+#define reg_sfoe_divg_int_len 1
+#define reg_sfoe_divg_int_lsb 0
+#define xd_r_reg_sfoe_divg_flag 0xA334
+#define reg_sfoe_divg_flag_pos 6
+#define reg_sfoe_divg_flag_len 1
+#define reg_sfoe_divg_flag_lsb 0
+#define xd_p_reg_fft_rst        0xA335
+#define reg_fft_rst_pos 0
+#define reg_fft_rst_len 1
+#define reg_fft_rst_lsb 0
+#define xd_p_reg_fft_fast_beacon        0xA335
+#define reg_fft_fast_beacon_pos 1
+#define reg_fft_fast_beacon_len 1
+#define reg_fft_fast_beacon_lsb 0
+#define xd_p_reg_fft_fast_valid 0xA335
+#define reg_fft_fast_valid_pos 2
+#define reg_fft_fast_valid_len 1
+#define reg_fft_fast_valid_lsb 0
+#define xd_p_reg_fft_mask_en    0xA335
+#define reg_fft_mask_en_pos 3
+#define reg_fft_mask_en_len 1
+#define reg_fft_mask_en_lsb 0
+#define xd_p_reg_fft_crc_en     0xA335
+#define reg_fft_crc_en_pos 4
+#define reg_fft_crc_en_len 1
+#define reg_fft_crc_en_lsb 0
+#define xd_p_reg_finr_en        0xA336
+#define reg_finr_en_pos 0
+#define reg_finr_en_len 1
+#define reg_finr_en_lsb 0
+#define xd_p_fd_fste_en 0xA337
+#define fd_fste_en_pos 1
+#define fd_fste_en_len 1
+#define fd_fste_en_lsb 0
+#define xd_p_fd_sqi_tps_level_shift     0xA338
+#define fd_sqi_tps_level_shift_pos 0
+#define fd_sqi_tps_level_shift_len 8
+#define fd_sqi_tps_level_shift_lsb 0
+#define xd_p_fd_pilot_ma_len    0xA339
+#define fd_pilot_ma_len_pos 0
+#define fd_pilot_ma_len_len 6
+#define fd_pilot_ma_len_lsb 0
+#define xd_p_fd_tps_ma_len      0xA33A
+#define fd_tps_ma_len_pos 0
+#define fd_tps_ma_len_len 6
+#define fd_tps_ma_len_lsb 0
+#define xd_p_fd_sqi_s3  0xA33B
+#define fd_sqi_s3_pos 0
+#define fd_sqi_s3_len 8
+#define fd_sqi_s3_lsb 0
+#define xd_p_fd_sqi_dummy_reg_0 0xA33C
+#define fd_sqi_dummy_reg_0_pos 0
+#define fd_sqi_dummy_reg_0_len 1
+#define fd_sqi_dummy_reg_0_lsb 0
+#define xd_p_fd_sqi_debug_sel   0xA33C
+#define fd_sqi_debug_sel_pos 1
+#define fd_sqi_debug_sel_len 2
+#define fd_sqi_debug_sel_lsb 0
+#define xd_p_fd_sqi_s2  0xA33C
+#define fd_sqi_s2_pos 3
+#define fd_sqi_s2_len 5
+#define fd_sqi_s2_lsb 0
+#define xd_p_fd_sqi_dummy_reg_1 0xA33D
+#define fd_sqi_dummy_reg_1_pos 0
+#define fd_sqi_dummy_reg_1_len 1
+#define fd_sqi_dummy_reg_1_lsb 0
+#define xd_p_fd_inr_ignore      0xA33D
+#define fd_inr_ignore_pos 1
+#define fd_inr_ignore_len 1
+#define fd_inr_ignore_lsb 0
+#define xd_p_fd_pilot_ignore    0xA33D
+#define fd_pilot_ignore_pos 2
+#define fd_pilot_ignore_len 1
+#define fd_pilot_ignore_lsb 0
+#define xd_p_fd_etps_ignore     0xA33D
+#define fd_etps_ignore_pos 3
+#define fd_etps_ignore_len 1
+#define fd_etps_ignore_lsb 0
+#define xd_p_fd_sqi_s1  0xA33D
+#define fd_sqi_s1_pos 4
+#define fd_sqi_s1_len 4
+#define fd_sqi_s1_lsb 0
+#define xd_p_reg_fste_ehw_7_0   0xA33E
+#define reg_fste_ehw_7_0_pos 0
+#define reg_fste_ehw_7_0_len 8
+#define reg_fste_ehw_7_0_lsb 0
+#define xd_p_reg_fste_ehw_9_8   0xA33F
+#define reg_fste_ehw_9_8_pos 0
+#define reg_fste_ehw_9_8_len 2
+#define reg_fste_ehw_9_8_lsb 8
+#define xd_p_reg_fste_i_adj_vld 0xA33F
+#define reg_fste_i_adj_vld_pos 2
+#define reg_fste_i_adj_vld_len 1
+#define reg_fste_i_adj_vld_lsb 0
+#define xd_p_reg_fste_phase_ini_7_0     0xA340
+#define reg_fste_phase_ini_7_0_pos 0
+#define reg_fste_phase_ini_7_0_len 8
+#define reg_fste_phase_ini_7_0_lsb 0
+#define xd_p_reg_fste_phase_ini_11_8    0xA341
+#define reg_fste_phase_ini_11_8_pos 0
+#define reg_fste_phase_ini_11_8_len 4
+#define reg_fste_phase_ini_11_8_lsb 8
+#define xd_p_reg_fste_phase_inc_3_0     0xA341
+#define reg_fste_phase_inc_3_0_pos 4
+#define reg_fste_phase_inc_3_0_len 4
+#define reg_fste_phase_inc_3_0_lsb 0
+#define xd_p_reg_fste_phase_inc_11_4    0xA342
+#define reg_fste_phase_inc_11_4_pos 0
+#define reg_fste_phase_inc_11_4_len 8
+#define reg_fste_phase_inc_11_4_lsb 4
+#define xd_p_reg_fste_acum_cost_cnt_max 0xA343
+#define reg_fste_acum_cost_cnt_max_pos 0
+#define reg_fste_acum_cost_cnt_max_len 4
+#define reg_fste_acum_cost_cnt_max_lsb 0
+#define xd_p_reg_fste_step_size_std     0xA343
+#define reg_fste_step_size_std_pos 4
+#define reg_fste_step_size_std_len 4
+#define reg_fste_step_size_std_lsb 0
+#define xd_p_reg_fste_step_size_max     0xA344
+#define reg_fste_step_size_max_pos 0
+#define reg_fste_step_size_max_len 4
+#define reg_fste_step_size_max_lsb 0
+#define xd_p_reg_fste_step_size_min     0xA344
+#define reg_fste_step_size_min_pos 4
+#define reg_fste_step_size_min_len 4
+#define reg_fste_step_size_min_lsb 0
+#define xd_p_reg_fste_frac_step_size_7_0        0xA345
+#define reg_fste_frac_step_size_7_0_pos 0
+#define reg_fste_frac_step_size_7_0_len 8
+#define reg_fste_frac_step_size_7_0_lsb 0
+#define xd_p_reg_fste_frac_step_size_15_8       0xA346
+#define reg_fste_frac_step_size_15_8_pos 0
+#define reg_fste_frac_step_size_15_8_len 8
+#define reg_fste_frac_step_size_15_8_lsb 8
+#define xd_p_reg_fste_frac_step_size_19_16      0xA347
+#define reg_fste_frac_step_size_19_16_pos 0
+#define reg_fste_frac_step_size_19_16_len 4
+#define reg_fste_frac_step_size_19_16_lsb 16
+#define xd_p_reg_fste_rpd_dir_cnt_max   0xA347
+#define reg_fste_rpd_dir_cnt_max_pos 4
+#define reg_fste_rpd_dir_cnt_max_len 4
+#define reg_fste_rpd_dir_cnt_max_lsb 0
+#define xd_p_reg_fste_ehs       0xA348
+#define reg_fste_ehs_pos 0
+#define reg_fste_ehs_len 4
+#define reg_fste_ehs_lsb 0
+#define xd_p_reg_fste_frac_cost_cnt_max_3_0     0xA348
+#define reg_fste_frac_cost_cnt_max_3_0_pos 4
+#define reg_fste_frac_cost_cnt_max_3_0_len 4
+#define reg_fste_frac_cost_cnt_max_3_0_lsb 0
+#define xd_p_reg_fste_frac_cost_cnt_max_9_4     0xA349
+#define reg_fste_frac_cost_cnt_max_9_4_pos 0
+#define reg_fste_frac_cost_cnt_max_9_4_len 6
+#define reg_fste_frac_cost_cnt_max_9_4_lsb 4
+#define xd_p_reg_fste_w0_7_0    0xA34A
+#define reg_fste_w0_7_0_pos 0
+#define reg_fste_w0_7_0_len 8
+#define reg_fste_w0_7_0_lsb 0
+#define xd_p_reg_fste_w0_11_8   0xA34B
+#define reg_fste_w0_11_8_pos 0
+#define reg_fste_w0_11_8_len 4
+#define reg_fste_w0_11_8_lsb 8
+#define xd_p_reg_fste_w1_3_0    0xA34B
+#define reg_fste_w1_3_0_pos 4
+#define reg_fste_w1_3_0_len 4
+#define reg_fste_w1_3_0_lsb 0
+#define xd_p_reg_fste_w1_11_4   0xA34C
+#define reg_fste_w1_11_4_pos 0
+#define reg_fste_w1_11_4_len 8
+#define reg_fste_w1_11_4_lsb 4
+#define xd_p_reg_fste_w2_7_0    0xA34D
+#define reg_fste_w2_7_0_pos 0
+#define reg_fste_w2_7_0_len 8
+#define reg_fste_w2_7_0_lsb 0
+#define xd_p_reg_fste_w2_11_8   0xA34E
+#define reg_fste_w2_11_8_pos 0
+#define reg_fste_w2_11_8_len 4
+#define reg_fste_w2_11_8_lsb 8
+#define xd_p_reg_fste_w3_3_0    0xA34E
+#define reg_fste_w3_3_0_pos 4
+#define reg_fste_w3_3_0_len 4
+#define reg_fste_w3_3_0_lsb 0
+#define xd_p_reg_fste_w3_11_4   0xA34F
+#define reg_fste_w3_11_4_pos 0
+#define reg_fste_w3_11_4_len 8
+#define reg_fste_w3_11_4_lsb 4
+#define xd_p_reg_fste_w4_7_0    0xA350
+#define reg_fste_w4_7_0_pos 0
+#define reg_fste_w4_7_0_len 8
+#define reg_fste_w4_7_0_lsb 0
+#define xd_p_reg_fste_w4_11_8   0xA351
+#define reg_fste_w4_11_8_pos 0
+#define reg_fste_w4_11_8_len 4
+#define reg_fste_w4_11_8_lsb 8
+#define xd_p_reg_fste_w5_3_0    0xA351
+#define reg_fste_w5_3_0_pos 4
+#define reg_fste_w5_3_0_len 4
+#define reg_fste_w5_3_0_lsb 0
+#define xd_p_reg_fste_w5_11_4   0xA352
+#define reg_fste_w5_11_4_pos 0
+#define reg_fste_w5_11_4_len 8
+#define reg_fste_w5_11_4_lsb 4
+#define xd_p_reg_fste_w6_7_0    0xA353
+#define reg_fste_w6_7_0_pos 0
+#define reg_fste_w6_7_0_len 8
+#define reg_fste_w6_7_0_lsb 0
+#define xd_p_reg_fste_w6_11_8   0xA354
+#define reg_fste_w6_11_8_pos 0
+#define reg_fste_w6_11_8_len 4
+#define reg_fste_w6_11_8_lsb 8
+#define xd_p_reg_fste_w7_3_0    0xA354
+#define reg_fste_w7_3_0_pos 4
+#define reg_fste_w7_3_0_len 4
+#define reg_fste_w7_3_0_lsb 0
+#define xd_p_reg_fste_w7_11_4   0xA355
+#define reg_fste_w7_11_4_pos 0
+#define reg_fste_w7_11_4_len 8
+#define reg_fste_w7_11_4_lsb 4
+#define xd_p_reg_fste_w8_7_0    0xA356
+#define reg_fste_w8_7_0_pos 0
+#define reg_fste_w8_7_0_len 8
+#define reg_fste_w8_7_0_lsb 0
+#define xd_p_reg_fste_w8_11_8   0xA357
+#define reg_fste_w8_11_8_pos 0
+#define reg_fste_w8_11_8_len 4
+#define reg_fste_w8_11_8_lsb 8
+#define xd_p_reg_fste_w9_3_0    0xA357
+#define reg_fste_w9_3_0_pos 4
+#define reg_fste_w9_3_0_len 4
+#define reg_fste_w9_3_0_lsb 0
+#define xd_p_reg_fste_w9_11_4   0xA358
+#define reg_fste_w9_11_4_pos 0
+#define reg_fste_w9_11_4_len 8
+#define reg_fste_w9_11_4_lsb 4
+#define xd_p_reg_fste_wa_7_0    0xA359
+#define reg_fste_wa_7_0_pos 0
+#define reg_fste_wa_7_0_len 8
+#define reg_fste_wa_7_0_lsb 0
+#define xd_p_reg_fste_wa_11_8   0xA35A
+#define reg_fste_wa_11_8_pos 0
+#define reg_fste_wa_11_8_len 4
+#define reg_fste_wa_11_8_lsb 8
+#define xd_p_reg_fste_wb_3_0    0xA35A
+#define reg_fste_wb_3_0_pos 4
+#define reg_fste_wb_3_0_len 4
+#define reg_fste_wb_3_0_lsb 0
+#define xd_p_reg_fste_wb_11_4   0xA35B
+#define reg_fste_wb_11_4_pos 0
+#define reg_fste_wb_11_4_len 8
+#define reg_fste_wb_11_4_lsb 4
+#define xd_r_fd_fste_i_adj      0xA35C
+#define fd_fste_i_adj_pos 0
+#define fd_fste_i_adj_len 5
+#define fd_fste_i_adj_lsb 0
+#define xd_r_fd_fste_f_adj_7_0  0xA35D
+#define fd_fste_f_adj_7_0_pos 0
+#define fd_fste_f_adj_7_0_len 8
+#define fd_fste_f_adj_7_0_lsb 0
+#define xd_r_fd_fste_f_adj_15_8 0xA35E
+#define fd_fste_f_adj_15_8_pos 0
+#define fd_fste_f_adj_15_8_len 8
+#define fd_fste_f_adj_15_8_lsb 8
+#define xd_r_fd_fste_f_adj_19_16        0xA35F
+#define fd_fste_f_adj_19_16_pos 0
+#define fd_fste_f_adj_19_16_len 4
+#define fd_fste_f_adj_19_16_lsb 16
+#define xd_p_reg_feq_Leak_Bypass        0xA366
+#define reg_feq_Leak_Bypass_pos 0
+#define reg_feq_Leak_Bypass_len 1
+#define reg_feq_Leak_Bypass_lsb 0
+#define xd_p_reg_feq_Leak_Mneg1 0xA366
+#define reg_feq_Leak_Mneg1_pos 1
+#define reg_feq_Leak_Mneg1_len 3
+#define reg_feq_Leak_Mneg1_lsb 0
+#define xd_p_reg_feq_Leak_B_ShiftQ      0xA366
+#define reg_feq_Leak_B_ShiftQ_pos 4
+#define reg_feq_Leak_B_ShiftQ_len 4
+#define reg_feq_Leak_B_ShiftQ_lsb 0
+#define xd_p_reg_feq_Leak_B_Float0      0xA367
+#define reg_feq_Leak_B_Float0_pos 0
+#define reg_feq_Leak_B_Float0_len 8
+#define reg_feq_Leak_B_Float0_lsb 0
+#define xd_p_reg_feq_Leak_B_Float1      0xA368
+#define reg_feq_Leak_B_Float1_pos 0
+#define reg_feq_Leak_B_Float1_len 8
+#define reg_feq_Leak_B_Float1_lsb 0
+#define xd_p_reg_feq_Leak_B_Float2      0xA369
+#define reg_feq_Leak_B_Float2_pos 0
+#define reg_feq_Leak_B_Float2_len 8
+#define reg_feq_Leak_B_Float2_lsb 0
+#define xd_p_reg_feq_Leak_B_Float3      0xA36A
+#define reg_feq_Leak_B_Float3_pos 0
+#define reg_feq_Leak_B_Float3_len 8
+#define reg_feq_Leak_B_Float3_lsb 0
+#define xd_p_reg_feq_Leak_B_Float4      0xA36B
+#define reg_feq_Leak_B_Float4_pos 0
+#define reg_feq_Leak_B_Float4_len 8
+#define reg_feq_Leak_B_Float4_lsb 0
+#define xd_p_reg_feq_Leak_B_Float5      0xA36C
+#define reg_feq_Leak_B_Float5_pos 0
+#define reg_feq_Leak_B_Float5_len 8
+#define reg_feq_Leak_B_Float5_lsb 0
+#define xd_p_reg_feq_Leak_B_Float6      0xA36D
+#define reg_feq_Leak_B_Float6_pos 0
+#define reg_feq_Leak_B_Float6_len 8
+#define reg_feq_Leak_B_Float6_lsb 0
+#define xd_p_reg_feq_Leak_B_Float7      0xA36E
+#define reg_feq_Leak_B_Float7_pos 0
+#define reg_feq_Leak_B_Float7_len 8
+#define reg_feq_Leak_B_Float7_lsb 0
+#define xd_r_reg_feq_data_h2_7_0        0xA36F
+#define reg_feq_data_h2_7_0_pos 0
+#define reg_feq_data_h2_7_0_len 8
+#define reg_feq_data_h2_7_0_lsb 0
+#define xd_r_reg_feq_data_h2_9_8        0xA370
+#define reg_feq_data_h2_9_8_pos 0
+#define reg_feq_data_h2_9_8_len 2
+#define reg_feq_data_h2_9_8_lsb 8
+#define xd_p_reg_feq_leak_use_slice_tps 0xA371
+#define reg_feq_leak_use_slice_tps_pos 0
+#define reg_feq_leak_use_slice_tps_len 1
+#define reg_feq_leak_use_slice_tps_lsb 0
+#define xd_p_reg_feq_read_update        0xA371
+#define reg_feq_read_update_pos 1
+#define reg_feq_read_update_len 1
+#define reg_feq_read_update_lsb 0
+#define xd_p_reg_feq_data_vld   0xA371
+#define reg_feq_data_vld_pos 2
+#define reg_feq_data_vld_len 1
+#define reg_feq_data_vld_lsb 0
+#define xd_p_reg_feq_tone_idx_4_0       0xA371
+#define reg_feq_tone_idx_4_0_pos 3
+#define reg_feq_tone_idx_4_0_len 5
+#define reg_feq_tone_idx_4_0_lsb 0
+#define xd_p_reg_feq_tone_idx_12_5      0xA372
+#define reg_feq_tone_idx_12_5_pos 0
+#define reg_feq_tone_idx_12_5_len 8
+#define reg_feq_tone_idx_12_5_lsb 5
+#define xd_r_reg_feq_data_re_7_0        0xA373
+#define reg_feq_data_re_7_0_pos 0
+#define reg_feq_data_re_7_0_len 8
+#define reg_feq_data_re_7_0_lsb 0
+#define xd_r_reg_feq_data_re_10_8       0xA374
+#define reg_feq_data_re_10_8_pos 0
+#define reg_feq_data_re_10_8_len 3
+#define reg_feq_data_re_10_8_lsb 8
+#define xd_r_reg_feq_data_im_7_0        0xA375
+#define reg_feq_data_im_7_0_pos 0
+#define reg_feq_data_im_7_0_len 8
+#define reg_feq_data_im_7_0_lsb 0
+#define xd_r_reg_feq_data_im_10_8       0xA376
+#define reg_feq_data_im_10_8_pos 0
+#define reg_feq_data_im_10_8_len 3
+#define reg_feq_data_im_10_8_lsb 8
+#define xd_r_reg_feq_y_re       0xA377
+#define reg_feq_y_re_pos 0
+#define reg_feq_y_re_len 8
+#define reg_feq_y_re_lsb 0
+#define xd_r_reg_feq_y_im       0xA378
+#define reg_feq_y_im_pos 0
+#define reg_feq_y_im_len 8
+#define reg_feq_y_im_lsb 0
+#define xd_r_reg_feq_h_re_7_0   0xA379
+#define reg_feq_h_re_7_0_pos 0
+#define reg_feq_h_re_7_0_len 8
+#define reg_feq_h_re_7_0_lsb 0
+#define xd_r_reg_feq_h_re_8     0xA37A
+#define reg_feq_h_re_8_pos 0
+#define reg_feq_h_re_8_len 1
+#define reg_feq_h_re_8_lsb 0
+#define xd_r_reg_feq_h_im_7_0   0xA37B
+#define reg_feq_h_im_7_0_pos 0
+#define reg_feq_h_im_7_0_len 8
+#define reg_feq_h_im_7_0_lsb 0
+#define xd_r_reg_feq_h_im_8     0xA37C
+#define reg_feq_h_im_8_pos 0
+#define reg_feq_h_im_8_len 1
+#define reg_feq_h_im_8_lsb 0
+#define xd_p_fec_super_frm_unit_7_0     0xA380
+#define fec_super_frm_unit_7_0_pos 0
+#define fec_super_frm_unit_7_0_len 8
+#define fec_super_frm_unit_7_0_lsb 0
+#define xd_p_fec_super_frm_unit_15_8    0xA381
+#define fec_super_frm_unit_15_8_pos 0
+#define fec_super_frm_unit_15_8_len 8
+#define fec_super_frm_unit_15_8_lsb 8
+#define xd_r_fec_vtb_err_bit_cnt_7_0    0xA382
+#define fec_vtb_err_bit_cnt_7_0_pos 0
+#define fec_vtb_err_bit_cnt_7_0_len 8
+#define fec_vtb_err_bit_cnt_7_0_lsb 0
+#define xd_r_fec_vtb_err_bit_cnt_15_8   0xA383
+#define fec_vtb_err_bit_cnt_15_8_pos 0
+#define fec_vtb_err_bit_cnt_15_8_len 8
+#define fec_vtb_err_bit_cnt_15_8_lsb 8
+#define xd_r_fec_vtb_err_bit_cnt_23_16  0xA384
+#define fec_vtb_err_bit_cnt_23_16_pos 0
+#define fec_vtb_err_bit_cnt_23_16_len 8
+#define fec_vtb_err_bit_cnt_23_16_lsb 16
+#define xd_p_fec_rsd_packet_unit_7_0    0xA385
+#define fec_rsd_packet_unit_7_0_pos 0
+#define fec_rsd_packet_unit_7_0_len 8
+#define fec_rsd_packet_unit_7_0_lsb 0
+#define xd_p_fec_rsd_packet_unit_15_8   0xA386
+#define fec_rsd_packet_unit_15_8_pos 0
+#define fec_rsd_packet_unit_15_8_len 8
+#define fec_rsd_packet_unit_15_8_lsb 8
+#define xd_r_fec_rsd_bit_err_cnt_7_0    0xA387
+#define fec_rsd_bit_err_cnt_7_0_pos 0
+#define fec_rsd_bit_err_cnt_7_0_len 8
+#define fec_rsd_bit_err_cnt_7_0_lsb 0
+#define xd_r_fec_rsd_bit_err_cnt_15_8   0xA388
+#define fec_rsd_bit_err_cnt_15_8_pos 0
+#define fec_rsd_bit_err_cnt_15_8_len 8
+#define fec_rsd_bit_err_cnt_15_8_lsb 8
+#define xd_r_fec_rsd_bit_err_cnt_23_16  0xA389
+#define fec_rsd_bit_err_cnt_23_16_pos 0
+#define fec_rsd_bit_err_cnt_23_16_len 8
+#define fec_rsd_bit_err_cnt_23_16_lsb 16
+#define xd_r_fec_rsd_abort_packet_cnt_7_0       0xA38A
+#define fec_rsd_abort_packet_cnt_7_0_pos 0
+#define fec_rsd_abort_packet_cnt_7_0_len 8
+#define fec_rsd_abort_packet_cnt_7_0_lsb 0
+#define xd_r_fec_rsd_abort_packet_cnt_15_8      0xA38B
+#define fec_rsd_abort_packet_cnt_15_8_pos 0
+#define fec_rsd_abort_packet_cnt_15_8_len 8
+#define fec_rsd_abort_packet_cnt_15_8_lsb 8
+#define xd_p_fec_RSD_PKT_NUM_PER_UNIT_7_0       0xA38C
+#define fec_RSD_PKT_NUM_PER_UNIT_7_0_pos 0
+#define fec_RSD_PKT_NUM_PER_UNIT_7_0_len 8
+#define fec_RSD_PKT_NUM_PER_UNIT_7_0_lsb 0
+#define xd_p_fec_RSD_PKT_NUM_PER_UNIT_15_8      0xA38D
+#define fec_RSD_PKT_NUM_PER_UNIT_15_8_pos 0
+#define fec_RSD_PKT_NUM_PER_UNIT_15_8_len 8
+#define fec_RSD_PKT_NUM_PER_UNIT_15_8_lsb 8
+#define xd_p_fec_RS_TH_1_7_0    0xA38E
+#define fec_RS_TH_1_7_0_pos 0
+#define fec_RS_TH_1_7_0_len 8
+#define fec_RS_TH_1_7_0_lsb 0
+#define xd_p_fec_RS_TH_1_15_8   0xA38F
+#define fec_RS_TH_1_15_8_pos 0
+#define fec_RS_TH_1_15_8_len 8
+#define fec_RS_TH_1_15_8_lsb 8
+#define xd_p_fec_RS_TH_2        0xA390
+#define fec_RS_TH_2_pos 0
+#define fec_RS_TH_2_len 8
+#define fec_RS_TH_2_lsb 0
+#define xd_p_fec_mon_en 0xA391
+#define fec_mon_en_pos 0
+#define fec_mon_en_len 1
+#define fec_mon_en_lsb 0
+#define xd_p_reg_b8to47 0xA391
+#define reg_b8to47_pos 1
+#define reg_b8to47_len 1
+#define reg_b8to47_lsb 0
+#define xd_p_reg_rsd_sync_rep   0xA391
+#define reg_rsd_sync_rep_pos 2
+#define reg_rsd_sync_rep_len 1
+#define reg_rsd_sync_rep_lsb 0
+#define xd_p_fec_rsd_retrain_rst        0xA391
+#define fec_rsd_retrain_rst_pos 3
+#define fec_rsd_retrain_rst_len 1
+#define fec_rsd_retrain_rst_lsb 0
+#define xd_r_fec_rsd_ber_rdy    0xA391
+#define fec_rsd_ber_rdy_pos 4
+#define fec_rsd_ber_rdy_len 1
+#define fec_rsd_ber_rdy_lsb 0
+#define xd_p_fec_rsd_ber_rst    0xA391
+#define fec_rsd_ber_rst_pos 5
+#define fec_rsd_ber_rst_len 1
+#define fec_rsd_ber_rst_lsb 0
+#define xd_r_fec_vtb_ber_rdy    0xA391
+#define fec_vtb_ber_rdy_pos 6
+#define fec_vtb_ber_rdy_len 1
+#define fec_vtb_ber_rdy_lsb 0
+#define xd_p_fec_vtb_ber_rst    0xA391
+#define fec_vtb_ber_rst_pos 7
+#define fec_vtb_ber_rst_len 1
+#define fec_vtb_ber_rst_lsb 0
+#define xd_p_reg_vtb_clk40en    0xA392
+#define reg_vtb_clk40en_pos 0
+#define reg_vtb_clk40en_len 1
+#define reg_vtb_clk40en_lsb 0
+#define xd_p_fec_vtb_rsd_mon_en 0xA392
+#define fec_vtb_rsd_mon_en_pos 1
+#define fec_vtb_rsd_mon_en_len 1
+#define fec_vtb_rsd_mon_en_lsb 0
+#define xd_p_reg_fec_data_en    0xA392
+#define reg_fec_data_en_pos 2
+#define reg_fec_data_en_len 1
+#define reg_fec_data_en_lsb 0
+#define xd_p_fec_dummy_reg_2    0xA392
+#define fec_dummy_reg_2_pos 3
+#define fec_dummy_reg_2_len 3
+#define fec_dummy_reg_2_lsb 0
+#define xd_p_reg_sync_chk       0xA392
+#define reg_sync_chk_pos 6
+#define reg_sync_chk_len 1
+#define reg_sync_chk_lsb 0
+#define xd_p_fec_rsd_bypass     0xA392
+#define fec_rsd_bypass_pos 7
+#define fec_rsd_bypass_len 1
+#define fec_rsd_bypass_lsb 0
+#define xd_p_fec_sw_rst 0xA393
+#define fec_sw_rst_pos 0
+#define fec_sw_rst_len 1
+#define fec_sw_rst_lsb 0
+#define xd_r_fec_vtb_pm_crc     0xA394
+#define fec_vtb_pm_crc_pos 0
+#define fec_vtb_pm_crc_len 8
+#define fec_vtb_pm_crc_lsb 0
+#define xd_r_fec_vtb_tb_7_crc   0xA395
+#define fec_vtb_tb_7_crc_pos 0
+#define fec_vtb_tb_7_crc_len 8
+#define fec_vtb_tb_7_crc_lsb 0
+#define xd_r_fec_vtb_tb_6_crc   0xA396
+#define fec_vtb_tb_6_crc_pos 0
+#define fec_vtb_tb_6_crc_len 8
+#define fec_vtb_tb_6_crc_lsb 0
+#define xd_r_fec_vtb_tb_5_crc   0xA397
+#define fec_vtb_tb_5_crc_pos 0
+#define fec_vtb_tb_5_crc_len 8
+#define fec_vtb_tb_5_crc_lsb 0
+#define xd_r_fec_vtb_tb_4_crc   0xA398
+#define fec_vtb_tb_4_crc_pos 0
+#define fec_vtb_tb_4_crc_len 8
+#define fec_vtb_tb_4_crc_lsb 0
+#define xd_r_fec_vtb_tb_3_crc   0xA399
+#define fec_vtb_tb_3_crc_pos 0
+#define fec_vtb_tb_3_crc_len 8
+#define fec_vtb_tb_3_crc_lsb 0
+#define xd_r_fec_vtb_tb_2_crc   0xA39A
+#define fec_vtb_tb_2_crc_pos 0
+#define fec_vtb_tb_2_crc_len 8
+#define fec_vtb_tb_2_crc_lsb 0
+#define xd_r_fec_vtb_tb_1_crc   0xA39B
+#define fec_vtb_tb_1_crc_pos 0
+#define fec_vtb_tb_1_crc_len 8
+#define fec_vtb_tb_1_crc_lsb 0
+#define xd_r_fec_vtb_tb_0_crc   0xA39C
+#define fec_vtb_tb_0_crc_pos 0
+#define fec_vtb_tb_0_crc_len 8
+#define fec_vtb_tb_0_crc_lsb 0
+#define xd_r_fec_rsd_bank0_crc  0xA39D
+#define fec_rsd_bank0_crc_pos 0
+#define fec_rsd_bank0_crc_len 8
+#define fec_rsd_bank0_crc_lsb 0
+#define xd_r_fec_rsd_bank1_crc  0xA39E
+#define fec_rsd_bank1_crc_pos 0
+#define fec_rsd_bank1_crc_len 8
+#define fec_rsd_bank1_crc_lsb 0
+#define xd_r_fec_idi_vtb_crc    0xA39F
+#define fec_idi_vtb_crc_pos 0
+#define fec_idi_vtb_crc_len 8
+#define fec_idi_vtb_crc_lsb 0
+#define xd_g_reg_tpsd_txmod     0xA3C0
+#define reg_tpsd_txmod_pos 0
+#define reg_tpsd_txmod_len 2
+#define reg_tpsd_txmod_lsb 0
+#define xd_g_reg_tpsd_gi        0xA3C0
+#define reg_tpsd_gi_pos 2
+#define reg_tpsd_gi_len 2
+#define reg_tpsd_gi_lsb 0
+#define xd_g_reg_tpsd_hier      0xA3C0
+#define reg_tpsd_hier_pos 4
+#define reg_tpsd_hier_len 3
+#define reg_tpsd_hier_lsb 0
+#define xd_g_reg_bw     0xA3C1
+#define reg_bw_pos 2
+#define reg_bw_len 2
+#define reg_bw_lsb 0
+#define xd_g_reg_dec_pri        0xA3C1
+#define reg_dec_pri_pos 4
+#define reg_dec_pri_len 1
+#define reg_dec_pri_lsb 0
+#define xd_g_reg_tpsd_const     0xA3C1
+#define reg_tpsd_const_pos 6
+#define reg_tpsd_const_len 2
+#define reg_tpsd_const_lsb 0
+#define xd_g_reg_tpsd_hpcr      0xA3C2
+#define reg_tpsd_hpcr_pos 0
+#define reg_tpsd_hpcr_len 3
+#define reg_tpsd_hpcr_lsb 0
+#define xd_g_reg_tpsd_lpcr      0xA3C2
+#define reg_tpsd_lpcr_pos 3
+#define reg_tpsd_lpcr_len 3
+#define reg_tpsd_lpcr_lsb 0
+#define xd_g_reg_ofsm_clk       0xA3D0
+#define reg_ofsm_clk_pos 0
+#define reg_ofsm_clk_len 3
+#define reg_ofsm_clk_lsb 0
+#define xd_g_reg_fclk_cfg       0xA3D1
+#define reg_fclk_cfg_pos 0
+#define reg_fclk_cfg_len 1
+#define reg_fclk_cfg_lsb 0
+#define xd_g_reg_fclk_idi       0xA3D1
+#define reg_fclk_idi_pos 1
+#define reg_fclk_idi_len 1
+#define reg_fclk_idi_lsb 0
+#define xd_g_reg_fclk_odi       0xA3D1
+#define reg_fclk_odi_pos 2
+#define reg_fclk_odi_len 1
+#define reg_fclk_odi_lsb 0
+#define xd_g_reg_fclk_rsd       0xA3D1
+#define reg_fclk_rsd_pos 3
+#define reg_fclk_rsd_len 1
+#define reg_fclk_rsd_lsb 0
+#define xd_g_reg_fclk_vtb       0xA3D1
+#define reg_fclk_vtb_pos 4
+#define reg_fclk_vtb_len 1
+#define reg_fclk_vtb_lsb 0
+#define xd_g_reg_fclk_cste      0xA3D1
+#define reg_fclk_cste_pos 5
+#define reg_fclk_cste_len 1
+#define reg_fclk_cste_lsb 0
+#define xd_g_reg_fclk_mp2if     0xA3D1
+#define reg_fclk_mp2if_pos 6
+#define reg_fclk_mp2if_len 1
+#define reg_fclk_mp2if_lsb 0
+#define xd_I2C_i2c_m_slave_addr 0xA400
+#define i2c_m_slave_addr_pos 0
+#define i2c_m_slave_addr_len 8
+#define i2c_m_slave_addr_lsb 0
+#define xd_I2C_i2c_m_data1      0xA401
+#define i2c_m_data1_pos 0
+#define i2c_m_data1_len 8
+#define i2c_m_data1_lsb 0
+#define xd_I2C_i2c_m_data2      0xA402
+#define i2c_m_data2_pos 0
+#define i2c_m_data2_len 8
+#define i2c_m_data2_lsb 0
+#define xd_I2C_i2c_m_data3      0xA403
+#define i2c_m_data3_pos 0
+#define i2c_m_data3_len 8
+#define i2c_m_data3_lsb 0
+#define xd_I2C_i2c_m_data4      0xA404
+#define i2c_m_data4_pos 0
+#define i2c_m_data4_len 8
+#define i2c_m_data4_lsb 0
+#define xd_I2C_i2c_m_data5      0xA405
+#define i2c_m_data5_pos 0
+#define i2c_m_data5_len 8
+#define i2c_m_data5_lsb 0
+#define xd_I2C_i2c_m_data6      0xA406
+#define i2c_m_data6_pos 0
+#define i2c_m_data6_len 8
+#define i2c_m_data6_lsb 0
+#define xd_I2C_i2c_m_data7      0xA407
+#define i2c_m_data7_pos 0
+#define i2c_m_data7_len 8
+#define i2c_m_data7_lsb 0
+#define xd_I2C_i2c_m_data8      0xA408
+#define i2c_m_data8_pos 0
+#define i2c_m_data8_len 8
+#define i2c_m_data8_lsb 0
+#define xd_I2C_i2c_m_data9      0xA409
+#define i2c_m_data9_pos 0
+#define i2c_m_data9_len 8
+#define i2c_m_data9_lsb 0
+#define xd_I2C_i2c_m_data10     0xA40A
+#define i2c_m_data10_pos 0
+#define i2c_m_data10_len 8
+#define i2c_m_data10_lsb 0
+#define xd_I2C_i2c_m_data11     0xA40B
+#define i2c_m_data11_pos 0
+#define i2c_m_data11_len 8
+#define i2c_m_data11_lsb 0
+#define xd_I2C_i2c_m_cmd_rw     0xA40C
+#define i2c_m_cmd_rw_pos 0
+#define i2c_m_cmd_rw_len 1
+#define i2c_m_cmd_rw_lsb 0
+#define xd_I2C_i2c_m_cmd_rwlen  0xA40C
+#define i2c_m_cmd_rwlen_pos 3
+#define i2c_m_cmd_rwlen_len 4
+#define i2c_m_cmd_rwlen_lsb 0
+#define xd_I2C_i2c_m_status_cmd_exe     0xA40D
+#define i2c_m_status_cmd_exe_pos 0
+#define i2c_m_status_cmd_exe_len 1
+#define i2c_m_status_cmd_exe_lsb 0
+#define xd_I2C_i2c_m_status_wdat_done   0xA40D
+#define i2c_m_status_wdat_done_pos 1
+#define i2c_m_status_wdat_done_len 1
+#define i2c_m_status_wdat_done_lsb 0
+#define xd_I2C_i2c_m_status_wdat_fail   0xA40D
+#define i2c_m_status_wdat_fail_pos 2
+#define i2c_m_status_wdat_fail_len 1
+#define i2c_m_status_wdat_fail_lsb 0
+#define xd_I2C_i2c_m_period     0xA40E
+#define i2c_m_period_pos 0
+#define i2c_m_period_len 8
+#define i2c_m_period_lsb 0
+#define xd_I2C_i2c_m_reg_msb_lsb        0xA40F
+#define i2c_m_reg_msb_lsb_pos 0
+#define i2c_m_reg_msb_lsb_len 1
+#define i2c_m_reg_msb_lsb_lsb 0
+#define xd_I2C_reg_ofdm_rst     0xA40F
+#define reg_ofdm_rst_pos 1
+#define reg_ofdm_rst_len 1
+#define reg_ofdm_rst_lsb 0
+#define xd_I2C_reg_sample_period_on_tuner       0xA40F
+#define reg_sample_period_on_tuner_pos 2
+#define reg_sample_period_on_tuner_len 1
+#define reg_sample_period_on_tuner_lsb 0
+#define xd_I2C_reg_rst_i2c      0xA40F
+#define reg_rst_i2c_pos 3
+#define reg_rst_i2c_len 1
+#define reg_rst_i2c_lsb 0
+#define xd_I2C_reg_ofdm_rst_en  0xA40F
+#define reg_ofdm_rst_en_pos 4
+#define reg_ofdm_rst_en_len 1
+#define reg_ofdm_rst_en_lsb 0
+#define xd_I2C_reg_tuner_sda_sync_on    0xA40F
+#define reg_tuner_sda_sync_on_pos 5
+#define reg_tuner_sda_sync_on_len 1
+#define reg_tuner_sda_sync_on_lsb 0
+#define xd_p_mp2if_data_access_disable_ofsm     0xA500
+#define mp2if_data_access_disable_ofsm_pos 0
+#define mp2if_data_access_disable_ofsm_len 1
+#define mp2if_data_access_disable_ofsm_lsb 0
+#define xd_p_reg_mp2_sw_rst_ofsm        0xA500
+#define reg_mp2_sw_rst_ofsm_pos 1
+#define reg_mp2_sw_rst_ofsm_len 1
+#define reg_mp2_sw_rst_ofsm_lsb 0
+#define xd_p_reg_mp2if_clk_en_ofsm      0xA500
+#define reg_mp2if_clk_en_ofsm_pos 2
+#define reg_mp2if_clk_en_ofsm_len 1
+#define reg_mp2if_clk_en_ofsm_lsb 0
+#define xd_r_mp2if_sync_byte_locked     0xA500
+#define mp2if_sync_byte_locked_pos 3
+#define mp2if_sync_byte_locked_len 1
+#define mp2if_sync_byte_locked_lsb 0
+#define xd_r_mp2if_ts_not_188   0xA500
+#define mp2if_ts_not_188_pos 4
+#define mp2if_ts_not_188_len 1
+#define mp2if_ts_not_188_lsb 0
+#define xd_r_mp2if_psb_empty    0xA500
+#define mp2if_psb_empty_pos 5
+#define mp2if_psb_empty_len 1
+#define mp2if_psb_empty_lsb 0
+#define xd_r_mp2if_psb_overflow 0xA500
+#define mp2if_psb_overflow_pos 6
+#define mp2if_psb_overflow_len 1
+#define mp2if_psb_overflow_lsb 0
+#define xd_p_mp2if_keep_sf_sync_byte_ofsm       0xA500
+#define mp2if_keep_sf_sync_byte_ofsm_pos 7
+#define mp2if_keep_sf_sync_byte_ofsm_len 1
+#define mp2if_keep_sf_sync_byte_ofsm_lsb 0
+#define xd_r_mp2if_psb_mp2if_num_pkt    0xA501
+#define mp2if_psb_mp2if_num_pkt_pos 0
+#define mp2if_psb_mp2if_num_pkt_len 6
+#define mp2if_psb_mp2if_num_pkt_lsb 0
+#define xd_p_reg_mpeg_full_speed_ofsm   0xA501
+#define reg_mpeg_full_speed_ofsm_pos 6
+#define reg_mpeg_full_speed_ofsm_len 1
+#define reg_mpeg_full_speed_ofsm_lsb 0
+#define xd_p_mp2if_mpeg_ser_mode_ofsm   0xA501
+#define mp2if_mpeg_ser_mode_ofsm_pos 7
+#define mp2if_mpeg_ser_mode_ofsm_len 1
+#define mp2if_mpeg_ser_mode_ofsm_lsb 0
+#define xd_p_reg_sw_mon51       0xA600
+#define reg_sw_mon51_pos 0
+#define reg_sw_mon51_len 8
+#define reg_sw_mon51_lsb 0
+#define xd_p_reg_top_pcsel      0xA601
+#define reg_top_pcsel_pos 0
+#define reg_top_pcsel_len 1
+#define reg_top_pcsel_lsb 0
+#define xd_p_reg_top_rs232      0xA601
+#define reg_top_rs232_pos 1
+#define reg_top_rs232_len 1
+#define reg_top_rs232_lsb 0
+#define xd_p_reg_top_pcout      0xA601
+#define reg_top_pcout_pos 2
+#define reg_top_pcout_len 1
+#define reg_top_pcout_lsb 0
+#define xd_p_reg_top_debug      0xA601
+#define reg_top_debug_pos 3
+#define reg_top_debug_len 1
+#define reg_top_debug_lsb 0
+#define xd_p_reg_top_adcdly     0xA601
+#define reg_top_adcdly_pos 4
+#define reg_top_adcdly_len 2
+#define reg_top_adcdly_lsb 0
+#define xd_p_reg_top_pwrdw      0xA601
+#define reg_top_pwrdw_pos 6
+#define reg_top_pwrdw_len 1
+#define reg_top_pwrdw_lsb 0
+#define xd_p_reg_top_pwrdw_inv  0xA601
+#define reg_top_pwrdw_inv_pos 7
+#define reg_top_pwrdw_inv_len 1
+#define reg_top_pwrdw_inv_lsb 0
+#define xd_p_reg_top_int_inv    0xA602
+#define reg_top_int_inv_pos 0
+#define reg_top_int_inv_len 1
+#define reg_top_int_inv_lsb 0
+#define xd_p_reg_top_dio_sel    0xA602
+#define reg_top_dio_sel_pos 1
+#define reg_top_dio_sel_len 1
+#define reg_top_dio_sel_lsb 0
+#define xd_p_reg_top_gpioon0    0xA603
+#define reg_top_gpioon0_pos 0
+#define reg_top_gpioon0_len 1
+#define reg_top_gpioon0_lsb 0
+#define xd_p_reg_top_gpioon1    0xA603
+#define reg_top_gpioon1_pos 1
+#define reg_top_gpioon1_len 1
+#define reg_top_gpioon1_lsb 0
+#define xd_p_reg_top_gpioon2    0xA603
+#define reg_top_gpioon2_pos 2
+#define reg_top_gpioon2_len 1
+#define reg_top_gpioon2_lsb 0
+#define xd_p_reg_top_gpioon3    0xA603
+#define reg_top_gpioon3_pos 3
+#define reg_top_gpioon3_len 1
+#define reg_top_gpioon3_lsb 0
+#define xd_p_reg_top_lockon1    0xA603
+#define reg_top_lockon1_pos 4
+#define reg_top_lockon1_len 1
+#define reg_top_lockon1_lsb 0
+#define xd_p_reg_top_lockon2    0xA603
+#define reg_top_lockon2_pos 5
+#define reg_top_lockon2_len 1
+#define reg_top_lockon2_lsb 0
+#define xd_p_reg_top_gpioo0     0xA604
+#define reg_top_gpioo0_pos 0
+#define reg_top_gpioo0_len 1
+#define reg_top_gpioo0_lsb 0
+#define xd_p_reg_top_gpioo1     0xA604
+#define reg_top_gpioo1_pos 1
+#define reg_top_gpioo1_len 1
+#define reg_top_gpioo1_lsb 0
+#define xd_p_reg_top_gpioo2     0xA604
+#define reg_top_gpioo2_pos 2
+#define reg_top_gpioo2_len 1
+#define reg_top_gpioo2_lsb 0
+#define xd_p_reg_top_gpioo3     0xA604
+#define reg_top_gpioo3_pos 3
+#define reg_top_gpioo3_len 1
+#define reg_top_gpioo3_lsb 0
+#define xd_p_reg_top_lock1      0xA604
+#define reg_top_lock1_pos 4
+#define reg_top_lock1_len 1
+#define reg_top_lock1_lsb 0
+#define xd_p_reg_top_lock2      0xA604
+#define reg_top_lock2_pos 5
+#define reg_top_lock2_len 1
+#define reg_top_lock2_lsb 0
+#define xd_p_reg_top_gpioen0    0xA605
+#define reg_top_gpioen0_pos 0
+#define reg_top_gpioen0_len 1
+#define reg_top_gpioen0_lsb 0
+#define xd_p_reg_top_gpioen1    0xA605
+#define reg_top_gpioen1_pos 1
+#define reg_top_gpioen1_len 1
+#define reg_top_gpioen1_lsb 0
+#define xd_p_reg_top_gpioen2    0xA605
+#define reg_top_gpioen2_pos 2
+#define reg_top_gpioen2_len 1
+#define reg_top_gpioen2_lsb 0
+#define xd_p_reg_top_gpioen3    0xA605
+#define reg_top_gpioen3_pos 3
+#define reg_top_gpioen3_len 1
+#define reg_top_gpioen3_lsb 0
+#define xd_p_reg_top_locken1    0xA605
+#define reg_top_locken1_pos 4
+#define reg_top_locken1_len 1
+#define reg_top_locken1_lsb 0
+#define xd_p_reg_top_locken2    0xA605
+#define reg_top_locken2_pos 5
+#define reg_top_locken2_len 1
+#define reg_top_locken2_lsb 0
+#define xd_r_reg_top_gpioi0     0xA606
+#define reg_top_gpioi0_pos 0
+#define reg_top_gpioi0_len 1
+#define reg_top_gpioi0_lsb 0
+#define xd_r_reg_top_gpioi1     0xA606
+#define reg_top_gpioi1_pos 1
+#define reg_top_gpioi1_len 1
+#define reg_top_gpioi1_lsb 0
+#define xd_r_reg_top_gpioi2     0xA606
+#define reg_top_gpioi2_pos 2
+#define reg_top_gpioi2_len 1
+#define reg_top_gpioi2_lsb 0
+#define xd_r_reg_top_gpioi3     0xA606
+#define reg_top_gpioi3_pos 3
+#define reg_top_gpioi3_len 1
+#define reg_top_gpioi3_lsb 0
+#define xd_r_reg_top_locki1     0xA606
+#define reg_top_locki1_pos 4
+#define reg_top_locki1_len 1
+#define reg_top_locki1_lsb 0
+#define xd_r_reg_top_locki2     0xA606
+#define reg_top_locki2_pos 5
+#define reg_top_locki2_len 1
+#define reg_top_locki2_lsb 0
+#define xd_p_reg_dummy_7_0      0xA608
+#define reg_dummy_7_0_pos 0
+#define reg_dummy_7_0_len 8
+#define reg_dummy_7_0_lsb 0
+#define xd_p_reg_dummy_15_8     0xA609
+#define reg_dummy_15_8_pos 0
+#define reg_dummy_15_8_len 8
+#define reg_dummy_15_8_lsb 8
+#define xd_p_reg_dummy_23_16    0xA60A
+#define reg_dummy_23_16_pos 0
+#define reg_dummy_23_16_len 8
+#define reg_dummy_23_16_lsb 16
+#define xd_p_reg_dummy_31_24    0xA60B
+#define reg_dummy_31_24_pos 0
+#define reg_dummy_31_24_len 8
+#define reg_dummy_31_24_lsb 24
+#define xd_p_reg_dummy_39_32    0xA60C
+#define reg_dummy_39_32_pos 0
+#define reg_dummy_39_32_len 8
+#define reg_dummy_39_32_lsb 32
+#define xd_p_reg_dummy_47_40    0xA60D
+#define reg_dummy_47_40_pos 0
+#define reg_dummy_47_40_len 8
+#define reg_dummy_47_40_lsb 40
+#define xd_p_reg_dummy_55_48    0xA60E
+#define reg_dummy_55_48_pos 0
+#define reg_dummy_55_48_len 8
+#define reg_dummy_55_48_lsb 48
+#define xd_p_reg_dummy_63_56    0xA60F
+#define reg_dummy_63_56_pos 0
+#define reg_dummy_63_56_len 8
+#define reg_dummy_63_56_lsb 56
+#define xd_p_reg_dummy_71_64    0xA610
+#define reg_dummy_71_64_pos 0
+#define reg_dummy_71_64_len 8
+#define reg_dummy_71_64_lsb 64
+#define xd_p_reg_dummy_79_72    0xA611
+#define reg_dummy_79_72_pos 0
+#define reg_dummy_79_72_len 8
+#define reg_dummy_79_72_lsb 72
+#define xd_p_reg_dummy_87_80    0xA612
+#define reg_dummy_87_80_pos 0
+#define reg_dummy_87_80_len 8
+#define reg_dummy_87_80_lsb 80
+#define xd_p_reg_dummy_95_88    0xA613
+#define reg_dummy_95_88_pos 0
+#define reg_dummy_95_88_len 8
+#define reg_dummy_95_88_lsb 88
+#define xd_p_reg_dummy_103_96   0xA614
+#define reg_dummy_103_96_pos 0
+#define reg_dummy_103_96_len 8
+#define reg_dummy_103_96_lsb 96
+
+#define xd_p_reg_unplug_flag    0xA615
+#define reg_unplug_flag_pos 0
+#define reg_unplug_flag_len 1
+#define reg_unplug_flag_lsb 104
+
+#define xd_p_reg_api_dca_stes_request   0xA615
+#define reg_api_dca_stes_request_pos 1
+#define reg_api_dca_stes_request_len 1
+#define reg_api_dca_stes_request_lsb 0
+
+#define xd_p_reg_back_to_dca_flag       0xA615
+#define reg_back_to_dca_flag_pos 2
+#define reg_back_to_dca_flag_len 1
+#define reg_back_to_dca_flag_lsb 106
+
+#define xd_p_reg_api_retrain_request    0xA615
+#define reg_api_retrain_request_pos 3
+#define reg_api_retrain_request_len 1
+#define reg_api_retrain_request_lsb 0
+
+#define xd_p_reg_Dyn_Top_Try_flag       0xA615
+#define reg_Dyn_Top_Try_flag_pos 3
+#define reg_Dyn_Top_Try_flag_len 1
+#define reg_Dyn_Top_Try_flag_lsb 107
+
+#define xd_p_reg_API_retrain_freeze_flag        0xA615
+#define reg_API_retrain_freeze_flag_pos 4
+#define reg_API_retrain_freeze_flag_len 1
+#define reg_API_retrain_freeze_flag_lsb 108
+
+#define xd_p_reg_dummy_111_104  0xA615
+#define reg_dummy_111_104_pos 0
+#define reg_dummy_111_104_len 8
+#define reg_dummy_111_104_lsb 104
+#define xd_p_reg_dummy_119_112  0xA616
+#define reg_dummy_119_112_pos 0
+#define reg_dummy_119_112_len 8
+#define reg_dummy_119_112_lsb 112
+#define xd_p_reg_dummy_127_120  0xA617
+#define reg_dummy_127_120_pos 0
+#define reg_dummy_127_120_len 8
+#define reg_dummy_127_120_lsb 120
+#define xd_p_reg_dummy_135_128  0xA618
+#define reg_dummy_135_128_pos 0
+#define reg_dummy_135_128_len 8
+#define reg_dummy_135_128_lsb 128
+
+#define xd_p_reg_dummy_143_136  0xA619
+#define reg_dummy_143_136_pos 0
+#define reg_dummy_143_136_len 8
+#define reg_dummy_143_136_lsb 136
+
+#define xd_p_reg_CCIR_dis       0xA619
+#define reg_CCIR_dis_pos 0
+#define reg_CCIR_dis_len 1
+#define reg_CCIR_dis_lsb 0
+
+#define xd_p_reg_dummy_151_144  0xA61A
+#define reg_dummy_151_144_pos 0
+#define reg_dummy_151_144_len 8
+#define reg_dummy_151_144_lsb 144
+
+#define xd_p_reg_dummy_159_152  0xA61B
+#define reg_dummy_159_152_pos 0
+#define reg_dummy_159_152_len 8
+#define reg_dummy_159_152_lsb 152
+
+#define xd_p_reg_dummy_167_160  0xA61C
+#define reg_dummy_167_160_pos 0
+#define reg_dummy_167_160_len 8
+#define reg_dummy_167_160_lsb 160
+
+#define xd_p_reg_dummy_175_168  0xA61D
+#define reg_dummy_175_168_pos 0
+#define reg_dummy_175_168_len 8
+#define reg_dummy_175_168_lsb 168
+
+#define xd_p_reg_dummy_183_176  0xA61E
+#define reg_dummy_183_176_pos 0
+#define reg_dummy_183_176_len 8
+#define reg_dummy_183_176_lsb 176
+
+#define xd_p_reg_ofsm_read_rbc_en  0xA61E
+#define reg_ofsm_read_rbc_en_pos 2
+#define reg_ofsm_read_rbc_en_len 1
+#define reg_ofsm_read_rbc_en_lsb 0
+
+#define xd_p_reg_ce_filter_selection_dis  0xA61E
+#define reg_ce_filter_selection_dis_pos 1
+#define reg_ce_filter_selection_dis_len 1
+#define reg_ce_filter_selection_dis_lsb 0
+
+#define xd_p_reg_OFSM_version_control_7_0  0xA611
+#define reg_OFSM_version_control_7_0_pos 0
+#define reg_OFSM_version_control_7_0_len 8
+#define reg_OFSM_version_control_7_0_lsb 0
+
+#define xd_p_reg_OFSM_version_control_15_8  0xA61F
+#define reg_OFSM_version_control_15_8_pos 0
+#define reg_OFSM_version_control_15_8_len 8
+#define reg_OFSM_version_control_15_8_lsb 0
+
+#define xd_p_reg_OFSM_version_control_23_16  0xA620
+#define reg_OFSM_version_control_23_16_pos 0
+#define reg_OFSM_version_control_23_16_len 8
+#define reg_OFSM_version_control_23_16_lsb 0
+
+#define xd_p_reg_dummy_191_184  0xA61F
+#define reg_dummy_191_184_pos 0
+#define reg_dummy_191_184_len 8
+#define reg_dummy_191_184_lsb 184
+
+#define xd_p_reg_dummy_199_192  0xA620
+#define reg_dummy_199_192_pos 0
+#define reg_dummy_199_192_len 8
+#define reg_dummy_199_192_lsb 192
+
+#define xd_p_reg_ce_en  0xABC0
+#define reg_ce_en_pos 0
+#define reg_ce_en_len 1
+#define reg_ce_en_lsb 0
+#define xd_p_reg_ce_fctrl_en    0xABC0
+#define reg_ce_fctrl_en_pos 1
+#define reg_ce_fctrl_en_len 1
+#define reg_ce_fctrl_en_lsb 0
+#define xd_p_reg_ce_fste_tdi    0xABC0
+#define reg_ce_fste_tdi_pos 2
+#define reg_ce_fste_tdi_len 1
+#define reg_ce_fste_tdi_lsb 0
+#define xd_p_reg_ce_dynamic     0xABC0
+#define reg_ce_dynamic_pos 3
+#define reg_ce_dynamic_len 1
+#define reg_ce_dynamic_lsb 0
+#define xd_p_reg_ce_conf        0xABC0
+#define reg_ce_conf_pos 4
+#define reg_ce_conf_len 2
+#define reg_ce_conf_lsb 0
+#define xd_p_reg_ce_dyn12       0xABC0
+#define reg_ce_dyn12_pos 6
+#define reg_ce_dyn12_len 1
+#define reg_ce_dyn12_lsb 0
+#define xd_p_reg_ce_derot_en    0xABC0
+#define reg_ce_derot_en_pos 7
+#define reg_ce_derot_en_len 1
+#define reg_ce_derot_en_lsb 0
+#define xd_p_reg_ce_dynamic_th_7_0      0xABC1
+#define reg_ce_dynamic_th_7_0_pos 0
+#define reg_ce_dynamic_th_7_0_len 8
+#define reg_ce_dynamic_th_7_0_lsb 0
+#define xd_p_reg_ce_dynamic_th_15_8     0xABC2
+#define reg_ce_dynamic_th_15_8_pos 0
+#define reg_ce_dynamic_th_15_8_len 8
+#define reg_ce_dynamic_th_15_8_lsb 8
+#define xd_p_reg_ce_s1  0xABC3
+#define reg_ce_s1_pos 0
+#define reg_ce_s1_len 5
+#define reg_ce_s1_lsb 0
+#define xd_p_reg_ce_var_forced_value    0xABC3
+#define reg_ce_var_forced_value_pos 5
+#define reg_ce_var_forced_value_len 3
+#define reg_ce_var_forced_value_lsb 0
+#define xd_p_reg_ce_data_im_7_0 0xABC4
+#define reg_ce_data_im_7_0_pos 0
+#define reg_ce_data_im_7_0_len 8
+#define reg_ce_data_im_7_0_lsb 0
+#define xd_p_reg_ce_data_im_8   0xABC5
+#define reg_ce_data_im_8_pos 0
+#define reg_ce_data_im_8_len 1
+#define reg_ce_data_im_8_lsb 0
+#define xd_p_reg_ce_data_re_6_0 0xABC5
+#define reg_ce_data_re_6_0_pos 1
+#define reg_ce_data_re_6_0_len 7
+#define reg_ce_data_re_6_0_lsb 0
+#define xd_p_reg_ce_data_re_8_7 0xABC6
+#define reg_ce_data_re_8_7_pos 0
+#define reg_ce_data_re_8_7_len 2
+#define reg_ce_data_re_8_7_lsb 7
+#define xd_p_reg_ce_tone_5_0    0xABC6
+#define reg_ce_tone_5_0_pos 2
+#define reg_ce_tone_5_0_len 6
+#define reg_ce_tone_5_0_lsb 0
+#define xd_p_reg_ce_tone_12_6   0xABC7
+#define reg_ce_tone_12_6_pos 0
+#define reg_ce_tone_12_6_len 7
+#define reg_ce_tone_12_6_lsb 6
+#define xd_p_reg_ce_centroid_drift_th   0xABC8
+#define reg_ce_centroid_drift_th_pos 0
+#define reg_ce_centroid_drift_th_len 8
+#define reg_ce_centroid_drift_th_lsb 0
+#define xd_p_reg_ce_centroid_count_max  0xABC9
+#define reg_ce_centroid_count_max_pos 0
+#define reg_ce_centroid_count_max_len 4
+#define reg_ce_centroid_count_max_lsb 0
+#define xd_p_reg_ce_centroid_bias_inc_7_0       0xABCA
+#define reg_ce_centroid_bias_inc_7_0_pos 0
+#define reg_ce_centroid_bias_inc_7_0_len 8
+#define reg_ce_centroid_bias_inc_7_0_lsb 0
+#define xd_p_reg_ce_centroid_bias_inc_8 0xABCB
+#define reg_ce_centroid_bias_inc_8_pos 0
+#define reg_ce_centroid_bias_inc_8_len 1
+#define reg_ce_centroid_bias_inc_8_lsb 0
+#define xd_p_reg_ce_var_th0_7_0 0xABCC
+#define reg_ce_var_th0_7_0_pos 0
+#define reg_ce_var_th0_7_0_len 8
+#define reg_ce_var_th0_7_0_lsb 0
+#define xd_p_reg_ce_var_th0_15_8        0xABCD
+#define reg_ce_var_th0_15_8_pos 0
+#define reg_ce_var_th0_15_8_len 8
+#define reg_ce_var_th0_15_8_lsb 8
+#define xd_p_reg_ce_var_th1_7_0 0xABCE
+#define reg_ce_var_th1_7_0_pos 0
+#define reg_ce_var_th1_7_0_len 8
+#define reg_ce_var_th1_7_0_lsb 0
+#define xd_p_reg_ce_var_th1_15_8        0xABCF
+#define reg_ce_var_th1_15_8_pos 0
+#define reg_ce_var_th1_15_8_len 8
+#define reg_ce_var_th1_15_8_lsb 8
+#define xd_p_reg_ce_var_th2_7_0 0xABD0
+#define reg_ce_var_th2_7_0_pos 0
+#define reg_ce_var_th2_7_0_len 8
+#define reg_ce_var_th2_7_0_lsb 0
+#define xd_p_reg_ce_var_th2_15_8        0xABD1
+#define reg_ce_var_th2_15_8_pos 0
+#define reg_ce_var_th2_15_8_len 8
+#define reg_ce_var_th2_15_8_lsb 8
+#define xd_p_reg_ce_var_th3_7_0 0xABD2
+#define reg_ce_var_th3_7_0_pos 0
+#define reg_ce_var_th3_7_0_len 8
+#define reg_ce_var_th3_7_0_lsb 0
+#define xd_p_reg_ce_var_th3_15_8        0xABD3
+#define reg_ce_var_th3_15_8_pos 0
+#define reg_ce_var_th3_15_8_len 8
+#define reg_ce_var_th3_15_8_lsb 8
+#define xd_p_reg_ce_var_th4_7_0 0xABD4
+#define reg_ce_var_th4_7_0_pos 0
+#define reg_ce_var_th4_7_0_len 8
+#define reg_ce_var_th4_7_0_lsb 0
+#define xd_p_reg_ce_var_th4_15_8        0xABD5
+#define reg_ce_var_th4_15_8_pos 0
+#define reg_ce_var_th4_15_8_len 8
+#define reg_ce_var_th4_15_8_lsb 8
+#define xd_p_reg_ce_var_th5_7_0 0xABD6
+#define reg_ce_var_th5_7_0_pos 0
+#define reg_ce_var_th5_7_0_len 8
+#define reg_ce_var_th5_7_0_lsb 0
+#define xd_p_reg_ce_var_th5_15_8        0xABD7
+#define reg_ce_var_th5_15_8_pos 0
+#define reg_ce_var_th5_15_8_len 8
+#define reg_ce_var_th5_15_8_lsb 8
+#define xd_p_reg_ce_var_th6_7_0 0xABD8
+#define reg_ce_var_th6_7_0_pos 0
+#define reg_ce_var_th6_7_0_len 8
+#define reg_ce_var_th6_7_0_lsb 0
+#define xd_p_reg_ce_var_th6_15_8        0xABD9
+#define reg_ce_var_th6_15_8_pos 0
+#define reg_ce_var_th6_15_8_len 8
+#define reg_ce_var_th6_15_8_lsb 8
+#define xd_p_reg_ce_fctrl_reset 0xABDA
+#define reg_ce_fctrl_reset_pos 0
+#define reg_ce_fctrl_reset_len 1
+#define reg_ce_fctrl_reset_lsb 0
+#define xd_p_reg_ce_cent_auto_clr_en    0xABDA
+#define reg_ce_cent_auto_clr_en_pos 1
+#define reg_ce_cent_auto_clr_en_len 1
+#define reg_ce_cent_auto_clr_en_lsb 0
+#define xd_p_reg_ce_fctrl_auto_reset_en 0xABDA
+#define reg_ce_fctrl_auto_reset_en_pos 2
+#define reg_ce_fctrl_auto_reset_en_len 1
+#define reg_ce_fctrl_auto_reset_en_lsb 0
+#define xd_p_reg_ce_var_forced_en       0xABDA
+#define reg_ce_var_forced_en_pos 3
+#define reg_ce_var_forced_en_len 1
+#define reg_ce_var_forced_en_lsb 0
+#define xd_p_reg_ce_cent_forced_en      0xABDA
+#define reg_ce_cent_forced_en_pos 4
+#define reg_ce_cent_forced_en_len 1
+#define reg_ce_cent_forced_en_lsb 0
+#define xd_p_reg_ce_var_max     0xABDA
+#define reg_ce_var_max_pos 5
+#define reg_ce_var_max_len 3
+#define reg_ce_var_max_lsb 0
+#define xd_p_reg_ce_cent_forced_value_7_0       0xABDB
+#define reg_ce_cent_forced_value_7_0_pos 0
+#define reg_ce_cent_forced_value_7_0_len 8
+#define reg_ce_cent_forced_value_7_0_lsb 0
+#define xd_p_reg_ce_cent_forced_value_11_8      0xABDC
+#define reg_ce_cent_forced_value_11_8_pos 0
+#define reg_ce_cent_forced_value_11_8_len 4
+#define reg_ce_cent_forced_value_11_8_lsb 8
+#define xd_p_reg_ce_fctrl_rd    0xABDD
+#define reg_ce_fctrl_rd_pos 0
+#define reg_ce_fctrl_rd_len 1
+#define reg_ce_fctrl_rd_lsb 0
+#define xd_p_reg_ce_centroid_max_6_0    0xABDD
+#define reg_ce_centroid_max_6_0_pos 1
+#define reg_ce_centroid_max_6_0_len 7
+#define reg_ce_centroid_max_6_0_lsb 0
+#define xd_p_reg_ce_centroid_max_11_7   0xABDE
+#define reg_ce_centroid_max_11_7_pos 0
+#define reg_ce_centroid_max_11_7_len 5
+#define reg_ce_centroid_max_11_7_lsb 7
+#define xd_p_reg_ce_var 0xABDF
+#define reg_ce_var_pos 0
+#define reg_ce_var_len 3
+#define reg_ce_var_lsb 0
+#define xd_p_reg_ce_fctrl_rdy   0xABDF
+#define reg_ce_fctrl_rdy_pos 3
+#define reg_ce_fctrl_rdy_len 1
+#define reg_ce_fctrl_rdy_lsb 0
+#define xd_p_reg_ce_centroid_out_3_0    0xABDF
+#define reg_ce_centroid_out_3_0_pos 4
+#define reg_ce_centroid_out_3_0_len 4
+#define reg_ce_centroid_out_3_0_lsb 0
+#define xd_p_reg_ce_centroid_out_11_4   0xABE0
+#define reg_ce_centroid_out_11_4_pos 0
+#define reg_ce_centroid_out_11_4_len 8
+#define reg_ce_centroid_out_11_4_lsb 4
+#define xd_p_reg_ce_bias_7_0    0xABE1
+#define reg_ce_bias_7_0_pos 0
+#define reg_ce_bias_7_0_len 8
+#define reg_ce_bias_7_0_lsb 0
+#define xd_p_reg_ce_bias_11_8   0xABE2
+#define reg_ce_bias_11_8_pos 0
+#define reg_ce_bias_11_8_len 4
+#define reg_ce_bias_11_8_lsb 8
+#define xd_p_reg_ce_m1_3_0      0xABE2
+#define reg_ce_m1_3_0_pos 4
+#define reg_ce_m1_3_0_len 4
+#define reg_ce_m1_3_0_lsb 0
+#define xd_p_reg_ce_m1_11_4     0xABE3
+#define reg_ce_m1_11_4_pos 0
+#define reg_ce_m1_11_4_len 8
+#define reg_ce_m1_11_4_lsb 4
+#define xd_p_reg_ce_rh0_7_0     0xABE4
+#define reg_ce_rh0_7_0_pos 0
+#define reg_ce_rh0_7_0_len 8
+#define reg_ce_rh0_7_0_lsb 0
+#define xd_p_reg_ce_rh0_15_8    0xABE5
+#define reg_ce_rh0_15_8_pos 0
+#define reg_ce_rh0_15_8_len 8
+#define reg_ce_rh0_15_8_lsb 8
+#define xd_p_reg_ce_rh0_23_16   0xABE6
+#define reg_ce_rh0_23_16_pos 0
+#define reg_ce_rh0_23_16_len 8
+#define reg_ce_rh0_23_16_lsb 16
+#define xd_p_reg_ce_rh0_31_24   0xABE7
+#define reg_ce_rh0_31_24_pos 0
+#define reg_ce_rh0_31_24_len 8
+#define reg_ce_rh0_31_24_lsb 24
+#define xd_p_reg_ce_rh3_real_7_0        0xABE8
+#define reg_ce_rh3_real_7_0_pos 0
+#define reg_ce_rh3_real_7_0_len 8
+#define reg_ce_rh3_real_7_0_lsb 0
+#define xd_p_reg_ce_rh3_real_15_8       0xABE9
+#define reg_ce_rh3_real_15_8_pos 0
+#define reg_ce_rh3_real_15_8_len 8
+#define reg_ce_rh3_real_15_8_lsb 8
+#define xd_p_reg_ce_rh3_real_23_16      0xABEA
+#define reg_ce_rh3_real_23_16_pos 0
+#define reg_ce_rh3_real_23_16_len 8
+#define reg_ce_rh3_real_23_16_lsb 16
+#define xd_p_reg_ce_rh3_real_31_24      0xABEB
+#define reg_ce_rh3_real_31_24_pos 0
+#define reg_ce_rh3_real_31_24_len 8
+#define reg_ce_rh3_real_31_24_lsb 24
+#define xd_p_reg_ce_rh3_imag_7_0        0xABEC
+#define reg_ce_rh3_imag_7_0_pos 0
+#define reg_ce_rh3_imag_7_0_len 8
+#define reg_ce_rh3_imag_7_0_lsb 0
+#define xd_p_reg_ce_rh3_imag_15_8       0xABED
+#define reg_ce_rh3_imag_15_8_pos 0
+#define reg_ce_rh3_imag_15_8_len 8
+#define reg_ce_rh3_imag_15_8_lsb 8
+#define xd_p_reg_ce_rh3_imag_23_16      0xABEE
+#define reg_ce_rh3_imag_23_16_pos 0
+#define reg_ce_rh3_imag_23_16_len 8
+#define reg_ce_rh3_imag_23_16_lsb 16
+#define xd_p_reg_ce_rh3_imag_31_24      0xABEF
+#define reg_ce_rh3_imag_31_24_pos 0
+#define reg_ce_rh3_imag_31_24_len 8
+#define reg_ce_rh3_imag_31_24_lsb 24
+#define xd_p_reg_feq_fix_eh2_7_0        0xABF0
+#define reg_feq_fix_eh2_7_0_pos 0
+#define reg_feq_fix_eh2_7_0_len 8
+#define reg_feq_fix_eh2_7_0_lsb 0
+#define xd_p_reg_feq_fix_eh2_15_8       0xABF1
+#define reg_feq_fix_eh2_15_8_pos 0
+#define reg_feq_fix_eh2_15_8_len 8
+#define reg_feq_fix_eh2_15_8_lsb 8
+#define xd_p_reg_feq_fix_eh2_23_16      0xABF2
+#define reg_feq_fix_eh2_23_16_pos 0
+#define reg_feq_fix_eh2_23_16_len 8
+#define reg_feq_fix_eh2_23_16_lsb 16
+#define xd_p_reg_feq_fix_eh2_31_24      0xABF3
+#define reg_feq_fix_eh2_31_24_pos 0
+#define reg_feq_fix_eh2_31_24_len 8
+#define reg_feq_fix_eh2_31_24_lsb 24
+#define xd_p_reg_ce_m2_central_7_0      0xABF4
+#define reg_ce_m2_central_7_0_pos 0
+#define reg_ce_m2_central_7_0_len 8
+#define reg_ce_m2_central_7_0_lsb 0
+#define xd_p_reg_ce_m2_central_15_8     0xABF5
+#define reg_ce_m2_central_15_8_pos 0
+#define reg_ce_m2_central_15_8_len 8
+#define reg_ce_m2_central_15_8_lsb 8
+#define xd_p_reg_ce_fftshift    0xABF6
+#define reg_ce_fftshift_pos 0
+#define reg_ce_fftshift_len 4
+#define reg_ce_fftshift_lsb 0
+#define xd_p_reg_ce_fftshift1   0xABF6
+#define reg_ce_fftshift1_pos 4
+#define reg_ce_fftshift1_len 4
+#define reg_ce_fftshift1_lsb 0
+#define xd_p_reg_ce_fftshift2   0xABF7
+#define reg_ce_fftshift2_pos 0
+#define reg_ce_fftshift2_len 4
+#define reg_ce_fftshift2_lsb 0
+#define xd_p_reg_ce_top_mobile  0xABF7
+#define reg_ce_top_mobile_pos 4
+#define reg_ce_top_mobile_len 1
+#define reg_ce_top_mobile_lsb 0
+#define xd_p_reg_strong_sginal_detected 0xA2BC
+#define reg_strong_sginal_detected_pos 2
+#define reg_strong_sginal_detected_len 1
+#define reg_strong_sginal_detected_lsb 0
+
+#define XD_MP2IF_BASE                           0xB000
+#define XD_MP2IF_CSR                        (0x00 + XD_MP2IF_BASE)
+#define XD_MP2IF_DMX_CTRL                       (0x03 + XD_MP2IF_BASE)
+#define XD_MP2IF_PID_IDX                        (0x04 + XD_MP2IF_BASE)
+#define XD_MP2IF_PID_DATA_L                     (0x05 + XD_MP2IF_BASE)
+#define XD_MP2IF_PID_DATA_H                     (0x06 + XD_MP2IF_BASE)
+#define XD_MP2IF_MISC                       (0x07 + XD_MP2IF_BASE)
+
+extern struct dvb_frontend *af9005_fe_attach(struct dvb_usb_device *d);
+extern int af9005_read_ofdm_register(struct dvb_usb_device *d, u16 reg,
+                                     u8 * value);
+extern int af9005_read_ofdm_registers(struct dvb_usb_device *d, u16 reg,
+                                      u8 * values, int len);
+extern int af9005_write_ofdm_register(struct dvb_usb_device *d, u16 reg,
+                                      u8 value);
+extern int af9005_write_ofdm_registers(struct dvb_usb_device *d, u16 reg,
+                                       u8 * values, int len);
+extern int af9005_read_tuner_registers(struct dvb_usb_device *d, u16 reg,
+                                       u8 addr, u8 * values, int len);
+extern int af9005_write_tuner_registers(struct dvb_usb_device *d, u16 reg,
+                                        u8 * values, int len);
+extern int af9005_read_register_bits(struct dvb_usb_device *d, u16 reg,
+                                     u8 pos, u8 len, u8 * value);
+extern int af9005_write_register_bits(struct dvb_usb_device *d, u16 reg,
+                                      u8 pos, u8 len, u8 value);
+extern int af9005_send_command(struct dvb_usb_device *d, u8 command,
+                               u8 * wbuf, int wlen, u8 * rbuf, int rlen);
+extern int af9005_read_eeprom(struct dvb_usb_device *d, u8 address,
+                              u8 * values, int len);
+extern int af9005_tuner_attach(struct dvb_usb_adapter *adap);
+extern int af9005_led_control(struct dvb_usb_device *d, int onoff);
+
+extern u8 regmask[8];
+
+/* remote control decoder */
+extern int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len,
+                            u32 * event, int *state);
+extern struct dvb_usb_rc_key af9005_rc_keys[];
+extern int af9005_rc_keys_size;
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index bac2ae3b4a1f..04e31cf7d530 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -354,41 +354,35 @@ static struct mt352_config cxusb_mt352_config = {
 /* Callbacks for DVB USB */
 static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        u8 bpll[4] = { 0x0b, 0xdc, 0x9c, 0xa0 };
-        adap->pll_addr = 0x61;
-        memcpy(adap->pll_init, bpll, 4);
-        adap->pll_desc = &dvb_pll_fmd1216me;
-
-        adap->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c;
-        adap->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
-
+        dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,
+                   DVB_PLL_FMD1216ME);
         return 0;
 }
 
 static int cxusb_dee1601_tuner_attach(struct dvb_usb_adapter *adap)
 {
         dvb_attach(dvb_pll_attach, adap->fe, 0x61,
-                   NULL, &dvb_pll_thomson_dtt7579);
+                   NULL, DVB_PLL_THOMSON_DTT7579);
         return 0;
 }
 
 static int cxusb_lgz201_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        dvb_attach(dvb_pll_attach, adap->fe, 0x61, NULL, &dvb_pll_lg_z201);
+        dvb_attach(dvb_pll_attach, adap->fe, 0x61, NULL, DVB_PLL_LG_Z201);
         return 0;
 }
 
 static int cxusb_dtt7579_tuner_attach(struct dvb_usb_adapter *adap)
 {
         dvb_attach(dvb_pll_attach, adap->fe, 0x60,
-                   NULL, &dvb_pll_thomson_dtt7579);
+                   NULL, DVB_PLL_THOMSON_DTT7579);
         return 0;
 }
 
 static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap)
 {
         dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,
-                   &dvb_pll_lg_tdvs_h06xf);
+                   DVB_PLL_LG_TDVS_H06XF);
         return 0;
 }
 
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 5143e426d283..9a184da01c47 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -295,7 +295,7 @@ int dibusb_dib3000mc_tuner_attach(struct dvb_usb_adapter *adap)
         tun_i2c = dib3000mc_get_tuner_i2c_master(adap->fe, 1);
         if (dvb_attach(mt2060_attach, adap->fe, tun_i2c, &stk3000p_mt2060_config, if1) == NULL) {
                 /* not found - use panasonic pll parameters */
-                if (dvb_attach(dvb_pll_attach, adap->fe, 0x60, tun_i2c, &dvb_pll_env57h1xd5) == NULL)
+                if (dvb_attach(dvb_pll_attach, adap->fe, 0x60, tun_i2c, DVB_PLL_ENV57H1XD5) == NULL)
                         return -ENOMEM;
         } else {
                 st->mt2060_present = 1;
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 7a6ae8f482e0..043cadae0859 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -14,6 +14,14 @@
  */
 #include "dibusb.h"
 
+static int dib3000mb_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+{
+        struct dvb_usb_adapter *adap = fe->dvb->priv;
+        struct dibusb_state *st = adap->priv;
+
+        return st->ops.tuner_pass_ctrl(fe, enable, st->tuner_addr);
+}
+
 static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_adapter *adap)
 {
         struct dib3000_config demod_cfg;
@@ -21,21 +29,34 @@ static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_adapter *adap)
 
         demod_cfg.demod_address = 0x8;
 
-        if ((adap->fe = dib3000mb_attach(&demod_cfg,&adap->dev->i2c_adap,&st->ops)) == NULL)
+        if ((adap->fe = dvb_attach(dib3000mb_attach, &demod_cfg,
+                                   &adap->dev->i2c_adap, &st->ops)) == NULL)
                 return -ENODEV;
 
-        adap->fe->ops.tuner_ops.init       = dvb_usb_tuner_init_i2c;
-        adap->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
-
-        adap->tuner_pass_ctrl = st->ops.tuner_pass_ctrl;
+        adap->fe->ops.i2c_gate_ctrl = dib3000mb_i2c_gate_ctrl;
 
         return 0;
 }
 
 static int dibusb_thomson_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        adap->pll_addr = 0x61;
-        adap->pll_desc = &dvb_pll_tua6010xs;
+        struct dibusb_state *st = adap->priv;
+
+        st->tuner_addr = 0x61;
+
+        dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,
+                   DVB_PLL_TUA6010XS);
+        return 0;
+}
+
+static int dibusb_panasonic_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct dibusb_state *st = adap->priv;
+
+        st->tuner_addr = 0x60;
+
+        dvb_attach(dvb_pll_attach, adap->fe, 0x60, &adap->dev->i2c_adap,
+                   DVB_PLL_TDA665X);
         return 0;
 }
 
@@ -50,30 +71,28 @@ static int dibusb_tuner_probe_and_attach(struct dvb_usb_adapter *adap)
                 { .flags = 0,        .buf = b,  .len = 2 },
                 { .flags = I2C_M_RD, .buf = b2, .len = 1 },
         };
+        struct dibusb_state *st = adap->priv;
 
         /* the Panasonic sits on I2C addrass 0x60, the Thomson on 0x61 */
-        msg[0].addr = msg[1].addr = 0x60;
+        msg[0].addr = msg[1].addr = st->tuner_addr = 0x60;
 
-        if (adap->tuner_pass_ctrl)
-                adap->tuner_pass_ctrl(adap->fe,1,msg[0].addr);
+        if (adap->fe->ops.i2c_gate_ctrl)
+                adap->fe->ops.i2c_gate_ctrl(adap->fe,1);
 
         if (i2c_transfer(&adap->dev->i2c_adap, msg, 2) != 2) {
                 err("tuner i2c write failed.");
                 ret = -EREMOTEIO;
         }
 
-        if (adap->tuner_pass_ctrl)
-                adap->tuner_pass_ctrl(adap->fe,0,msg[0].addr);
+        if (adap->fe->ops.i2c_gate_ctrl)
+                adap->fe->ops.i2c_gate_ctrl(adap->fe,0);
 
         if (b2[0] == 0xfe) {
                 info("This device has the Thomson Cable onboard. Which is default.");
-                dibusb_thomson_tuner_attach(adap);
+                ret = dibusb_thomson_tuner_attach(adap);
         } else {
-                u8 bpll[4] = { 0x0b, 0xf5, 0x85, 0xab };
                 info("This device has the Panasonic ENV77H11D5 onboard.");
-                adap->pll_addr = 0x60;
-                memcpy(adap->pll_init,bpll,4);
-                adap->pll_desc = &dvb_pll_tda665x;
+                ret = dibusb_panasonic_tuner_attach(adap);
         }
 
         return ret;
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
index b60781032742..8e847aa73ba1 100644
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -99,6 +99,7 @@
 struct dibusb_state {
         struct dib_fe_xfer_ops ops;
         int mt2060_present;
+        u8 tuner_addr;
 };
 
 struct dibusb_device_state {
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index b5acb11c0bc9..bca1e0905739 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -118,7 +118,8 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
 {
         struct dvb_usb_adapter *adap = fe->dvb->priv;
         u8 b[5];
-        dvb_usb_tuner_calc_regs(fe,fep,b, 5);
+
+        fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 1);
         return digitv_ctrl_msg(adap->dev, USB_WRITE_TUNER, 0, &b[1], 4, NULL, 0);
@@ -130,12 +131,14 @@ static struct nxt6000_config digitv_nxt6000_config = {
 
 static int digitv_frontend_attach(struct dvb_usb_adapter *adap)
 {
+        struct digitv_state *st = adap->dev->priv;
+
         if ((adap->fe = dvb_attach(mt352_attach, &digitv_mt352_config, &adap->dev->i2c_adap)) != NULL) {
-                adap->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+                st->is_nxt6000 = 0;
                 return 0;
         }
         if ((adap->fe = dvb_attach(nxt6000_attach, &digitv_nxt6000_config, &adap->dev->i2c_adap)) != NULL) {
-                adap->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
+                st->is_nxt6000 = 1;
                 return 0;
         }
         return -EIO;
@@ -143,8 +146,14 @@ static int digitv_frontend_attach(struct dvb_usb_adapter *adap)
 
 static int digitv_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        adap->pll_addr = 0x60;
-        adap->pll_desc = &dvb_pll_tded4;
+        struct digitv_state *st = adap->dev->priv;
+
+        if (!dvb_attach(dvb_pll_attach, adap->fe, 0x60, NULL, DVB_PLL_TDED4))
+                return -ENODEV;
+
+        if (st->is_nxt6000)
+                adap->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
+
         return 0;
 }
 
@@ -273,6 +282,8 @@ static struct dvb_usb_device_properties digitv_properties = {
         .usb_ctrl = CYPRESS_FX2,
         .firmware = "dvb-usb-digitv-02.fw",
 
+        .size_of_priv = sizeof(struct digitv_state),
+
         .num_adapters = 1,
         .adapter = {
                 {
diff --git a/drivers/media/dvb/dvb-usb/digitv.h b/drivers/media/dvb/dvb-usb/digitv.h
index 477ee428a70e..8b43e3db8691 100644
--- a/drivers/media/dvb/dvb-usb/digitv.h
+++ b/drivers/media/dvb/dvb-usb/digitv.h
@@ -4,6 +4,10 @@
 #define DVB_USB_LOG_PREFIX "digitv"
 #include "dvb-usb.h"
 
+struct digitv_state {
+    int is_nxt6000;
+};
+
 extern int dvb_usb_digitv_debug;
 #define deb_rc(args...)   dprintk(dvb_usb_digitv_debug,0x01,args)
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 088b6dee3a7f..23428cd30756 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -46,82 +46,3 @@ int dvb_usb_i2c_exit(struct dvb_usb_device *d)
         d->state &= ~DVB_USB_STATE_I2C;
         return 0;
 }
-
-int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)
-{
-        struct dvb_usb_adapter *adap = fe->dvb->priv;
-        struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = adap->pll_init, .len = 4 };
-        int ret = 0;
-
-        /* if pll_desc is not used */
-        if (adap->pll_desc == NULL)
-                return 0;
-
-        if (adap->tuner_pass_ctrl)
-                adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
-
-        deb_pll("pll init: %x\n",adap->pll_addr);
-        deb_pll("pll-buf: %x %x %x %x\n",adap->pll_init[0], adap->pll_init[1],
-                        adap->pll_init[2], adap->pll_init[3]);
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if (i2c_transfer (&adap->dev->i2c_adap, &msg, 1) != 1) {
-                err("tuner i2c write failed for pll_init.");
-                ret = -EREMOTEIO;
-        }
-        msleep(1);
-
-        if (adap->tuner_pass_ctrl)
-                adap->tuner_pass_ctrl(fe,0,adap->pll_addr);
-        return ret;
-}
-EXPORT_SYMBOL(dvb_usb_tuner_init_i2c);
-
-int dvb_usb_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 *b, int buf_len)
-{
-        struct dvb_usb_adapter *adap = fe->dvb->priv;
-
-        if (buf_len != 5)
-                return -EINVAL;
-        if (adap->pll_desc == NULL)
-                return 0;
-
-        deb_pll("pll addr: %x, freq: %d %p\n",adap->pll_addr, fep->frequency, adap->pll_desc);
-
-        b[0] = adap->pll_addr;
-        dvb_pll_configure(adap->pll_desc, &b[1], fep->frequency, fep->u.ofdm.bandwidth);
-
-        deb_pll("pll-buf: %x %x %x %x %x\n",b[0],b[1],b[2],b[3],b[4]);
-
-        return 5;
-}
-EXPORT_SYMBOL(dvb_usb_tuner_calc_regs);
-
-int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
-{
-        struct dvb_usb_adapter *adap = fe->dvb->priv;
-        int ret = 0;
-        u8 b[5];
-        struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = &b[1], .len = 4 };
-
-        dvb_usb_tuner_calc_regs(fe,fep,b,5);
-
-        if (adap->tuner_pass_ctrl)
-                adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-
-        if (i2c_transfer(&adap->dev->i2c_adap, &msg, 1) != 1) {
-                err("tuner i2c write failed for pll_set.");
-                ret = -EREMOTEIO;
-        }
-        msleep(1);
-
-        if (adap->tuner_pass_ctrl)
-                adap->tuner_pass_ctrl(fe, 0, adap->pll_addr);
-
-        return ret;
-}
-EXPORT_SYMBOL(dvb_usb_tuner_set_params_i2c);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 403081689de1..4dfab02a8a0d 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -11,7 +11,9 @@
 
 /* Vendor IDs */
 #define USB_VID_ADSTECH                         0x06e1
+#define USB_VID_AFATECH                         0x15a4
 #define USB_VID_ALCOR_MICRO             0x058f
+#define USB_VID_ALINK                           0x05e3
 #define USB_VID_ANCHOR                          0x0547
 #define USB_VID_ANUBIS_ELECTRONIC               0x10fd
 #define USB_VID_AVERMEDIA                       0x07ca
@@ -35,6 +37,7 @@
 #define USB_VID_MSI                             0x0db0
 #define USB_VID_OPERA1                          0x695c
 #define USB_VID_PINNACLE                        0x2304
+#define USB_VID_TERRATEC                        0x0ccd
 #define USB_VID_VISIONPLUS                      0x13d3
 #define USB_VID_TWINHAN                         0x1822
 #define USB_VID_ULTIMA_ELECTRONIC               0x05d8
@@ -44,6 +47,8 @@
 /* Product IDs */
 #define USB_PID_ADSTECH_USB2_COLD                       0xa333
 #define USB_PID_ADSTECH_USB2_WARM                       0xa334
+#define USB_PID_AFATECH_AF9005                          0x9020
+#define USB_VID_ALINK_DTU                               0xf170
 #define USB_PID_AVERMEDIA_DVBT_USB_COLD                 0x0001
 #define USB_PID_AVERMEDIA_DVBT_USB_WARM                 0x0002
 #define USB_PID_AVERMEDIA_DVBT_USB2_COLD                0xa800
@@ -69,6 +74,7 @@
 #define USB_PID_GRANDTEC_DVBT_USB_WARM                  0x0fa1
 #define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
 #define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
+#define USB_PID_TERRATEC_CINERGY_T_USB_XE               0x0055
 #define USB_PID_TWINHAN_VP7041_COLD                     0x3201
 #define USB_PID_TWINHAN_VP7041_WARM                     0x3202
 #define USB_PID_TWINHAN_VP7020_COLD                     0x3203
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 9200a30dd1b9..7b9f35bfb4f0 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -110,7 +110,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
         input_dev->name = "IR-receiver inside an USB DVB receiver";
         input_dev->phys = d->rc_phys;
         usb_to_input_id(d->udev, &input_dev->id);
-        input_dev->cdev.dev = &d->udev->dev;
+        input_dev->dev.parent = &d->udev->dev;
 
         /* set the bits for the keys */
         deb_rc("key map size: %d\n", d->props.rc_key_map_size);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 6f824a569e14..d1b3c7b81fff 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -297,12 +297,6 @@ struct dvb_usb_adapter {
         int feedcount;
         int pid_filtering;
 
-        /* tuner programming information */
-        u8 pll_addr;
-        u8 pll_init[4];
-        struct dvb_pll_desc *pll_desc;
-        int (*tuner_pass_ctrl) (struct dvb_frontend *, int, u8);
-
         /* dvb */
         struct dvb_adapter   dvb_adap;
         struct dmxdev        dmxdev;
@@ -388,11 +382,6 @@ extern int dvb_usb_generic_write(struct dvb_usb_device *, u8 *, u16);
 /* commonly used remote control parsing */
 extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int *);
 
-/* commonly used pll init and set functions */
-extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *);
-extern int dvb_usb_tuner_calc_regs(struct dvb_frontend *, struct dvb_frontend_parameters *, u8 *buf, int buf_len);
-extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);
-
 /* commonly used firmware download types and function */
 struct hexline {
         u8 len;
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index e0587e663591..f01d99c1c43c 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -157,6 +157,7 @@ static int gl861_probe(struct usb_interface *intf,
 
 static struct usb_device_id gl861_table [] = {
                 { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580_55801) },
+                { USB_DEVICE(USB_VID_ALINK, USB_VID_ALINK_DTU) },
                 { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, gl861_table);
@@ -187,12 +188,16 @@ static struct dvb_usb_device_properties gl861_properties = {
         }},
         .i2c_algo         = &gl861_i2c_algo,
 
-        .num_device_descs = 1,
+        .num_device_descs = 2,
         .devices = {
                 {   "MSI Mega Sky 55801 DVB-T USB2.0",
                         { &gl861_table[0], NULL },
                         { NULL },
                 },
+                {   "A-LINK DTU DVB-T USB2.0",
+                        { &gl861_table[1], NULL },
+                        { NULL },
+                },
         }
 };
 
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index c546ddeda5d4..a956bc503a4c 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -22,6 +22,8 @@ static int dvb_usb_m920x_debug;
 module_param_named(debug,dvb_usb_m920x_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
 
+static int m920x_set_filter(struct dvb_usb_device *d, int type, int idx, int pid);
+
 static inline int m920x_read(struct usb_device *udev, u8 request, u16 value,
                              u16 index, void *data, int size)
 {
@@ -57,7 +59,8 @@ static inline int m920x_write(struct usb_device *udev, u8 request,
 
 static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
 {
-        int ret = 0;
+        int ret = 0, i, epi, flags = 0;
+        int adap_enabled[M9206_MAX_ADAPTERS] = { 0 };
 
         /* Remote controller init. */
         if (d->props.rc_query) {
@@ -76,9 +79,51 @@ static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
                 deb("Initialising remote control success\n");
         }
 
+        for (i = 0; i < d->props.num_adapters; i++)
+                flags |= d->adapter[i].props.caps;
+
+        /* Some devices(Dposh) might crash if we attempt touch at all. */
+        if (flags & DVB_USB_ADAP_HAS_PID_FILTER) {
+                for (i = 0; i < d->props.num_adapters; i++) {
+                        epi = d->adapter[i].props.stream.endpoint - 0x81;
+
+                        if (epi < 0 || epi >= M9206_MAX_ADAPTERS) {
+                                printk(KERN_INFO "m920x: Unexpected adapter endpoint!\n");
+                                return -EINVAL;
+                        }
+
+                        adap_enabled[epi] = 1;
+                }
+
+                for (i = 0; i < M9206_MAX_ADAPTERS; i++) {
+                        if (adap_enabled[i])
+                                continue;
+
+                        if ((ret = m920x_set_filter(d, 0x81 + i, 0, 0x0)) != 0)
+                                return ret;
+
+                        if ((ret = m920x_set_filter(d, 0x81 + i, 0, 0x02f5)) != 0)
+                                return ret;
+                }
+        }
+
         return ret;
 }
 
+static int m920x_init_ep(struct usb_interface *intf)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct usb_host_interface *alt;
+
+        if ((alt = usb_altnum_to_altsetting(intf, 1)) == NULL) {
+                deb("No alt found!\n");
+                return -ENODEV;
+        }
+
+        return usb_set_interface(udev, alt->desc.bInterfaceNumber,
+                                 alt->desc.bAlternateSetting);
+}
+
 static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
         struct m920x_state *m = d->priv;
@@ -211,8 +256,7 @@ static struct i2c_algorithm m920x_i2c_algo = {
 };
 
 /* pid filter */
-static int m920x_set_filter(struct dvb_usb_adapter *adap,
-                            int type, int idx, int pid)
+static int m920x_set_filter(struct dvb_usb_device *d, int type, int idx, int pid)
 {
         int ret = 0;
 
@@ -221,10 +265,10 @@ static int m920x_set_filter(struct dvb_usb_adapter *adap,
 
         pid |= 0x8000;
 
-        if ((ret = m920x_write(adap->dev->udev, M9206_FILTER, pid, (type << 8) | (idx * 4) )) != 0)
+        if ((ret = m920x_write(d->udev, M9206_FILTER, pid, (type << 8) | (idx * 4) )) != 0)
                 return ret;
 
-        if ((ret = m920x_write(adap->dev->udev, M9206_FILTER, 0, (type << 8) | (idx * 4) )) != 0)
+        if ((ret = m920x_write(d->udev, M9206_FILTER, 0, (type << 8) | (idx * 4) )) != 0)
                 return ret;
 
         return ret;
@@ -233,40 +277,35 @@ static int m920x_set_filter(struct dvb_usb_adapter *adap,
 static int m920x_update_filters(struct dvb_usb_adapter *adap)
 {
         struct m920x_state *m = adap->dev->priv;
-        int enabled = m->filtering_enabled;
+        int enabled = m->filtering_enabled[adap->id];
         int i, ret = 0, filter = 0;
+        int ep = adap->props.stream.endpoint;
 
         for (i = 0; i < M9206_MAX_FILTERS; i++)
-                if (m->filters[i] == 8192)
+                if (m->filters[adap->id][i] == 8192)
                         enabled = 0;
 
         /* Disable all filters */
-        if ((ret = m920x_set_filter(adap, 0x81, 1, enabled)) != 0)
+        if ((ret = m920x_set_filter(adap->dev, ep, 1, enabled)) != 0)
                 return ret;
 
         for (i = 0; i < M9206_MAX_FILTERS; i++)
-                if ((ret = m920x_set_filter(adap, 0x81, i + 2, 0)) != 0)
+                if ((ret = m920x_set_filter(adap->dev, ep, i + 2, 0)) != 0)
                         return ret;
 
-        if ((ret = m920x_set_filter(adap, 0x82, 0, 0x0)) != 0)
-                return ret;
-
         /* Set */
         if (enabled) {
                 for (i = 0; i < M9206_MAX_FILTERS; i++) {
-                        if (m->filters[i] == 0)
+                        if (m->filters[adap->id][i] == 0)
                                 continue;
 
-                        if ((ret = m920x_set_filter(adap, 0x81, filter + 2, m->filters[i])) != 0)
+                        if ((ret = m920x_set_filter(adap->dev, ep, filter + 2, m->filters[adap->id][i])) != 0)
                                 return ret;
 
                         filter++;
                 }
         }
 
-        if ((ret = m920x_set_filter(adap, 0x82, 0, 0x02f5)) != 0)
-                return ret;
-
         return ret;
 }
 
@@ -274,7 +313,7 @@ static int m920x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
         struct m920x_state *m = adap->dev->priv;
 
-        m->filtering_enabled = onoff ? 1 : 0;
+        m->filtering_enabled[adap->id] = onoff ? 1 : 0;
 
         return m920x_update_filters(adap);
 }
@@ -283,7 +322,7 @@ static int m920x_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, in
 {
         struct m920x_state *m = adap->dev->priv;
 
-        m->filters[index] = onoff ? pid : 0;
+        m->filters[adap->id][index] = onoff ? pid : 0;
 
         return m920x_update_filters(adap);
 }
@@ -368,6 +407,7 @@ static int m920x_identify_state(struct usb_device *udev,
 /* demod configurations */
 static int m920x_mt352_demod_init(struct dvb_frontend *fe)
 {
+        int ret;
         u8 config[] = { CONFIG, 0x3d };
         u8 clock[] = { CLOCK_CTL, 0x30 };
         u8 reset[] = { RESET, 0x80 };
@@ -377,17 +417,25 @@ static int m920x_mt352_demod_init(struct dvb_frontend *fe)
         u8 unk1[] = { 0x93, 0x1a };
         u8 unk2[] = { 0xb5, 0x7a };
 
-        mt352_write(fe, config, ARRAY_SIZE(config));
-        mt352_write(fe, clock, ARRAY_SIZE(clock));
-        mt352_write(fe, reset, ARRAY_SIZE(reset));
-        mt352_write(fe, adc_ctl, ARRAY_SIZE(adc_ctl));
-        mt352_write(fe, agc, ARRAY_SIZE(agc));
-        mt352_write(fe, sec_agc, ARRAY_SIZE(sec_agc));
-        mt352_write(fe, unk1, ARRAY_SIZE(unk1));
-        mt352_write(fe, unk2, ARRAY_SIZE(unk2));
-
         deb("Demod init!\n");
 
+        if ((ret = mt352_write(fe, config, ARRAY_SIZE(config))) != 0)
+                return ret;
+        if ((ret = mt352_write(fe, clock, ARRAY_SIZE(clock))) != 0)
+                return ret;
+        if ((ret = mt352_write(fe, reset, ARRAY_SIZE(reset))) != 0)
+                return ret;
+        if ((ret = mt352_write(fe, adc_ctl, ARRAY_SIZE(adc_ctl))) != 0)
+                return ret;
+        if ((ret = mt352_write(fe, agc, ARRAY_SIZE(agc))) != 0)
+                return ret;
+        if ((ret = mt352_write(fe, sec_agc, ARRAY_SIZE(sec_agc))) != 0)
+                return ret;
+        if ((ret = mt352_write(fe, unk1, ARRAY_SIZE(unk1))) != 0)
+                return ret;
+        if ((ret = mt352_write(fe, unk2, ARRAY_SIZE(unk2))) != 0)
+                return ret;
+
         return 0;
 }
 
@@ -558,8 +606,7 @@ static struct dvb_usb_device_properties dposh_properties;
 static int m920x_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
 {
-        struct dvb_usb_device *d;
-        struct usb_host_interface *alt;
+        struct dvb_usb_device *d = NULL;
         int ret;
         struct m920x_inits *rc_init_seq = NULL;
         int bInterfaceNumber = intf->cur_altsetting->desc.bInterfaceNumber;
@@ -604,23 +651,13 @@ static int m920x_probe(struct usb_interface *intf,
                  * tvwalkertwin_properties already configured both
                  * tuners, so there is nothing for us to do here
                  */
-
-                return -ENODEV;
         }
 
  found:
-        alt = usb_altnum_to_altsetting(intf, 1);
-        if (alt == NULL) {
-                deb("No alt found!\n");
-                return -ENODEV;
-        }
-
-        ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
-                                alt->desc.bAlternateSetting);
-        if (ret < 0)
+        if ((ret = m920x_init_ep(intf)) < 0)
                 return ret;
 
-        if ((ret = m920x_init(d, rc_init_seq)) != 0)
+        if (d && (ret = m920x_init(d, rc_init_seq)) != 0)
                 return ret;
 
         return ret;
@@ -737,9 +774,9 @@ static struct dvb_usb_device_properties digivox_mini_ii_properties = {
  *
  * LifeView TV Walker Twin has 1 x M9206, 2 x TDA10046, 2 x TDA8275A
  * TDA10046 #0 is located at i2c address 0x08
- * TDA10046 #1 is located at i2c address 0x0b (presently disabled - not yet working)
+ * TDA10046 #1 is located at i2c address 0x0b
  * TDA8275A #0 is located at i2c address 0x60
- * TDA8275A #1 is located at i2c address 0x61 (presently disabled - not yet working)
+ * TDA8275A #1 is located at i2c address 0x61
  */
 static struct dvb_usb_device_properties tvwalkertwin_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -756,7 +793,7 @@ static struct dvb_usb_device_properties tvwalkertwin_properties = {
         .size_of_priv     = sizeof(struct m920x_state),
 
         .identify_state   = m920x_identify_state,
-        .num_adapters = 1,
+        .num_adapters = 2,
         .adapter = {{
                 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
                         DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/dvb/dvb-usb/m920x.h
index 2c8942d04222..37532890accd 100644
--- a/drivers/media/dvb/dvb-usb/m920x.h
+++ b/drivers/media/dvb/dvb-usb/m920x.h
@@ -18,6 +18,7 @@
 #define M9206_FW        0x30
 
 #define M9206_MAX_FILTERS 8
+#define M9206_MAX_ADAPTERS 2
 
 /*
 sequences found in logs:
@@ -60,8 +61,8 @@ response to a write, is unknown.
 */
 
 struct m920x_state {
-        u16 filters[M9206_MAX_FILTERS];
-        int filtering_enabled;
+        u16 filters[M9206_MAX_ADAPTERS][M9206_MAX_FILTERS];
+        int filtering_enabled[M9206_MAX_ADAPTERS];
         int rep_count;
 };
 
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 518d7ad217df..d7c04951ceab 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -263,7 +263,7 @@ static int opera1_tuner_attach(struct dvb_usb_adapter *adap)
 {
         dvb_attach(
                 dvb_pll_attach, adap->fe, 0xc0>>1,
-                &adap->dev->i2c_adap, &dvb_pll_opera1
+                &adap->dev->i2c_adap, DVB_PLL_OPERA1
         );
         return 0;
 }
@@ -435,9 +435,9 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev,
 {
         const struct firmware *fw = NULL;
         u8 *b, *p;
-        int ret = 0, i;
+        int ret = 0, i,fpgasize=40;
         u8 testval;
-        info("start downloading fpga firmware");
+        info("start downloading fpga firmware %s",filename);
 
         if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) {
                 err("did not find the firmware file. (%s) "
@@ -454,17 +454,20 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev,
                         /* clear fpga ? */
                         opera1_xilinx_rw(dev, 0xbc, 0xaa, &fpga_command, 1,
                                          OPERA_WRITE_MSG);
-                        for (i = 0; p[i] != 0 && i < fw->size;) {
+                        for (i = 0; i < fw->size;) {
+                                if ( (fw->size - i) <fpgasize){
+                                    fpgasize=fw->size-i;
+                                }
                                 b = (u8 *) p + i;
                                 if (opera1_xilinx_rw
-                                        (dev, OPERA_WRITE_FX2, 0x0, b + 1, b[0],
-                                                OPERA_WRITE_MSG) != b[0]
+                                        (dev, OPERA_WRITE_FX2, 0x0, b , fpgasize,
+                                                OPERA_WRITE_MSG) != fpgasize
                                         ) {
                                         err("error while transferring firmware");
                                         ret = -EINVAL;
                                         break;
                                 }
-                                i = i + 1 + b[0];
+                                i = i + fpgasize;
                         }
                         /* restart the CPU */
                         if (ret || opera1_xilinx_rw
@@ -534,18 +537,16 @@ static struct dvb_usb_device_properties opera1_properties = {
 static int opera1_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
-        struct dvb_usb_device *d;
         struct usb_device *udev = interface_to_usbdev(intf);
 
         if (udev->descriptor.idProduct == USB_PID_OPERA1_WARM &&
                 udev->descriptor.idVendor == USB_VID_OPERA1 &&
-                (d == NULL
-                        || opera1_xilinx_load_firmware(udev, "dvb-usb-opera1-fpga.fw") != 0)
-                ) {
+                opera1_xilinx_load_firmware(udev, "dvb-usb-opera1-fpga-01.fw") != 0
+            ) {
                 return -EINVAL;
         }
 
-        if (dvb_usb_device_init(intf, &opera1_properties, THIS_MODULE, &d) != 0)
+        if (dvb_usb_device_init(intf, &opera1_properties, THIS_MODULE, NULL) != 0)
                 return -EINVAL;
         return 0;
 }
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
index f77b48f76582..0dcab3d4e236 100644
--- a/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -65,9 +65,7 @@ static int umt_mt352_frontend_attach(struct dvb_usb_adapter *adap)
 
 static int umt_tuner_attach (struct dvb_usb_adapter *adap)
 {
-        adap->pll_addr = 0x61;
-        adap->pll_desc = &dvb_pll_tua6034;
-        adap->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+        dvb_attach(dvb_pll_attach, adap->fe, 0x61, NULL, DVB_PLL_TUA6034);
         return 0;
 }
 
@@ -84,8 +82,8 @@ static int umt_probe(struct usb_interface *intf,
 
 /* do not change the order of the ID table */
 static struct usb_device_id umt_table [] = {
-/* 00 */        { USB_DEVICE(USB_VID_HANFTEK,           USB_PID_HANFTEK_UMT_010_COLD) },
-/* 01 */        { USB_DEVICE(USB_VID_HANFTEK,           USB_PID_HANFTEK_UMT_010_WARM) },
+/* 00 */        { USB_DEVICE(USB_VID_HANFTEK, USB_PID_HANFTEK_UMT_010_COLD) },
+/* 01 */        { USB_DEVICE(USB_VID_HANFTEK, USB_PID_HANFTEK_UMT_010_WARM) },
                         { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, umt_table);
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 27f386585d43..156b062e02c4 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel DVB frontend device drivers.
 #
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
 
 obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 335219ebce2d..1dc164d5488c 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include "dvb_frontend.h"
-#include "dvb-pll.h"
 #include "cx22702.h"
 
 
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index 732e94aaa364..0834c0677fef 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -917,7 +917,7 @@ static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 static int cx24123_tune(struct dvb_frontend* fe,
                         struct dvb_frontend_parameters* params,
                         unsigned int mode_flags,
-                        int *delay,
+                        unsigned int *delay,
                         fe_status_t *status)
 {
         int retval = 0;
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 5f96ffda91ad..0c0b94767bc1 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -24,6 +24,23 @@
 
 #include "dvb-pll.h"
 
+struct dvb_pll_desc {
+        char *name;
+        u32  min;
+        u32  max;
+        u32  iffreq;
+        void (*set)(u8 *buf, const struct dvb_frontend_parameters *params);
+        u8   *initdata;
+        u8   *sleepdata;
+        int  count;
+        struct {
+                u32 limit;
+                u32 stepsize;
+                u8  config;
+                u8  cb;
+        } entries[12];
+};
+
 /* ----------------------------------------------------------- */
 /* descriptions                                                */
 
@@ -38,7 +55,13 @@
         0x50 = AGC Take over point = 103 dBuV */
 static u8 tua603x_agc103[] = { 2, 0x80|0x40|0x18|0x06|0x01, 0x00|0x50 };
 
-struct dvb_pll_desc dvb_pll_thomson_dtt7579 = {
+/*      0x04 = 166.67 kHz divider
+
+        0x80 = AGC Time constant 50ms Iagc = 9 uA
+        0x20 = AGC Take over point = 112 dBuV */
+static u8 tua603x_agc112[] = { 2, 0x80|0x40|0x18|0x04|0x01, 0x80|0x20 };
+
+static struct dvb_pll_desc dvb_pll_thomson_dtt7579 = {
         .name  = "Thomson dtt7579",
         .min   = 177000000,
         .max   = 858000000,
@@ -52,9 +75,8 @@ struct dvb_pll_desc dvb_pll_thomson_dtt7579 = {
                 {  999999999, 166667, 0xf4, 0x08 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_thomson_dtt7579);
 
-struct dvb_pll_desc dvb_pll_thomson_dtt7610 = {
+static struct dvb_pll_desc dvb_pll_thomson_dtt7610 = {
         .name  = "Thomson dtt7610",
         .min   =  44000000,
         .max   = 958000000,
@@ -66,19 +88,19 @@ struct dvb_pll_desc dvb_pll_thomson_dtt7610 = {
                 { 999999999, 62500, 0x8e, 0x3c },
         },
 };
-EXPORT_SYMBOL(dvb_pll_thomson_dtt7610);
 
-static void thomson_dtt759x_bw(u8 *buf, u32 freq, int bandwidth)
+static void thomson_dtt759x_bw(u8 *buf,
+                               const struct dvb_frontend_parameters *params)
 {
-        if (BANDWIDTH_7_MHZ == bandwidth)
+        if (BANDWIDTH_7_MHZ == params->u.ofdm.bandwidth)
                 buf[3] |= 0x10;
 }
 
-struct dvb_pll_desc dvb_pll_thomson_dtt759x = {
+static struct dvb_pll_desc dvb_pll_thomson_dtt759x = {
         .name  = "Thomson dtt759x",
         .min   = 177000000,
         .max   = 896000000,
-        .setbw = thomson_dtt759x_bw,
+        .set   = thomson_dtt759x_bw,
         .iffreq= 36166667,
         .sleepdata = (u8[]){ 2, 0x84, 0x03 },
         .count = 5,
@@ -90,9 +112,8 @@ struct dvb_pll_desc dvb_pll_thomson_dtt759x = {
                 {  999999999, 166667, 0xfc, 0x08 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_thomson_dtt759x);
 
-struct dvb_pll_desc dvb_pll_lg_z201 = {
+static struct dvb_pll_desc dvb_pll_lg_z201 = {
         .name  = "LG z201",
         .min   = 174000000,
         .max   = 862000000,
@@ -107,9 +128,8 @@ struct dvb_pll_desc dvb_pll_lg_z201 = {
                 {  999999999, 166667, 0xfc, 0x04 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_lg_z201);
 
-struct dvb_pll_desc dvb_pll_microtune_4042 = {
+static struct dvb_pll_desc dvb_pll_microtune_4042 = {
         .name  = "Microtune 4042 FI5",
         .min   =  57000000,
         .max   = 858000000,
@@ -121,9 +141,8 @@ struct dvb_pll_desc dvb_pll_microtune_4042 = {
                 { 999999999, 62500, 0x8e, 0x31 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_microtune_4042);
 
-struct dvb_pll_desc dvb_pll_thomson_dtt761x = {
+static struct dvb_pll_desc dvb_pll_thomson_dtt761x = {
         /* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
         .name  = "Thomson dtt761x",
         .min   =  57000000,
@@ -137,9 +156,8 @@ struct dvb_pll_desc dvb_pll_thomson_dtt761x = {
                 { 999999999, 62500, 0x8e, 0x3c },
         },
 };
-EXPORT_SYMBOL(dvb_pll_thomson_dtt761x);
 
-struct dvb_pll_desc dvb_pll_unknown_1 = {
+static struct dvb_pll_desc dvb_pll_unknown_1 = {
         .name  = "unknown 1", /* used by dntv live dvb-t */
         .min   = 174000000,
         .max   = 862000000,
@@ -157,12 +175,11 @@ struct dvb_pll_desc dvb_pll_unknown_1 = {
                 {  999999999, 166667, 0xfc, 0x08 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_unknown_1);
 
 /* Infineon TUA6010XS
  * used in Thomson Cable Tuner
  */
-struct dvb_pll_desc dvb_pll_tua6010xs = {
+static struct dvb_pll_desc dvb_pll_tua6010xs = {
         .name  = "Infineon TUA6010XS",
         .min   =  44250000,
         .max   = 858000000,
@@ -174,10 +191,9 @@ struct dvb_pll_desc dvb_pll_tua6010xs = {
                 {  999999999, 62500, 0x8e, 0x85 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_tua6010xs);
 
 /* Panasonic env57h1xd5 (some Philips PLL ?) */
-struct dvb_pll_desc dvb_pll_env57h1xd5 = {
+static struct dvb_pll_desc dvb_pll_env57h1xd5 = {
         .name  = "Panasonic ENV57H1XD5",
         .min   =  44250000,
         .max   = 858000000,
@@ -190,23 +206,23 @@ struct dvb_pll_desc dvb_pll_env57h1xd5 = {
                 {  999999999, 166667, 0xc2, 0xa4 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_env57h1xd5);
 
 /* Philips TDA6650/TDA6651
  * used in Panasonic ENV77H11D5
  */
-static void tda665x_bw(u8 *buf, u32 freq, int bandwidth)
+static void tda665x_bw(u8 *buf, const struct dvb_frontend_parameters *params)
 {
-        if (bandwidth == BANDWIDTH_8_MHZ)
+        if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
                 buf[3] |= 0x08;
 }
 
-struct dvb_pll_desc dvb_pll_tda665x = {
+static struct dvb_pll_desc dvb_pll_tda665x = {
         .name  = "Philips TDA6650/TDA6651",
         .min   =  44250000,
         .max   = 858000000,
-        .setbw = tda665x_bw,
+        .set   = tda665x_bw,
         .iffreq= 36166667,
+        .initdata = (u8[]){ 4, 0x0b, 0xf5, 0x85, 0xab },
         .count = 12,
         .entries = {
                 {   93834000, 166667, 0xca, 0x61 /* 011 0 0 0  01 */ },
@@ -223,36 +239,34 @@ struct dvb_pll_desc dvb_pll_tda665x = {
                 {  861000000, 166667, 0xca, 0xe4 /* 111 0 0 1  00 */ },
         }
 };
-EXPORT_SYMBOL(dvb_pll_tda665x);
 
 /* Infineon TUA6034
  * used in LG TDTP E102P
  */
-static void tua6034_bw(u8 *buf, u32 freq, int bandwidth)
+static void tua6034_bw(u8 *buf, const struct dvb_frontend_parameters *params)
 {
-        if (BANDWIDTH_7_MHZ != bandwidth)
+        if (BANDWIDTH_7_MHZ != params->u.ofdm.bandwidth)
                 buf[3] |= 0x08;
 }
 
-struct dvb_pll_desc dvb_pll_tua6034 = {
+static struct dvb_pll_desc dvb_pll_tua6034 = {
         .name  = "Infineon TUA6034",
         .min   =  44250000,
         .max   = 858000000,
         .iffreq= 36166667,
         .count = 3,
-        .setbw = tua6034_bw,
+        .set   = tua6034_bw,
         .entries = {
                 {  174500000, 62500, 0xce, 0x01 },
                 {  230000000, 62500, 0xce, 0x02 },
                 {  999999999, 62500, 0xce, 0x04 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_tua6034);
 
 /* Infineon TUA6034
  * used in LG TDVS-H061F, LG TDVS-H062F and LG TDVS-H064F
  */
-struct dvb_pll_desc dvb_pll_lg_tdvs_h06xf = {
+static struct dvb_pll_desc dvb_pll_lg_tdvs_h06xf = {
         .name  = "LG TDVS-H06xF",
         .min   =  54000000,
         .max   = 863000000,
@@ -265,23 +279,25 @@ struct dvb_pll_desc dvb_pll_lg_tdvs_h06xf = {
                 {  999999999, 62500, 0xce, 0x04 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_lg_tdvs_h06xf);
 
 /* Philips FMD1216ME
  * used in Medion Hybrid PCMCIA card and USB Box
  */
-static void fmd1216me_bw(u8 *buf, u32 freq, int bandwidth)
+static void fmd1216me_bw(u8 *buf, const struct dvb_frontend_parameters *params)
 {
-        if (bandwidth == BANDWIDTH_8_MHZ && freq >= 158870000)
+        if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ &&
+            params->frequency >= 158870000)
                 buf[3] |= 0x08;
 }
 
-struct dvb_pll_desc dvb_pll_fmd1216me = {
+static struct dvb_pll_desc dvb_pll_fmd1216me = {
         .name = "Philips FMD1216ME",
         .min = 50870000,
         .max = 858000000,
         .iffreq= 36125000,
-        .setbw = fmd1216me_bw,
+        .set   = fmd1216me_bw,
+        .initdata = tua603x_agc112,
+        .sleepdata = (u8[]){ 4, 0x9c, 0x60, 0x85, 0x54 },
         .count = 7,
         .entries = {
                 { 143870000, 166667, 0xbc, 0x41 },
@@ -293,23 +309,22 @@ struct dvb_pll_desc dvb_pll_fmd1216me = {
                 { 999999999, 166667, 0xfc, 0x44 },
         }
 };
-EXPORT_SYMBOL(dvb_pll_fmd1216me);
 
 /* ALPS TDED4
  * used in Nebula-Cards and USB boxes
  */
-static void tded4_bw(u8 *buf, u32 freq, int bandwidth)
+static void tded4_bw(u8 *buf, const struct dvb_frontend_parameters *params)
 {
-        if (bandwidth == BANDWIDTH_8_MHZ)
+        if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
                 buf[3] |= 0x04;
 }
 
-struct dvb_pll_desc dvb_pll_tded4 = {
+static struct dvb_pll_desc dvb_pll_tded4 = {
         .name = "ALPS TDED4",
         .min = 47000000,
         .max = 863000000,
         .iffreq= 36166667,
-        .setbw = tded4_bw,
+        .set   = tded4_bw,
         .count = 4,
         .entries = {
                 { 153000000, 166667, 0x85, 0x01 },
@@ -318,12 +333,11 @@ struct dvb_pll_desc dvb_pll_tded4 = {
                 { 999999999, 166667, 0x85, 0x88 },
         }
 };
-EXPORT_SYMBOL(dvb_pll_tded4);
 
 /* ALPS TDHU2
  * used in AverTVHD MCE A180
  */
-struct dvb_pll_desc dvb_pll_tdhu2 = {
+static struct dvb_pll_desc dvb_pll_tdhu2 = {
         .name = "ALPS TDHU2",
         .min = 54000000,
         .max = 864000000,
@@ -336,16 +350,29 @@ struct dvb_pll_desc dvb_pll_tdhu2 = {
                 { 999999999, 62500, 0x85, 0x88 },
         }
 };
-EXPORT_SYMBOL(dvb_pll_tdhu2);
 
 /* Philips TUV1236D
  * used in ATI HDTV Wonder
  */
-struct dvb_pll_desc dvb_pll_tuv1236d = {
+static void tuv1236d_rf(u8 *buf, const struct dvb_frontend_parameters *params)
+{
+        switch (params->u.vsb.modulation) {
+                case QAM_64:
+                case QAM_256:
+                        buf[3] |= 0x08;
+                        break;
+                case VSB_8:
+                default:
+                        buf[3] &= ~0x08;
+        }
+}
+
+static struct dvb_pll_desc dvb_pll_tuv1236d = {
         .name  = "Philips TUV1236D",
         .min   =  54000000,
         .max   = 864000000,
         .iffreq= 44000000,
+        .set   = tuv1236d_rf,
         .count = 3,
         .entries = {
                 { 157250000, 62500, 0xc6, 0x41 },
@@ -353,12 +380,11 @@ struct dvb_pll_desc dvb_pll_tuv1236d = {
                 { 999999999, 62500, 0xc6, 0x44 },
         },
 };
-EXPORT_SYMBOL(dvb_pll_tuv1236d);
 
 /* Samsung TBMV30111IN / TBMV30712IN1
  * used in Air2PC ATSC - 2nd generation (nxt2002)
  */
-struct dvb_pll_desc dvb_pll_samsung_tbmv = {
+static struct dvb_pll_desc dvb_pll_samsung_tbmv = {
         .name = "Samsung TBMV30111IN / TBMV30712IN1",
         .min = 54000000,
         .max = 860000000,
@@ -373,12 +399,11 @@ struct dvb_pll_desc dvb_pll_samsung_tbmv = {
                 { 999999999, 166667, 0xfc, 0x02 },
         }
 };
-EXPORT_SYMBOL(dvb_pll_samsung_tbmv);
 
 /*
  * Philips SD1878 Tuner.
  */
-struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261 = {
+static struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261 = {
         .name  = "Philips SD1878",
         .min   =  950000,
         .max   = 2150000,
@@ -391,19 +416,18 @@ struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261 = {
                 { 2150000, 500, 0xc4, 0xc0},
         },
 };
-EXPORT_SYMBOL(dvb_pll_philips_sd1878_tda8261);
 
 /*
  * Philips TD1316 Tuner.
  */
-static void td1316_bw(u8 *buf, u32 freq, int bandwidth)
+static void td1316_bw(u8 *buf, const struct dvb_frontend_parameters *params)
 {
         u8 band;
 
         /* determine band */
-        if (freq < 161000000)
+        if (params->frequency < 161000000)
                 band = 1;
-        else if (freq < 444000000)
+        else if (params->frequency < 444000000)
                 band = 2;
         else
                 band = 4;
@@ -411,16 +435,16 @@ static void td1316_bw(u8 *buf, u32 freq, int bandwidth)
         buf[3] |= band;
 
         /* setup PLL filter */
-        if (bandwidth == BANDWIDTH_8_MHZ)
+        if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
                 buf[3] |= 1 << 3;
 }
 
-struct dvb_pll_desc dvb_pll_philips_td1316 = {
+static struct dvb_pll_desc dvb_pll_philips_td1316 = {
         .name  = "Philips TD1316",
         .min   =  87000000,
         .max   = 895000000,
         .iffreq= 36166667,
-        .setbw = td1316_bw,
+        .set   = td1316_bw,
         .count = 9,
         .entries = {
                 {  93834000, 166667, 0xca, 0x60},
@@ -434,10 +458,9 @@ struct dvb_pll_desc dvb_pll_philips_td1316 = {
                 { 858834000, 166667, 0xca, 0xe0},
         },
 };
-EXPORT_SYMBOL(dvb_pll_philips_td1316);
 
 /* FE6600 used on DViCO Hybrid */
-struct dvb_pll_desc dvb_pll_thomson_fe6600 = {
+static struct dvb_pll_desc dvb_pll_thomson_fe6600 = {
         .name = "Thomson FE6600",
         .min =  44250000,
         .max = 858000000,
@@ -450,19 +473,19 @@ struct dvb_pll_desc dvb_pll_thomson_fe6600 = {
                 { 999999999, 166667, 0xf4, 0x18 },
         }
 };
-EXPORT_SYMBOL(dvb_pll_thomson_fe6600);
-static void opera1_bw(u8 *buf, u32 freq, int bandwidth)
+
+static void opera1_bw(u8 *buf, const struct dvb_frontend_parameters *params)
 {
-        if (bandwidth == BANDWIDTH_8_MHZ)
+        if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
                 buf[2] |= 0x08;
 }
 
-struct dvb_pll_desc dvb_pll_opera1 = {
+static struct dvb_pll_desc dvb_pll_opera1 = {
         .name  = "Opera Tuner",
         .min   =  900000,
         .max   = 2250000,
         .iffreq= 0,
-        .setbw = opera1_bw,
+        .set   = opera1_bw,
         .count = 8,
         .entries = {
                 { 1064000, 500, 0xe5, 0xc6 },
@@ -475,7 +498,54 @@ struct dvb_pll_desc dvb_pll_opera1 = {
                 { 2250000, 500, 0xe5, 0xc4 },
         }
 };
-EXPORT_SYMBOL(dvb_pll_opera1);
+
+/* Philips FCV1236D
+ */
+struct dvb_pll_desc dvb_pll_fcv1236d = {
+/* Bit_0: RF Input select
+ * Bit_1: 0=digital, 1=analog
+ */
+        .name  = "Philips FCV1236D",
+        .min   =  53000000,
+        .max   = 803000000,
+        .iffreq= 44000000,
+        .count = 3,
+        .entries = {
+                { 159000000, 62500, 0x8e, 0xa0 },
+                { 453000000, 62500, 0x8e, 0x90 },
+                { 999999999, 62500, 0x8e, 0x30 },
+        },
+};
+
+/* ----------------------------------------------------------- */
+
+static struct dvb_pll_desc *pll_list[] = {
+        [DVB_PLL_UNDEFINED]              = NULL,
+        [DVB_PLL_THOMSON_DTT7579]        = &dvb_pll_thomson_dtt7579,
+        [DVB_PLL_THOMSON_DTT759X]        = &dvb_pll_thomson_dtt759x,
+        [DVB_PLL_THOMSON_DTT7610]        = &dvb_pll_thomson_dtt7610,
+        [DVB_PLL_LG_Z201]                = &dvb_pll_lg_z201,
+        [DVB_PLL_MICROTUNE_4042]         = &dvb_pll_microtune_4042,
+        [DVB_PLL_THOMSON_DTT761X]        = &dvb_pll_thomson_dtt761x,
+        [DVB_PLL_UNKNOWN_1]              = &dvb_pll_unknown_1,
+        [DVB_PLL_TUA6010XS]              = &dvb_pll_tua6010xs,
+        [DVB_PLL_ENV57H1XD5]             = &dvb_pll_env57h1xd5,
+        [DVB_PLL_TUA6034]                = &dvb_pll_tua6034,
+        [DVB_PLL_LG_TDVS_H06XF]          = &dvb_pll_lg_tdvs_h06xf,
+        [DVB_PLL_TDA665X]                = &dvb_pll_tda665x,
+        [DVB_PLL_FMD1216ME]              = &dvb_pll_fmd1216me,
+        [DVB_PLL_TDED4]                  = &dvb_pll_tded4,
+        [DVB_PLL_TUV1236D]               = &dvb_pll_tuv1236d,
+        [DVB_PLL_TDHU2]                  = &dvb_pll_tdhu2,
+        [DVB_PLL_SAMSUNG_TBMV]           = &dvb_pll_samsung_tbmv,
+        [DVB_PLL_PHILIPS_SD1878_TDA8261] = &dvb_pll_philips_sd1878_tda8261,
+        [DVB_PLL_PHILIPS_TD1316]         = &dvb_pll_philips_td1316,
+        [DVB_PLL_THOMSON_FE6600]         = &dvb_pll_thomson_fe6600,
+        [DVB_PLL_OPERA1]                 = &dvb_pll_opera1,
+        [DVB_PLL_FCV1236D]               = &dvb_pll_fcv1236d,
+};
+
+/* ----------------------------------------------------------- */
 
 struct dvb_pll_priv {
         /* i2c details */
@@ -497,35 +567,37 @@ static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
-                      u32 freq, int bandwidth)
+static int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
+                             const struct dvb_frontend_parameters *params)
 {
         u32 div;
         int i;
 
-        if (freq != 0 && (freq < desc->min || freq > desc->max))
-            return -EINVAL;
+        if (params->frequency != 0 && (params->frequency < desc->min ||
+                                       params->frequency > desc->max))
+                return -EINVAL;
 
         for (i = 0; i < desc->count; i++) {
-                if (freq > desc->entries[i].limit)
+                if (params->frequency > desc->entries[i].limit)
                         continue;
                 break;
         }
+
         if (debug)
-                printk("pll: %s: freq=%d bw=%d | i=%d/%d\n",
-                       desc->name, freq, bandwidth, i, desc->count);
+                printk("pll: %s: freq=%d | i=%d/%d\n", desc->name,
+                       params->frequency, i, desc->count);
         if (i == desc->count)
                 return -EINVAL;
 
-        div = (freq + desc->iffreq + desc->entries[i].stepsize/2) /
-              desc->entries[i].stepsize;
+        div = (params->frequency + desc->iffreq +
+               desc->entries[i].stepsize/2) / desc->entries[i].stepsize;
         buf[0] = div >> 8;
         buf[1] = div & 0xff;
         buf[2] = desc->entries[i].config;
         buf[3] = desc->entries[i].cb;
 
-        if (desc->setbw)
-                desc->setbw(buf, freq, bandwidth);
+        if (desc->set)
+                desc->set(buf, params);
 
         if (debug)
                 printk("pll: %s: div=%d | buf=0x%02x,0x%02x,0x%02x,0x%02x\n",
@@ -534,7 +606,6 @@ int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
         // calculate the frequency we set it to
         return (div * desc->entries[i].stepsize) - desc->iffreq;
 }
-EXPORT_SYMBOL(dvb_pll_configure);
 
 static int dvb_pll_release(struct dvb_frontend *fe)
 {
@@ -578,18 +649,12 @@ static int dvb_pll_set_params(struct dvb_frontend *fe,
                 { .addr = priv->pll_i2c_address, .flags = 0,
                   .buf = buf, .len = sizeof(buf) };
         int result;
-        u32 bandwidth = 0, frequency = 0;
+        u32 frequency = 0;
 
         if (priv->i2c == NULL)
                 return -EINVAL;
 
-        // DVBT bandwidth only just now
-        if (fe->ops.info.type == FE_OFDM) {
-                bandwidth = params->u.ofdm.bandwidth;
-        }
-
-        if ((result = dvb_pll_configure(priv->pll_desc, buf,
-                                        params->frequency, bandwidth)) < 0)
+        if ((result = dvb_pll_configure(priv->pll_desc, buf, params)) < 0)
                 return result;
         else
                 frequency = result;
@@ -601,7 +666,7 @@ static int dvb_pll_set_params(struct dvb_frontend *fe,
         }
 
         priv->frequency = frequency;
-        priv->bandwidth = bandwidth;
+        priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
 
         return 0;
 }
@@ -612,18 +677,12 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,
 {
         struct dvb_pll_priv *priv = fe->tuner_priv;
         int result;
-        u32 bandwidth = 0, frequency = 0;
+        u32 frequency = 0;
 
         if (buf_len < 5)
                 return -EINVAL;
 
-        // DVBT bandwidth only just now
-        if (fe->ops.info.type == FE_OFDM) {
-                bandwidth = params->u.ofdm.bandwidth;
-        }
-
-        if ((result = dvb_pll_configure(priv->pll_desc, buf+1,
-                                        params->frequency, bandwidth)) < 0)
+        if ((result = dvb_pll_configure(priv->pll_desc, buf+1, params)) < 0)
                 return result;
         else
                 frequency = result;
@@ -631,7 +690,7 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,
         buf[0] = priv->pll_i2c_address;
 
         priv->frequency = frequency;
-        priv->bandwidth = bandwidth;
+        priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
 
         return 5;
 }
@@ -687,13 +746,18 @@ static struct dvb_tuner_ops dvb_pll_tuner_ops = {
 
 struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,
                                     struct i2c_adapter *i2c,
-                                    struct dvb_pll_desc *desc)
+                                    unsigned int pll_desc_id)
 {
         u8 b1 [] = { 0 };
         struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD,
                                .buf = b1, .len = 1 };
         struct dvb_pll_priv *priv = NULL;
         int ret;
+        struct dvb_pll_desc *desc;
+
+        BUG_ON(pll_desc_id < 1 || pll_desc_id >= ARRAY_SIZE(pll_list));
+
+        desc = pll_list[pll_desc_id];
 
         if (i2c != NULL) {
                 if (fe->ops.i2c_gate_ctrl)
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index 5209f46f0893..e93a8104052b 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -8,50 +8,29 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
-struct dvb_pll_desc {
-        char *name;
-        u32  min;
-        u32  max;
-        u32  iffreq;
-        void (*setbw)(u8 *buf, u32 freq, int bandwidth);
-        u8   *initdata;
-        u8   *sleepdata;
-        int  count;
-        struct {
-                u32 limit;
-                u32 stepsize;
-                u8  config;
-                u8  cb;
-        } entries[12];
-};
-
-extern struct dvb_pll_desc dvb_pll_thomson_dtt7579;
-extern struct dvb_pll_desc dvb_pll_thomson_dtt759x;
-extern struct dvb_pll_desc dvb_pll_thomson_dtt7610;
-extern struct dvb_pll_desc dvb_pll_lg_z201;
-extern struct dvb_pll_desc dvb_pll_microtune_4042;
-extern struct dvb_pll_desc dvb_pll_thomson_dtt761x;
-extern struct dvb_pll_desc dvb_pll_unknown_1;
-
-extern struct dvb_pll_desc dvb_pll_tua6010xs;
-extern struct dvb_pll_desc dvb_pll_env57h1xd5;
-extern struct dvb_pll_desc dvb_pll_tua6034;
-extern struct dvb_pll_desc dvb_pll_lg_tdvs_h06xf;
-extern struct dvb_pll_desc dvb_pll_tda665x;
-extern struct dvb_pll_desc dvb_pll_fmd1216me;
-extern struct dvb_pll_desc dvb_pll_tded4;
-
-extern struct dvb_pll_desc dvb_pll_tuv1236d;
-extern struct dvb_pll_desc dvb_pll_tdhu2;
-extern struct dvb_pll_desc dvb_pll_samsung_tbmv;
-extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;
-extern struct dvb_pll_desc dvb_pll_philips_td1316;
-
-extern struct dvb_pll_desc dvb_pll_thomson_fe6600;
-extern struct dvb_pll_desc dvb_pll_opera1;
-
-extern int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
-                             u32 freq, int bandwidth);
+#define DVB_PLL_UNDEFINED               0
+#define DVB_PLL_THOMSON_DTT7579         1
+#define DVB_PLL_THOMSON_DTT759X         2
+#define DVB_PLL_THOMSON_DTT7610         3
+#define DVB_PLL_LG_Z201                 4
+#define DVB_PLL_MICROTUNE_4042          5
+#define DVB_PLL_THOMSON_DTT761X         6
+#define DVB_PLL_UNKNOWN_1               7
+#define DVB_PLL_TUA6010XS               8
+#define DVB_PLL_ENV57H1XD5              9
+#define DVB_PLL_TUA6034                10
+#define DVB_PLL_LG_TDVS_H06XF          11
+#define DVB_PLL_TDA665X                12
+#define DVB_PLL_FMD1216ME              13
+#define DVB_PLL_TDED4                  14
+#define DVB_PLL_TUV1236D               15
+#define DVB_PLL_TDHU2                  16
+#define DVB_PLL_SAMSUNG_TBMV           17
+#define DVB_PLL_PHILIPS_SD1878_TDA8261 18
+#define DVB_PLL_PHILIPS_TD1316         19
+#define DVB_PLL_THOMSON_FE6600         20
+#define DVB_PLL_OPERA1                 21
+#define DVB_PLL_FCV1236D               22
 
 /**
  * Attach a dvb-pll to the supplied frontend structure.
@@ -59,19 +38,19 @@ extern int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
  * @param fe Frontend to attach to.
  * @param pll_addr i2c address of the PLL (if used).
  * @param i2c i2c adapter to use (set to NULL if not used).
- * @param desc dvb_pll_desc to use.
+ * @param pll_desc_id dvb_pll_desc to use.
  * @return Frontend pointer on success, NULL on failure
  */
 #if defined(CONFIG_DVB_PLL) || (defined(CONFIG_DVB_PLL_MODULE) && defined(MODULE))
 extern struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe,
                                            int pll_addr,
                                            struct i2c_adapter *i2c,
-                                           struct dvb_pll_desc *desc);
+                                           unsigned int pll_desc_id);
 #else
 static inline struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe,
                                            int pll_addr,
                                            struct i2c_adapter *i2c,
-                                           struct dvb_pll_desc *desc)
+                                           unsigned int pll_desc_id)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
         return NULL;
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index b809f83d9563..ddc84899cf86 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -49,7 +49,6 @@
 #include <linux/string.h>
 
 #include "dvb_frontend.h"
-#include "dvb-pll.h"
 #include "nxt200x.h"
 
 struct nxt200x_state {
@@ -546,11 +545,6 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
                 nxt200x_writebytes(state, 0x17, buf, 1);
         }
 
-        /* get tuning information */
-        if (fe->ops.tuner_ops.calc_regs) {
-                fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
-        }
-
         /* set additional params */
         switch (p->u.vsb.modulation) {
                 case QAM_64:
@@ -559,27 +553,24 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
                         /* This is just a guess since I am unable to test it */
                         if (state->config->set_ts_params)
                                 state->config->set_ts_params(fe, 1);
-
-                        /* set input */
-                        if (state->config->set_pll_input)
-                                state->config->set_pll_input(buf+1, 1);
                         break;
                 case VSB_8:
                         /* Set non-punctured clock for VSB */
                         if (state->config->set_ts_params)
                                 state->config->set_ts_params(fe, 0);
-
-                        /* set input */
-                        if (state->config->set_pll_input)
-                                state->config->set_pll_input(buf+1, 0);
                         break;
                 default:
                         return -EINVAL;
                         break;
         }
 
-        /* write frequency information */
-        nxt200x_writetuner(state, buf);
+        if (fe->ops.tuner_ops.calc_regs) {
+                /* get tuning information */
+                fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
+
+                /* write frequency information */
+                nxt200x_writetuner(state, buf);
+        }
 
         /* reset the agc now that tuning has been completed */
         nxt200x_agc_reset(state);
diff --git a/drivers/media/dvb/frontends/nxt200x.h b/drivers/media/dvb/frontends/nxt200x.h
index 28bc5591b319..bb0ef58d7972 100644
--- a/drivers/media/dvb/frontends/nxt200x.h
+++ b/drivers/media/dvb/frontends/nxt200x.h
@@ -38,9 +38,6 @@ struct nxt200x_config
         /* the demodulator's i2c address */
         u8 demod_address;
 
-        /* used to set pll input */
-        int (*set_pll_input)(u8* buf, int input);
-
         /* need to set device param for start_dma */
         int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
 };
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 4e0aca7c67aa..3cc8b444b8f2 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -45,7 +45,6 @@
 
 #include "dvb_math.h"
 #include "dvb_frontend.h"
-#include "dvb-pll.h"
 #include "or51132.h"
 
 static int debug;
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 048d7cfe12d3..f46d5a46683a 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -223,38 +223,13 @@ static int or51211_set_parameters(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters *param)
 {
         struct or51211_state* state = fe->demodulator_priv;
-        u32 freq = 0;
-        u16 tunerfreq = 0;
-        u8 buf[4];
 
         /* Change only if we are actually changing the channel */
         if (state->current_frequency != param->frequency) {
-                freq = 44000 + (param->frequency/1000);
-                tunerfreq = freq * 16/1000;
-
-                dprintk("set_parameters frequency = %d (tunerfreq = %d)\n",
-                        param->frequency,tunerfreq);
-
-                buf[0] = (tunerfreq >> 8) & 0x7F;
-                buf[1] = (tunerfreq & 0xFF);
-                buf[2] = 0x8E;
-
-                if (param->frequency < 157250000) {
-                        buf[3] = 0xA0;
-                        dprintk("set_parameters VHF low range\n");
-                } else if (param->frequency < 454000000) {
-                        buf[3] = 0x90;
-                        dprintk("set_parameters VHF high range\n");
-                } else {
-                        buf[3] = 0x30;
-                        dprintk("set_parameters UHF range\n");
+                if (fe->ops.tuner_ops.set_params) {
+                        fe->ops.tuner_ops.set_params(fe, param);
+                        if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
                 }
-                dprintk("set_parameters tuner bytes: 0x%02x 0x%02x "
-                        "0x%02x 0x%02x\n",buf[0],buf[1],buf[2],buf[3]);
-
-                if (i2c_writebytes(state,0xC2>>1,buf,4))
-                        printk(KERN_WARNING "or51211:set_parameters error "
-                               "writing to tuner\n");
 
                 /* Set to ATSC mode */
                 or51211_setmode(fe,0);
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 18768d2f6d40..6c607302c1b6 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -249,7 +249,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
         dprintk ("%s\n", __FUNCTION__);
 
         stv0299_readregs (state, 0x1f, sfr, 3);
-        stv0299_readregs (state, 0x1a, &rtf, 1);
+        stv0299_readregs (state, 0x1a, (u8 *)&rtf, 1);
 
         srate = (sfr[0] << 8) | sfr[1];
         srate *= Mclk;
diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c
index da796e784be3..4bb06f97938b 100644
--- a/drivers/media/dvb/frontends/tda10023.c
+++ b/drivers/media/dvb/frontends/tda10023.c
@@ -478,7 +478,7 @@ struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config,
         state->i2c = i2c;
         memcpy(&state->frontend.ops, &tda10023_ops, sizeof(struct dvb_frontend_ops));
         state->pwm = pwm;
-        for (i=0; i < sizeof(tda10023_inittab)/sizeof(*tda10023_inittab);i+=3) {
+        for (i=0; i < ARRAY_SIZE(tda10023_inittab);i+=3) {
                 if (tda10023_inittab[i] == 0x00) {
                         state->reg0 = tda10023_inittab[i+2];
                         break;
diff --git a/drivers/media/dvb/pluto2/Makefile b/drivers/media/dvb/pluto2/Makefile
index ce6a9aaf937e..7ac128724df8 100644
--- a/drivers/media/dvb/pluto2/Makefile
+++ b/drivers/media/dvb/pluto2/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 7751628e1415..6d53289b3276 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -108,7 +108,7 @@ config DVB_BUDGET_AV
         tristate "Budget cards with analog video inputs"
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select VIDEO_SAA7146_VV
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_TDA10021 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile
index aa85ecdc6c80..2c1145236ee6 100644
--- a/drivers/media/dvb/ttpci/Makefile
+++ b/drivers/media/dvb/ttpci/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o budget-ci.o ttpci-eeprom.o
 obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o budget-patch.o ttpci-eeprom.o
 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 
 hostprogs-y     := fdump
 
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index ef1108c0bf11..2cee9e3bd29f 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -137,6 +137,15 @@ static void init_av7110_av(struct av7110 *av7110)
         if (ret < 0)
                 printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret);
 
+        ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetMonitorType,
+                            1, (u16) av7110->display_ar);
+        if (ret < 0)
+                printk("dvb-ttpci: unable to set aspect ratio\n");
+        ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType,
+                            1, av7110->display_panscan);
+        if (ret < 0)
+                printk("dvb-ttpci: unable to set pan scan\n");
+
         ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 2, wss_cfg_4_3);
         if (ret < 0)
                 printk("dvb-ttpci: unable to configure 4:3 wss\n");
@@ -2639,12 +2648,12 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
         av7110->mixer.volume_left  = volume;
         av7110->mixer.volume_right = volume;
 
-        init_av7110_av(av7110);
-
         ret = av7110_register(av7110);
         if (ret < 0)
                 goto err_arm_thread_stop_10;
 
+        init_av7110_av(av7110);
+
         /* special case DVB-C: these cards have an analog tuner
            plus need some special handling, so we have separate
            saa7146_ext_vv data for these... */
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 115002b0390c..0cb439527498 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -194,6 +194,7 @@ struct av7110 {
 
         int                     video_blank;
         struct video_status     videostate;
+        u16                     display_panscan;
         int                     display_ar;
         int                     trickmode;
 #define TRICK_NONE   0
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 58678c05aa53..d75e7e48addc 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -391,7 +391,7 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count)
  ****************************************************************************/
 
 static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf,
-                                         const char *buf, unsigned long count)
+                                         const u8 *buf, unsigned long count)
 {
         unsigned long todo = count;
         int free;
@@ -436,7 +436,7 @@ static void play_audio_cb(u8 *buf, int count, void *priv)
 #define FREE_COND (dvb_ringbuffer_free(&av7110->avout) >= 20 * 1024 && \
                    dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024)
 
-static ssize_t dvb_play(struct av7110 *av7110, const u8 __user *buf,
+static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf,
                         unsigned long count, int nonblock, int type)
 {
         unsigned long todo = count, n;
@@ -499,7 +499,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf,
         return count - todo;
 }
 
-static ssize_t dvb_aplay(struct av7110 *av7110, const u8 __user *buf,
+static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf,
                          unsigned long count, int nonblock, int type)
 {
         unsigned long todo = count, n;
@@ -959,7 +959,7 @@ static u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x
 
 #define MIN_IFRAME 400000
 
-static int play_iframe(struct av7110 *av7110, u8 __user *buf, unsigned int len, int nonblock)
+static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len, int nonblock)
 {
         int i, n;
 
@@ -1082,19 +1082,18 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
         case VIDEO_SET_DISPLAY_FORMAT:
         {
                 video_displayformat_t format = (video_displayformat_t) arg;
-                u16 val = 0;
 
                 switch (format) {
                 case VIDEO_PAN_SCAN:
-                        val = VID_PAN_SCAN_PREF;
+                        av7110->display_panscan = VID_PAN_SCAN_PREF;
                         break;
 
                 case VIDEO_LETTER_BOX:
-                        val = VID_VC_AND_PS_PREF;
+                        av7110->display_panscan = VID_VC_AND_PS_PREF;
                         break;
 
                 case VIDEO_CENTER_CUT_OUT:
-                        val = VID_CENTRE_CUT_PREF;
+                        av7110->display_panscan = VID_CENTRE_CUT_PREF;
                         break;
 
                 default:
@@ -1104,7 +1103,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
                         break;
                 av7110->videostate.display_format = format;
                 ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType,
-                                    1, (u16) val);
+                                    1, av7110->display_panscan);
                 break;
         }
 
@@ -1466,8 +1465,9 @@ int av7110_av_register(struct av7110 *av7110)
         av7110->videostate.play_state = VIDEO_STOPPED;
         av7110->videostate.stream_source = VIDEO_SOURCE_DEMUX;
         av7110->videostate.video_format = VIDEO_FORMAT_4_3;
-        av7110->videostate.display_format = VIDEO_CENTER_CUT_OUT;
+        av7110->videostate.display_format = VIDEO_LETTER_BOX;
         av7110->display_ar = VIDEO_FORMAT_4_3;
+        av7110->display_panscan = VID_VC_AND_PS_PREF;
 
         init_waitqueue_head(&av7110->video_events.wait_queue);
         spin_lock_init(&av7110->video_events.lock);
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index e1c1294bb767..c58e3fc509ed 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -151,7 +151,7 @@ static ssize_t ci_ll_write(struct dvb_ringbuffer *cibuf, struct file *file,
 {
         int free;
         int non_blocking = file->f_flags & O_NONBLOCK;
-        char *page = (char *)__get_free_page(GFP_USER);
+        u8 *page = (u8 *)__get_free_page(GFP_USER);
         int res;
 
         if (!page)
@@ -208,7 +208,7 @@ static ssize_t ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file,
                 return -EINVAL;
         DVB_RINGBUFFER_SKIP(cibuf, 2);
 
-        return dvb_ringbuffer_read(cibuf, buf, len, 1);
+        return dvb_ringbuffer_read(cibuf, (u8 *)buf, len, 1);
 }
 
 static int dvb_ca_open(struct inode *inode, struct file *file)
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 70aee4eb5da4..515e8232e020 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -158,7 +158,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
                 }
                 dprintk(4, "writing DRAM block %d\n", i);
                 mwdebi(av7110, DEBISWAB, bootblock,
-                       ((char*)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE);
+                       ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE);
                 bootblock ^= 0x1400;
                 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
                 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, AV7110_BOOT_MAX_SIZE, 2);
@@ -173,10 +173,10 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
                 }
                 if (rest > 4)
                         mwdebi(av7110, DEBISWAB, bootblock,
-                               ((char*)data) + i * AV7110_BOOT_MAX_SIZE, rest);
+                               ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE, rest);
                 else
                         mwdebi(av7110, DEBISWAB, bootblock,
-                               ((char*)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4);
+                               ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4);
 
                 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
                 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, rest, 2);
@@ -751,7 +751,7 @@ static int FlushText(struct av7110 *av7110)
         return 0;
 }
 
-static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
+static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
 {
         int i, ret;
         unsigned long start;
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index 673d9b3f064c..74d940f75da6 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -393,7 +393,7 @@ static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val,
 }
 
 /* buffer writes */
-static inline void mwdebi(struct av7110 *av7110, u32 config, int addr, char *val, int count)
+static inline void mwdebi(struct av7110 *av7110, u32 config, int addr, u8 *val, int count)
 {
         memcpy(av7110->debi_virt, val, count);
         av7110_debiwrite(av7110, config, addr, 0, count);
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index a97f166bb523..6322800ee12b 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -356,7 +356,7 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
                 input_dev->id.vendor = av7110->dev->pci->vendor;
                 input_dev->id.product = av7110->dev->pci->device;
         }
-        input_dev->cdev.dev = &av7110->dev->pci->dev;
+        input_dev->dev.parent = &av7110->dev->pci->dev;
         /* initial keymap */
         memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
         input_register_keys(&av7110->ir);
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index fcd9994058d0..87afaebc0703 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -333,7 +333,7 @@ static int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                         return -EINVAL;
 
                 memset(t, 0, sizeof(*t));
-                strcpy(t->name, "Television");
+                strcpy((char *)t->name, "Television");
 
                 t->type = V4L2_TUNER_ANALOG_TV;
                 t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 0e817d6f1ce5..0aee7a13a070 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -828,29 +828,6 @@ static u8 philips_sd1878_inittab[] = {
         0xff, 0xff
 };
 
-static int philips_sd1878_tda8261_tuner_set_params(struct dvb_frontend *fe,
-                                                   struct dvb_frontend_parameters *params)
-{
-        u8              buf[4];
-        int             rc;
-        struct i2c_msg  tuner_msg = {.addr=0x60,.flags=0,.buf=buf,.len=sizeof(buf)};
-        struct budget *budget = (struct budget *) fe->dvb->priv;
-
-        if((params->frequency < 950000) || (params->frequency > 2150000))
-                return -EINVAL;
-
-        rc=dvb_pll_configure(&dvb_pll_philips_sd1878_tda8261, buf,
-                             params->frequency, 0);
-        if(rc < 0) return rc;
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if(i2c_transfer(&budget->i2c_adap, &tuner_msg, 1) != 1)
-                return -EIO;
-
-    return 0;
-}
-
 static int philips_sd1878_ci_set_symbol_rate(struct dvb_frontend *fe,
                 u32 srate, u32 ratio)
 {
@@ -921,6 +898,7 @@ static u8 read_pwm(struct budget_av *budget_av)
 #define SUBID_DVBS_TV_STAR              0x0014
 #define SUBID_DVBS_TV_STAR_CI           0x0016
 #define SUBID_DVBS_EASYWATCH_1          0x001a
+#define SUBID_DVBS_EASYWATCH_2          0x001b
 #define SUBID_DVBS_EASYWATCH            0x001e
 
 #define SUBID_DVBC_EASYWATCH            0x002a
@@ -982,10 +960,13 @@ static void frontend_init(struct budget_av *budget_av)
         case SUBID_DVBS_TV_STAR_CI:
         case SUBID_DVBS_CYNERGY1200N:
         case SUBID_DVBS_EASYWATCH:
+        case SUBID_DVBS_EASYWATCH_2:
                 fe = dvb_attach(stv0299_attach, &philips_sd1878_config,
                                 &budget_av->budget.i2c_adap);
                 if (fe) {
-                        fe->ops.tuner_ops.set_params = philips_sd1878_tda8261_tuner_set_params;
+                        dvb_attach(dvb_pll_attach, fe, 0x60,
+                                   &budget_av->budget.i2c_adap,
+                                   DVB_PLL_PHILIPS_SD1878_TDA8261);
                 }
                 break;
 
@@ -1264,6 +1245,7 @@ MAKE_BUDGET_INFO(knc1t, "KNC1 DVB-T", BUDGET_KNC1T);
 MAKE_BUDGET_INFO(kncxs, "KNC TV STAR DVB-S", BUDGET_TVSTAR);
 MAKE_BUDGET_INFO(satewpls, "Satelco EasyWatch DVB-S light", BUDGET_TVSTAR);
 MAKE_BUDGET_INFO(satewpls1, "Satelco EasyWatch DVB-S light", BUDGET_KNC1S);
+MAKE_BUDGET_INFO(satewps, "Satelco EasyWatch DVB-S", BUDGET_KNC1S);
 MAKE_BUDGET_INFO(satewplc, "Satelco EasyWatch DVB-C", BUDGET_KNC1CP);
 MAKE_BUDGET_INFO(satewcmk3, "Satelco EasyWatch DVB-C MK3", BUDGET_KNC1C_MK3);
 MAKE_BUDGET_INFO(knc1sp, "KNC1 DVB-S Plus", BUDGET_KNC1SP);
@@ -1287,6 +1269,7 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(kncxs, 0x1894, 0x0016),
         MAKE_EXTENSION_PCI(satewpls, 0x1894, 0x001e),
         MAKE_EXTENSION_PCI(satewpls1, 0x1894, 0x001a),
+        MAKE_EXTENSION_PCI(satewps, 0x1894, 0x001b),
         MAKE_EXTENSION_PCI(satewplc, 0x1894, 0x002a),
         MAKE_EXTENSION_PCI(satewcmk3, 0x1894, 0x002c),
         MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020),
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 9d42f88ebb0e..873c3ba296f2 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -206,7 +206,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
                 input_dev->id.vendor = saa->pci->vendor;
                 input_dev->id.product = saa->pci->device;
         }
-        input_dev->cdev.dev = &saa->pci->dev;
+        input_dev->dev.parent = &saa->pci->dev;
 
         /* Select keymap and address */
         switch (budget_ci->budget.dev->pci->subsystem_device) {
diff --git a/drivers/media/dvb/ttusb-budget/Makefile b/drivers/media/dvb/ttusb-budget/Makefile
index 6ab97f6b53fc..fbe2b9514c21 100644
--- a/drivers/media/dvb/ttusb-budget/Makefile
+++ b/drivers/media/dvb/ttusb-budget/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/ttusb-dec/Makefile b/drivers/media/dvb/ttusb-dec/Makefile
index b41bf1f06a9f..2d70a8269391 100644
--- a/drivers/media/dvb/ttusb-dec/Makefile
+++ b/drivers/media/dvb/ttusb-dec/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 194b102140ef..f8bf9fe37d36 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -324,8 +324,8 @@ config RADIO_ZOLTRIX_PORT
           Enter the I/O port of your Zoltrix radio card.
 
 config USB_DSBR
-        tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-        depends on USB && VIDEO_V4L2 && EXPERIMENTAL
+        tristate "D-Link/GemTek USB FM radio support"
+        depends on USB && VIDEO_V4L2
         ---help---
           Say Y here if you want to connect this type of radio to your
           computer's USB port. Note that the audio is not digital, and
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 5adc27c3ced9..ce940b1b787f 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -392,7 +392,6 @@ static struct video_device rtrack_radio=
         .owner          = THIS_MODULE,
         .name           = "RadioTrack radio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &rtrack_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 9f1addae6928..9b1f7a99dac0 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -355,7 +355,6 @@ static struct video_device aztech_radio=
         .owner              = THIS_MODULE,
         .name               = "Aztech radio",
         .type               = VID_TYPE_TUNER,
-        .hardware           = 0,
         .fops               = &aztech_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 5e6f17df204b..4db05b2b1b6e 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -377,7 +377,6 @@ static struct video_device vdev_template = {
         .owner         = THIS_MODULE,
         .name          = "Gemtek PCI Radio",
         .type          = VID_TYPE_TUNER,
-        .hardware      = 0,
         .fops          = &gemtek_pci_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index b04b6a7fff7c..eab8c80a2e47 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -330,7 +330,6 @@ static struct video_device gemtek_radio=
         .owner          = THIS_MODULE,
         .name           = "GemTek radio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &gemtek_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 9b493b3298cd..82aedfc95d4f 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -297,7 +297,6 @@ static struct video_device rtrack2_radio=
         .owner          = THIS_MODULE,
         .name           = "RadioTrack II radio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &rtrack2_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index dc33f19c0e2c..395165367f37 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -297,7 +297,6 @@ static struct video_device fmi_radio=
         .owner          = THIS_MODULE,
         .name           = "SF16FMx radio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &fmi_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index e6c125def5cb..c432c44bd634 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -442,7 +442,6 @@ static struct video_device fmr2_radio=
         .owner          = THIS_MODULE,
         .name           = "SF16FMR2 radio",
         . type          = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &fmr2_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index e43acfd7e533..7e1911c3d54e 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -369,7 +369,6 @@ static struct video_device terratec_radio=
         .owner          = THIS_MODULE,
         .name           = "TerraTec ActiveRadio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &terratec_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index c27c629d99df..c11981fed827 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -349,7 +349,6 @@ static struct video_device trust_radio=
         .owner          = THIS_MODULE,
         .name           = "Trust FM Radio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &trust_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 8ff5a23a9f01..1366326474e5 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -349,7 +349,6 @@ static struct video_device typhoon_radio =
         .owner          = THIS_MODULE,
         .name           = "Typhoon Radio",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &typhoon_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4d45a40016de..9dcbffd0aa15 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -489,6 +489,15 @@ config TUNER_3036
           Say Y here to include support for Philips SAB3036 compatible tuners.
           If in doubt, say N.
 
+config TUNER_TEA5761
+        bool "TEA 5761 radio tuner (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        depends on I2C
+        select VIDEO_TUNER
+        help
+          Say Y here to include support for Philips TEA5761 radio tuner.
+          If in doubt, say N.
+
 config VIDEO_VINO
         tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
         depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 9c2de501612f..10b4d4469016 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -7,6 +7,8 @@ zr36067-objs	:=	zoran_procfs.o zoran_device.o \
 tuner-objs      :=      tuner-core.o tuner-types.o tuner-simple.o \
                         mt20xx.o tda8290.o tea5767.o tda9887.o
 
+tuner-$(CONFIG_TUNER_TEA5761)   += tea5761.o
+
 msp3400-objs    :=      msp3400-driver.o msp3400-kthreads.o
 
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o
@@ -16,7 +18,7 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
 endif
 
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
-obj-$(CONFIG_VIDEO_BT848) += ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
 obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
 obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o
@@ -59,7 +61,7 @@ obj-$(CONFIG_VIDEO_CPIA) += cpia.o
 obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o
 obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
-obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/
+obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 823cd6cc471e..cbab53fc6243 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -38,23 +38,23 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <linux/types.h>
+#include <asm/uaccess.h>
 
 #include <linux/videodev.h>
-#include <asm/uaccess.h>
+#include <linux/video_encoder.h>
 
 MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");
 MODULE_AUTHOR("Maxim Yevtyushkin");
 MODULE_LICENSE("GPL");
 
-#include <linux/i2c.h>
 
 #define I2C_NAME(x) (x)->name
 
-#include <linux/video_encoder.h>
 
 static int debug = 0;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 05c7820fe53e..0d0c554bfdf7 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -34,23 +34,23 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <linux/types.h>
+#include <asm/uaccess.h>
 
 #include <linux/videodev.h>
-#include <asm/uaccess.h>
+#include <linux/video_encoder.h>
 
 MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");
 MODULE_AUTHOR("Dave Perks");
 MODULE_LICENSE("GPL");
 
-#include <linux/i2c.h>
 
 #define I2C_NAME(s) (s)->name
 
-#include <linux/video_encoder.h>
 
 static int debug = 0;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 59a43603b5cb..12d1b9248be5 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -38,23 +38,24 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <linux/types.h>
+#include <asm/uaccess.h>
 
 #include <linux/videodev.h>
-#include <asm/uaccess.h>
+#include <linux/video_decoder.h>
+
 
 MODULE_DESCRIPTION("Brooktree-819 video decoder driver");
 MODULE_AUTHOR("Mike Bernson & Dave Perks");
 MODULE_LICENSE("GPL");
 
-#include <linux/i2c.h>
 
 #define I2C_NAME(s) (s)->name
 
-#include <linux/video_decoder.h>
 
 static int debug = 0;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 853b1a3d6a1d..e1028a76c042 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -38,23 +38,23 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
+#include <linux/video_encoder.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <linux/types.h>
+#include <asm/uaccess.h>
 
 #include <linux/videodev.h>
-#include <asm/uaccess.h>
 
 MODULE_DESCRIPTION("Brooktree-856A video encoder driver");
 MODULE_AUTHOR("Mike Bernson & Dave Perks");
 MODULE_LICENSE("GPL");
 
-#include <linux/i2c.h>
 
 #define I2C_NAME(s) (s)->name
 
-#include <linux/video_encoder.h>
 
 static int debug = 0;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 6b31e50fb951..2aea09c72093 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -178,8 +178,8 @@ static struct CARD {
         /* this seems to happen as well ... */
         { 0xff1211bd, BTTV_BOARD_PINNACLE,      "Pinnacle PCTV" },
 
-        { 0x3000121a, BTTV_BOARD_VOODOOTV_FM,   "3Dfx VoodooTV FM/ VoodooTV 200" },
-        { 0x263710b4, BTTV_BOARD_VOODOOTV_FM,   "3Dfx VoodooTV FM/ VoodooTV 200" },
+        { 0x3000121a, BTTV_BOARD_VOODOOTV_200,  "3Dfx VoodooTV 200" },
+        { 0x263710b4, BTTV_BOARD_VOODOOTV_FM,   "3Dfx VoodooTV FM" },
         { 0x3060121a, BTTV_BOARD_STB2,    "3Dfx VoodooTV 100/ STB OEM" },
 
         { 0x3000144f, BTTV_BOARD_MAGICTVIEW063, "(Askey Magic/others) TView99 CPH06x" },
@@ -313,6 +313,7 @@ static struct CARD {
         { 0xdb1118ac, BTTV_BOARD_DVICO_DVBT_LITE,    "Ultraview DVB-T Lite" },
         { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE,    "DViCO FusionHDTV 5 Lite" },
         { 0x00261822, BTTV_BOARD_TWINHAN_DST,   "DNTV Live! Mini "},
+        { 0xd200dbc0, BTTV_BOARD_DVICO_FUSIONHDTV_2,    "DViCO FusionHDTV 2" },
 
         { 0, -1, NULL }
 };
@@ -329,7 +330,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner          = 0,
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1, 0 },
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -344,7 +345,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 2, 0, 0, 0 },
                 .gpiomute       = 10,
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -359,7 +360,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 1, 2, 3 },
                 .gpiomute       = 4,
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -387,13 +388,13 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
-                .tuner_type     = 4,
+                .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -408,7 +409,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 1, 0, 1 },
                 .gpiomute       = 3,
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -423,7 +424,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0x0c, 0x04, 0x08, 0x04 },
                 /*                0x04 for some cards ?? */
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .audio_hook     = avermedia_tvphone_audio,
@@ -433,13 +434,13 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "MATRIX-Vision MV-Delta",
                 .video_inputs   = 5,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 3,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0 },
                 .gpiomux        = { 0 },
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -457,7 +458,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0xc00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -488,7 +489,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -503,7 +504,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0x20001,0x10001, 0, 0 },
                 .gpiomute       = 10,
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -519,7 +520,7 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 13, 14, 11, 7 },
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -553,7 +554,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 4,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -568,7 +569,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 0, 1, 0 },
                 .gpiomute       = 10,
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -587,7 +588,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0x002000,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
         },
         [BTTV_BOARD_WINVIEW_601] = {
                 .name           = "Leadtek WinView 601",
@@ -600,7 +601,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 },
                 .gpiomute       = 0xcfa007,
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .audio_hook     = winview_audio,
@@ -616,7 +617,7 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 1, 0, 0, 0 },
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -624,13 +625,13 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)",
                 .video_inputs   = 4,
                 .audio_inputs   = 1,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .gpiomask       = 0x8dff00,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 0 },
                 .no_msp34xx     = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -643,7 +644,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner          = 0,
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1, 1 },
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -674,7 +675,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0xc00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -683,7 +684,7 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 3,
                 .audio_inputs   = 1,
                 .tuner          = 0,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, -1 },
                 .digital_mode   = DIGITAL_MODE_CAMERA,
@@ -708,7 +709,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0xc00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_remote     = 1,
@@ -740,7 +741,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 1, 2, 3 },
                 .gpiomute       = 4,
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -813,13 +814,13 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Imagenation PXC200",
                 .video_inputs   = 5,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1, /* was: 4 */
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0},
                 .gpiomux        = { 0 },
                 .needs_tvaudio  = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .muxsel_hook    = PXC200_muxsel,
@@ -836,7 +837,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 0x0800, 0x1000, 0x1000 },
                 .gpiomute       = 0x1800,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -860,13 +861,13 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
-                .tuner_type     = 4,
+                .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -911,7 +912,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .has_radio      = 1,
-                .tuner_type     = 5, /* default for now, gpio reads BFFF06 for Pal bg+dk */
+                .tuner_type     = TUNER_PHILIPS_PAL, /* default for now, gpio reads BFFF06 for Pal bg+dk */
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .audio_hook     = winfast2000_audio,
@@ -928,7 +929,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
                 .gpiomute       = 0x1800,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -945,7 +946,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
                 .gpiomute       = 0x1800,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_radio      = 1,
@@ -962,7 +963,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0x29,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -978,7 +979,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0x551c00,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 1,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_remote     = 1,
@@ -995,7 +996,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 1,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1030,7 +1031,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 13, 4, 11, 7 },
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_radio      = 1,
@@ -1048,7 +1049,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 1,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1063,7 +1064,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0 },
                 .gpiomute       = 0xff3ffc,
                 .no_msp34xx     = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1074,14 +1075,14 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 2,
                 .audio_inputs   = 1,
                 .tuner          = 0,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 3,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 1, 1, 0, 2 },
                 .gpiomute       = 3,
                 .no_msp34xx     = 1,
                 .pll            = PLL_NONE,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1089,14 +1090,14 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "MATRIX-Vision MV-Delta 2",
                 .video_inputs   = 5,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 3,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0 },
                 .gpiomux        = { 0 },
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1112,7 +1113,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0xbcb03f,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 21,
+                .tuner_type     = TUNER_TEMIC_4039FR5_NTSC,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1129,7 +1130,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_35,
-                .tuner_type     = 1,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_radio      = 1,
@@ -1148,7 +1149,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 1,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1206,7 +1207,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 1, 2, 3 },
                 .gpiomute       = 4,
                 .pll            = PLL_28,
-                .tuner_type     = -1 /* TUNER_ALPS_TMDH2_NTSC */,
+                .tuner_type     = UNSET /* TUNER_ALPS_TMDH2_NTSC */,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1234,7 +1235,7 @@ struct tvcard bttv_tvcards[] = {
                                         1= FM stereo Radio from Tuner */
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1277,7 +1278,7 @@ struct tvcard bttv_tvcards[] = {
                                 0x0080: Tuner A2 SAP (second audio program = Zweikanalton)
                                 0x0880: Tuner A2 stereo */
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1313,7 +1314,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
                 .gpiomute       = 0x1800,
                 .pll            = PLL_28,
-                .tuner_type     = 5,
+                .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1324,7 +1325,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "GrandTec 'Grand Video Capture' (Bt848)",
                 .video_inputs   = 2,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .gpiomask       = 0,
                 .muxsel         = { 3, 1 },
@@ -1332,7 +1333,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_35,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1365,7 +1366,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 2, 0, 0, 0 },
                 .gpiomute       = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 0,
+                .tuner_type     = TUNER_TEMIC_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1377,7 +1378,7 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 2,
                 .audio_inputs   = 2,
                 .tuner          = 0,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 11,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 2, 0, 0, 1 },
@@ -1392,7 +1393,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "AG Electronics GMV1",
                 .video_inputs   = 2,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .gpiomask       = 0xF,
                 .muxsel         = { 2, 2 },
@@ -1400,7 +1401,7 @@ struct tvcard bttv_tvcards[] = {
                 .no_msp34xx     = 1,
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1447,7 +1448,7 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 2,
                 .audio_inputs   = 1,
                 .tuner          = 0,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 1,
                 .muxsel         = { 2, 3, 0, 1 },
                 .gpiomux        = { 0, 0, 1, 0 },
@@ -1476,7 +1477,7 @@ struct tvcard bttv_tvcards[] = {
                 .no_tda9875     = 1,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 5,
+                .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1517,13 +1518,35 @@ struct tvcard bttv_tvcards[] = {
 
         /* ---- card 0x44 ---------------------------------- */
         [BTTV_BOARD_VOODOOTV_FM] = {
-                .name           = "3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)",
+                .name           = "3Dfx VoodooTV FM (Euro)",
+                /* try "insmod msp3400 simple=0" if you have
+                * sound problems with this card. */
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = UNSET,
+                .gpiomask       = 0x4f8a00,
+                /* 0x100000: 1=MSP enabled (0=disable again)
+                * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
+                .gpiomux        = {0x947fff, 0x987fff,0x947fff,0x947fff },
+                .gpiomute       = 0x947fff,
+                /* tvtuner, radio,   external,internal, mute,  stereo
+                * tuner, Composit, SVid, Composit-on-Svid-adapter */
+                .muxsel         = { 2, 3 ,0 ,1 },
+                .tuner_type     = TUNER_MT2032,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_VOODOOTV_200] = {
+                .name           = "VoodooTV 200 (USA)",
                 /* try "insmod msp3400 simple=0" if you have
                 * sound problems with this card. */
                 .video_inputs   = 4,
                 .audio_inputs   = 1,
                 .tuner          = 0,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 0x4f8a00,
                 /* 0x100000: 1=MSP enabled (0=disable again)
                 * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
@@ -1543,8 +1566,8 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Active Imaging AIMMS",
                 .video_inputs   = 1,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -1564,7 +1587,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 13,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 25,
+                .tuner_type     = TUNER_LG_PAL_I_FM,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_remote     = 1,
@@ -1580,7 +1603,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Lifeview FlyVideo 98EZ (capture only) LR51",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1, 1 }, /* AV1, AV2, SVHS, CVid adapter on SVHS */
                 .pll            = PLL_28,
@@ -1606,7 +1629,7 @@ struct tvcard bttv_tvcards[] = {
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 5,
+                .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .audio_hook     = pvbt878p9b_audio, /* Note: not all cards have stereo */
@@ -1626,13 +1649,13 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Sensoray 311",
                 .video_inputs   = 5,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 4,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0, 0 },
                 .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1641,15 +1664,15 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "RemoteVision MX (RV605)",
                 .video_inputs   = 16,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .gpiomask       = 0x00,
                 .gpiomask2      = 0x07ff,
                 .muxsel         = { 0x33, 0x13, 0x23, 0x43, 0xf3, 0x73, 0xe3, 0x03,
                                 0xd3, 0xb3, 0xc3, 0x63, 0x93, 0x53, 0x83, 0xa3 },
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .muxsel_hook    = rv605_muxsel,
@@ -1693,15 +1716,15 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "GrandTec Multi Capture Card (Bt878)",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0 },
                 .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1724,7 +1747,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 5,
+                .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 /* Samsung TCPA9095PC27A (BG+DK), philips compatible, w/FM, stereo and
@@ -1744,10 +1767,10 @@ struct tvcard bttv_tvcards[] = {
                 /* Arthur Tetzlaff-Deas, DSP Design Ltd <software@dspdesign.com> */
                 .name           = "DSP Design TCVIDEO",
                 .video_inputs   = 4,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .muxsel         = { 2, 3, 1, 0 },
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -1762,7 +1785,7 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = { 2, 0, 1, 1 },
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
 
@@ -1791,11 +1814,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 100/150 (878)", /* 0x1(2|3)-45C6-C1 */
                 .video_inputs   = 4,                  /* id-inputs-clock */
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 3,
                 .muxsel         = { 3, 2, 0, 1 },
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -1806,11 +1829,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 100/150 (848)", /* 0x04-54C0-C1 & older boards */
                 .video_inputs   = 3,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1 },
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -1823,11 +1846,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 101 (848)", /* 0x05-40C0-C1 */
                 .video_inputs   = 2,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 3, 1 },
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -1838,11 +1861,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 101/151",       /* 0x1(4|5)-0004-C4 */
                 .video_inputs   = 1,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .muxsel         = { 0 },
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -1853,11 +1876,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 101/151 w/ svid",  /* 0x(16|17|20)-00C4-C1 */
                 .video_inputs   = 2,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 0, 1 },
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -1868,8 +1891,8 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 200/201/250/251",  /* 0x1(8|9|E|F)-0004-C4 */
                 .video_inputs   = 1,
                 .audio_inputs   = 1,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .muxsel         = { 0 },
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
@@ -1885,7 +1908,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 200/250",   /* 0x1(A|B)-00C4-C1 */
                 .video_inputs   = 2,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 0, 1 },
                 .pll            = PLL_28,
@@ -1900,7 +1923,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 210/220/230",   /* 0x1(A|B)-04C0-C1 */
                 .video_inputs   = 2,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 2, 3 },
                 .pll            = PLL_28,
@@ -1915,11 +1938,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 500",   /* 500 */
                 .video_inputs   = 2,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 2, 3 },
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -1930,9 +1953,9 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 540",   /* 540 */
                 .video_inputs   = 4,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -1945,7 +1968,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 2000",  /* 2000 */
                 .video_inputs   = 2,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 2, 3 },
                 .pll            = PLL_28,
@@ -1961,11 +1984,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "IDS Eagle",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 0,
                 .muxsel         = { 0, 1, 2, 3 },
                 .muxsel_hook    = eagle_muxsel,
@@ -1978,8 +2001,8 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 2,
                 .audio_inputs   = 0,
                 .svhs           = 1,
-                .tuner          = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
@@ -2020,13 +2043,13 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 3,
                 .audio_inputs   = 1,
                 .tuner          = 0,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 7,
                 .muxsel         = { 2, 3, 1, 1},
                 .gpiomux        = { 0, 1, 2, 3},
                 .gpiomute       = 4,
                 .needs_tvaudio  = 1,
-                .tuner_type     = 5,
+                .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -2035,7 +2058,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Euresys Picolo",
                 .video_inputs   = 3,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .no_msp34xx     = 1,
@@ -2052,8 +2075,8 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "ProVideo PV150", /* 0x4f */
                 .video_inputs   = 2,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3 },
                 .gpiomux        = { 0 },
@@ -2080,7 +2103,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 2,
+                .tuner_type     = TUNER_PHILIPS_NTSC,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .audio_hook     = adtvk503_audio,
@@ -2098,7 +2121,7 @@ struct tvcard bttv_tvcards[] = {
                 .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 5,
+                .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 /* Notes:
@@ -2121,7 +2144,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
-                .tuner_type     = 1,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_radio      = 1,
@@ -2138,11 +2161,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "IVC-200",
                 .video_inputs   = 1,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 0xdf,
                 .muxsel         = { 2 },
                 .pll            = PLL_28,
@@ -2151,9 +2174,9 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Grand X-Guard / Trust 814PCI",
                 .video_inputs   = 16,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
-                .tuner_type     = 4,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
+                .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask2      = 0xff,
@@ -2169,14 +2192,14 @@ struct tvcard bttv_tvcards[] = {
         [BTTV_BOARD_NEBULA_DIGITV] = {
                 .name           = "Nebula Electronics DigiTV",
                 .video_inputs   = 1,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .muxsel         = { 2, 3, 1, 0 },
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_dvb        = 1,
@@ -2189,15 +2212,15 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "ProVideo PV143",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .gpiomask       = 0,
                 .muxsel         = { 2, 3, 1, 0 },
                 .gpiomux        = { 0 },
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2206,14 +2229,14 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "PHYTEC VD-009-X1 MiniDIN (bt878)",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1, /* card has no tuner */
+                .tuner          = UNSET, /* card has no tuner */
                 .svhs           = 3,
                 .gpiomask       = 0x00,
                 .muxsel         = { 2, 3, 1, 0 },
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2221,14 +2244,14 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "PHYTEC VD-009-X1 Combi (bt878)",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1, /* card has no tuner */
+                .tuner          = UNSET, /* card has no tuner */
                 .svhs           = 3,
                 .gpiomask       = 0x00,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2238,7 +2261,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "PHYTEC VD-009 MiniDIN (bt878)",
                 .video_inputs   = 10,
                 .audio_inputs   = 0,
-                .tuner          = -1, /* card has no tuner */
+                .tuner          = UNSET, /* card has no tuner */
                 .svhs           = 9,
                 .gpiomask       = 0x00,
                 .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
@@ -2248,7 +2271,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2256,7 +2279,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "PHYTEC VD-009 Combi (bt878)",
                 .video_inputs   = 10,
                 .audio_inputs   = 0,
-                .tuner          = -1, /* card has no tuner */
+                .tuner          = UNSET, /* card has no tuner */
                 .svhs           = 9,
                 .gpiomask       = 0x00,
                 .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
@@ -2266,7 +2289,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2274,11 +2297,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "IVC-100",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 0xdf,
                 .muxsel         = { 2, 3, 1, 0 },
                 .pll            = PLL_28,
@@ -2288,11 +2311,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "IVC-120G",
                 .video_inputs   = 16,
                 .audio_inputs   = 0,    /* card has no audio */
-                .tuner          = -1,   /* card has no tuner */
-                .tuner_type     = -1,
+                .tuner          = UNSET,   /* card has no tuner */
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .svhs           = -1,   /* card has no svhs */
+                .svhs           = UNSET,   /* card has no svhs */
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
@@ -2333,7 +2356,7 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 3,
                 .audio_inputs   = 0,
                 .svhs           = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .muxsel         = { 3, 1, 1, 3 }, /* Vid In, SVid In, Vid over SVid in connector */
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
@@ -2364,9 +2387,9 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "SIMUS GVC1100",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -2395,14 +2418,14 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "LMLBT4",
                 .video_inputs   = 4, /* IN1,IN2,IN3,IN4 */
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .muxsel         = { 2, 3, 1, 0 },
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .needs_tvaudio  = 0,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2452,8 +2475,8 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Euresys Picolo Tetra",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .gpiomask       = 0,
                 .gpiomask2      = 0x3C<<16,/*Set the GPIO[18]->GPIO[21] as output pin.==> drive the video inputs through analog multiplexers*/
                 .no_msp34xx     = 1,
@@ -2464,7 +2487,7 @@ struct tvcard bttv_tvcards[] = {
                 .pll            = PLL_28,
                 .needs_tvaudio  = 0,
                 .muxsel_hook    = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2490,7 +2513,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "AVerMedia AVerTV DVB-T 771",
                 .video_inputs   = 2,
                 .svhs           = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -2509,14 +2532,14 @@ struct tvcard bttv_tvcards[] = {
                 /* Based on the Nebula card data - added remote and new card number - BTTV_BOARD_AVDVBT_761, see also ir-kbd-gpio.c */
                 .name           = "AverMedia AverTV DVB-T 761",
                 .video_inputs   = 2,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 3, 1, 2, 0 }, /* Comp0, S-Video, ?, ? */
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_dvb        = 1,
@@ -2528,8 +2551,8 @@ struct tvcard bttv_tvcards[] = {
                 .name             = "MATRIX Vision Sigma-SQ",
                 .video_inputs     = 16,
                 .audio_inputs     = 0,
-                .tuner            = -1,
-                .svhs             = -1,
+                .tuner            = UNSET,
+                .svhs             = UNSET,
                 .gpiomask         = 0x0,
                 .muxsel           = { 2, 2, 2, 2, 2, 2, 2, 2,
                                 3, 3, 3, 3, 3, 3, 3, 3 },
@@ -2537,7 +2560,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux          = { 0 },
                 .no_msp34xx       = 1,
                 .pll              = PLL_28,
-                .tuner_type       = -1,
+                .tuner_type       = UNSET,
                 .tuner_addr       = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2546,15 +2569,15 @@ struct tvcard bttv_tvcards[] = {
                 .name             = "MATRIX Vision Sigma-SLC",
                 .video_inputs     = 4,
                 .audio_inputs     = 0,
-                .tuner            = -1,
-                .svhs             = -1,
+                .tuner            = UNSET,
+                .svhs             = UNSET,
                 .gpiomask         = 0x0,
                 .muxsel           = { 2, 2, 2, 2 },
                 .muxsel_hook      = sigmaSLC_muxsel,
                 .gpiomux          = { 0 },
                 .no_msp34xx       = 1,
                 .pll              = PLL_28,
-                .tuner_type       = -1,
+                .tuner_type       = UNSET,
                 .tuner_addr       = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2566,7 +2589,7 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 2,
                 .audio_inputs   = 1,
                 .tuner          = 0,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 0xFF,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 2, 0, 0, 0 },
@@ -2584,14 +2607,14 @@ struct tvcard bttv_tvcards[] = {
         [BTTV_BOARD_DVICO_DVBT_LITE] = {
                 /* Chris Pascoe <c.pascoe@itee.uq.edu.au> */
                 .name           = "DViCO FusionHDTV DVB-T Lite",
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
                 .no_video       = 1,
                 .has_dvb        = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2634,14 +2657,14 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Tibet Systems 'Progress DVR' CS16",
                 .video_inputs   = 16,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .muxsel         = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
                 .pll            = PLL_28,
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .muxsel_hook    = tibetCS16_muxsel,
@@ -2661,11 +2684,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Kodicom 4400R (master)",
                 .video_inputs   = 16,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 /* GPIO bits 0-9 used for analog switch:
                 *   00 - 03:    camera selector
                 *   04 - 06:    channel (controller) selector
@@ -2693,11 +2716,11 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Kodicom 4400R (slave)",
                 .video_inputs   = 16,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .tuner_type     = -1,
+                .tuner          = UNSET,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .svhs           = -1,
+                .svhs           = UNSET,
                 .gpiomask       = 0x010000,
                 .no_gpioirq     = 1,
                 .muxsel         = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
@@ -2717,7 +2740,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner          = 0,
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1, 0 },
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -2824,7 +2847,7 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Osprey 440",
                 .video_inputs   = 1,
                 .audio_inputs   = 1,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 2 },
                 .pll            = PLL_28,
@@ -2848,7 +2871,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 1,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
-                .tuner_type     = 2,
+                .tuner_type     = TUNER_PHILIPS_NTSC,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2875,14 +2898,14 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "Hauppauge ImpactVCB (bt878)",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .gpiomask       = 0x0f, /* old: 7 */
                 .muxsel         = { 0, 1, 3, 2 }, /* Composite 0-3 */
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2914,10 +2937,10 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "SSAI Security Video Interface",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
-                .tuner          = -1,
-                .svhs           = -1,
+                .tuner          = UNSET,
+                .svhs           = UNSET,
                 .muxsel         = { 0, 1, 2, 3 },
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
@@ -2925,13 +2948,31 @@ struct tvcard bttv_tvcards[] = {
                 .name           = "SSAI Ultrasound Video Interface",
                 .video_inputs   = 2,
                 .audio_inputs   = 0,
-                .tuner          = -1,
+                .tuner          = UNSET,
                 .svhs           = 1,
                 .muxsel         = { 2, 0, 1, 3 },
-                .tuner_type     = -1,
+                .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
+        /* ---- card 0x94---------------------------------- */
+        [BTTV_BOARD_DVICO_FUSIONHDTV_2] = {
+                .name           = "DViCO FusionHDTV 2",
+                .tuner          = 0,
+                .tuner_type     = TUNER_PHILIPS_ATSC, /* FCV1236D */
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1 },
+                .gpiomask       = 0x00e00007,
+                .gpiomux        = { 0x00400005, 0, 0x00000001, 0 },
+                .gpiomute       = 0x00c00007,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
@@ -3040,7 +3081,7 @@ static void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256])
 static void flyvideo_gpio(struct bttv *btv)
 {
         int gpio,has_remote,has_radio,is_capture_only,is_lr90,has_tda9820_tda9821;
-        int tuner=-1,ttype;
+        int tuner=UNSET,ttype;
 
         gpio_inout(0xffffff, 0);
         udelay(8);  /* without this we would see the 0x1800 mask */
@@ -3085,7 +3126,7 @@ static void flyvideo_gpio(struct bttv *btv)
          * gpio & 0x001000    output bit for audio routing */
 
         if(is_capture_only)
-                tuner=4; /* No tuner present */
+                tuner = TUNER_ABSENT; /* No tuner present */
 
         printk(KERN_INFO "bttv%d: FlyVideo Radio=%s RemoteControl=%s Tuner=%d gpio=0x%06x\n",
                btv->c.nr, has_radio? "yes":"no ", has_remote? "yes":"no ", tuner, gpio);
@@ -3093,7 +3134,7 @@ static void flyvideo_gpio(struct bttv *btv)
                 btv->c.nr, is_lr90?"yes":"no ", has_tda9820_tda9821?"yes":"no ",
                 is_capture_only?"yes":"no ");
 
-        if(tuner!= -1) /* only set if known tuner autodetected, else let insmod option through */
+        if (tuner != UNSET) /* only set if known tuner autodetected, else let insmod option through */
                 btv->tuner_type = tuner;
         btv->has_radio = has_radio;
 
@@ -3302,6 +3343,7 @@ void __devinit bttv_init_card1(struct bttv *btv)
         case BTTV_BOARD_HAUPPAUGE878:
                 boot_msp34xx(btv,5);
                 break;
+        case BTTV_BOARD_VOODOOTV_200:
         case BTTV_BOARD_VOODOOTV_FM:
                 boot_msp34xx(btv,20);
                 break;
@@ -3328,10 +3370,9 @@ void __devinit bttv_init_card1(struct bttv *btv)
 /* initialization part two -- after registering i2c bus */
 void __devinit bttv_init_card2(struct bttv *btv)
 {
-        int tda9887;
         int addr=ADDR_UNSET;
 
-        btv->tuner_type = -1;
+        btv->tuner_type = UNSET;
 
         if (BTTV_BOARD_UNKNOWN == btv->c.type) {
                 bttv_readee(btv,eeprom_data,0xa0);
@@ -3479,7 +3520,15 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         btv->tuner_type = bttv_tvcards[btv->c.type].tuner_type;
         if (UNSET != tuner[btv->c.nr])
                 btv->tuner_type = tuner[btv->c.nr];
-        printk("bttv%d: using tuner=%d\n",btv->c.nr,btv->tuner_type);
+
+        if (btv->tuner_type == TUNER_ABSENT ||
+            bttv_tvcards[btv->c.type].tuner == UNSET)
+                printk(KERN_INFO "bttv%d: tuner absent\n", btv->c.nr);
+        else if(btv->tuner_type == UNSET)
+                printk(KERN_WARNING "bttv%d: tuner type unset\n", btv->c.nr);
+        else
+                printk(KERN_INFO "bttv%d: tuner type=%d\n", btv->c.nr,
+                       btv->tuner_type);
 
         if (btv->tuner_type != UNSET) {
                 struct tuner_setup tun_setup;
@@ -3521,6 +3570,9 @@ void __devinit bttv_init_card2(struct bttv *btv)
         if (!autoload)
                 return;
 
+        if (bttv_tvcards[btv->c.type].tuner == UNSET)
+                return;  /* no tuner or related drivers to load */
+
         /* try to detect audio/fader chips */
         if (!bttv_tvcards[btv->c.type].no_msp34xx &&
             bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx") >=0)
@@ -3541,17 +3593,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
         if (bttv_tvcards[btv->c.type].needs_tvaudio)
                 request_module("tvaudio");
 
-        /* tuner modules */
-        tda9887 = 0;
-        if (btv->tda9887_conf)
-                tda9887 = 1;
-        if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb &&
-            bttv_I2CRead(btv, I2C_ADDR_TDA9887, "TDA9887") >=0)
-                tda9887 = 1;
-        /* Hybrid DVB card, DOES have a tda9887 */
-        if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)
-                tda9887 = 1;
-        if (btv->tuner_type != UNSET)
+        if (btv->tuner_type != UNSET && btv->tuner_type != TUNER_ABSENT)
                 request_module("tuner");
 }
 
@@ -3865,11 +3907,15 @@ void bttv_tda9880_setnorm(struct bttv *btv, int norm)
         if(norm==VIDEO_MODE_NTSC) {
                 bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomux[TVAUDIO_INPUT_TUNER]=0x957fff;
                 bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomute=0x957fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_200].gpiomux[TVAUDIO_INPUT_TUNER]=0x957fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_200].gpiomute=0x957fff;
                 dprintk("bttv_tda9880_setnorm to NTSC\n");
         }
         else {
                 bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomux[TVAUDIO_INPUT_TUNER]=0x947fff;
                 bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].gpiomute=0x947fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_200].gpiomux[TVAUDIO_INPUT_TUNER]=0x947fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_200].gpiomute=0x947fff;
                 dprintk("bttv_tda9880_setnorm to PAL\n");
         }
         /* set GPIO according */
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index b1fedb0f6431..cb555f2c40f9 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1218,7 +1218,14 @@ audio_mux(struct bttv *btv, int input, int mute)
                         break;
                 case TVAUDIO_INPUT_TUNER:
                 default:
-                        route.input = MSP_INPUT_DEFAULT;
+                        /* This is the only card that uses TUNER2, and afaik,
+                           is the only difference between the VOODOOTV_FM
+                           and VOODOOTV_200 */
+                        if (btv->c.type == BTTV_BOARD_VOODOOTV_200)
+                                route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER2, \
+                                        MSP_DSP_IN_TUNER, MSP_DSP_IN_TUNER);
+                        else
+                                route.input = MSP_INPUT_DEFAULT;
                         break;
                 }
                 route.output = MSP_OUTPUT_DEFAULT;
@@ -1253,7 +1260,7 @@ i2c_vidiocschan(struct bttv *btv)
         v4l2_std_id std = bttv_tvnorms[btv->tvnorm].v4l2_id;
 
         bttv_call_i2c_clients(btv, VIDIOC_S_STD, &std);
-        if (btv->c.type == BTTV_BOARD_VOODOOTV_FM)
+        if (btv->c.type == BTTV_BOARD_VOODOOTV_FM || btv->c.type == BTTV_BOARD_VOODOOTV_200)
                 bttv_tda9880_setnorm(btv,btv->tvnorm);
 }
 
@@ -1323,6 +1330,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
 
         switch (btv->c.type) {
         case BTTV_BOARD_VOODOOTV_FM:
+        case BTTV_BOARD_VOODOOTV_200:
                 bttv_tda9880_setnorm(btv,norm);
                 break;
         }
@@ -2251,6 +2259,24 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 printk(KERN_INFO "bttv%d: ==================  END STATUS CARD #%d  ==================\n", btv->c.nr, btv->c.nr);
                 return 0;
         }
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
+        {
+                struct v4l2_register *reg = arg;
+                if (!capable(CAP_SYS_ADMIN))
+                        return -EPERM;
+                if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
+                        return -EINVAL;
+                /* bt848 has a 12-bit register space */
+                reg->reg &= 0xfff;
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = btread(reg->reg);
+                else
+                        btwrite(reg->val, reg->reg);
+                return 0;
+        }
+#endif
 
         default:
                 return -ENOIOCTLCMD;
@@ -3561,6 +3587,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_G_FREQUENCY:
         case VIDIOC_S_FREQUENCY:
         case VIDIOC_LOG_STATUS:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
                 return bttv_common_ioctls(btv,cmd,arg);
 
         default:
@@ -3943,6 +3971,8 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOCGAUDIO:
         case VIDIOCSAUDIO:
         case VIDIOC_LOG_STATUS:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
                 return bttv_common_ioctls(btv,cmd,arg);
 
         default:
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 6f74c8042bc3..94a13d0ee614 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -313,7 +313,7 @@ int bttv_input_init(struct bttv *btv)
                 input_dev->id.vendor  = btv->c.pci->vendor;
                 input_dev->id.product = btv->c.pci->device;
         }
-        input_dev->cdev.dev = &btv->c.pci->dev;
+        input_dev->dev.parent = &btv->c.pci->dev;
 
         btv->remote = ir;
         bttv_ir_start(btv, ir);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index f821ba69db99..dcc847dc2486 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -170,6 +170,8 @@
 #define BTTV_BOARD_MACHTV_MAGICTV          0x90
 #define BTTV_BOARD_SSAI_SECURITY           0x91
 #define BTTV_BOARD_SSAI_ULTRASOUND         0x92
+#define BTTV_BOARD_VOODOOTV_200            0x93
+#define BTTV_BOARD_DVICO_FUSIONHDTV_2      0x94
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 8f44f02029be..bd85f6d0fbe3 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -33,12 +33,12 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/videodev.h>
-#include <media/v4l2-common.h>
 #include <linux/pci.h>
 #include <linux/input.h>
 #include <linux/mutex.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
+#include <media/v4l2-common.h>
 
 #include <linux/device.h>
 #include <media/video-buf.h>
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index fd771c7a2fe2..55aab8d38880 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -663,15 +663,13 @@ int cpia2_reset_camera(struct camera_data *cam)
                 cpia2_send_command(cam, &cmd);
         }
 
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(100 * HZ / 1000);      /* wait for 100 msecs */
+        schedule_timeout_interruptible(msecs_to_jiffies(100));
 
         if (cam->params.pnp_id.device_type == DEVICE_STV_672)
                 retval = apply_vp_patch(cam);
 
         /* wait for vp to go to sleep */
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(100 * HZ / 1000);      /* wait for 100 msecs */
+        schedule_timeout_interruptible(msecs_to_jiffies(100));
 
         /***
          * If this is a 676, apply VP5 fixes before we start streaming
@@ -720,8 +718,7 @@ int cpia2_reset_camera(struct camera_data *cam)
         set_default_user_mode(cam);
 
         /* Give VP time to wake up */
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(100 * HZ / 1000);      /* wait for 100 msecs */
+        schedule_timeout_interruptible(msecs_to_jiffies(100));
 
         set_all_properties(cam);
 
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 1bda7ad9de11..92778cd1d735 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -105,7 +105,7 @@ static struct control_menu_info framerate_controls[] =
         { CPIA2_VP_FRAMERATE_25,   "25 fps"   },
         { CPIA2_VP_FRAMERATE_30,   "30 fps"   },
 };
-#define NUM_FRAMERATE_CONTROLS (sizeof(framerate_controls)/sizeof(framerate_controls[0]))
+#define NUM_FRAMERATE_CONTROLS (ARRAY_SIZE(framerate_controls))
 
 static struct control_menu_info flicker_controls[] =
 {
@@ -113,7 +113,7 @@ static struct control_menu_info flicker_controls[] =
         { FLICKER_50,    "50 Hz" },
         { FLICKER_60,    "60 Hz"  },
 };
-#define NUM_FLICKER_CONTROLS (sizeof(flicker_controls)/sizeof(flicker_controls[0]))
+#define NUM_FLICKER_CONTROLS (ARRAY_SIZE(flicker_controls))
 
 static struct control_menu_info lights_controls[] =
 {
@@ -122,7 +122,7 @@ static struct control_menu_info lights_controls[] =
         { 128, "Bottom"  },
         { 192, "Both"  },
 };
-#define NUM_LIGHTS_CONTROLS (sizeof(lights_controls)/sizeof(lights_controls[0]))
+#define NUM_LIGHTS_CONTROLS (ARRAY_SIZE(lights_controls))
 #define GPIO_LIGHTS_MASK 192
 
 static struct v4l2_queryctrl controls[] = {
@@ -235,7 +235,7 @@ static struct v4l2_queryctrl controls[] = {
                 .default_value = 0,
         },
 };
-#define NUM_CONTROLS (sizeof(controls)/sizeof(controls[0]))
+#define NUM_CONTROLS (ARRAY_SIZE(controls))
 
 
 /******************************************************************************
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 0f9d96963618..f750a543c961 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -47,7 +47,7 @@ config VIDEO_CX88_DVB
         tristate "DVB/ATSC Support for cx2388x based TV cards"
         depends on VIDEO_CX88 && DVB_CORE
         select VIDEO_BUF_DVB
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select DVB_OR51132 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index a80b1cb1abe8..f2fcdb92ecce 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -56,8 +56,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [blackbird]");
 
 /* ------------------------------------------------------------------ */
 
-#define OLD_BLACKBIRD_FIRM_IMAGE_SIZE 262144
-#define     BLACKBIRD_FIRM_IMAGE_SIZE 376836
+#define BLACKBIRD_FIRM_IMAGE_SIZE 376836
 
 /* defines below are from ivtv-driver.h */
 
@@ -405,7 +404,7 @@ static int blackbird_find_mailbox(struct cx8802_dev *dev)
         u32 value;
         int i;
 
-        for (i = 0; i < dev->fw_size; i++) {
+        for (i = 0; i < BLACKBIRD_FIRM_IMAGE_SIZE; i++) {
                 memory_read(dev->core, i, &value);
                 if (value == signature[signaturecnt])
                         signaturecnt++;
@@ -453,15 +452,12 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
                 return -1;
         }
 
-        if ((firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) &&
-            (firmware->size != OLD_BLACKBIRD_FIRM_IMAGE_SIZE)) {
-                dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d or %d)\n",
-                        firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE,
-                        OLD_BLACKBIRD_FIRM_IMAGE_SIZE);
+        if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) {
+                dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
+                        firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE);
                 release_firmware(firmware);
                 return -1;
         }
-        dev->fw_size = firmware->size;
 
         if (0 != memcmp(firmware->data, magic, 8)) {
                 dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n");
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index e61102dc8ad7..6a136ddbccf8 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1335,6 +1335,26 @@ struct cx88_board cx88_boards[] = {
                 /* fixme: Add radio support */
                 .mpeg           = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD,
         },
+        [CX88_BOARD_ADSTECH_PTV_390] = {
+                .name           = "ADS Tech Instant Video PCI",
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DEBUG,
+                        .vmux   = 3,
+                        .gpio0  = 0x04ff,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x07fa,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x07fa,
+                }},
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1641,6 +1661,10 @@ struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x1421,
                 .subdevice = 0x0341, /* ADS Tech InstantTV DVB-S */
                 .card      = CX88_BOARD_KWORLD_DVBS_100,
+        },{
+                .subvendor = 0x1421,
+                .subdevice = 0x0390,
+                .card      = CX88_BOARD_ADSTECH_PTV_390,
         },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index dbfe4dc9cf8c..1773b40467dc 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -35,9 +35,7 @@
 
 #include "mt352.h"
 #include "mt352_priv.h"
-#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
-# include "cx88-vp3054-i2c.h"
-#endif
+#include "cx88-vp3054-i2c.h"
 #include "zl10353.h"
 #include "cx22702.h"
 #include "or51132.h"
@@ -199,7 +197,7 @@ static struct mt352_config dvico_fusionhdtv_dual = {
         .demod_init    = dvico_dual_demod_init,
 };
 
-#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
+#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE))
 static int dntv_live_dvbt_pro_demod_init(struct dvb_frontend* fe)
 {
         static u8 clock_config []  = { 0x89, 0x38, 0x38 };
@@ -223,64 +221,6 @@ static int dntv_live_dvbt_pro_demod_init(struct dvb_frontend* fe)
         return 0;
 }
 
-static int philips_fmd1216_pll_init(struct dvb_frontend *fe)
-{
-        struct cx8802_dev *dev= fe->dvb->priv;
-
-        /* this message is to set up ATC and ALC */
-        static u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0xa0 };
-        struct i2c_msg msg =
-                { .addr = dev->core->pll_addr, .flags = 0,
-                  .buf = fmd1216_init, .len = sizeof(fmd1216_init) };
-        int err;
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
-                if (err < 0)
-                        return err;
-                else
-                        return -EREMOTEIO;
-        }
-
-        return 0;
-}
-
-static int dntv_live_dvbt_pro_tuner_set_params(struct dvb_frontend* fe,
-                                               struct dvb_frontend_parameters* params)
-{
-        struct cx8802_dev *dev= fe->dvb->priv;
-        u8 buf[4];
-        struct i2c_msg msg =
-                { .addr = dev->core->pll_addr, .flags = 0,
-                  .buf = buf, .len = 4 };
-        int err;
-
-        /* Switch PLL to DVB mode */
-        err = philips_fmd1216_pll_init(fe);
-        if (err)
-                return err;
-
-        /* Tune PLL */
-        dvb_pll_configure(dev->core->pll_desc, buf,
-                          params->frequency,
-                          params->u.ofdm.bandwidth);
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
-
-                printk(KERN_WARNING "cx88-dvb: %s error "
-                       "(addr %02x <- %02x, err = %i)\n",
-                       __FUNCTION__, dev->core->pll_addr, buf[0], err);
-                if (err < 0)
-                        return err;
-                else
-                        return -EREMOTEIO;
-        }
-
-        return 0;
-}
-
 static struct mt352_config dntv_live_dvbt_pro_config = {
         .demod_address = 0x0f,
         .no_tuner      = 1,
@@ -370,18 +310,8 @@ static int nxt200x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
         return 0;
 }
 
-static int nxt200x_set_pll_input(u8* buf, int input)
-{
-        if (input)
-                buf[3] |= 0x08;
-        else
-                buf[3] &= ~0x08;
-        return 0;
-}
-
 static struct nxt200x_config ati_hdtvwonder = {
         .demod_address = 0x0a,
-        .set_pll_input = nxt200x_set_pll_input,
         .set_ts_params = nxt200x_set_ts_param,
 };
 
@@ -456,7 +386,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_thomson_dtt759x);
+                                   DVB_PLL_THOMSON_DTT759X);
                 }
                 break;
         case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
@@ -469,7 +399,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_thomson_dtt7579);
+                                   DVB_PLL_THOMSON_DTT7579);
                 }
                 break;
         case CX88_BOARD_WINFAST_DTV2000H:
@@ -482,7 +412,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   &dev->core->i2c_adap, &dvb_pll_fmd1216me);
+                                   &dev->core->i2c_adap, DVB_PLL_FMD1216ME);
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
@@ -491,7 +421,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
-                                   NULL, &dvb_pll_thomson_dtt7579);
+                                   NULL, DVB_PLL_THOMSON_DTT7579);
                         break;
                 }
                 /* ZL10353 replaces MT352 on later cards */
@@ -500,7 +430,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
-                                   NULL, &dvb_pll_thomson_dtt7579);
+                                   NULL, DVB_PLL_THOMSON_DTT7579);
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
@@ -511,7 +441,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_thomson_dtt7579);
+                                   NULL, DVB_PLL_THOMSON_DTT7579);
                         break;
                 }
                 /* ZL10353 replaces MT352 on later cards */
@@ -520,7 +450,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_thomson_dtt7579);
+                                   NULL, DVB_PLL_THOMSON_DTT7579);
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
@@ -529,7 +459,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_lg_z201);
+                                   NULL, DVB_PLL_LG_Z201);
                 }
                 break;
         case CX88_BOARD_KWORLD_DVB_T:
@@ -540,17 +470,16 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_unknown_1);
+                                   NULL, DVB_PLL_UNKNOWN_1);
                 }
                 break;
         case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
-#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
-                dev->core->pll_addr = 0x61;
-                dev->core->pll_desc = &dvb_pll_fmd1216me;
+#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE))
                 dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,
                         &((struct vp3054_i2c_state *)dev->card_priv)->adap);
                 if (dev->dvb.frontend != NULL) {
-                        dev->dvb.frontend->ops.tuner_ops.set_params = dntv_live_dvbt_pro_tuner_set_params;
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+                                   &dev->core->i2c_adap, DVB_PLL_FMD1216ME);
                 }
 #else
                 printk("%s: built without vp3054 support\n", dev->core->name);
@@ -563,7 +492,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_thomson_fe6600);
+                                   DVB_PLL_THOMSON_FE6600);
                 }
                 break;
         case CX88_BOARD_PCHDTV_HD3000:
@@ -572,7 +501,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_thomson_dtt761x);
+                                   DVB_PLL_THOMSON_DTT761X);
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
@@ -594,7 +523,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_microtune_4042);
+                                   DVB_PLL_MICROTUNE_4042);
                 }
                 }
                 break;
@@ -614,7 +543,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_thomson_dtt761x);
+                                   DVB_PLL_THOMSON_DTT761X);
                 }
                 }
                 break;
@@ -634,7 +563,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_lg_tdvs_h06xf);
+                                   DVB_PLL_LG_TDVS_H06XF);
                 }
                 }
                 break;
@@ -654,7 +583,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    &dev->core->i2c_adap,
-                                   &dvb_pll_lg_tdvs_h06xf);
+                                   DVB_PLL_LG_TDVS_H06XF);
                 }
                 }
                 break;
@@ -664,7 +593,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_tuv1236d);
+                                   NULL, DVB_PLL_TUV1236D);
                 }
                 break;
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
@@ -705,10 +634,6 @@ static int dvb_register(struct cx8802_dev *dev)
                 return -1;
         }
 
-        if (dev->core->pll_desc) {
-                dev->dvb.frontend->ops.info.frequency_min = dev->core->pll_desc->min;
-                dev->dvb.frontend->ops.info.frequency_max = dev->core->pll_desc->max;
-        }
         /* Ensure all frontends negotiate bus access */
         dev->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
 
@@ -778,11 +703,10 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
         if (!(cx88_boards[core->board].mpeg & CX88_MPEG_DVB))
                 goto fail_core;
 
-#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
+        /* If vp3054 isn't enabled, a stub will just return 0 */
         err = vp3054_i2c_probe(dev);
         if (0 != err)
                 goto fail_core;
-#endif
 
         /* dvb stuff */
         printk("%s/2: cx2388x based dvb card\n", core->name);
@@ -807,9 +731,7 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv)
         /* dvb */
         videobuf_dvb_unregister(&dev->dvb);
 
-#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
         vp3054_i2c_remove(dev);
-#endif
 
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 7919a1f9da06..78bbcfab9670 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -160,7 +160,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
                 i2c_clients_command(&core->i2c_adap, cmd, arg);
 }
 
-static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
+static const struct i2c_algo_bit_data cx8800_i2c_algo_template = {
         .setsda  = cx8800_bit_setsda,
         .setscl  = cx8800_bit_setscl,
         .getsda  = cx8800_bit_getsda,
@@ -171,18 +171,6 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_adapter cx8800_i2c_adap_template = {
-        .name              = "cx2388x",
-        .owner             = THIS_MODULE,
-        .id                = I2C_HW_B_CX2388x,
-        .client_register   = attach_inform,
-        .client_unregister = detach_inform,
-};
-
-static struct i2c_client cx8800_i2c_client_template = {
-        .name   = "cx88xx internal",
-};
-
 static char *i2c_devs[128] = {
         [ 0x1c >> 1 ] = "lgdt330x",
         [ 0x86 >> 1 ] = "tda9887/cx22702",
@@ -212,14 +200,9 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
         /* Prevents usage of invalid delay values */
         if (i2c_udelay<5)
                 i2c_udelay=5;
-        cx8800_i2c_algo_template.udelay=i2c_udelay;
 
-        memcpy(&core->i2c_adap, &cx8800_i2c_adap_template,
-               sizeof(core->i2c_adap));
         memcpy(&core->i2c_algo, &cx8800_i2c_algo_template,
                sizeof(core->i2c_algo));
-        memcpy(&core->i2c_client, &cx8800_i2c_client_template,
-               sizeof(core->i2c_client));
 
         if (core->tuner_type != TUNER_ABSENT)
                 core->i2c_adap.class |= I2C_CLASS_TV_ANALOG;
@@ -228,10 +211,16 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 
         core->i2c_adap.dev.parent = &pci->dev;
         strlcpy(core->i2c_adap.name,core->name,sizeof(core->i2c_adap.name));
+        core->i2c_adap.owner = THIS_MODULE;
+        core->i2c_adap.id = I2C_HW_B_CX2388x;
+        core->i2c_adap.client_register = attach_inform;
+        core->i2c_adap.client_unregister = detach_inform;
+        core->i2c_algo.udelay = i2c_udelay;
         core->i2c_algo.data = core;
         i2c_set_adapdata(&core->i2c_adap,core);
         core->i2c_adap.algo_data = &core->i2c_algo;
         core->i2c_client.adapter = &core->i2c_adap;
+        strlcpy(core->i2c_client.name, "cx88xx internal", I2C_NAME_SIZE);
 
         cx8800_bit_setscl(core,1);
         cx8800_bit_setsda(core,1);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 8136673fe9e8..f5d4a565346e 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -74,7 +74,8 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
         /* read gpio value */
         gpio = cx_read(ir->gpio_addr);
-        if (core->board == CX88_BOARD_NPGTECH_REALTV_TOP10FM) {
+        switch (core->board) {
+        case CX88_BOARD_NPGTECH_REALTV_TOP10FM:
                 /* This board apparently uses a combination of 2 GPIO
                    to represent the keys. Additionally, the second GPIO
                    can be used for parity.
@@ -90,9 +91,14 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
                 auxgpio = cx_read(MO_GP1_IO);
                 /* Take out the parity part */
                 gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
-        } else
+                break;
+        case CX88_BOARD_WINFAST_DTV1000:
+                gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900);
                 auxgpio = gpio;
-
+                break;
+        default:
+                auxgpio = gpio;
+        }
         if (ir->polling) {
                 if (ir->last_gpio == auxgpio)
                         return;
@@ -148,20 +154,16 @@ static void ir_timer(unsigned long data)
 static void cx88_ir_work(struct work_struct *work)
 {
         struct cx88_IR *ir = container_of(work, struct cx88_IR, work);
-        unsigned long timeout;
 
         cx88_ir_handle_key(ir);
-        timeout = jiffies + (ir->polling * HZ / 1000);
-        mod_timer(&ir->timer, timeout);
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
 static void cx88_ir_start(struct cx88_core *core, struct cx88_IR *ir)
 {
         if (ir->polling) {
+                setup_timer(&ir->timer, ir_timer, (unsigned long)ir);
                 INIT_WORK(&ir->work, cx88_ir_work);
-                init_timer(&ir->timer);
-                ir->timer.function = ir_timer;
-                ir->timer.data = (unsigned long)ir;
                 schedule_work(&ir->work);
         }
         if (ir->sampling) {
@@ -222,7 +224,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
-        case CX88_BOARD_HAUPPAUGE_HVR1300:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
                 ir_codes = ir_codes_hauppauge_new;
                 ir_type = IR_TYPE_RC5;
@@ -236,6 +237,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->polling = 50; /* ms */
                 break;
         case CX88_BOARD_WINFAST2000XP_EXPERT:
+        case CX88_BOARD_WINFAST_DTV1000:
                 ir_codes = ir_codes_winfast;
                 ir->gpio_addr = MO_GP0_IO;
                 ir->mask_keycode = 0x8f8;
@@ -328,7 +330,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 input_dev->id.vendor = pci->vendor;
                 input_dev->id.product = pci->device;
         }
-        input_dev->cdev.dev = &pci->dev;
+        input_dev->dev.parent = &pci->dev;
         /* record handles to ourself */
         ir->core = core;
         core->ir = ir;
@@ -442,7 +444,6 @@ void cx88_ir_irq(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
-        case CX88_BOARD_HAUPPAUGE_HVR1300:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
                 ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
                 ir_dprintk("biphase decoded: %x\n", ircode);
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 543b05ebc0e7..317a2a3f9cc1 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -336,7 +336,7 @@ static void cx8802_timeout(unsigned long data)
 {
         struct cx8802_dev *dev = (struct cx8802_dev*)data;
 
-        dprintk(0, "%s\n",__FUNCTION__);
+        dprintk(1, "%s\n",__FUNCTION__);
 
         if (debug)
                 cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]);
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 82bc3a28aa22..cd0877636a32 100644
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -94,7 +94,7 @@ static int vp3054_bit_getsda(void *data)
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_algo_bit_data vp3054_i2c_algo_template = {
+static const struct i2c_algo_bit_data vp3054_i2c_algo_template = {
         .setsda  = vp3054_bit_setsda,
         .setscl  = vp3054_bit_setscl,
         .getsda  = vp3054_bit_getsda,
@@ -105,12 +105,6 @@ static struct i2c_algo_bit_data vp3054_i2c_algo_template = {
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_adapter vp3054_i2c_adap_template = {
-        .name              = "cx2388x",
-        .owner             = THIS_MODULE,
-        .id                = I2C_HW_B_CX2388x,
-};
-
 int vp3054_i2c_probe(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
@@ -125,8 +119,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
                 return -ENOMEM;
         vp3054_i2c = dev->card_priv;
 
-        memcpy(&vp3054_i2c->adap, &vp3054_i2c_adap_template,
-               sizeof(vp3054_i2c->adap));
         memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
                sizeof(vp3054_i2c->algo));
 
@@ -135,6 +127,8 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
         vp3054_i2c->adap.dev.parent = &dev->pci->dev;
         strlcpy(vp3054_i2c->adap.name, core->name,
                 sizeof(vp3054_i2c->adap.name));
+        vp3054_i2c->adap.owner = THIS_MODULE;
+        vp3054_i2c->adap.id = I2C_HW_B_CX2388x;
         vp3054_i2c->algo.data = dev;
         i2c_set_adapdata(&vp3054_i2c->adap, dev);
         vp3054_i2c->adap.algo_data = &vp3054_i2c->algo;
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.h b/drivers/media/video/cx88/cx88-vp3054-i2c.h
index 637a7d232238..be99c931dc3e 100644
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.h
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.h
@@ -30,5 +30,12 @@ struct vp3054_i2c_state {
 };
 
 /* ----------------------------------------------------------------------- */
+#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE))
 int  vp3054_i2c_probe(struct cx8802_dev *dev);
 void vp3054_i2c_remove(struct cx8802_dev *dev);
+#else
+static inline int  vp3054_i2c_probe(struct cx8802_dev *dev)
+{ return 0; }
+static inline void vp3054_i2c_remove(struct cx8802_dev *dev)
+{ }
+#endif
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 738d4f20c580..c4f656ec46b0 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -209,6 +209,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_NORWOOD_MICRO           54
 #define CX88_BOARD_TE_DTV_250_OEM_SWANN    55
 #define CX88_BOARD_HAUPPAUGE_HVR1300       56
+#define CX88_BOARD_ADSTECH_PTV_390         57
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,
@@ -316,8 +317,6 @@ struct cx88_core {
 
         /* config info -- dvb */
 #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
-        struct dvb_pll_desc        *pll_desc;
-        unsigned int               pll_addr;
         int                        (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
 #endif
 
@@ -463,13 +462,10 @@ struct cx8802_dev {
         u32                        mailbox;
         int                        width;
         int                        height;
-        int                        fw_size;
 
 #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
         /* for dvb only */
         struct videobuf_dvb        dvb;
-        void*                      fe_handle;
-        int                        (*fe_release)(void *handle);
 
         void                       *card_priv;
 #endif
diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig
index 664676f44068..dcc1a0335440 100644
--- a/drivers/media/video/et61x251/Kconfig
+++ b/drivers/media/video/et61x251/Kconfig
@@ -1,6 +1,6 @@
 config USB_ET61X251
         tristate "USB ET61X[12]51 PC Camera Controller support"
-        depends on VIDEO_V4L1
+        depends on VIDEO_V4L2
         ---help---
           Say Y here if you want support for cameras based on Etoms ET61X151
           or ET61X251 PC Camera Controllers.
diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index 262f98e12409..02c741d8f85a 100644
--- a/drivers/media/video/et61x251/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -36,6 +36,7 @@
 #include <linux/mutex.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
+#include <linux/kref.h>
 
 #include "et61x251_sensor.h"
 
@@ -134,7 +135,7 @@ struct et61x251_module_param {
 };
 
 static DEFINE_MUTEX(et61x251_sysfs_lock);
-static DECLARE_RWSEM(et61x251_disconnect);
+static DECLARE_RWSEM(et61x251_dev_lock);
 
 struct et61x251_device {
         struct video_device* v4ldev;
@@ -158,12 +159,14 @@ struct et61x251_device {
         struct et61x251_sysfs_attr sysfs;
         struct et61x251_module_param module_param;
 
+        struct kref kref;
         enum et61x251_dev_state state;
         u8 users;
 
-        struct mutex dev_mutex, fileop_mutex;
+        struct completion probe;
+        struct mutex open_mutex, fileop_mutex;
         spinlock_t queue_lock;
-        wait_queue_head_t open, wait_frame, wait_stream;
+        wait_queue_head_t wait_open, wait_frame, wait_stream;
 };
 
 /*****************************************************************************/
@@ -177,7 +180,7 @@ et61x251_match_id(struct et61x251_device* cam, const struct usb_device_id *id)
 
 void
 et61x251_attach_sensor(struct et61x251_device* cam,
-                       struct et61x251_sensor* sensor)
+                       const struct et61x251_sensor* sensor)
 {
         memcpy(&cam->sensor, sensor, sizeof(struct et61x251_sensor));
 }
@@ -195,8 +198,8 @@ do {                                                                          \
                 else if ((level) == 2)                                        \
                         dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
                 else if ((level) >= 3)                                        \
-                        dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
-                                 __FUNCTION__, __LINE__ , ## args);           \
+                        dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n",   \
+                                 __FILE__, __FUNCTION__, __LINE__ , ## args); \
         }                                                                     \
 } while (0)
 #       define KDBG(level, fmt, args...)                                      \
@@ -205,8 +208,8 @@ do {                                                                          \
                 if ((level) == 1 || (level) == 2)                             \
                         pr_info("et61x251: " fmt "\n", ## args);              \
                 else if ((level) == 3)                                        \
-                        pr_debug("et61x251: [%s:%d] " fmt "\n", __FUNCTION__, \
-                                 __LINE__ , ## args);                         \
+                        pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__,   \
+                                 __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
 } while (0)
 #       define V4LDBG(level, name, cmd)                                       \
@@ -222,8 +225,8 @@ do {                                                                          \
 
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
-dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",                              \
-         __FUNCTION__, __LINE__ , ## args)
+dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __FUNCTION__,   \
+         __LINE__ , ## args)
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index a6525513cd1e..585bd1fe0765 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -45,11 +45,11 @@
 
 #define ET61X251_MODULE_NAME    "V4L2 driver for ET61X[12]51 "                \
                                 "PC Camera Controllers"
-#define ET61X251_MODULE_AUTHOR  "(C) 2006 Luca Risolia"
+#define ET61X251_MODULE_AUTHOR  "(C) 2006-2007 Luca Risolia"
 #define ET61X251_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
 #define ET61X251_MODULE_LICENSE "GPL"
-#define ET61X251_MODULE_VERSION "1:1.04"
-#define ET61X251_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 4)
+#define ET61X251_MODULE_VERSION "1:1.09"
+#define ET61X251_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 9)
 
 /*****************************************************************************/
 
@@ -245,7 +245,8 @@ int et61x251_read_reg(struct et61x251_device* cam, u16 index)
 
 
 static int
-et61x251_i2c_wait(struct et61x251_device* cam, struct et61x251_sensor* sensor)
+et61x251_i2c_wait(struct et61x251_device* cam,
+                  const struct et61x251_sensor* sensor)
 {
         int i, r;
 
@@ -270,7 +271,7 @@ et61x251_i2c_wait(struct et61x251_device* cam, struct et61x251_sensor* sensor)
 
 int
 et61x251_i2c_try_read(struct et61x251_device* cam,
-                      struct et61x251_sensor* sensor, u8 address)
+                      const struct et61x251_sensor* sensor, u8 address)
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
@@ -303,7 +304,8 @@ et61x251_i2c_try_read(struct et61x251_device* cam,
 
 int
 et61x251_i2c_try_write(struct et61x251_device* cam,
-                       struct et61x251_sensor* sensor, u8 address, u8 value)
+                       const struct et61x251_sensor* sensor, u8 address,
+                       u8 value)
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
@@ -615,7 +617,7 @@ static int et61x251_start_transfer(struct et61x251_device* cam)
         return 0;
 
 free_urbs:
-        for (i = 0; (i < ET61X251_URBS) &&  cam->urb[i]; i++)
+        for (i = 0; (i < ET61X251_URBS) && cam->urb[i]; i++)
                 usb_free_urb(cam->urb[i]);
 
 free_buffers:
@@ -682,7 +684,7 @@ static u8 et61x251_strtou8(const char* buff, size_t len, ssize_t* count)
 
         if (len < 4) {
                 strncpy(str, buff, len);
-                str[len+1] = '\0';
+                str[len] = '\0';
         } else {
                 strncpy(str, buff, 4);
                 str[4] = '\0';
@@ -977,30 +979,30 @@ static CLASS_DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
 
 static int et61x251_create_sysfs(struct et61x251_device* cam)
 {
-        struct video_device *v4ldev = cam->v4ldev;
+        struct class_device *classdev = &(cam->v4ldev->class_dev);
         int err = 0;
 
-        if ((err = video_device_create_file(v4ldev, &class_device_attr_reg)))
+        if ((err = class_device_create_file(classdev, &class_device_attr_reg)))
                 goto err_out;
-        if ((err = video_device_create_file(v4ldev, &class_device_attr_val)))
+        if ((err = class_device_create_file(classdev, &class_device_attr_val)))
                 goto err_reg;
 
         if (cam->sensor.sysfs_ops) {
-                if ((err = video_device_create_file(v4ldev,
+                if ((err = class_device_create_file(classdev,
                                                   &class_device_attr_i2c_reg)))
                         goto err_val;
-                if ((err = video_device_create_file(v4ldev,
+                if ((err = class_device_create_file(classdev,
                                                   &class_device_attr_i2c_val)))
                         goto err_i2c_reg;
         }
 
 err_i2c_reg:
         if (cam->sensor.sysfs_ops)
-        video_device_remove_file(v4ldev, &class_device_attr_i2c_reg);
+                class_device_remove_file(classdev, &class_device_attr_i2c_reg);
 err_val:
-        video_device_remove_file(v4ldev, &class_device_attr_val);
+        class_device_remove_file(classdev, &class_device_attr_val);
 err_reg:
-        video_device_remove_file(v4ldev, &class_device_attr_reg);
+        class_device_remove_file(classdev, &class_device_attr_reg);
 err_out:
         return err;
 }
@@ -1103,7 +1105,8 @@ static int et61x251_init(struct et61x251_device* cam)
         int err = 0;
 
         if (!(cam->state & DEV_INITIALIZED)) {
-                init_waitqueue_head(&cam->open);
+                mutex_init(&cam->open_mutex);
+                init_waitqueue_head(&cam->wait_open);
                 qctrl = s->qctrl;
                 rect = &(s->cropcap.defrect);
                 cam->compression.quality = ET61X251_COMPRESSION_QUALITY;
@@ -1177,64 +1180,80 @@ static int et61x251_init(struct et61x251_device* cam)
         return 0;
 }
 
+/*****************************************************************************/
 
-static void et61x251_release_resources(struct et61x251_device* cam)
+static void et61x251_release_resources(struct kref *kref)
 {
+        struct et61x251_device *cam;
+
         mutex_lock(&et61x251_sysfs_lock);
 
+        cam = container_of(kref, struct et61x251_device, kref);
+
         DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor);
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
+        usb_put_dev(cam->usbdev);
+        kfree(cam->control_buffer);
+        kfree(cam);
 
         mutex_unlock(&et61x251_sysfs_lock);
-
-        kfree(cam->control_buffer);
 }
 
-/*****************************************************************************/
 
 static int et61x251_open(struct inode* inode, struct file* filp)
 {
         struct et61x251_device* cam;
         int err = 0;
 
-        /*
-           This is the only safe way to prevent race conditions with
-           disconnect
-        */
-        if (!down_read_trylock(&et61x251_disconnect))
+        if (!down_read_trylock(&et61x251_dev_lock))
                 return -ERESTARTSYS;
 
         cam = video_get_drvdata(video_devdata(filp));
 
-        if (mutex_lock_interruptible(&cam->dev_mutex)) {
-                up_read(&et61x251_disconnect);
+        if (wait_for_completion_interruptible(&cam->probe)) {
+                up_read(&et61x251_dev_lock);
                 return -ERESTARTSYS;
         }
 
+        kref_get(&cam->kref);
+
+        if (mutex_lock_interruptible(&cam->open_mutex)) {
+                kref_put(&cam->kref, et61x251_release_resources);
+                up_read(&et61x251_dev_lock);
+                return -ERESTARTSYS;
+        }
+
+        if (cam->state & DEV_DISCONNECTED) {
+                DBG(1, "Device not present");
+                err = -ENODEV;
+                goto out;
+        }
+
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor);
+                DBG(2, "Device /dev/video%d is already in use",
+                       cam->v4ldev->minor);
+                DBG(3, "Simultaneous opens are not supported");
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
                         err = -EWOULDBLOCK;
                         goto out;
                 }
-                mutex_unlock(&cam->dev_mutex);
-                err = wait_event_interruptible_exclusive(cam->open,
-                                                  cam->state & DEV_DISCONNECTED
+                DBG(2, "A blocking open() has been requested. Wait for the "
+                       "device to be released...");
+                up_read(&et61x251_dev_lock);
+                err = wait_event_interruptible_exclusive(cam->wait_open,
+                                                (cam->state & DEV_DISCONNECTED)
                                                          || !cam->users);
-                if (err) {
-                        up_read(&et61x251_disconnect);
-                        return err;
-                }
+                down_read(&et61x251_dev_lock);
+                if (err)
+                        goto out;
                 if (cam->state & DEV_DISCONNECTED) {
-                        up_read(&et61x251_disconnect);
-                        return -ENODEV;
+                        err = -ENODEV;
+                        goto out;
                 }
-                mutex_lock(&cam->dev_mutex);
         }
 
-
         if (cam->state & DEV_MISCONFIGURED) {
                 err = et61x251_init(cam);
                 if (err) {
@@ -1259,36 +1278,32 @@ static int et61x251_open(struct inode* inode, struct file* filp)
         DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor);
 
 out:
-        mutex_unlock(&cam->dev_mutex);
-        up_read(&et61x251_disconnect);
+        mutex_unlock(&cam->open_mutex);
+        if (err)
+                kref_put(&cam->kref, et61x251_release_resources);
+        up_read(&et61x251_dev_lock);
         return err;
 }
 
 
 static int et61x251_release(struct inode* inode, struct file* filp)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device* cam;
 
-        mutex_lock(&cam->dev_mutex); /* prevent disconnect() to be called */
+        down_write(&et61x251_dev_lock);
 
-        et61x251_stop_transfer(cam);
+        cam = video_get_drvdata(video_devdata(filp));
 
+        et61x251_stop_transfer(cam);
         et61x251_release_buffers(cam);
-
-        if (cam->state & DEV_DISCONNECTED) {
-                et61x251_release_resources(cam);
-                usb_put_dev(cam->usbdev);
-                mutex_unlock(&cam->dev_mutex);
-                kfree(cam);
-                return 0;
-        }
-
         cam->users--;
-        wake_up_interruptible_nr(&cam->open, 1);
+        wake_up_interruptible_nr(&cam->wait_open, 1);
 
         DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor);
 
-        mutex_unlock(&cam->dev_mutex);
+        kref_put(&cam->kref, et61x251_release_resources);
+
+        up_write(&et61x251_dev_lock);
 
         return 0;
 }
@@ -1324,7 +1339,7 @@ et61x251_read(struct file* filp, char __user * buf,
                 DBG(3, "Close and open the device again to choose the read "
                        "method");
                 mutex_unlock(&cam->fileop_mutex);
-                return -EINVAL;
+                return -EBUSY;
         }
 
         if (cam->io == IO_NONE) {
@@ -1504,7 +1519,12 @@ static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)
                 return -EIO;
         }
 
-        if (cam->io != IO_MMAP || !(vma->vm_flags & VM_WRITE) ||
+        if (!(vma->vm_flags & (VM_WRITE | VM_READ))) {
+                mutex_unlock(&cam->fileop_mutex);
+                return -EACCES;
+        }
+
+        if (cam->io != IO_MMAP ||
             size != PAGE_ALIGN(cam->frame[0].buf.length)) {
                 mutex_unlock(&cam->fileop_mutex);
                 return -EINVAL;
@@ -1535,7 +1555,6 @@ static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)
 
         vma->vm_ops = &et61x251_vm_ops;
         vma->vm_private_data = &cam->frame[i];
-
         et61x251_vm_open(vma);
 
         mutex_unlock(&cam->fileop_mutex);
@@ -1764,7 +1783,7 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
                         if (cam->frame[i].vma_use_count) {
                                 DBG(3, "VIDIOC_S_CROP failed. "
                                        "Unmap the buffers first.");
-                                return -EINVAL;
+                                return -EBUSY;
                         }
 
         /* Preserve R,G or B origin */
@@ -1921,6 +1940,8 @@ et61x251_vidioc_g_fmt(struct et61x251_device* cam, void __user * arg)
         if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
 
+        pfmt->colorspace = (pfmt->pixelformat == V4L2_PIX_FMT_ET61X251) ?
+                           0 : V4L2_COLORSPACE_SRGB;
         pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_ET61X251)
                              ? 0 : (pfmt->width * pfmt->priv) / 8;
         pfmt->sizeimage = pfmt->height * ((pfmt->width*pfmt->priv)/8);
@@ -1996,6 +2017,8 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
             pix->pixelformat != V4L2_PIX_FMT_SBGGR8)
                 pix->pixelformat = pfmt->pixelformat;
         pix->priv = pfmt->priv; /* bpp */
+        pix->colorspace = (pix->pixelformat == V4L2_PIX_FMT_ET61X251) ?
+                          0 : V4L2_COLORSPACE_SRGB;
         pix->colorspace = pfmt->colorspace;
         pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_ET61X251)
                             ? 0 : (pix->width * pix->priv) / 8;
@@ -2013,7 +2036,7 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
                         if (cam->frame[i].vma_use_count) {
                                 DBG(3, "VIDIOC_S_FMT failed. "
                                        "Unmap the buffers first.");
-                                return -EINVAL;
+                                return -EBUSY;
                         }
 
         if (cam->stream == STREAM_ON)
@@ -2129,14 +2152,14 @@ et61x251_vidioc_reqbufs(struct et61x251_device* cam, void __user * arg)
         if (cam->io == IO_READ) {
                 DBG(3, "Close and open the device again to choose the mmap "
                        "I/O method");
-                return -EINVAL;
+                return -EBUSY;
         }
 
         for (i = 0; i < cam->nbuffers; i++)
                 if (cam->frame[i].vma_use_count) {
                         DBG(3, "VIDIOC_REQBUFS failed. "
                                "Previous buffers are still mapped.");
-                        return -EINVAL;
+                        return -EBUSY;
                 }
 
         if (cam->stream == STREAM_ON)
@@ -2284,9 +2307,6 @@ et61x251_vidioc_streamon(struct et61x251_device* cam, void __user * arg)
         if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
                 return -EINVAL;
 
-        if (list_empty(&cam->inqueue))
-                return -EINVAL;
-
         cam->stream = STREAM_ON;
 
         DBG(3, "Stream on");
@@ -2535,8 +2555,6 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        mutex_init(&cam->dev_mutex);
-
         DBG(2, "ET61X[12]51 PC Camera Controller detected "
                "(vid/pid 0x%04X:0x%04X)",id->idVendor, id->idProduct);
 
@@ -2568,7 +2586,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->v4ldev->release = video_device_release;
         video_set_drvdata(cam->v4ldev, cam);
 
-        mutex_lock(&cam->dev_mutex);
+        init_completion(&cam->probe);
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
                                     video_nr[dev_nr]);
@@ -2578,7 +2596,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                         DBG(1, "Free /dev/videoX node not found");
                 video_nr[dev_nr] = -1;
                 dev_nr = (dev_nr < ET61X251_MAX_DEVICES-1) ? dev_nr+1 : 0;
-                mutex_unlock(&cam->dev_mutex);
+                complete_all(&cam->probe);
                 goto fail;
         }
 
@@ -2599,11 +2617,15 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                        "device controlling. Error #%d", err);
 #else
         DBG(2, "Optional device control through 'sysfs' interface disabled");
+        DBG(3, "Compile the kernel with the 'CONFIG_VIDEO_ADV_DEBUG' "
+               "configuration option to enable it.");
 #endif
 
         usb_set_intfdata(intf, cam);
+        kref_init(&cam->kref);
+        usb_get_dev(cam->usbdev);
 
-        mutex_unlock(&cam->dev_mutex);
+        complete_all(&cam->probe);
 
         return 0;
 
@@ -2620,40 +2642,31 @@ fail:
 
 static void et61x251_usb_disconnect(struct usb_interface* intf)
 {
-        struct et61x251_device* cam = usb_get_intfdata(intf);
-
-        if (!cam)
-                return;
+        struct et61x251_device* cam;
 
-        down_write(&et61x251_disconnect);
+        down_write(&et61x251_dev_lock);
 
-        mutex_lock(&cam->dev_mutex);
+        cam = usb_get_intfdata(intf);
 
         DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
-        wake_up_interruptible_all(&cam->open);
-
         if (cam->users) {
                 DBG(2, "Device /dev/video%d is open! Deregistration and "
-                       "memory deallocation are deferred on close.",
+                       "memory deallocation are deferred.",
                     cam->v4ldev->minor);
                 cam->state |= DEV_MISCONFIGURED;
                 et61x251_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;
                 wake_up_interruptible(&cam->wait_frame);
                 wake_up(&cam->wait_stream);
-                usb_get_dev(cam->usbdev);
-        } else {
+        } else
                 cam->state |= DEV_DISCONNECTED;
-                et61x251_release_resources(cam);
-        }
 
-        mutex_unlock(&cam->dev_mutex);
+        wake_up_interruptible_all(&cam->wait_open);
 
-        if (!cam->users)
-                kfree(cam);
+        kref_put(&cam->kref, et61x251_release_resources);
 
-        up_write(&et61x251_disconnect);
+        up_write(&et61x251_dev_lock);
 }
 
 
diff --git a/drivers/media/video/et61x251/et61x251_sensor.h b/drivers/media/video/et61x251/et61x251_sensor.h
index 5fadb5de68bf..e14586330623 100644
--- a/drivers/media/video/et61x251/et61x251_sensor.h
+++ b/drivers/media/video/et61x251/et61x251_sensor.h
@@ -22,7 +22,7 @@
 #define _ET61X251_SENSOR_H_
 
 #include <linux/usb.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/device.h>
 #include <linux/stddef.h>
 #include <linux/errno.h>
@@ -47,7 +47,7 @@ et61x251_match_id(struct et61x251_device* cam, const struct usb_device_id *id);
 
 extern void
 et61x251_attach_sensor(struct et61x251_device* cam,
-                       struct et61x251_sensor* sensor);
+                       const struct et61x251_sensor* sensor);
 
 /*****************************************************************************/
 
@@ -56,10 +56,10 @@ extern int et61x251_read_reg(struct et61x251_device*, u16 index);
 extern int et61x251_i2c_write(struct et61x251_device*, u8 address, u8 value);
 extern int et61x251_i2c_read(struct et61x251_device*, u8 address);
 extern int et61x251_i2c_try_write(struct et61x251_device*,
-                                  struct et61x251_sensor*, u8 address,
+                                  const struct et61x251_sensor*, u8 address,
                                   u8 value);
 extern int et61x251_i2c_try_read(struct et61x251_device*,
-                                 struct et61x251_sensor*, u8 address);
+                                 const struct et61x251_sensor*, u8 address);
 extern int et61x251_i2c_raw_write(struct et61x251_device*, u8 n, u8 data1,
                                   u8 data2, u8 data3, u8 data4, u8 data5,
                                   u8 data6, u8 data7, u8 data8, u8 address);
diff --git a/drivers/media/video/et61x251/et61x251_tas5130d1b.c b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
index b06643409842..04b7fbb310a8 100644
--- a/drivers/media/video/et61x251/et61x251_tas5130d1b.c
+++ b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
@@ -69,7 +69,7 @@ static int tas5130d1b_set_ctrl(struct et61x251_device* cam,
 }
 
 
-static struct et61x251_sensor tas5130d1b = {
+static const struct et61x251_sensor tas5130d1b = {
         .name = "TAS5130D1B",
         .interface = ET61X251_I2C_3WIRES,
         .rsta = ET61X251_I2C_RSTA_STOP,
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index ed92b6f7187a..2d709e064679 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -37,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/i2c-id.h>
 #include <linux/workqueue.h>
 #include <asm/semaphore.h>
 
@@ -60,21 +61,22 @@ MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults
 
 /* ----------------------------------------------------------------------- */
 
-static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
+                               int size, int offset)
 {
-        unsigned char buf[3];
+        unsigned char buf[6];
         int start, range, toggle, dev, code;
 
         /* poll IR chip */
-        if (3 != i2c_master_recv(&ir->c,buf,3))
+        if (size != i2c_master_recv(&ir->c,buf,size))
                 return -EIO;
 
         /* split rc5 data block ... */
-        start  = (buf[0] >> 7) &    1;
-        range  = (buf[0] >> 6) &    1;
-        toggle = (buf[0] >> 5) &    1;
-        dev    =  buf[0]       & 0x1f;
-        code   = (buf[1] >> 2) & 0x3f;
+        start  = (buf[offset] >> 7) &    1;
+        range  = (buf[offset] >> 6) &    1;
+        toggle = (buf[offset] >> 5) &    1;
+        dev    =  buf[offset]       & 0x1f;
+        code   = (buf[offset+1] >> 2) & 0x3f;
 
         /* rc5 has two start bits
          * the first bit must be one
@@ -96,6 +98,16 @@ static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
         return 1;
 }
 
+static inline int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        return get_key_haup_common (ir, ir_key, ir_raw, 3, 0);
+}
+
+static inline int get_key_haup_xvr(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        return get_key_haup_common (ir, ir_key, ir_raw, 6, 3);
+}
+
 static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
         unsigned char b;
@@ -270,8 +282,9 @@ static void ir_timer(unsigned long data)
 static void ir_work(struct work_struct *work)
 {
         struct IR_i2c *ir = container_of(work, struct IR_i2c, work);
+
         ir_key_poll(ir);
-        mod_timer(&ir->timer, jiffies+HZ/10);
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(100));
 }
 
 /* ----------------------------------------------------------------------- */
@@ -354,9 +367,21 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
         case 0x7a:
         case 0x47:
         case 0x71:
-                /* Handled by saa7134-input */
-                name        = "SAA713x remote";
-                ir_type     = IR_TYPE_OTHER;
+                if (adap->id == I2C_HW_B_CX2388x) {
+                        /* Handled by cx88-input */
+                        name        = "CX2388x remote";
+                        ir_type     = IR_TYPE_RC5;
+                        ir->get_key = get_key_haup_xvr;
+                        if (hauppauge == 1) {
+                                ir_codes    = ir_codes_hauppauge_new;
+                        } else {
+                                ir_codes    = ir_codes_rc5_tv;
+                        }
+                } else {
+                        /* Handled by saa7134-input */
+                        name        = "SAA713x remote";
+                        ir_type     = IR_TYPE_OTHER;
+                }
                 break;
         default:
                 /* shouldn't happen */
@@ -450,6 +475,7 @@ static int ir_probe(struct i2c_adapter *adap)
         static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
         static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, -1 };
         static const int probe_em28XX[] = { 0x30, 0x47, -1 };
+        static const int probe_cx88[] = { 0x18, 0x71, -1 };
         const int *probe = NULL;
         struct i2c_client c;
         unsigned char buf;
@@ -468,6 +494,9 @@ static int ir_probe(struct i2c_adapter *adap)
         case I2C_HW_B_EM28XX:
                 probe = probe_em28XX;
                 break;
+        case I2C_HW_B_CX2388x:
+                probe = probe_cx88;
+                break;
         }
         if (NULL == probe)
                 return 0;
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index efc66355339a..4c93466a89e5 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -181,7 +181,7 @@ MODULE_PARM_DESC(secam, "Set SECAM standard: B, G, H, D, K, L, LC");
 MODULE_PARM_DESC(ntsc, "Set NTSC standard: M, J, K");
 MODULE_PARM_DESC(debug,
                  "Debug level (bitmask). Default: errors only\n"
-                 "\t\t\t(debug = 511 gives full debugging)");
+                 "\t\t\t(debug = 1023 gives full debugging)");
 MODULE_PARM_DESC(ivtv_pci_latency,
                  "Change the PCI latency to 64 if lower: 0 = No, 1 = Yes,\n"
                  "\t\t\tDefault: Yes");
@@ -339,6 +339,7 @@ static void ivtv_process_eeprom(struct ivtv *itv)
                 /* In a few cases the PCI subsystem IDs do not correctly
                    identify the card. A better method is to check the
                    model number from the eeprom instead. */
+                case 30012 ... 30039:  /* Low profile PVR250 */
                 case 32000 ... 32999:
                 case 48000 ... 48099:  /* 48??? range are PVR250s with a cx23415 */
                 case 48400 ... 48599:
@@ -622,6 +623,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
         itv->enc_mbox.max_mbox = 2; /* the encoder has 3 mailboxes (0-2) */
         itv->dec_mbox.max_mbox = 1; /* the decoder has 2 mailboxes (0-1) */
 
+        mutex_init(&itv->serialize_lock);
         mutex_init(&itv->i2c_bus_lock);
         mutex_init(&itv->udma.lock);
 
@@ -1288,10 +1290,7 @@ static void ivtv_remove(struct pci_dev *pci_dev)
 
         IVTV_DEBUG_INFO(" Releasing irq.\n");
         free_irq(itv->dev->irq, (void *)itv);
-
-        if (itv->dev) {
-                ivtv_iounmap(itv);
-        }
+        ivtv_iounmap(itv);
 
         IVTV_DEBUG_INFO(" Releasing mem.\n");
         release_mem_region(itv->base_addr, IVTV_ENCODER_SIZE);
@@ -1326,9 +1325,9 @@ static int module_start(void)
                 return -1;
         }
 
-        if (ivtv_debug < 0 || ivtv_debug > 511) {
+        if (ivtv_debug < 0 || ivtv_debug > 1023) {
                 ivtv_debug = 0;
-                printk(KERN_INFO "ivtv:  debug value must be >= 0 and <= 511!\n");
+                printk(KERN_INFO "ivtv:  debug value must be >= 0 and <= 1023!\n");
         }
 
         if (pci_register_driver(&ivtv_pci_driver)) {
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index e6e56f175f3f..6c1a85f1ee1b 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -268,6 +268,8 @@ extern const u32 yuv_offset[4];
 #define IVTV_DBGFLG_IRQ   (1 << 6)
 #define IVTV_DBGFLG_DEC   (1 << 7)
 #define IVTV_DBGFLG_YUV   (1 << 8)
+/* Flag to turn on high volume debugging */
+#define IVTV_DBGFLG_HIGHVOL (1 << 9)
 
 /* NOTE: extra space before comma in 'itv->num , ## args' is required for
    gcc-2.95, otherwise it won't compile. */
@@ -286,6 +288,21 @@ extern const u32 yuv_offset[4];
 #define IVTV_DEBUG_DEC(fmt, args...)   IVTV_DEBUG(IVTV_DBGFLG_DEC, "dec", fmt , ## args)
 #define IVTV_DEBUG_YUV(fmt, args...)   IVTV_DEBUG(IVTV_DBGFLG_YUV, "yuv", fmt , ## args)
 
+#define IVTV_DEBUG_HIGH_VOL(x, type, fmt, args...) \
+        do { \
+                if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) \
+                        printk(KERN_INFO "ivtv%d " type ": " fmt, itv->num , ## args); \
+        } while (0)
+#define IVTV_DEBUG_HI_WARN(fmt, args...)  IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_WARN, "warning", fmt , ## args)
+#define IVTV_DEBUG_HI_INFO(fmt, args...)  IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_INFO, "info",fmt , ## args)
+#define IVTV_DEBUG_HI_API(fmt, args...)   IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_API, "api", fmt , ## args)
+#define IVTV_DEBUG_HI_DMA(fmt, args...)   IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_DMA, "dma", fmt , ## args)
+#define IVTV_DEBUG_HI_IOCTL(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_IOCTL, "ioctl", fmt , ## args)
+#define IVTV_DEBUG_HI_I2C(fmt, args...)   IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_I2C, "i2c", fmt , ## args)
+#define IVTV_DEBUG_HI_IRQ(fmt, args...)   IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_IRQ, "irq", fmt , ## args)
+#define IVTV_DEBUG_HI_DEC(fmt, args...)   IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_DEC, "dec", fmt , ## args)
+#define IVTV_DEBUG_HI_YUV(fmt, args...)   IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_YUV, "yuv", fmt , ## args)
+
 #define IVTV_FB_DEBUG(x, type, fmt, args...) \
         do { \
                 if ((x) & ivtv_debug) \
@@ -650,7 +667,6 @@ struct vbi_info {
         /* convenience pointer to sliced struct in vbi_in union */
         struct v4l2_sliced_vbi_format *sliced_in;
         u32 service_set_in;
-        u32 service_set_out;
         int insert_mpeg;
 
         /* Buffer for the maximum of 2 * 18 * packet_size sliced VBI lines.
@@ -723,6 +739,7 @@ struct ivtv {
         int search_pack_header;
 
         spinlock_t dma_reg_lock; /* lock access to DMA engine registers */
+        struct mutex serialize_lock;  /* lock used to serialize starting streams */
 
         /* User based DMA for OSD */
         struct ivtv_user_dma udma;
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 555d5e6369c3..ee7e884e9c4f 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -406,7 +406,7 @@ static ssize_t ivtv_read_pos(struct ivtv_stream *s, char __user *ubuf, size_t co
         ssize_t rc = count ? ivtv_read(s, ubuf, count, non_block) : 0;
         struct ivtv *itv = s->itv;
 
-        IVTV_DEBUG_INFO("read %zd from %s, got %zd\n", count, s->name, rc);
+        IVTV_DEBUG_HI_INFO("read %zd from %s, got %zd\n", count, s->name, rc);
         if (rc > 0)
                 pos += rc;
         return rc;
@@ -497,7 +497,7 @@ ssize_t ivtv_v4l2_read(struct file * filp, char __user *buf, size_t count, loff_
         struct ivtv_stream *s = &itv->streams[id->type];
         int rc;
 
-        IVTV_DEBUG_IOCTL("read %zd bytes from %s\n", count, s->name);
+        IVTV_DEBUG_HI_IOCTL("read %zd bytes from %s\n", count, s->name);
 
         rc = ivtv_start_capture(id);
         if (rc)
@@ -535,7 +535,7 @@ ssize_t ivtv_v4l2_write(struct file *filp, const char __user *user_buf, size_t c
         int rc;
         DEFINE_WAIT(wait);
 
-        IVTV_DEBUG_IOCTL("write %zd bytes to %s\n", count, s->name);
+        IVTV_DEBUG_HI_IOCTL("write %zd bytes to %s\n", count, s->name);
 
         if (s->type != IVTV_DEC_STREAM_TYPE_MPG &&
             s->type != IVTV_DEC_STREAM_TYPE_YUV &&
@@ -643,7 +643,7 @@ retry:
            to transfer the rest. */
         if (count && !(filp->f_flags & O_NONBLOCK))
                 goto retry;
-        IVTV_DEBUG_INFO("Wrote %d bytes to %s (%d)\n", bytes_written, s->name, s->q_full.bytesused);
+        IVTV_DEBUG_HI_INFO("Wrote %d bytes to %s (%d)\n", bytes_written, s->name, s->q_full.bytesused);
         return bytes_written;
 }
 
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index d4c910b782af..2b6208a6a108 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -56,9 +56,7 @@ retry:
                 volatile u32 __iomem *dst = (volatile u32 __iomem *)mem;
                 const u32 *src = (const u32 *)fw->data;
 
-                /* temporarily allow 256 KB encoding firmwares as well for
-                   compatibility with blackbird cards */
-                if (fw->size != size && fw->size != 256 * 1024) {
+                if (fw->size != size) {
                         /* Due to race conditions in firmware loading (esp. with udev <0.95)
                            the wrong file was sometimes loaded. So we check filesizes to
                            see if at least the right-sized file was loaded. If not, then we
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index bc8f8ca2961f..676418cbaaad 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -115,8 +115,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)
         curout = (curout & ~0xF) | 1;
         write_reg(curout, IVTV_REG_GPIO_OUT);
         /* We could use something else for smaller time */
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(1);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
         curout |= 2;
         write_reg(curout, IVTV_REG_GPIO_OUT);
         curdir &= ~0x80;
@@ -138,13 +137,11 @@ int ivtv_reset_tuner_gpio(enum v4l2_tuner_type mode, void *priv, int ptr)
 
         curout &= ~(1 << 12);
         write_reg(curout, IVTV_REG_GPIO_OUT);
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(1);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
 
         curout |= (1 << 12);
         write_reg(curout, IVTV_REG_GPIO_OUT);
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(1);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
 
         return 0;
 }
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 57af1762de1f..4773453e8dab 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1159,7 +1159,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 
                 memset(fb, 0, sizeof(*fb));
                 if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                        break;
+                        return -EINVAL;
                 fb->capability = V4L2_FBUF_CAP_EXTERNOVERLAY | V4L2_FBUF_CAP_CHROMAKEY |
                         V4L2_FBUF_CAP_LOCAL_ALPHA | V4L2_FBUF_CAP_GLOBAL_ALPHA;
                 fb->fmt.pixelformat = itv->osd_pixelformat;
@@ -1179,7 +1179,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                 struct v4l2_framebuffer *fb = arg;
 
                 if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                        break;
+                        return -EINVAL;
                 itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;
                 itv->osd_local_alpha_state = (fb->flags & V4L2_FBUF_FLAG_LOCAL_ALPHA) != 0;
                 itv->osd_color_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0;
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index ba98bf054f2e..1a3ee464a826 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -48,7 +48,7 @@ static void ivtv_pio_work_handler(struct ivtv *itv)
         struct list_head *p;
         int i = 0;
 
-        IVTV_DEBUG_DMA("ivtv_pio_work_handler\n");
+        IVTV_DEBUG_HI_DMA("ivtv_pio_work_handler\n");
         if (itv->cur_pio_stream < 0 || itv->cur_pio_stream >= IVTV_MAX_STREAMS ||
                         s->v4l2dev == NULL || !ivtv_use_pio(s)) {
                 itv->cur_pio_stream = -1;
@@ -56,7 +56,7 @@ static void ivtv_pio_work_handler(struct ivtv *itv)
                 write_reg(IVTV_IRQ_ENC_PIO_COMPLETE, 0x44);
                 return;
         }
-        IVTV_DEBUG_DMA("Process PIO %s\n", s->name);
+        IVTV_DEBUG_HI_DMA("Process PIO %s\n", s->name);
         buf = list_entry(s->q_dma.list.next, struct ivtv_buffer, list);
         list_for_each(p, &s->q_dma.list) {
                 struct ivtv_buffer *buf = list_entry(p, struct ivtv_buffer, list);
@@ -187,7 +187,7 @@ static int stream_enc_dma_append(struct ivtv_stream *s, u32 data[CX2341X_MBOX_MA
                 bytes_needed += UVsize;
         }
 
-        IVTV_DEBUG_DMA("%s %s: 0x%08x bytes at 0x%08x\n",
+        IVTV_DEBUG_HI_DMA("%s %s: 0x%08x bytes at 0x%08x\n",
                 ivtv_use_pio(s) ? "PIO" : "DMA", s->name, bytes_needed, offset);
 
         rc = ivtv_queue_move(s, &s->q_free, &s->q_full, &s->q_predma, bytes_needed);
@@ -242,7 +242,7 @@ static void dma_post(struct ivtv_stream *s)
         u32 *u32buf;
         int x = 0;
 
-        IVTV_DEBUG_DMA("%s %s completed (%x)\n", ivtv_use_pio(s) ? "PIO" : "DMA",
+        IVTV_DEBUG_HI_DMA("%s %s completed (%x)\n", ivtv_use_pio(s) ? "PIO" : "DMA",
                         s->name, s->dma_offset);
         list_for_each(p, &s->q_dma.list) {
                 buf = list_entry(p, struct ivtv_buffer, list);
@@ -321,7 +321,7 @@ void ivtv_dma_stream_dec_prepare(struct ivtv_stream *s, u32 offset, int lock)
         unsigned long flags = 0;
         int idx = 0;
 
-        IVTV_DEBUG_DMA("DEC PREPARE DMA %s: %08x %08x\n", s->name, s->q_predma.bytesused, offset);
+        IVTV_DEBUG_HI_DMA("DEC PREPARE DMA %s: %08x %08x\n", s->name, s->q_predma.bytesused, offset);
         buf = list_entry(s->q_predma.list.next, struct ivtv_buffer, list);
         list_for_each(p, &s->q_predma.list) {
                 struct ivtv_buffer *buf = list_entry(p, struct ivtv_buffer, list);
@@ -368,7 +368,7 @@ static void ivtv_dma_enc_start(struct ivtv_stream *s)
         struct ivtv_stream *s_vbi = &itv->streams[IVTV_ENC_STREAM_TYPE_VBI];
         int i;
 
-        IVTV_DEBUG_DMA("start %s for %s\n", ivtv_use_dma(s) ? "DMA" : "PIO", s->name);
+        IVTV_DEBUG_HI_DMA("start %s for %s\n", ivtv_use_dma(s) ? "DMA" : "PIO", s->name);
 
         if (s->q_predma.bytesused)
                 ivtv_queue_move(s, &s->q_predma, NULL, &s->q_dma, s->q_predma.bytesused);
@@ -397,7 +397,7 @@ static void ivtv_dma_enc_start(struct ivtv_stream *s)
                 itv->vbi.dma_offset = s_vbi->dma_offset;
                 s_vbi->SG_length = 0;
                 set_bit(IVTV_F_S_DMA_HAS_VBI, &s->s_flags);
-                IVTV_DEBUG_DMA("include DMA for %s\n", s->name);
+                IVTV_DEBUG_HI_DMA("include DMA for %s\n", s->name);
         }
 
         /* Mark last buffer size for Interrupt flag */
@@ -431,7 +431,7 @@ static void ivtv_dma_dec_start(struct ivtv_stream *s)
 
         if (s->q_predma.bytesused)
                 ivtv_queue_move(s, &s->q_predma, NULL, &s->q_dma, s->q_predma.bytesused);
-        IVTV_DEBUG_DMA("start DMA for %s\n", s->name);
+        IVTV_DEBUG_HI_DMA("start DMA for %s\n", s->name);
         /* put SG Handle into register 0x0c */
         write_reg(s->SG_handle, IVTV_REG_DECDMAADDR);
         write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x01, IVTV_REG_DMAXFER);
@@ -447,7 +447,7 @@ static void ivtv_irq_dma_read(struct ivtv *itv)
         struct ivtv_buffer *buf;
         int hw_stream_type;
 
-        IVTV_DEBUG_IRQ("DEC DMA READ\n");
+        IVTV_DEBUG_HI_IRQ("DEC DMA READ\n");
         del_timer(&itv->dma_timer);
         if (read_reg(IVTV_REG_DMASTATUS) & 0x14) {
                 IVTV_DEBUG_WARN("DEC DMA ERROR %x\n", read_reg(IVTV_REG_DMASTATUS));
@@ -462,7 +462,7 @@ static void ivtv_irq_dma_read(struct ivtv *itv)
                         s = &itv->streams[IVTV_DEC_STREAM_TYPE_MPG];
                         hw_stream_type = 0;
                 }
-                IVTV_DEBUG_DMA("DEC DATA READ %s: %d\n", s->name, s->q_dma.bytesused);
+                IVTV_DEBUG_HI_DMA("DEC DATA READ %s: %d\n", s->name, s->q_dma.bytesused);
 
                 ivtv_stream_sync_for_cpu(s);
 
@@ -495,7 +495,7 @@ static void ivtv_irq_enc_dma_complete(struct ivtv *itv)
 
         del_timer(&itv->dma_timer);
         ivtv_api_get_data(&itv->enc_mbox, IVTV_MBOX_DMA_END, data);
-        IVTV_DEBUG_IRQ("ENC DMA COMPLETE %x %d\n", data[0], data[1]);
+        IVTV_DEBUG_HI_IRQ("ENC DMA COMPLETE %x %d\n", data[0], data[1]);
         if (test_and_clear_bit(IVTV_F_I_ENC_VBI, &itv->i_flags))
                 data[1] = 3;
         else if (data[1] > 2)
@@ -532,7 +532,7 @@ static void ivtv_irq_enc_pio_complete(struct ivtv *itv)
                 return;
         }
         s = &itv->streams[itv->cur_pio_stream];
-        IVTV_DEBUG_IRQ("ENC PIO COMPLETE %s\n", s->name);
+        IVTV_DEBUG_HI_IRQ("ENC PIO COMPLETE %s\n", s->name);
         s->SG_length = 0;
         clear_bit(IVTV_F_I_ENC_VBI, &itv->i_flags);
         clear_bit(IVTV_F_I_PIO, &itv->i_flags);
@@ -590,7 +590,7 @@ static void ivtv_irq_enc_start_cap(struct ivtv *itv)
 
         /* Get DMA destination and size arguments from card */
         ivtv_api_get_data(&itv->enc_mbox, IVTV_MBOX_DMA, data);
-        IVTV_DEBUG_IRQ("ENC START CAP %d: %08x %08x\n", data[0], data[1], data[2]);
+        IVTV_DEBUG_HI_IRQ("ENC START CAP %d: %08x %08x\n", data[0], data[1], data[2]);
 
         if (data[0] > 2 || data[1] == 0 || data[2] == 0) {
                 IVTV_DEBUG_WARN("Unknown input: %08x %08x %08x\n",
@@ -610,7 +610,7 @@ static void ivtv_irq_enc_vbi_cap(struct ivtv *itv)
         u32 data[CX2341X_MBOX_MAX_DATA];
         struct ivtv_stream *s;
 
-        IVTV_DEBUG_IRQ("ENC START VBI CAP\n");
+        IVTV_DEBUG_HI_IRQ("ENC START VBI CAP\n");
         s = &itv->streams[IVTV_ENC_STREAM_TYPE_VBI];
 
         /* If more than two VBI buffers are pending, then
@@ -644,7 +644,7 @@ static void ivtv_irq_dec_vbi_reinsert(struct ivtv *itv)
         u32 data[CX2341X_MBOX_MAX_DATA];
         struct ivtv_stream *s = &itv->streams[IVTV_DEC_STREAM_TYPE_VBI];
 
-        IVTV_DEBUG_IRQ("DEC VBI REINSERT\n");
+        IVTV_DEBUG_HI_IRQ("DEC VBI REINSERT\n");
         if (test_bit(IVTV_F_S_CLAIMED, &s->s_flags) &&
                         !stream_enc_dma_append(s, data)) {
                 set_bit(IVTV_F_S_PIO_PENDING, &s->s_flags);
@@ -669,7 +669,7 @@ static void ivtv_irq_dec_data_req(struct ivtv *itv)
                 itv->dma_data_req_offset = data[1];
                 s = &itv->streams[IVTV_DEC_STREAM_TYPE_MPG];
         }
-        IVTV_DEBUG_IRQ("DEC DATA REQ %s: %d %08x %u\n", s->name, s->q_full.bytesused,
+        IVTV_DEBUG_HI_IRQ("DEC DATA REQ %s: %d %08x %u\n", s->name, s->q_full.bytesused,
                        itv->dma_data_req_offset, itv->dma_data_req_size);
         if (itv->dma_data_req_size == 0 || s->q_full.bytesused < itv->dma_data_req_size) {
                 set_bit(IVTV_F_S_NEEDS_DATA, &s->s_flags);
@@ -791,10 +791,10 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
         /* Exclude interrupts noted below from the output, otherwise the log is flooded with
            these messages */
         if (combo & ~0xff6d0400)
-                IVTV_DEBUG_IRQ("======= valid IRQ bits: 0x%08x ======\n", combo);
+                IVTV_DEBUG_HI_IRQ("======= valid IRQ bits: 0x%08x ======\n", combo);
 
         if (combo & IVTV_IRQ_DEC_DMA_COMPLETE) {
-                IVTV_DEBUG_IRQ("DEC DMA COMPLETE\n");
+                IVTV_DEBUG_HI_IRQ("DEC DMA COMPLETE\n");
         }
 
         if (combo & IVTV_IRQ_DMA_READ) {
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 6af88ae9295f..287117187499 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -446,6 +446,9 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
         if (s->v4l2dev == NULL)
                 return -EINVAL;
 
+        /* Big serialization lock to ensure no two streams are started
+           simultaneously: that can give all sorts of weird results. */
+        mutex_lock(&itv->serialize_lock);
         IVTV_DEBUG_INFO("Start encoder stream %s\n", s->name);
 
         switch (s->type) {
@@ -487,6 +490,7 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
                         0, sizeof(itv->vbi.sliced_mpeg_size));
                 break;
         default:
+                mutex_unlock(&itv->serialize_lock);
                 return -EINVAL;
         }
         s->subtype = subtype;
@@ -568,6 +572,7 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
         if (ivtv_vapi(itv, CX2341X_ENC_START_CAPTURE, 2, captype, subtype))
         {
                 IVTV_DEBUG_WARN( "Error starting capture!\n");
+                mutex_unlock(&itv->serialize_lock);
                 return -EINVAL;
         }
 
@@ -583,6 +588,7 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
 
         /* you're live! sit back and await interrupts :) */
         atomic_inc(&itv->capturing);
+        mutex_unlock(&itv->serialize_lock);
         return 0;
 }
 
@@ -762,17 +768,6 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
         /* when: 0 =  end of GOP  1 = NOW!, type: 0 = mpeg, subtype: 3 = video+audio */
         ivtv_vapi(itv, CX2341X_ENC_STOP_CAPTURE, 3, stopmode, cap_type, s->subtype);
 
-        /* only run these if we're shutting down the last cap */
-        if (atomic_read(&itv->capturing) - 1 == 0) {
-                /* event notification (off) */
-                if (test_and_clear_bit(IVTV_F_I_DIG_RST, &itv->i_flags)) {
-                        /* type: 0 = refresh */
-                        /* on/off: 0 = off, intr: 0x10000000, mbox_id: -1: none */
-                        ivtv_vapi(itv, CX2341X_ENC_SET_EVENT_NOTIFICATION, 4, 0, 0, IVTV_IRQ_ENC_VIM_RST, -1);
-                        ivtv_set_irq_mask(itv, IVTV_IRQ_ENC_VIM_RST);
-                }
-        }
-
         then = jiffies;
 
         if (!test_bit(IVTV_F_S_PASSTHROUGH, &s->s_flags)) {
@@ -812,7 +807,6 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
                 then = jiffies;
                 /* Make sure DMA is complete */
                 add_wait_queue(&s->waitq, &wait);
-                set_current_state(TASK_INTERRUPTIBLE);
                 do {
                         /* check if DMA is pending */
                         if ((s->type == IVTV_ENC_STREAM_TYPE_MPG) &&    /* MPG Only */
@@ -827,9 +821,7 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
                         } else if (read_reg(IVTV_REG_DMASTATUS) & 0x02) {
                                 break;
                         }
-
-                        ivtv_sleep_timeout(HZ / 100, 1);
-                } while (then + HZ * 2 > jiffies);
+                } while (!ivtv_sleep_timeout(HZ / 100, 1) && then + HZ * 2 > jiffies);
 
                 set_current_state(TASK_RUNNING);
                 remove_wait_queue(&s->waitq, &wait);
@@ -840,17 +832,30 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
         /* Clear capture and no-read bits */
         clear_bit(IVTV_F_S_STREAMING, &s->s_flags);
 
+        /* ensure these global cleanup actions are done only once */
+        mutex_lock(&itv->serialize_lock);
+
         if (s->type == IVTV_ENC_STREAM_TYPE_VBI)
                 ivtv_set_irq_mask(itv, IVTV_IRQ_ENC_VBI_CAP);
 
         if (atomic_read(&itv->capturing) > 0) {
+                mutex_unlock(&itv->serialize_lock);
                 return 0;
         }
 
         /* Set the following Interrupt mask bits for capture */
         ivtv_set_irq_mask(itv, IVTV_IRQ_MASK_CAPTURE);
 
+        /* event notification (off) */
+        if (test_and_clear_bit(IVTV_F_I_DIG_RST, &itv->i_flags)) {
+                /* type: 0 = refresh */
+                /* on/off: 0 = off, intr: 0x10000000, mbox_id: -1: none */
+                ivtv_vapi(itv, CX2341X_ENC_SET_EVENT_NOTIFICATION, 4, 0, 0, IVTV_IRQ_ENC_VIM_RST, -1);
+                ivtv_set_irq_mask(itv, IVTV_IRQ_ENC_VIM_RST);
+        }
+
         wake_up(&s->waitq);
+        mutex_unlock(&itv->serialize_lock);
 
         return 0;
 }
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
index 3ba46e07ea1f..a7282a91bd97 100644
--- a/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/drivers/media/video/ivtv/ivtv-vbi.c
@@ -219,31 +219,23 @@ ssize_t ivtv_write_vbi(struct ivtv *itv, const char __user *ubuf, size_t count)
         int found_cc = 0;
         int cc_pos = itv->vbi.cc_pos;
 
-        if (itv->vbi.service_set_out == 0)
-                return -EPERM;
-
         while (count >= sizeof(struct v4l2_sliced_vbi_data)) {
                 switch (p->id) {
                 case V4L2_SLICED_CAPTION_525:
-                        if (p->id == V4L2_SLICED_CAPTION_525 &&
-                            p->line == 21 &&
-                            (itv->vbi.service_set_out &
-                                V4L2_SLICED_CAPTION_525) == 0) {
-                                break;
-                        }
-                        found_cc = 1;
-                        if (p->field) {
-                                cc[2] = p->data[0];
-                                cc[3] = p->data[1];
-                        } else {
-                                cc[0] = p->data[0];
-                                cc[1] = p->data[1];
+                        if (p->line == 21) {
+                                found_cc = 1;
+                                if (p->field) {
+                                        cc[2] = p->data[0];
+                                        cc[3] = p->data[1];
+                                } else {
+                                        cc[0] = p->data[0];
+                                        cc[1] = p->data[1];
+                                }
                         }
                         break;
 
                 case V4L2_SLICED_VPS:
-                        if (p->line == 16 && p->field == 0 &&
-                            (itv->vbi.service_set_out & V4L2_SLICED_VPS)) {
+                        if (p->line == 16 && p->field == 0) {
                                 itv->vbi.vps[0] = p->data[2];
                                 itv->vbi.vps[1] = p->data[8];
                                 itv->vbi.vps[2] = p->data[9];
@@ -255,8 +247,7 @@ ssize_t ivtv_write_vbi(struct ivtv *itv, const char __user *ubuf, size_t count)
                         break;
 
                 case V4L2_SLICED_WSS_625:
-                        if (p->line == 23 && p->field == 0 &&
-                            (itv->vbi.service_set_out & V4L2_SLICED_WSS_625)) {
+                        if (p->line == 23 && p->field == 0) {
                                 /* No lock needed for WSS */
                                 itv->vbi.wss = p->data[0] | (p->data[1] << 8);
                                 itv->vbi.wss_found = 1;
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 3bb7d6634862..507b1d4260ed 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -157,8 +157,7 @@ static int msp_read(struct i2c_client *client, int dev, int addr)
                         break;
                 v4l_warn(client, "I/O error #%d (read 0x%02x/0x%02x)\n", err,
                        dev, addr);
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(msecs_to_jiffies(10));
+                schedule_timeout_interruptible(msecs_to_jiffies(10));
         }
         if (err == 3) {
                 v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-|\n");
@@ -197,8 +196,7 @@ static int msp_write(struct i2c_client *client, int dev, int addr, int val)
                         break;
                 v4l_warn(client, "I/O error #%d (write 0x%02x/0x%02x)\n", err,
                        dev, addr);
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(msecs_to_jiffies(10));
+                schedule_timeout_interruptible(msecs_to_jiffies(10));
         }
         if (err == 3) {
                 v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-|\n");
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index c7c9f3f8715c..7549114aaaca 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -7,7 +7,7 @@
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <linux/moduleparam.h>
-#include <media/tuner.h>
+#include "tuner-driver.h"
 
 /* ---------------------------------------------------------------------- */
 
@@ -37,6 +37,19 @@ static char *microtune_part[] = {
         [ MT2050 ] = "MT2050",
 };
 
+struct microtune_priv {
+        unsigned int xogc;
+        unsigned int radio_if2;
+};
+
+static void microtune_release(struct i2c_client *c)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+
+        kfree(t->priv);
+        t->priv = NULL;
+}
+
 // IsSpurInBand()?
 static int mt2032_spurcheck(struct i2c_client *c,
                             int f1, int f2, int spectrum_from,int spectrum_to)
@@ -218,6 +231,7 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
         unsigned char buf[21];
         int lint_try,ret,sel,lock=0;
         struct tuner *t = i2c_get_clientdata(c);
+        struct microtune_priv *priv = t->priv;
 
         tuner_dbg("mt2032_set_if_freq rfin=%d if1=%d if2=%d from=%d to=%d\n",
                   rfin,if1,if2,from,to);
@@ -227,7 +241,7 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
         i2c_master_recv(c,buf,21);
 
         buf[0]=0;
-        ret=mt2032_compute_freq(c,rfin,if1,if2,from,to,&buf[1],&sel,t->xogc);
+        ret=mt2032_compute_freq(c,rfin,if1,if2,from,to,&buf[1],&sel,priv->xogc);
         if (ret<0)
                 return;
 
@@ -251,10 +265,10 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
 
                 tuner_dbg("mt2032: re-init PLLs by LINT\n");
                 buf[0]=7;
-                buf[1]=0x80 +8+t->xogc; // set LINT to re-init PLLs
+                buf[1]=0x80 +8+priv->xogc; // set LINT to re-init PLLs
                 i2c_master_send(c,buf,2);
                 mdelay(10);
-                buf[1]=8+t->xogc;
+                buf[1]=8+priv->xogc;
                 i2c_master_send(c,buf,2);
         }
 
@@ -294,17 +308,25 @@ static void mt2032_set_tv_freq(struct i2c_client *c, unsigned int freq)
 static void mt2032_set_radio_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
-        int if2 = t->radio_if2;
+        struct microtune_priv *priv = t->priv;
+        int if2 = priv->radio_if2;
 
         // per Manual for FM tuning: first if center freq. 1085 MHz
         mt2032_set_if_freq(c, freq * 1000 / 16,
                               1085*1000*1000,if2,if2,if2);
 }
 
+static struct tuner_operations mt2032_tuner_ops = {
+        .set_tv_freq    = mt2032_set_tv_freq,
+        .set_radio_freq = mt2032_set_radio_freq,
+        .release        = microtune_release,
+};
+
 // Initalization as described in "MT203x Programming Procedures", Rev 1.2, Feb.2001
 static int mt2032_init(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct microtune_priv *priv = t->priv;
         unsigned char buf[21];
         int ret,xogc,xok=0;
 
@@ -351,23 +373,23 @@ static int mt2032_init(struct i2c_client *c)
                 if (ret!=2)
                         tuner_warn("i2c i/o error: rc == %d (should be 2)\n",ret);
         } while (xok != 1 );
-        t->xogc=xogc;
+        priv->xogc=xogc;
+
+        memcpy(&t->ops, &mt2032_tuner_ops, sizeof(struct tuner_operations));
 
-        t->set_tv_freq    = mt2032_set_tv_freq;
-        t->set_radio_freq = mt2032_set_radio_freq;
         return(1);
 }
 
 static void mt2050_set_antenna(struct i2c_client *c, unsigned char antenna)
 {
         struct tuner *t = i2c_get_clientdata(c);
-       unsigned char buf[2];
-       int ret;
+        unsigned char buf[2];
+        int ret;
 
-       buf[0] = 6;
-       buf[1] = antenna ? 0x11 : 0x10;
-       ret=i2c_master_send(c,buf,2);
-       tuner_dbg("mt2050: enabled antenna connector %d\n", antenna);
+        buf[0] = 6;
+        buf[1] = antenna ? 0x11 : 0x10;
+        ret=i2c_master_send(c,buf,2);
+        tuner_dbg("mt2050: enabled antenna connector %d\n", antenna);
 }
 
 static void mt2050_set_if_freq(struct i2c_client *c,unsigned int freq, unsigned int if2)
@@ -456,12 +478,19 @@ static void mt2050_set_tv_freq(struct i2c_client *c, unsigned int freq)
 static void mt2050_set_radio_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
-        int if2 = t->radio_if2;
+        struct microtune_priv *priv = t->priv;
+        int if2 = priv->radio_if2;
 
         mt2050_set_if_freq(c, freq * 1000 / 16, if2);
         mt2050_set_antenna(c, radio_antenna);
 }
 
+static struct tuner_operations mt2050_tuner_ops = {
+        .set_tv_freq    = mt2050_set_tv_freq,
+        .set_radio_freq = mt2050_set_radio_freq,
+        .release        = microtune_release,
+};
+
 static int mt2050_init(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
@@ -481,28 +510,35 @@ static int mt2050_init(struct i2c_client *c)
         i2c_master_recv(c,buf,1);
 
         tuner_dbg("mt2050: sro is %x\n",buf[0]);
-        t->set_tv_freq    = mt2050_set_tv_freq;
-        t->set_radio_freq = mt2050_set_radio_freq;
+
+        memcpy(&t->ops, &mt2050_tuner_ops, sizeof(struct tuner_operations));
+
         return 0;
 }
 
 int microtune_init(struct i2c_client *c)
 {
+        struct microtune_priv *priv = NULL;
         struct tuner *t = i2c_get_clientdata(c);
         char *name;
         unsigned char buf[21];
         int company_code;
 
+        priv = kzalloc(sizeof(struct microtune_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return -ENOMEM;
+        t->priv = priv;
+
+        priv->radio_if2 = 10700 * 1000; /* 10.7MHz - FM radio */
+
         memset(buf,0,sizeof(buf));
-        t->set_tv_freq    = NULL;
-        t->set_radio_freq = NULL;
-        t->standby    = NULL;
+
         if (t->std & V4L2_STD_525_60) {
                 tuner_dbg("pinnacle ntsc\n");
-                t->radio_if2 = 41300 * 1000;
+                priv->radio_if2 = 41300 * 1000;
         } else {
                 tuner_dbg("pinnacle pal\n");
-                t->radio_if2 = 33300 * 1000;
+                priv->radio_if2 = 33300 * 1000;
         }
         name = "unknown";
 
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index 3ceb8a6249dd..f8f21ddd9843 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -617,7 +617,7 @@ static struct ov7670_win_size {
         },
 };
 
-#define N_WIN_SIZES (sizeof(ov7670_win_sizes)/sizeof(ov7670_win_sizes[0]))
+#define N_WIN_SIZES (ARRAY_SIZE(ov7670_win_sizes))
 
 
 /*
@@ -1183,7 +1183,7 @@ static struct ov7670_control {
                 .query = ov7670_q_hflip,
         },
 };
-#define N_CONTROLS (sizeof(ov7670_controls)/sizeof(ov7670_controls[0]))
+#define N_CONTROLS (ARRAY_SIZE(ov7670_controls))
 
 static struct ov7670_control *ov7670_find_control(__u32 id)
 {
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 085332a503de..9c0e8d18c2f6 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1099,7 +1099,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
                 return -EBUSY;
         }
 
-        down(&pdev->modlock);
+        mutex_lock(&pdev->modlock);
         if (!pdev->usb_init) {
                 PWC_DEBUG_OPEN("Doing first time initialization.\n");
                 pdev->usb_init = 1;
@@ -1131,7 +1131,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
         if (i < 0) {
                 PWC_DEBUG_OPEN("Failed to allocate buffers memory.\n");
                 pwc_free_buffers(pdev);
-                up(&pdev->modlock);
+                mutex_unlock(&pdev->modlock);
                 return i;
         }
 
@@ -1172,7 +1172,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
         if (i) {
                 PWC_DEBUG_OPEN("Second attempt at set_video_mode failed.\n");
                 pwc_free_buffers(pdev);
-                up(&pdev->modlock);
+                mutex_unlock(&pdev->modlock);
                 return i;
         }
 
@@ -1181,7 +1181,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
                 PWC_DEBUG_OPEN("Failed to init ISOC stuff = %d.\n", i);
                 pwc_isoc_cleanup(pdev);
                 pwc_free_buffers(pdev);
-                up(&pdev->modlock);
+                mutex_unlock(&pdev->modlock);
                 return i;
         }
 
@@ -1191,7 +1191,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
 
         pdev->vopen++;
         file->private_data = vdev;
-        up(&pdev->modlock);
+        mutex_unlock(&pdev->modlock);
         PWC_DEBUG_OPEN("<< video_open() returns 0.\n");
         return 0;
 }
@@ -1685,7 +1685,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                 pdev->angle_range.tilt_max =  2500;
         }
 
-        init_MUTEX(&pdev->modlock);
+        mutex_init(&pdev->modlock);
         spin_lock_init(&pdev->ptrlock);
 
         pdev->udev = udev;
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index acbb9312960a..910a04f53920 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -31,7 +31,7 @@
 #include <linux/wait.h>
 #include <linux/smp_lock.h>
 #include <linux/version.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #include <asm/errno.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
@@ -244,7 +244,7 @@ struct pwc_device
    int image_read_pos;                  /* In case we read data in pieces, keep track of were we are in the imagebuffer */
    int image_used[MAX_IMAGES];          /* For MCAPTURE and SYNC */
 
-   struct semaphore modlock;            /* to prevent races in video_open(), etc */
+   struct mutex modlock;                /* to prevent races in video_open(), etc */
    spinlock_t ptrlock;                  /* for manipulating the buffer pointers */
 
    /*** motorized pan/tilt feature */
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index c1a392e47170..7ae2d646d000 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -37,23 +37,23 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <linux/types.h>
+#include <asm/uaccess.h>
 
 #include <linux/videodev.h>
-#include <asm/uaccess.h>
+#include <linux/video_decoder.h>
 
 MODULE_DESCRIPTION("Philips SAA7111 video decoder driver");
 MODULE_AUTHOR("Dave Perks");
 MODULE_LICENSE("GPL");
 
-#include <linux/i2c.h>
 
 #define I2C_NAME(s) (s)->name
 
-#include <linux/video_decoder.h>
 
 static int debug = 0;
 module_param(debug, int, 0644);
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 87c3144ec7fc..677df51de1a9 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -35,28 +35,26 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-
 #include <linux/slab.h>
-
 #include <linux/mm.h>
 #include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <linux/types.h>
+#include <asm/uaccess.h>
 
 #include <linux/videodev.h>
-#include <asm/uaccess.h>
+#include <linux/video_decoder.h>
 
 MODULE_DESCRIPTION("Philips SAA7114H video decoder driver");
 MODULE_AUTHOR("Maxim Yevtyushkin");
 MODULE_LICENSE("GPL");
 
-#include <linux/i2c.h>
 
 #define I2C_NAME(x) (x)->name
 
-#include <linux/video_decoder.h>
 
 static int debug = 0;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 309dca368f4a..9f1417a4f7d2 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -40,7 +40,7 @@ config VIDEO_SAA7134_DVB
         depends on VIDEO_SAA7134 && DVB_CORE
         select VIDEO_BUF_DVB
         select FW_LOADER
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_NXT200X if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index ffb0f647a86d..3c0fc9027ad0 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -75,7 +75,8 @@ typedef struct snd_card_saa7134 {
         struct saa7134_dev *dev;
 
         unsigned long iobase;
-        int irq;
+        s16 irq;
+        u16 mute_was_on;
 
         spinlock_t lock;
 } snd_card_saa7134_t;
@@ -589,8 +590,10 @@ static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream)
         snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
         struct saa7134_dev *dev = saa7134->dev;
 
-        dev->ctl_mute = 1;
-        saa7134_tvaudio_setmute(dev);
+        if (saa7134->mute_was_on) {
+                dev->ctl_mute = 1;
+                saa7134_tvaudio_setmute(dev);
+        }
         return 0;
 }
 
@@ -637,8 +640,11 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
         runtime->private_free = snd_card_saa7134_runtime_free;
         runtime->hw = snd_card_saa7134_capture;
 
-        dev->ctl_mute = 0;
-        saa7134_tvaudio_setmute(dev);
+        if (dev->ctl_mute != 0) {
+                saa7134->mute_was_on = 1;
+                dev->ctl_mute = 0;
+                saa7134_tvaudio_setmute(dev);
+        }
 
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 50f15adfa7c8..8ec83bd70094 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -400,7 +400,7 @@ struct saa7134_board saa7134_boards[] = {
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
-                        .amux = LINE2,
+                        .amux = TV,
                         .tv   = 1,
                         .gpio = 0x20000,
                 },{
@@ -3502,6 +3502,38 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = TV,
                 },
         },
+        [SAA7134_BOARD_10MOONSTVMASTER3] = {
+                /* Tony Wan <aloha_cn@hotmail.com> */
+                .name           = "10MOONS TM300 TV Card",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_LG_PAL_NEW_TAPC,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x7000,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .gpio = 0x0000,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+                }},
+                .mute = {
+                        .name = name_mute,
+                        .amux = LINE2,
+                        .gpio = 0x3000,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4219,6 +4251,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x2003, /* OEM cardbus */
                 .driver_data  = SAA7134_BOARD_SABRENT_TV_PCB05,
         },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = PCI_VENDOR_ID_PHILIPS,
+                .subdevice    = 0x2304,
+                .driver_data  = SAA7134_BOARD_10MOONSTVMASTER3,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -4330,6 +4368,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_A16AR:
         case SAA7134_BOARD_ENCORE_ENLTV:
         case SAA7134_BOARD_ENCORE_ENLTV_FM:
+        case SAA7134_BOARD_10MOONSTVMASTER3:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index e0eec80088c7..1f6bd3300715 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -175,18 +175,6 @@ static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe,
         return mt352_pinnacle_init(fe);
 }
 
-static int mt352_aver777_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len)
-{
-        if (buf_len < 5)
-                return -EINVAL;
-
-        pllbuf[0] = 0x61;
-        dvb_pll_configure(&dvb_pll_philips_td1316, pllbuf+1,
-                          params->frequency,
-                          params->u.ofdm.bandwidth);
-        return 5;
-}
-
 static struct mt352_config pinnacle_300i = {
         .demod_address = 0x3c >> 1,
         .adc_clock     = 20333,
@@ -444,135 +432,6 @@ static struct tda1004x_config philips_europa_config = {
 
 /* ------------------------------------------------------------------ */
 
-static int philips_fmd1216_tuner_init(struct dvb_frontend *fe)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-        struct tda1004x_state *state = fe->demodulator_priv;
-        u8 addr = state->config->tuner_address;
-        /* this message is to set up ATC and ALC */
-        static u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0xa0 };
-        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
-                return -EIO;
-        msleep(1);
-
-        return 0;
-}
-
-static int philips_fmd1216_tuner_sleep(struct dvb_frontend *fe)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-        struct tda1004x_state *state = fe->demodulator_priv;
-        u8 addr = state->config->tuner_address;
-        /* this message actually turns the tuner back to analog mode */
-        u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0x60 };
-        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
-        msleep(1);
-        fmd1216_init[2] = 0x86;
-        fmd1216_init[3] = 0x54;
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
-        msleep(1);
-        return 0;
-}
-
-static int philips_fmd1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-        struct tda1004x_state *state = fe->demodulator_priv;
-        u8 addr = state->config->tuner_address;
-        u8 tuner_buf[4];
-        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tuner_buf,.len =
-                        sizeof(tuner_buf) };
-        int tuner_frequency = 0;
-        int divider = 0;
-        u8 band, mode, cp;
-
-        /* determine charge pump */
-        tuner_frequency = params->frequency + 36130000;
-        if (tuner_frequency < 87000000)
-                return -EINVAL;
-        /* low band */
-        else if (tuner_frequency < 180000000) {
-                band = 1;
-                mode = 7;
-                cp   = 0;
-        } else if (tuner_frequency < 195000000) {
-                band = 1;
-                mode = 6;
-                cp   = 1;
-        /* mid band     */
-        } else if (tuner_frequency < 366000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 10;
-                } else {
-                        band = 2;
-                }
-                mode = 7;
-                cp   = 0;
-        } else if (tuner_frequency < 478000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 10;
-                } else {
-                        band = 2;
-                }
-                mode = 6;
-                cp   = 1;
-        /* high band */
-        } else if (tuner_frequency < 662000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 12;
-                } else {
-                        band = 4;
-                }
-                mode = 7;
-                cp   = 0;
-        } else if (tuner_frequency < 840000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 12;
-                } else {
-                        band = 4;
-                }
-                mode = 6;
-                cp   = 1;
-        } else {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 12;
-                } else {
-                        band = 4;
-                }
-                mode = 7;
-                cp   = 1;
-
-        }
-        /* calculate divisor */
-        /* ((36166000 + Finput) / 166666) rounded! */
-        divider = (tuner_frequency + 83333) / 166667;
-
-        /* setup tuner buffer */
-        tuner_buf[0] = (divider >> 8) & 0x7f;
-        tuner_buf[1] = divider & 0xff;
-        tuner_buf[2] = 0x80 | (cp << 6) | (mode  << 3) | 4;
-        tuner_buf[3] = 0x40 | band;
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1) {
-                wprintk("could not write to tuner at addr: 0x%02x\n",
-                        addr << 1);
-                return -EIO;
-        }
-        return 0;
-}
-
 static struct tda1004x_config medion_cardbus = {
         .demod_address = 0x08,
         .invert        = 1,
@@ -958,18 +817,8 @@ static struct nxt200x_config avertvhda180 = {
         .demod_address    = 0x0a,
 };
 
-static int nxt200x_set_pll_input(u8 *buf, int input)
-{
-        if (input)
-                buf[3] |= 0x08;
-        else
-                buf[3] &= ~0x08;
-        return 0;
-}
-
 static struct nxt200x_config kworldatsc110 = {
         .demod_address    = 0x0a,
-        .set_pll_input    = nxt200x_set_pll_input,
 };
 
 /* ==================================================================
@@ -1005,7 +854,8 @@ static int dvb_init(struct saa7134_dev *dev)
                 dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+                                   NULL, DVB_PLL_PHILIPS_TD1316);
                 }
                 break;
         case SAA7134_BOARD_MD7134:
@@ -1013,9 +863,8 @@ static int dvb_init(struct saa7134_dev *dev)
                                                &medion_cardbus,
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
-                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,
+                                   &dev->i2c_adap, DVB_PLL_FMD1216ME);
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TOUGH:
@@ -1113,7 +962,7 @@ static int dvb_init(struct saa7134_dev *dev)
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_tdhu2);
+                                   NULL, DVB_PLL_TDHU2);
                 }
                 break;
         case SAA7134_BOARD_KWORLD_ATSC110:
@@ -1121,7 +970,7 @@ static int dvb_init(struct saa7134_dev *dev)
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_tuv1236d);
+                                   NULL, DVB_PLL_TUV1236D);
                 }
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
@@ -1144,9 +993,9 @@ static int dvb_init(struct saa7134_dev *dev)
                 if (dev->dvb.frontend) {
                         dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
                         dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
-                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;
+
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,
+                                   &dev->i2c_adap, DVB_PLL_FMD1216ME);
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_200A:
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index f521603482ca..fc260ec8fdc2 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -96,6 +96,10 @@ static int ts_open(struct inode *inode, struct file *file)
         if (dev->empress_users)
                 goto done_up;
 
+        /* Unmute audio */
+        saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
+                saa_readb(SAA7134_AUDIO_MUTE_CTRL) & ~(1 << 6));
+
         dev->empress_users++;
         file->private_data = dev;
         err = 0;
@@ -121,6 +125,10 @@ static int ts_release(struct inode *inode, struct file *file)
         /* stop the encoder */
         ts_reset_encoder(dev);
 
+        /* Mute audio */
+        saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
+                saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6));
+
         mutex_unlock(&dev->empress_tsq.lock);
         return 0;
 }
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index c0de37e3f5c6..1b6dfd801cc1 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -153,21 +153,18 @@ void saa7134_input_irq(struct saa7134_dev *dev)
 
 static void saa7134_input_timer(unsigned long data)
 {
-        struct saa7134_dev *dev = (struct saa7134_dev*)data;
+        struct saa7134_dev *dev = (struct saa7134_dev *)data;
         struct card_ir *ir = dev->remote;
-        unsigned long timeout;
 
         build_key(dev);
-        timeout = jiffies + (ir->polling * HZ / 1000);
-        mod_timer(&ir->timer, timeout);
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
 static void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
 {
         if (ir->polling) {
-                init_timer(&ir->timer);
-                ir->timer.function = saa7134_input_timer;
-                ir->timer.data     = (unsigned long)dev;
+                setup_timer(&ir->timer, saa7134_input_timer,
+                            (unsigned long)dev);
                 ir->timer.expires  = jiffies + HZ;
                 add_timer(&ir->timer);
         } else if (ir->rc5_gpio) {
@@ -314,6 +311,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keycode = 0x003F00;
                 mask_keyup   = 0x040000;
                 break;
+        case SAA7134_BOARD_FLYDVBS_LR300:
         case SAA7134_BOARD_FLYDVBT_LR301:
         case SAA7134_BOARD_FLYDVBTDUO:
                 ir_codes     = ir_codes_flydvb;
@@ -333,6 +331,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x040000;
                 polling      = 50; // ms
                 break;
+        case SAA7134_BOARD_10MOONSTVMASTER3:
+                ir_codes     = ir_codes_encore_enltv;
+                mask_keycode = 0x5f80000;
+                mask_keyup   = 0x8000000;
+                polling      = 50; //ms
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -374,7 +378,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 input_dev->id.vendor  = dev->pci->vendor;
                 input_dev->id.product = dev->pci->device;
         }
-        input_dev->cdev.dev = &dev->pci->dev;
+        input_dev->dev.parent = &dev->pci->dev;
 
         dev->remote = ir;
         saa7134_ir_start(dev, ir);
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 30395d6b5f14..18b4817b4aac 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
+#include <linux/kthread.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <asm/div64.h>
@@ -341,10 +342,8 @@ static void tvaudio_setmode(struct saa7134_dev *dev,
 
 static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
 {
-        DECLARE_WAITQUEUE(wait, current);
-
-        add_wait_queue(&dev->thread.wq, &wait);
-        if (dev->thread.scan1 == dev->thread.scan2 && !dev->thread.shutdown) {
+        if (dev->thread.scan1 == dev->thread.scan2 &&
+            !kthread_should_stop()) {
                 if (timeout < 0) {
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
@@ -353,7 +352,6 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
                                                 (msecs_to_jiffies(timeout));
                 }
         }
-        remove_wait_queue(&dev->thread.wq, &wait);
         return dev->thread.scan1 != dev->thread.scan2;
 }
 
@@ -505,11 +503,10 @@ static int tvaudio_thread(void *data)
         unsigned int i, audio, nscan;
         int max1,max2,carrier,rx,mode,lastmode,default_carrier;
 
-        daemonize("%s", dev->name);
         allow_signal(SIGTERM);
         for (;;) {
                 tvaudio_sleep(dev,-1);
-                if (dev->thread.shutdown || signal_pending(current))
+                if (kthread_should_stop() || signal_pending(current))
                         goto done;
 
         restart:
@@ -618,7 +615,7 @@ static int tvaudio_thread(void *data)
                 for (;;) {
                         if (tvaudio_sleep(dev,5000))
                                 goto restart;
-                        if (dev->thread.shutdown || signal_pending(current))
+                        if (kthread_should_stop() || signal_pending(current))
                                 break;
                         if (UNSET == dev->thread.mode) {
                                 rx = tvaudio_getstereo(dev,&tvaudio[i]);
@@ -634,7 +631,6 @@ static int tvaudio_thread(void *data)
         }
 
  done:
-        complete_and_exit(&dev->thread.exit, 0);
         return 0;
 }
 
@@ -782,7 +778,6 @@ static int tvaudio_thread_ddep(void *data)
         struct saa7134_dev *dev = data;
         u32 value, norms, clock;
 
-        daemonize("%s", dev->name);
         allow_signal(SIGTERM);
 
         clock = saa7134_boards[dev->board].audio_clock;
@@ -796,7 +791,7 @@ static int tvaudio_thread_ddep(void *data)
 
         for (;;) {
                 tvaudio_sleep(dev,-1);
-                if (dev->thread.shutdown || signal_pending(current))
+                if (kthread_should_stop() || signal_pending(current))
                         goto done;
 
         restart:
@@ -876,7 +871,6 @@ static int tvaudio_thread_ddep(void *data)
         }
 
  done:
-        complete_and_exit(&dev->thread.exit, 0);
         return 0;
 }
 
@@ -973,7 +967,6 @@ int saa7134_tvaudio_getstereo(struct saa7134_dev *dev)
 
 int saa7134_tvaudio_init2(struct saa7134_dev *dev)
 {
-        DECLARE_MUTEX_LOCKED(sem);
         int (*my_thread)(void *data) = NULL;
 
         switch (dev->pci->device) {
@@ -986,15 +979,15 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)
                 break;
         }
 
-        dev->thread.pid = -1;
+        dev->thread.thread = NULL;
         if (my_thread) {
                 /* start tvaudio thread */
-                init_waitqueue_head(&dev->thread.wq);
-                init_completion(&dev->thread.exit);
-                dev->thread.pid = kernel_thread(my_thread,dev,0);
-                if (dev->thread.pid < 0)
+                dev->thread.thread = kthread_run(my_thread, dev, "%s", dev->name);
+                if (IS_ERR(dev->thread.thread)) {
                         printk(KERN_WARNING "%s: kernel_thread() failed\n",
                                dev->name);
+                        /* XXX: missing error handling here */
+                }
                 saa7134_tvaudio_do_scan(dev);
         }
 
@@ -1005,11 +998,9 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)
 int saa7134_tvaudio_fini(struct saa7134_dev *dev)
 {
         /* shutdown tvaudio thread */
-        if (dev->thread.pid > 0) {
-                dev->thread.shutdown = 1;
-                wake_up_interruptible(&dev->thread.wq);
-                wait_for_completion(&dev->thread.exit);
-        }
+        if (dev->thread.thread)
+                kthread_stop(dev->thread.thread);
+
         saa_andorb(SAA7134_ANALOG_IO_SELECT, 0x07, 0x00); /* LINE1 */
         return 0;
 }
@@ -1020,10 +1011,10 @@ int saa7134_tvaudio_do_scan(struct saa7134_dev *dev)
                 dprintk("sound IF not in use, skipping scan\n");
                 dev->automute = 0;
                 saa7134_tvaudio_setmute(dev);
-        } else if (dev->thread.pid >= 0) {
+        } else if (dev->thread.thread) {
                 dev->thread.mode = UNSET;
                 dev->thread.scan2++;
-                wake_up_interruptible(&dev->thread.wq);
+                wake_up_process(dev->thread.thread);
         } else {
                 dev->automute = 0;
                 saa7134_tvaudio_setmute(dev);
@@ -1040,4 +1031,3 @@ EXPORT_SYMBOL(saa7134_tvaudio_setmute);
  * c-basic-offset: 8
  * End:
  */
-
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 15623b27ad2e..d32a856192d7 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -238,6 +238,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_ECS_TVP3XP_4CB6  113
 #define SAA7134_BOARD_KWORLD_DVBT_210 114
 #define SAA7134_BOARD_SABRENT_TV_PCB05     115
+#define SAA7134_BOARD_10MOONSTVMASTER3     116
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
@@ -327,10 +328,7 @@ struct saa7134_pgtable {
 
 /* tvaudio thread status */
 struct saa7134_thread {
-        pid_t                      pid;
-        struct completion          exit;
-        wait_queue_head_t          wq;
-        unsigned int               shutdown;
+        struct task_struct         *thread;
         unsigned int               scan1;
         unsigned int               scan2;
         unsigned int               mode;
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 339592e7722d..66cc92c0ea66 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -34,23 +34,23 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <linux/types.h>
+#include <asm/uaccess.h>
 
 #include <linux/videodev.h>
-#include <asm/uaccess.h>
+#include <linux/video_encoder.h>
 
 MODULE_DESCRIPTION("Philips SAA7185 video encoder driver");
 MODULE_AUTHOR("Dave Perks");
 MODULE_LICENSE("GPL");
 
-#include <linux/i2c.h>
 
 #define I2C_NAME(s) (s)->name
 
-#include <linux/video_encoder.h>
 
 static int debug = 0;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/sn9c102/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h
index 11fcb49f5b99..2e3c3de793a7 100644
--- a/drivers/media/video/sn9c102/sn9c102.h
+++ b/drivers/media/video/sn9c102/sn9c102.h
@@ -36,6 +36,7 @@
 #include <linux/mutex.h>
 #include <linux/string.h>
 #include <linux/stddef.h>
+#include <linux/kref.h>
 
 #include "sn9c102_config.h"
 #include "sn9c102_sensor.h"
@@ -94,7 +95,7 @@ struct sn9c102_module_param {
 };
 
 static DEFINE_MUTEX(sn9c102_sysfs_lock);
-static DECLARE_RWSEM(sn9c102_disconnect);
+static DECLARE_RWSEM(sn9c102_dev_lock);
 
 struct sn9c102_device {
         struct video_device* v4ldev;
@@ -122,12 +123,14 @@ struct sn9c102_device {
 
         struct sn9c102_module_param module_param;
 
+        struct kref kref;
         enum sn9c102_dev_state state;
         u8 users;
 
-        struct mutex dev_mutex, fileop_mutex;
+        struct completion probe;
+        struct mutex open_mutex, fileop_mutex;
         spinlock_t queue_lock;
-        wait_queue_head_t open, wait_frame, wait_stream;
+        wait_queue_head_t wait_open, wait_frame, wait_stream;
 };
 
 /*****************************************************************************/
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 74a204f8ebc8..36d8a455e0ec 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -48,8 +48,8 @@
 #define SN9C102_MODULE_AUTHOR   "(C) 2004-2007 Luca Risolia"
 #define SN9C102_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
 #define SN9C102_MODULE_LICENSE  "GPL"
-#define SN9C102_MODULE_VERSION  "1:1.44"
-#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 44)
+#define SN9C102_MODULE_VERSION  "1:1.47"
+#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 47)
 
 /*****************************************************************************/
 
@@ -64,9 +64,10 @@ MODULE_LICENSE(SN9C102_MODULE_LICENSE);
 static short video_nr[] = {[0 ... SN9C102_MAX_DEVICES-1] = -1};
 module_param_array(video_nr, short, NULL, 0444);
 MODULE_PARM_DESC(video_nr,
-                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
-                 "\n -1 = use next available (default)"
-                 "\n  n = use minor number n (integer >= 0)"
+                 " <-1|n[,...]>"
+                 "\nSpecify V4L2 minor mode number."
+                 "\n-1 = use next available (default)"
+                 "\n n = use minor number n (integer >= 0)"
                  "\nYou can specify up to "__MODULE_STRING(SN9C102_MAX_DEVICES)
                  " cameras this way."
                  "\nFor example:"
@@ -79,13 +80,14 @@ static short force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] =
                                SN9C102_FORCE_MUNMAP};
 module_param_array(force_munmap, bool, NULL, 0444);
 MODULE_PARM_DESC(force_munmap,
-                 "\n<0|1[,...]> Force the application to unmap previously"
+                 " <0|1[,...]>"
+                 "\nForce the application to unmap previously"
                  "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
                  "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
                  "\nthis feature. This parameter is specific for each"
                  "\ndetected camera."
-                 "\n 0 = do not force memory unmapping"
-                 "\n 1 = force memory unmapping (save memory)"
+                 "\n0 = do not force memory unmapping"
+                 "\n1 = force memory unmapping (save memory)"
                  "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
                  "\n");
 
@@ -93,7 +95,8 @@ static unsigned int frame_timeout[] = {[0 ... SN9C102_MAX_DEVICES-1] =
                                        SN9C102_FRAME_TIMEOUT};
 module_param_array(frame_timeout, uint, NULL, 0644);
 MODULE_PARM_DESC(frame_timeout,
-                 "\n<0|n[,...]> Timeout for a video frame in seconds before"
+                 " <0|n[,...]>"
+                 "\nTimeout for a video frame in seconds before"
                  "\nreturning an I/O error; 0 for infinity."
                  "\nThis parameter is specific for each detected camera."
                  "\nDefault value is "__MODULE_STRING(SN9C102_FRAME_TIMEOUT)"."
@@ -103,7 +106,8 @@ MODULE_PARM_DESC(frame_timeout,
 static unsigned short debug = SN9C102_DEBUG_LEVEL;
 module_param(debug, ushort, 0644);
 MODULE_PARM_DESC(debug,
-                 "\n<n> Debugging information level, from 0 to 3:"
+                 " <n>"
+                 "\nDebugging information level, from 0 to 3:"
                  "\n0 = none (use carefully)"
                  "\n1 = critical errors"
                  "\n2 = significant informations"
@@ -1616,7 +1620,8 @@ static int sn9c102_init(struct sn9c102_device* cam)
         int err = 0;
 
         if (!(cam->state & DEV_INITIALIZED)) {
-                init_waitqueue_head(&cam->open);
+                mutex_init(&cam->open_mutex);
+                init_waitqueue_head(&cam->wait_open);
                 qctrl = s->qctrl;
                 rect = &(s->cropcap.defrect);
         } else { /* use current values */
@@ -1706,21 +1711,27 @@ static int sn9c102_init(struct sn9c102_device* cam)
         return 0;
 }
 
+/*****************************************************************************/
 
-static void sn9c102_release_resources(struct sn9c102_device* cam)
+static void sn9c102_release_resources(struct kref *kref)
 {
+        struct sn9c102_device *cam;
+
         mutex_lock(&sn9c102_sysfs_lock);
 
+        cam = container_of(kref, struct sn9c102_device, kref);
+
         DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor);
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
+        usb_put_dev(cam->usbdev);
+        kfree(cam->control_buffer);
+        kfree(cam);
 
         mutex_unlock(&sn9c102_sysfs_lock);
 
-        kfree(cam->control_buffer);
 }
 
-/*****************************************************************************/
 
 static int sn9c102_open(struct inode* inode, struct file* filp)
 {
@@ -1728,43 +1739,78 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
         int err = 0;
 
         /*
-           This is the only safe way to prevent race conditions with
-           disconnect
+           A read_trylock() in open() is the only safe way to prevent race
+           conditions with disconnect(), one close() and multiple (not
+           necessarily simultaneous) attempts to open(). For example, it
+           prevents from waiting for a second access, while the device
+           structure is being deallocated, after a possible disconnect() and
+           during a following close() holding the write lock: given that, after
+           this deallocation, no access will be possible anymore, using the
+           non-trylock version would have let open() gain the access to the
+           device structure improperly.
+           For this reason the lock must also not be per-device.
         */
-        if (!down_read_trylock(&sn9c102_disconnect))
+        if (!down_read_trylock(&sn9c102_dev_lock))
                 return -ERESTARTSYS;
 
         cam = video_get_drvdata(video_devdata(filp));
 
-        if (mutex_lock_interruptible(&cam->dev_mutex)) {
-                up_read(&sn9c102_disconnect);
+        if (wait_for_completion_interruptible(&cam->probe)) {
+                up_read(&sn9c102_dev_lock);
+                return -ERESTARTSYS;
+        }
+
+        kref_get(&cam->kref);
+
+        /*
+            Make sure to isolate all the simultaneous opens.
+        */
+        if (mutex_lock_interruptible(&cam->open_mutex)) {
+                kref_put(&cam->kref, sn9c102_release_resources);
+                up_read(&sn9c102_dev_lock);
                 return -ERESTARTSYS;
         }
 
+        if (cam->state & DEV_DISCONNECTED) {
+                DBG(1, "Device not present");
+                err = -ENODEV;
+                goto out;
+        }
+
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor);
+                DBG(2, "Device /dev/video%d is already in use",
+                       cam->v4ldev->minor);
                 DBG(3, "Simultaneous opens are not supported");
+                /*
+                   open() must follow the open flags and should block
+                   eventually while the device is in use.
+                */
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
                         err = -EWOULDBLOCK;
                         goto out;
                 }
-                mutex_unlock(&cam->dev_mutex);
-                err = wait_event_interruptible_exclusive(cam->open,
-                                                  cam->state & DEV_DISCONNECTED
+                DBG(2, "A blocking open() has been requested. Wait for the "
+                       "device to be released...");
+                up_read(&sn9c102_dev_lock);
+                /*
+                   We will not release the "open_mutex" lock, so that only one
+                   process can be in the wait queue below. This way the process
+                   will be sleeping while holding the lock, without loosing its
+                   priority after any wake_up().
+                */
+                err = wait_event_interruptible_exclusive(cam->wait_open,
+                                                (cam->state & DEV_DISCONNECTED)
                                                          || !cam->users);
-                if (err) {
-                        up_read(&sn9c102_disconnect);
-                        return err;
-                }
+                down_read(&sn9c102_dev_lock);
+                if (err)
+                        goto out;
                 if (cam->state & DEV_DISCONNECTED) {
-                        up_read(&sn9c102_disconnect);
-                        return -ENODEV;
+                        err = -ENODEV;
+                        goto out;
                 }
-                mutex_lock(&cam->dev_mutex);
         }
 
-
         if (cam->state & DEV_MISCONFIGURED) {
                 err = sn9c102_init(cam);
                 if (err) {
@@ -1789,36 +1835,33 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
         DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor);
 
 out:
-        mutex_unlock(&cam->dev_mutex);
-        up_read(&sn9c102_disconnect);
+        mutex_unlock(&cam->open_mutex);
+        if (err)
+                kref_put(&cam->kref, sn9c102_release_resources);
+
+        up_read(&sn9c102_dev_lock);
         return err;
 }
 
 
 static int sn9c102_release(struct inode* inode, struct file* filp)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device* cam;
 
-        mutex_lock(&cam->dev_mutex); /* prevent disconnect() to be called */
+        down_write(&sn9c102_dev_lock);
 
-        sn9c102_stop_transfer(cam);
+        cam = video_get_drvdata(video_devdata(filp));
 
+        sn9c102_stop_transfer(cam);
         sn9c102_release_buffers(cam);
-
-        if (cam->state & DEV_DISCONNECTED) {
-                sn9c102_release_resources(cam);
-                usb_put_dev(cam->usbdev);
-                mutex_unlock(&cam->dev_mutex);
-                kfree(cam);
-                return 0;
-        }
-
         cam->users--;
-        wake_up_interruptible_nr(&cam->open, 1);
+        wake_up_interruptible_nr(&cam->wait_open, 1);
 
         DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor);
 
-        mutex_unlock(&cam->dev_mutex);
+        kref_put(&cam->kref, sn9c102_release_resources);
+
+        up_write(&sn9c102_dev_lock);
 
         return 0;
 }
@@ -2085,7 +2128,6 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
 
         vma->vm_ops = &sn9c102_vm_ops;
         vma->vm_private_data = &cam->frame[i];
-
         sn9c102_vm_open(vma);
 
         mutex_unlock(&cam->fileop_mutex);
@@ -3215,8 +3257,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        mutex_init(&cam->dev_mutex);
-
         r = sn9c102_read_reg(cam, 0x00);
         if (r < 0 || (r != 0x10 && r != 0x11 && r != 0x12)) {
                 DBG(1, "Sorry, this is not a SN9C1xx-based camera "
@@ -3282,7 +3322,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->v4ldev->release = video_device_release;
         video_set_drvdata(cam->v4ldev, cam);
 
-        mutex_lock(&cam->dev_mutex);
+        init_completion(&cam->probe);
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
                                     video_nr[dev_nr]);
@@ -3292,7 +3332,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                         DBG(1, "Free /dev/videoX node not found");
                 video_nr[dev_nr] = -1;
                 dev_nr = (dev_nr < SN9C102_MAX_DEVICES-1) ? dev_nr+1 : 0;
-                mutex_unlock(&cam->dev_mutex);
+                complete_all(&cam->probe);
                 goto fail;
         }
 
@@ -3318,8 +3358,10 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 #endif
 
         usb_set_intfdata(intf, cam);
+        kref_init(&cam->kref);
+        usb_get_dev(cam->usbdev);
 
-        mutex_unlock(&cam->dev_mutex);
+        complete_all(&cam->probe);
 
         return 0;
 
@@ -3336,40 +3378,31 @@ fail:
 
 static void sn9c102_usb_disconnect(struct usb_interface* intf)
 {
-        struct sn9c102_device* cam = usb_get_intfdata(intf);
-
-        if (!cam)
-                return;
+        struct sn9c102_device* cam;
 
-        down_write(&sn9c102_disconnect);
+        down_write(&sn9c102_dev_lock);
 
-        mutex_lock(&cam->dev_mutex);
+        cam = usb_get_intfdata(intf);
 
         DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
-        wake_up_interruptible_all(&cam->open);
-
         if (cam->users) {
                 DBG(2, "Device /dev/video%d is open! Deregistration and "
-                       "memory deallocation are deferred on close.",
+                       "memory deallocation are deferred.",
                     cam->v4ldev->minor);
                 cam->state |= DEV_MISCONFIGURED;
                 sn9c102_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;
                 wake_up_interruptible(&cam->wait_frame);
                 wake_up(&cam->wait_stream);
-                usb_get_dev(cam->usbdev);
-        } else {
+        } else
                 cam->state |= DEV_DISCONNECTED;
-                sn9c102_release_resources(cam);
-        }
 
-        mutex_unlock(&cam->dev_mutex);
+        wake_up_interruptible_all(&cam->wait_open);
 
-        if (!cam->users)
-                kfree(cam);
+        kref_put(&cam->kref, sn9c102_release_resources);
 
-        up_write(&sn9c102_disconnect);
+        up_write(&sn9c102_dev_lock);
 }
 
 
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c
index e6832347894f..e4856fd77982 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7630.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7630.c
@@ -104,6 +104,145 @@ static int ov7630_init(struct sn9c102_device* cam)
                 err += sn9c102_i2c_write(cam, 0x74, 0x21);
                 err += sn9c102_i2c_write(cam, 0x7d, 0xf7);
                 break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+        err = sn9c102_write_const_regs(cam, {0x40, 0x02}, {0x00, 0x03},
+                                       {0x1a, 0x04}, {0x03, 0x10},
+                                       {0x0a, 0x14}, {0xe2, 0x17},
+                                       {0x0b, 0x18}, {0x00, 0x19},
+                                       {0x1d, 0x1a}, {0x10, 0x1b},
+                                       {0x02, 0x1c}, {0x03, 0x1d},
+                                       {0x0f, 0x1e}, {0x0c, 0x1f},
+                                       {0x00, 0x20}, {0x24, 0x21},
+                                       {0x3b, 0x22}, {0x47, 0x23},
+                                       {0x60, 0x24}, {0x71, 0x25},
+                                       {0x80, 0x26}, {0x8f, 0x27},
+                                       {0x9d, 0x28}, {0xaa, 0x29},
+                                       {0xb8, 0x2a}, {0xc4, 0x2b},
+                                       {0xd1, 0x2c}, {0xdd, 0x2d},
+                                       {0xe8, 0x2e}, {0xf4, 0x2f},
+                                       {0xff, 0x30}, {0x00, 0x3f},
+                                       {0xc7, 0x40}, {0x01, 0x41},
+                                       {0x44, 0x42}, {0x00, 0x43},
+                                       {0x44, 0x44}, {0x00, 0x45},
+                                       {0x44, 0x46}, {0x00, 0x47},
+                                       {0xc7, 0x48}, {0x01, 0x49},
+                                       {0xc7, 0x4a}, {0x01, 0x4b},
+                                       {0xc7, 0x4c}, {0x01, 0x4d},
+                                       {0x44, 0x4e}, {0x00, 0x4f},
+                                       {0x44, 0x50}, {0x00, 0x51},
+                                       {0x44, 0x52}, {0x00, 0x53},
+                                       {0xc7, 0x54}, {0x01, 0x55},
+                                       {0xc7, 0x56}, {0x01, 0x57},
+                                       {0xc7, 0x58}, {0x01, 0x59},
+                                       {0x44, 0x5a}, {0x00, 0x5b},
+                                       {0x44, 0x5c}, {0x00, 0x5d},
+                                       {0x44, 0x5e}, {0x00, 0x5f},
+                                       {0xc7, 0x60}, {0x01, 0x61},
+                                       {0xc7, 0x62}, {0x01, 0x63},
+                                       {0xc7, 0x64}, {0x01, 0x65},
+                                       {0x44, 0x66}, {0x00, 0x67},
+                                       {0x44, 0x68}, {0x00, 0x69},
+                                       {0x44, 0x6a}, {0x00, 0x6b},
+                                       {0xc7, 0x6c}, {0x01, 0x6d},
+                                       {0xc7, 0x6e}, {0x01, 0x6f},
+                                       {0xc7, 0x70}, {0x01, 0x71},
+                                       {0x44, 0x72}, {0x00, 0x73},
+                                       {0x44, 0x74}, {0x00, 0x75},
+                                       {0x44, 0x76}, {0x00, 0x77},
+                                       {0xc7, 0x78}, {0x01, 0x79},
+                                       {0xc7, 0x7a}, {0x01, 0x7b},
+                                       {0xc7, 0x7c}, {0x01, 0x7d},
+                                       {0x44, 0x7e}, {0x00, 0x7f},
+                                       {0x17, 0x84}, {0x00, 0x85},
+                                       {0x2e, 0x86}, {0x00, 0x87},
+                                       {0x09, 0x88}, {0x00, 0x89},
+                                       {0xe8, 0x8a}, {0x0f, 0x8b},
+                                       {0xda, 0x8c}, {0x0f, 0x8d},
+                                       {0x40, 0x8e}, {0x00, 0x8f},
+                                       {0x37, 0x90}, {0x00, 0x91},
+                                       {0xcf, 0x92}, {0x0f, 0x93},
+                                       {0xfa, 0x94}, {0x0f, 0x95},
+                                       {0x00, 0x96}, {0x00, 0x97},
+                                       {0x00, 0x98}, {0x66, 0x99},
+                                       {0x00, 0x9a}, {0x40, 0x9b},
+                                       {0x20, 0x9c}, {0x00, 0x9d},
+                                       {0x00, 0x9e}, {0x00, 0x9f},
+                                       {0x2d, 0xc0}, {0x2d, 0xc1},
+                                       {0x3a, 0xc2}, {0x00, 0xc3},
+                                       {0x04, 0xc4}, {0x3f, 0xc5},
+                                       {0x00, 0xc6}, {0x00, 0xc7},
+                                       {0x50, 0xc8}, {0x3c, 0xc9},
+                                       {0x28, 0xca}, {0xd8, 0xcb},
+                                       {0x14, 0xcc}, {0xec, 0xcd},
+                                       {0x32, 0xce}, {0xdd, 0xcf},
+                                       {0x32, 0xd0}, {0xdd, 0xd1},
+                                       {0x6a, 0xd2}, {0x50, 0xd3},
+                                       {0x60, 0xd4}, {0x00, 0xd5},
+                                       {0x00, 0xd6});
+
+                err += sn9c102_i2c_write(cam, 0x12, 0x80);
+                err += sn9c102_i2c_write(cam, 0x12, 0x48);
+                err += sn9c102_i2c_write(cam, 0x01, 0x80);
+                err += sn9c102_i2c_write(cam, 0x02, 0x80);
+                err += sn9c102_i2c_write(cam, 0x03, 0x80);
+                err += sn9c102_i2c_write(cam, 0x04, 0x10);
+                err += sn9c102_i2c_write(cam, 0x05, 0x20);
+                err += sn9c102_i2c_write(cam, 0x06, 0x80);
+                err += sn9c102_i2c_write(cam, 0x11, 0x00);
+                err += sn9c102_i2c_write(cam, 0x0c, 0x20);
+                err += sn9c102_i2c_write(cam, 0x0d, 0x20);
+                err += sn9c102_i2c_write(cam, 0x15, 0x80);
+                err += sn9c102_i2c_write(cam, 0x16, 0x03);
+                err += sn9c102_i2c_write(cam, 0x17, 0x1b);
+                err += sn9c102_i2c_write(cam, 0x18, 0xbd);
+                err += sn9c102_i2c_write(cam, 0x19, 0x05);
+                err += sn9c102_i2c_write(cam, 0x1a, 0xf6);
+                err += sn9c102_i2c_write(cam, 0x1b, 0x04);
+                err += sn9c102_i2c_write(cam, 0x21, 0x1b);
+                err += sn9c102_i2c_write(cam, 0x22, 0x00);
+                err += sn9c102_i2c_write(cam, 0x23, 0xde);
+                err += sn9c102_i2c_write(cam, 0x24, 0x10);
+                err += sn9c102_i2c_write(cam, 0x25, 0x8a);
+                err += sn9c102_i2c_write(cam, 0x26, 0xa0);
+                err += sn9c102_i2c_write(cam, 0x27, 0xca);
+                err += sn9c102_i2c_write(cam, 0x28, 0xa2);
+                err += sn9c102_i2c_write(cam, 0x29, 0x74);
+                err += sn9c102_i2c_write(cam, 0x2a, 0x88);
+                err += sn9c102_i2c_write(cam, 0x2b, 0x34);
+                err += sn9c102_i2c_write(cam, 0x2c, 0x88);
+                err += sn9c102_i2c_write(cam, 0x2e, 0x00);
+                err += sn9c102_i2c_write(cam, 0x2f, 0x00);
+                err += sn9c102_i2c_write(cam, 0x30, 0x00);
+                err += sn9c102_i2c_write(cam, 0x32, 0xc2);
+                err += sn9c102_i2c_write(cam, 0x33, 0x08);
+                err += sn9c102_i2c_write(cam, 0x4c, 0x40);
+                err += sn9c102_i2c_write(cam, 0x4d, 0xf3);
+                err += sn9c102_i2c_write(cam, 0x60, 0x05);
+                err += sn9c102_i2c_write(cam, 0x61, 0x40);
+                err += sn9c102_i2c_write(cam, 0x62, 0x12);
+                err += sn9c102_i2c_write(cam, 0x63, 0x57);
+                err += sn9c102_i2c_write(cam, 0x64, 0x73);
+                err += sn9c102_i2c_write(cam, 0x65, 0x00);
+                err += sn9c102_i2c_write(cam, 0x66, 0x55);
+                err += sn9c102_i2c_write(cam, 0x67, 0x01);
+                err += sn9c102_i2c_write(cam, 0x68, 0xac);
+                err += sn9c102_i2c_write(cam, 0x69, 0x38);
+                err += sn9c102_i2c_write(cam, 0x6f, 0x1f);
+                err += sn9c102_i2c_write(cam, 0x70, 0x01);
+                err += sn9c102_i2c_write(cam, 0x71, 0x00);
+                err += sn9c102_i2c_write(cam, 0x72, 0x10);
+                err += sn9c102_i2c_write(cam, 0x73, 0x50);
+                err += sn9c102_i2c_write(cam, 0x74, 0x20);
+                err += sn9c102_i2c_write(cam, 0x76, 0x01);
+                err += sn9c102_i2c_write(cam, 0x77, 0xf3);
+                err += sn9c102_i2c_write(cam, 0x78, 0x90);
+                err += sn9c102_i2c_write(cam, 0x79, 0x98);
+                err += sn9c102_i2c_write(cam, 0x7a, 0x98);
+                err += sn9c102_i2c_write(cam, 0x7b, 0x00);
+                err += sn9c102_i2c_write(cam, 0x7c, 0x38);
+                err += sn9c102_i2c_write(cam, 0x7d, 0xff);
+                break;
         default:
                 break;
         }
@@ -115,6 +254,7 @@ static int ov7630_init(struct sn9c102_device* cam)
 static int ov7630_get_ctrl(struct sn9c102_device* cam,
                            struct v4l2_control* ctrl)
 {
+        enum sn9c102_bridge bridge = sn9c102_get_bridge(cam);
         int err = 0;
 
         switch (ctrl->id) {
@@ -123,13 +263,20 @@ static int ov7630_get_ctrl(struct sn9c102_device* cam,
                         return -EIO;
                 break;
         case V4L2_CID_RED_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x07);
+                if (bridge == BRIDGE_SN9C105 || bridge == BRIDGE_SN9C120)
+                        ctrl->value = sn9c102_pread_reg(cam, 0x05);
+                else
+                        ctrl->value = sn9c102_pread_reg(cam, 0x07);
                 break;
         case V4L2_CID_BLUE_BALANCE:
                 ctrl->value = sn9c102_pread_reg(cam, 0x06);
                 break;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x05);
+                if (bridge == BRIDGE_SN9C105 || bridge == BRIDGE_SN9C120)
+                        ctrl->value = sn9c102_pread_reg(cam, 0x07);
+                else
+                        ctrl->value = sn9c102_pread_reg(cam, 0x05);
+                break;
                 break;
         case V4L2_CID_GAIN:
                 if ((ctrl->value = sn9c102_i2c_read(cam, 0x00)) < 0)
@@ -177,6 +324,7 @@ static int ov7630_get_ctrl(struct sn9c102_device* cam,
 static int ov7630_set_ctrl(struct sn9c102_device* cam,
                            const struct v4l2_control* ctrl)
 {
+        enum sn9c102_bridge bridge = sn9c102_get_bridge(cam);
         int err = 0;
 
         switch (ctrl->id) {
@@ -184,13 +332,19 @@ static int ov7630_set_ctrl(struct sn9c102_device* cam,
                 err += sn9c102_i2c_write(cam, 0x10, ctrl->value);
                 break;
         case V4L2_CID_RED_BALANCE:
-                err += sn9c102_write_reg(cam, ctrl->value, 0x07);
+                if (bridge == BRIDGE_SN9C105 || bridge == BRIDGE_SN9C120)
+                        err += sn9c102_write_reg(cam, ctrl->value, 0x05);
+                else
+                        err += sn9c102_write_reg(cam, ctrl->value, 0x07);
                 break;
         case V4L2_CID_BLUE_BALANCE:
                 err += sn9c102_write_reg(cam, ctrl->value, 0x06);
                 break;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
-                err += sn9c102_write_reg(cam, ctrl->value, 0x05);
+                if (bridge == BRIDGE_SN9C105 || bridge == BRIDGE_SN9C120)
+                        err += sn9c102_write_reg(cam, ctrl->value, 0x07);
+                else
+                        err += sn9c102_write_reg(cam, ctrl->value, 0x05);
                 break;
         case V4L2_CID_GAIN:
                 err += sn9c102_i2c_write(cam, 0x00, ctrl->value);
@@ -227,8 +381,21 @@ static int ov7630_set_crop(struct sn9c102_device* cam,
 {
         struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
-        u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 1,
-           v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
+        u8 h_start = 0, v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
+
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+        case BRIDGE_SN9C103:
+                h_start = (u8)(rect->left - s->cropcap.bounds.left) + 1;
+                break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                h_start = (u8)(rect->left - s->cropcap.bounds.left) + 4;
+                break;
+        default:
+                break;
+        }
 
         err += sn9c102_write_reg(cam, h_start, 0x12);
         err += sn9c102_write_reg(cam, v_start, 0x13);
@@ -242,10 +409,28 @@ static int ov7630_set_pix_format(struct sn9c102_device* cam,
 {
         int err = 0;
 
-        if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
-                err += sn9c102_write_reg(cam, 0x20, 0x19);
-        else
-                err += sn9c102_write_reg(cam, 0x50, 0x19);
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+        case BRIDGE_SN9C103:
+                if (pix->pixelformat == V4L2_PIX_FMT_SBGGR8)
+                        err += sn9c102_write_reg(cam, 0x50, 0x19);
+                else
+                        err += sn9c102_write_reg(cam, 0x20, 0x19);
+                break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                if (pix->pixelformat == V4L2_PIX_FMT_SBGGR8) {
+                        err += sn9c102_write_reg(cam, 0xe5, 0x17);
+                        err += sn9c102_i2c_write(cam, 0x11, 0x04);
+                } else {
+                        err += sn9c102_write_reg(cam, 0xe2, 0x17);
+                        err += sn9c102_i2c_write(cam, 0x11, 0x02);
+                }
+                break;
+        default:
+                break;
+        }
 
         return err;
 }
@@ -254,7 +439,8 @@ static int ov7630_set_pix_format(struct sn9c102_device* cam,
 static const struct sn9c102_sensor ov7630 = {
         .name = "OV7630",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
-        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103 |
+                            BRIDGE_SN9C105 | BRIDGE_SN9C120,
         .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
@@ -417,6 +603,12 @@ int sn9c102_probe_ov7630(struct sn9c102_device* cam)
                         err += sn9c102_write_const_regs(cam, {0x01, 0x01},
                                                         {0x00, 0x01});
                 break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                err = sn9c102_write_const_regs(cam, {0x01, 0xf1}, {0x00, 0xf1},
+                                               {0x29, 0x01}, {0x74, 0x02},
+                                               {0x0e, 0x01}, {0x44, 0x01});
+                break;
         default:
                 break;
         }
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/video/sn9c102/sn9c102_ov7660.c
index 4b6474048a72..8aae416ba8ec 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7660.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7660.c
@@ -41,65 +41,65 @@ static int ov7660_init(struct sn9c102_device* cam)
                                        {0xbb, 0x2a}, {0xc7, 0x2b},
                                        {0xd3, 0x2c}, {0xde, 0x2d},
                                        {0xea, 0x2e}, {0xf4, 0x2f},
-                                       {0xff, 0x30}, {0x00, 0x3F},
-                                       {0xC7, 0x40}, {0x01, 0x41},
+                                       {0xff, 0x30}, {0x00, 0x3f},
+                                       {0xc7, 0x40}, {0x01, 0x41},
                                        {0x44, 0x42}, {0x00, 0x43},
                                        {0x44, 0x44}, {0x00, 0x45},
                                        {0x44, 0x46}, {0x00, 0x47},
-                                       {0xC7, 0x48}, {0x01, 0x49},
-                                       {0xC7, 0x4A}, {0x01, 0x4B},
-                                       {0xC7, 0x4C}, {0x01, 0x4D},
-                                       {0x44, 0x4E}, {0x00, 0x4F},
+                                       {0xc7, 0x48}, {0x01, 0x49},
+                                       {0xc7, 0x4a}, {0x01, 0x4b},
+                                       {0xc7, 0x4c}, {0x01, 0x4d},
+                                       {0x44, 0x4e}, {0x00, 0x4f},
                                        {0x44, 0x50}, {0x00, 0x51},
                                        {0x44, 0x52}, {0x00, 0x53},
-                                       {0xC7, 0x54}, {0x01, 0x55},
-                                       {0xC7, 0x56}, {0x01, 0x57},
-                                       {0xC7, 0x58}, {0x01, 0x59},
-                                       {0x44, 0x5A}, {0x00, 0x5B},
-                                       {0x44, 0x5C}, {0x00, 0x5D},
-                                       {0x44, 0x5E}, {0x00, 0x5F},
-                                       {0xC7, 0x60}, {0x01, 0x61},
-                                       {0xC7, 0x62}, {0x01, 0x63},
-                                       {0xC7, 0x64}, {0x01, 0x65},
+                                       {0xc7, 0x54}, {0x01, 0x55},
+                                       {0xc7, 0x56}, {0x01, 0x57},
+                                       {0xc7, 0x58}, {0x01, 0x59},
+                                       {0x44, 0x5a}, {0x00, 0x5b},
+                                       {0x44, 0x5c}, {0x00, 0x5d},
+                                       {0x44, 0x5e}, {0x00, 0x5f},
+                                       {0xc7, 0x60}, {0x01, 0x61},
+                                       {0xc7, 0x62}, {0x01, 0x63},
+                                       {0xc7, 0x64}, {0x01, 0x65},
                                        {0x44, 0x66}, {0x00, 0x67},
                                        {0x44, 0x68}, {0x00, 0x69},
-                                       {0x44, 0x6A}, {0x00, 0x6B},
-                                       {0xC7, 0x6C}, {0x01, 0x6D},
-                                       {0xC7, 0x6E}, {0x01, 0x6F},
-                                       {0xC7, 0x70}, {0x01, 0x71},
+                                       {0x44, 0x6a}, {0x00, 0x6b},
+                                       {0xc7, 0x6c}, {0x01, 0x6d},
+                                       {0xc7, 0x6e}, {0x01, 0x6f},
+                                       {0xc7, 0x70}, {0x01, 0x71},
                                        {0x44, 0x72}, {0x00, 0x73},
                                        {0x44, 0x74}, {0x00, 0x75},
                                        {0x44, 0x76}, {0x00, 0x77},
-                                       {0xC7, 0x78}, {0x01, 0x79},
-                                       {0xC7, 0x7A}, {0x01, 0x7B},
-                                       {0xC7, 0x7C}, {0x01, 0x7D},
-                                       {0x44, 0x7E}, {0x00, 0x7F},
+                                       {0xc7, 0x78}, {0x01, 0x79},
+                                       {0xc7, 0x7a}, {0x01, 0x7b},
+                                       {0xc7, 0x7c}, {0x01, 0x7d},
+                                       {0x44, 0x7e}, {0x00, 0x7f},
                                        {0x14, 0x84}, {0x00, 0x85},
                                        {0x27, 0x86}, {0x00, 0x87},
                                        {0x07, 0x88}, {0x00, 0x89},
-                                       {0xEC, 0x8A}, {0x0f, 0x8B},
-                                       {0xD8, 0x8C}, {0x0f, 0x8D},
-                                       {0x3D, 0x8E}, {0x00, 0x8F},
-                                       {0x3D, 0x90}, {0x00, 0x91},
-                                       {0xCD, 0x92}, {0x0f, 0x93},
+                                       {0xec, 0x8a}, {0x0f, 0x8b},
+                                       {0xd8, 0x8c}, {0x0f, 0x8d},
+                                       {0x3d, 0x8e}, {0x00, 0x8f},
+                                       {0x3d, 0x90}, {0x00, 0x91},
+                                       {0xcd, 0x92}, {0x0f, 0x93},
                                        {0xf7, 0x94}, {0x0f, 0x95},
-                                       {0x0C, 0x96}, {0x00, 0x97},
+                                       {0x0c, 0x96}, {0x00, 0x97},
                                        {0x00, 0x98}, {0x66, 0x99},
-                                       {0x05, 0x9A}, {0x00, 0x9B},
-                                       {0x04, 0x9C}, {0x00, 0x9D},
-                                       {0x08, 0x9E}, {0x00, 0x9F},
-                                       {0x2D, 0xC0}, {0x2D, 0xC1},
-                                       {0x3A, 0xC2}, {0x05, 0xC3},
-                                       {0x04, 0xC4}, {0x3F, 0xC5},
-                                       {0x00, 0xC6}, {0x00, 0xC7},
-                                       {0x50, 0xC8}, {0x3C, 0xC9},
-                                       {0x28, 0xCA}, {0xD8, 0xCB},
-                                       {0x14, 0xCC}, {0xEC, 0xCD},
-                                       {0x32, 0xCE}, {0xDD, 0xCF},
-                                       {0x32, 0xD0}, {0xDD, 0xD1},
-                                       {0x6A, 0xD2}, {0x50, 0xD3},
-                                       {0x00, 0xD4}, {0x00, 0xD5},
-                                       {0x00, 0xD6});
+                                       {0x05, 0x9a}, {0x00, 0x9b},
+                                       {0x04, 0x9c}, {0x00, 0x9d},
+                                       {0x08, 0x9e}, {0x00, 0x9f},
+                                       {0x2d, 0xc0}, {0x2d, 0xc1},
+                                       {0x3a, 0xc2}, {0x05, 0xc3},
+                                       {0x04, 0xc4}, {0x3f, 0xc5},
+                                       {0x00, 0xc6}, {0x00, 0xc7},
+                                       {0x50, 0xc8}, {0x3C, 0xc9},
+                                       {0x28, 0xca}, {0xd8, 0xcb},
+                                       {0x14, 0xcc}, {0xec, 0xcd},
+                                       {0x32, 0xce}, {0xdd, 0xcf},
+                                       {0x32, 0xd0}, {0xdd, 0xd1},
+                                       {0x6a, 0xd2}, {0x50, 0xd3},
+                                       {0x00, 0xd4}, {0x00, 0xd5},
+                                       {0x00, 0xd6});
 
         err += sn9c102_i2c_write(cam, 0x12, 0x80);
         err += sn9c102_i2c_write(cam, 0x11, 0x09);
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 3e736be5de84..eb220461ac77 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1321,7 +1321,7 @@ static int saa_ioctl(struct inode *inode, struct file *file,
                         u32 format;
                         if (copy_from_user(&p, arg, sizeof(p)))
                                 return -EFAULT;
-                        if (p.palette < sizeof(palette2fmt) / sizeof(u32)) {
+                        if (p.palette < ARRAY_SIZE(palette2fmt)) {
                                 format = palette2fmt[p.palette];
                                 saa->win.color_fmt = format;
                                 saawrite(format | 0x60,
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index bf3aa8d2d57e..4dc5bc714b95 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -715,8 +715,11 @@ static int stv680_start_stream (struct usb_stv *stv680)
                                    stv680_video_irq, stv680);
                 stv680->urb[i] = urb;
                 err = usb_submit_urb (stv680->urb[i], GFP_KERNEL);
-                if (err)
-                        PDEBUG (0, "STV(e): urb burned down in start stream");
+                if (err) {
+                        PDEBUG (0, "STV(e): urb burned down with err "
+                                   "%d in start stream %d", err, i);
+                        goto nomem_err;
+                }
         }                       /* i STV680_NUMSBUF */
 
         stv680->framecount = 0;
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 1a1bef0e9c3d..59cff5a3c59e 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -21,7 +21,17 @@
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <linux/delay.h>
-#include <media/tuner.h>
+#include "tuner-driver.h"
+
+/* ---------------------------------------------------------------------- */
+
+struct tda8290_priv {
+        unsigned char tda8290_easy_mode;
+        unsigned char tda827x_lpsel;
+        unsigned char tda827x_addr;
+        unsigned char tda827x_ver;
+        unsigned int sgIF;
+};
 
 /* ---------------------------------------------------------------------- */
 
@@ -76,7 +86,8 @@ static void tda827x_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
         u32 N;
         int i;
         struct tuner *t = i2c_get_clientdata(c);
-        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags = 0};
+        struct tda8290_priv *priv = t->priv;
+        struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags = 0};
 
         if (t->mode == V4L2_TUNER_RADIO)
                 freq = freq / 1000;
@@ -95,7 +106,7 @@ static void tda827x_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
         tuner_reg[1] = (unsigned char)(N>>8);
         tuner_reg[2] = (unsigned char) N;
         tuner_reg[3] = 0x40;
-        tuner_reg[4] = 0x52 + (t->tda827x_lpsel << 5);
+        tuner_reg[4] = 0x52 + (priv->tda827x_lpsel << 5);
         tuner_reg[5] = (tda827x_analog[i].spd   << 6) + (tda827x_analog[i].div1p5 <<5) +
                        (tda827x_analog[i].bs     <<3) +  tda827x_analog[i].bp;
         tuner_reg[6] = 0x8f + (tda827x_analog[i].gc3 << 4);
@@ -146,8 +157,9 @@ static void tda827x_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
 static void tda827x_agcf(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct tda8290_priv *priv = t->priv;
         unsigned char data[] = {0x80, 0x0c};
-        struct i2c_msg msg = {.addr = t->tda827x_addr, .buf = data,
+        struct i2c_msg msg = {.addr = priv->tda827x_addr, .buf = data,
                               .flags = 0, .len = 2};
         i2c_transfer(c->adapter, &msg, 1);
 }
@@ -234,7 +246,8 @@ static void tda827xa_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
         u32 N;
         int i;
         struct tuner *t = i2c_get_clientdata(c);
-        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags = 0, .buf = tuner_reg};
+        struct tda8290_priv *priv = t->priv;
+        struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags = 0, .buf = tuner_reg};
 
         tda827xa_lna_gain( c, 1);
         msleep(10);
@@ -271,7 +284,7 @@ static void tda827xa_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
         tuner_reg[1] = 0xff;
         tuner_reg[2] = 0xe0;
         tuner_reg[3] = 0;
-        tuner_reg[4] = 0x99 + (t->tda827x_lpsel << 1);
+        tuner_reg[4] = 0x99 + (priv->tda827x_lpsel << 1);
         msg.len = 5;
         i2c_transfer(c->adapter, &msg, 1);
 
@@ -311,15 +324,16 @@ static void tda827xa_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
         i2c_transfer(c->adapter, &msg, 1);
 
         tuner_reg[0] = 0xc0;
-        tuner_reg[1] = 0x19 + (t->tda827x_lpsel << 1);
+        tuner_reg[1] = 0x19 + (priv->tda827x_lpsel << 1);
         i2c_transfer(c->adapter, &msg, 1);
 }
 
 static void tda827xa_agcf(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct tda8290_priv *priv = t->priv;
         unsigned char data[] = {0x80, 0x2c};
-        struct i2c_msg msg = {.addr = t->tda827x_addr, .buf = data,
+        struct i2c_msg msg = {.addr = priv->tda827x_addr, .buf = data,
                               .flags = 0, .len = 2};
         i2c_transfer(c->adapter, &msg, 1);
 }
@@ -347,8 +361,9 @@ static void tda8290_i2c_bridge(struct i2c_client *c, int close)
 static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct tda8290_priv *priv = t->priv;
         unsigned char soft_reset[]  = { 0x00, 0x00 };
-        unsigned char easy_mode[]   = { 0x01, t->tda8290_easy_mode };
+        unsigned char easy_mode[]   = { 0x01, priv->tda8290_easy_mode };
         unsigned char expert_mode[] = { 0x01, 0x80 };
         unsigned char agc_out_on[]  = { 0x02, 0x00 };
         unsigned char gainset_off[] = { 0x28, 0x14 };
@@ -375,18 +390,18 @@ static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
         i2c_master_send(c, soft_reset, 2);
         msleep(1);
 
-        expert_mode[1] = t->tda8290_easy_mode + 0x80;
+        expert_mode[1] = priv->tda8290_easy_mode + 0x80;
         i2c_master_send(c, expert_mode, 2);
         i2c_master_send(c, gainset_off, 2);
         i2c_master_send(c, if_agc_spd, 2);
-        if (t->tda8290_easy_mode & 0x60)
+        if (priv->tda8290_easy_mode & 0x60)
                 i2c_master_send(c, adc_head_9, 2);
         else
                 i2c_master_send(c, adc_head_6, 2);
         i2c_master_send(c, pll_bw_nom, 2);
 
         tda8290_i2c_bridge(c, 1);
-        if (t->tda827x_ver != 0)
+        if (priv->tda827x_ver != 0)
                 tda827xa_tune(c, ifc, freq);
         else
                 tda827x_tune(c, ifc, freq);
@@ -418,7 +433,7 @@ static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
                 if ((agc_stat > 115) || !(pll_stat & 0x80)) {
                         tuner_dbg("adjust gain, step 2. Agc: %d, lock: %d\n",
                                    agc_stat, pll_stat & 0x80);
-                        if (t->tda827x_ver != 0)
+                        if (priv->tda827x_ver != 0)
                                 tda827xa_agcf(c);
                         else
                                 tda827x_agcf(c);
@@ -437,7 +452,7 @@ static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
         }
 
         /* l/ l' deadlock? */
-        if(t->tda8290_easy_mode & 0x60) {
+        if(priv->tda8290_easy_mode & 0x60) {
                 i2c_master_send(c, &addr_adc_sat, 1);
                 i2c_master_recv(c, &adc_sat, 1);
                 i2c_master_send(c, &addr_pll_stat, 1);
@@ -459,41 +474,42 @@ static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
 
 static void set_audio(struct tuner *t)
 {
+        struct tda8290_priv *priv = t->priv;
         char* mode;
 
-        t->tda827x_lpsel = 0;
+        priv->tda827x_lpsel = 0;
         if (t->std & V4L2_STD_MN) {
-                t->sgIF = 92;
-                t->tda8290_easy_mode = 0x01;
-                t->tda827x_lpsel = 1;
+                priv->sgIF = 92;
+                priv->tda8290_easy_mode = 0x01;
+                priv->tda827x_lpsel = 1;
                 mode = "MN";
         } else if (t->std & V4L2_STD_B) {
-                t->sgIF = 108;
-                t->tda8290_easy_mode = 0x02;
+                priv->sgIF = 108;
+                priv->tda8290_easy_mode = 0x02;
                 mode = "B";
         } else if (t->std & V4L2_STD_GH) {
-                t->sgIF = 124;
-                t->tda8290_easy_mode = 0x04;
+                priv->sgIF = 124;
+                priv->tda8290_easy_mode = 0x04;
                 mode = "GH";
         } else if (t->std & V4L2_STD_PAL_I) {
-                t->sgIF = 124;
-                t->tda8290_easy_mode = 0x08;
+                priv->sgIF = 124;
+                priv->tda8290_easy_mode = 0x08;
                 mode = "I";
         } else if (t->std & V4L2_STD_DK) {
-                t->sgIF = 124;
-                t->tda8290_easy_mode = 0x10;
+                priv->sgIF = 124;
+                priv->tda8290_easy_mode = 0x10;
                 mode = "DK";
         } else if (t->std & V4L2_STD_SECAM_L) {
-                t->sgIF = 124;
-                t->tda8290_easy_mode = 0x20;
+                priv->sgIF = 124;
+                priv->tda8290_easy_mode = 0x20;
                 mode = "L";
         } else if (t->std & V4L2_STD_SECAM_LC) {
-                t->sgIF = 20;
-                t->tda8290_easy_mode = 0x40;
+                priv->sgIF = 20;
+                priv->tda8290_easy_mode = 0x40;
                 mode = "LC";
         } else {
-                t->sgIF = 124;
-                t->tda8290_easy_mode = 0x10;
+                priv->sgIF = 124;
+                priv->tda8290_easy_mode = 0x10;
                 mode = "xx";
         }
         tuner_dbg("setting tda8290 to system %s\n", mode);
@@ -502,9 +518,10 @@ static void set_audio(struct tuner *t)
 static void set_tv_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct tda8290_priv *priv = t->priv;
 
         set_audio(t);
-        tda8290_tune(c, t->sgIF, freq);
+        tda8290_tune(c, priv->sgIF, freq);
 }
 
 static void set_radio_freq(struct i2c_client *c, unsigned int freq)
@@ -528,13 +545,14 @@ static int has_signal(struct i2c_client *c)
 static void standby(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct tda8290_priv *priv = t->priv;
         unsigned char cb1[] = { 0x30, 0xD0 };
         unsigned char tda8290_standby[] = { 0x00, 0x02 };
         unsigned char tda8290_agc_tri[] = { 0x02, 0x20 };
-        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags=0, .buf=cb1, .len = 2};
+        struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0, .buf=cb1, .len = 2};
 
         tda8290_i2c_bridge(c, 1);
-        if (t->tda827x_ver != 0)
+        if (priv->tda827x_ver != 0)
                 cb1[1] = 0x90;
         i2c_transfer(c->adapter, &msg, 1);
         tda8290_i2c_bridge(c, 0);
@@ -560,13 +578,14 @@ static void tda8290_init_if(struct i2c_client *c)
 static void tda8290_init_tuner(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct tda8290_priv *priv = t->priv;
         unsigned char tda8275_init[]  = { 0x00, 0x00, 0x00, 0x40, 0xdC, 0x04, 0xAf,
                                           0x3F, 0x2A, 0x04, 0xFF, 0x00, 0x00, 0x40 };
         unsigned char tda8275a_init[] = { 0x00, 0x00, 0x00, 0x00, 0xdC, 0x05, 0x8b,
                                           0x0c, 0x04, 0x20, 0xFF, 0x00, 0x00, 0x4b };
-        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags=0,
+        struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0,
                               .buf=tda8275_init, .len = 14};
-        if (t->tda827x_ver != 0)
+        if (priv->tda827x_ver != 0)
                 msg.buf = tda8275a_init;
 
         tda8290_i2c_bridge(c, 1);
@@ -576,14 +595,36 @@ static void tda8290_init_tuner(struct i2c_client *c)
 
 /*---------------------------------------------------------------------*/
 
+static void tda8290_release(struct i2c_client *c)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+
+        kfree(t->priv);
+        t->priv = NULL;
+}
+
+static struct tuner_operations tda8290_tuner_ops = {
+        .set_tv_freq    = set_tv_freq,
+        .set_radio_freq = set_radio_freq,
+        .has_signal     = has_signal,
+        .standby        = standby,
+        .release        = tda8290_release,
+};
+
 int tda8290_init(struct i2c_client *c)
 {
+        struct tda8290_priv *priv = NULL;
         struct tuner *t = i2c_get_clientdata(c);
         u8 data;
         int i, ret, tuners_found;
         u32 tuner_addrs;
         struct i2c_msg msg = {.flags=I2C_M_RD, .buf=&data, .len = 1};
 
+        priv = kzalloc(sizeof(struct tda8290_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return -ENOMEM;
+        t->priv = priv;
+
         tda8290_i2c_bridge(c, 1);
         /* probe for tuner chip */
         tuners_found = 0;
@@ -618,7 +659,7 @@ int tda8290_init(struct i2c_client *c)
                 tuner_addrs = tuner_addrs & 0xff;
                 tuner_info ("setting tuner address to %x\n", tuner_addrs);
         }
-        t->tda827x_addr = tuner_addrs;
+        priv->tda827x_addr = tuner_addrs;
         msg.addr = tuner_addrs;
 
         tda8290_i2c_bridge(c, 1);
@@ -627,18 +668,16 @@ int tda8290_init(struct i2c_client *c)
                 tuner_warn ("TDA827x access failed!\n");
         if ((data & 0x3c) == 0) {
                 strlcpy(c->name, "tda8290+75", sizeof(c->name));
-                t->tda827x_ver = 0;
+                priv->tda827x_ver = 0;
         } else {
                 strlcpy(c->name, "tda8290+75a", sizeof(c->name));
-                t->tda827x_ver = 2;
+                priv->tda827x_ver = 2;
         }
         tuner_info("type set to %s\n", c->name);
 
-        t->set_tv_freq    = set_tv_freq;
-        t->set_radio_freq = set_radio_freq;
-        t->has_signal = has_signal;
-        t->standby = standby;
-        t->tda827x_lpsel = 0;
+        memcpy(&t->ops, &tda8290_tuner_ops, sizeof(struct tuner_operations));
+
+        priv->tda827x_lpsel = 0;
         t->mode = V4L2_TUNER_ANALOG_TV;
 
         tda8290_init_tuner(c);
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index fde576f1101c..a8f773274fe3 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -11,6 +11,7 @@
 
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
+#include "tuner-driver.h"
 
 
 /* Chips:
@@ -29,6 +30,9 @@
                 printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.name, \
                         i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
 
+struct tda9887_priv {
+        unsigned char      data[4];
+};
 
 /* ---------------------------------------------------------------------- */
 
@@ -508,10 +512,11 @@ static int tda9887_status(struct tuner *t)
 static void tda9887_configure(struct i2c_client *client)
 {
         struct tuner *t = i2c_get_clientdata(client);
+        struct tda9887_priv *priv = t->priv;
         int rc;
 
-        memset(t->tda9887_data,0,sizeof(t->tda9887_data));
-        tda9887_set_tvnorm(t,t->tda9887_data);
+        memset(priv->data,0,sizeof(priv->data));
+        tda9887_set_tvnorm(t,priv->data);
 
         /* A note on the port settings:
            These settings tend to depend on the specifics of the board.
@@ -526,22 +531,22 @@ static void tda9887_configure(struct i2c_client *client)
            the ports should be set to active (0), but, again, that may
            differ depending on the precise hardware configuration.
          */
-        t->tda9887_data[1] |= cOutputPort1Inactive;
-        t->tda9887_data[1] |= cOutputPort2Inactive;
+        priv->data[1] |= cOutputPort1Inactive;
+        priv->data[1] |= cOutputPort2Inactive;
 
-        tda9887_set_config(t,t->tda9887_data);
-        tda9887_set_insmod(t,t->tda9887_data);
+        tda9887_set_config(t,priv->data);
+        tda9887_set_insmod(t,priv->data);
 
         if (t->mode == T_STANDBY) {
-                t->tda9887_data[1] |= cForcedMuteAudioON;
+                priv->data[1] |= cForcedMuteAudioON;
         }
 
         tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
-                t->tda9887_data[1],t->tda9887_data[2],t->tda9887_data[3]);
+                priv->data[1],priv->data[2],priv->data[3]);
         if (tuner_debug > 1)
-                dump_write_message(t, t->tda9887_data);
+                dump_write_message(t, priv->data);
 
-        if (4 != (rc = i2c_master_send(&t->i2c,t->tda9887_data,4)))
+        if (4 != (rc = i2c_master_send(&t->i2c,priv->data,4)))
                 tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
 
         if (tuner_debug > 2) {
@@ -555,7 +560,8 @@ static void tda9887_configure(struct i2c_client *client)
 static void tda9887_tuner_status(struct i2c_client *client)
 {
         struct tuner *t = i2c_get_clientdata(client);
-        tda9887_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n", t->tda9887_data[1], t->tda9887_data[2], t->tda9887_data[3]);
+        struct tda9887_priv *priv = t->priv;
+        tda9887_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n", priv->data[1], priv->data[2], priv->data[3]);
 }
 
 static int tda9887_get_afc(struct i2c_client *client)
@@ -586,20 +592,39 @@ static void tda9887_set_freq(struct i2c_client *client, unsigned int freq)
         tda9887_configure(client);
 }
 
+static void tda9887_release(struct i2c_client *c)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+
+        kfree(t->priv);
+        t->priv = NULL;
+}
+
+static struct tuner_operations tda9887_tuner_ops = {
+        .set_tv_freq    = tda9887_set_freq,
+        .set_radio_freq = tda9887_set_freq,
+        .standby        = tda9887_standby,
+        .tuner_status   = tda9887_tuner_status,
+        .get_afc        = tda9887_get_afc,
+        .release        = tda9887_release,
+};
+
 int tda9887_tuner_init(struct i2c_client *c)
 {
+        struct tda9887_priv *priv = NULL;
         struct tuner *t = i2c_get_clientdata(c);
 
+        priv = kzalloc(sizeof(struct tda9887_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return -ENOMEM;
+        t->priv = priv;
+
         strlcpy(c->name, "tda9887", sizeof(c->name));
 
         tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t->i2c.addr,
                                                 t->i2c.driver->driver.name);
 
-        t->set_tv_freq = tda9887_set_freq;
-        t->set_radio_freq = tda9887_set_freq;
-        t->standby = tda9887_standby;
-        t->tuner_status = tda9887_tuner_status;
-        t->get_afc = tda9887_get_afc;
+        memcpy(&t->ops, &tda9887_tuner_ops, sizeof(struct tuner_operations));
 
         return 0;
 }
diff --git a/drivers/media/video/tea5761.c b/drivers/media/video/tea5761.c
new file mode 100644
index 000000000000..ae105c2cd0ac
--- /dev/null
+++ b/drivers/media/video/tea5761.c
@@ -0,0 +1,243 @@
+/*
+ * For Philips TEA5761 FM Chip
+ * I2C address is allways 0x20 (0x10 at 7-bit mode).
+ *
+ * Copyright (c) 2005-2007 Mauro Carvalho Chehab (mchehab@infradead.org)
+ * This code is placed under the terms of the GNUv2 General Public License
+ *
+ */
+
+#include <linux/i2c.h>
+#include <linux/videodev.h>
+#include <linux/delay.h>
+#include <media/tuner.h>
+#include "tuner-driver.h"
+
+#define PREFIX "TEA5761 "
+
+/* from tuner-core.c */
+extern int tuner_debug;
+
+/*****************************************************************************/
+
+/***************************
+ * TEA5761HN I2C registers *
+ ***************************/
+
+/* INTREG - Read: bytes 0 and 1 / Write: byte 0 */
+
+        /* first byte for reading */
+#define TEA5761_INTREG_IFFLAG           0x10
+#define TEA5761_INTREG_LEVFLAG          0x8
+#define TEA5761_INTREG_FRRFLAG          0x2
+#define TEA5761_INTREG_BLFLAG           0x1
+
+        /* second byte for reading / byte for writing */
+#define TEA5761_INTREG_IFMSK            0x10
+#define TEA5761_INTREG_LEVMSK           0x8
+#define TEA5761_INTREG_FRMSK            0x2
+#define TEA5761_INTREG_BLMSK            0x1
+
+/* FRQSET - Read: bytes 2 and 3 / Write: byte 1 and 2 */
+
+        /* First byte */
+#define TEA5761_FRQSET_SEARCH_UP 0x80           /* 1=Station search from botton to up */
+#define TEA5761_FRQSET_SEARCH_MODE 0x40         /* 1=Search mode */
+
+        /* Bits 0-5 for divider MSB */
+
+        /* Second byte */
+        /* Bits 0-7 for divider LSB */
+
+/* TNCTRL - Read: bytes 4 and 5 / Write: Bytes 3 and 4 */
+
+        /* first byte */
+
+#define TEA5761_TNCTRL_PUPD_0   0x40    /* Power UP/Power Down MSB */
+#define TEA5761_TNCTRL_BLIM     0X20    /* 1= Japan Frequencies, 0= European frequencies */
+#define TEA5761_TNCTRL_SWPM     0x10    /* 1= software port is FRRFLAG */
+#define TEA5761_TNCTRL_IFCTC    0x08    /* 1= IF count time 15.02 ms, 0= IF count time 2.02 ms */
+#define TEA5761_TNCTRL_AFM      0x04
+#define TEA5761_TNCTRL_SMUTE    0x02    /* 1= Soft mute */
+#define TEA5761_TNCTRL_SNC      0x01
+
+        /* second byte */
+
+#define TEA5761_TNCTRL_MU       0x80    /* 1=Hard mute */
+#define TEA5761_TNCTRL_SSL_1    0x40
+#define TEA5761_TNCTRL_SSL_0    0x20
+#define TEA5761_TNCTRL_HLSI     0x10
+#define TEA5761_TNCTRL_MST      0x08    /* 1 = mono */
+#define TEA5761_TNCTRL_SWP      0x04
+#define TEA5761_TNCTRL_DTC      0x02    /* 1 = deemphasis 50 us, 0 = deemphasis 75 us */
+#define TEA5761_TNCTRL_AHLSI    0x01
+
+/* FRQCHECK - Read: bytes 6 and 7  */
+        /* First byte */
+
+        /* Bits 0-5 for divider MSB */
+
+        /* Second byte */
+        /* Bits 0-7 for divider LSB */
+
+/* TUNCHECK - Read: bytes 8 and 9  */
+
+        /* First byte */
+#define TEA5761_TUNCHECK_IF_MASK        0x7e    /* IF count */
+#define TEA5761_TUNCHECK_TUNTO          0x01
+
+        /* Second byte */
+#define TEA5761_TUNCHECK_LEV_MASK       0xf0    /* Level Count */
+#define TEA5761_TUNCHECK_LD             0x08
+#define TEA5761_TUNCHECK_STEREO         0x04
+
+/* TESTREG - Read: bytes 10 and 11 / Write: bytes 5 and 6 */
+
+        /* All zero = no test mode */
+
+/* MANID - Read: bytes 12 and 13 */
+
+        /* First byte - should be 0x10 */
+#define TEA5767_MANID_VERSION_MASK      0xf0    /* Version = 1 */
+#define TEA5767_MANID_ID_MSB_MASK       0x0f    /* Manufacurer ID - should be 0 */
+
+        /* Second byte - Should be 0x2b */
+
+#define TEA5767_MANID_ID_LSB_MASK       0xfe    /* Manufacturer ID - should be 0x15 */
+#define TEA5767_MANID_IDAV              0x01    /* 1 = Chip has ID, 0 = Chip has no ID */
+
+/* Chip ID - Read: bytes 14 and 15 */
+
+        /* First byte - should be 0x57 */
+
+        /* Second byte - should be 0x61 */
+
+/*****************************************************************************/
+
+static void set_tv_freq(struct i2c_client *c, unsigned int freq)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+
+        tuner_warn("This tuner doesn't support TV freq.\n");
+}
+
+#define FREQ_OFFSET 0 /* for TEA5767, it is 700 to give the right freq */
+static void tea5761_status_dump(unsigned char *buffer)
+{
+        unsigned int div, frq;
+
+        div = ((buffer[2] & 0x3f) << 8) | buffer[3];
+
+        frq = 1000 * (div * 32768 / 1000 + FREQ_OFFSET + 225) / 4;      /* Freq in KHz */
+
+        printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
+               frq / 1000, frq % 1000, div);
+}
+
+/* Freq should be specifyed at 62.5 Hz */
+static void set_radio_freq(struct i2c_client *c, unsigned int frq)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+        unsigned char buffer[7] = {0, 0, 0, 0, 0, 0, 0 };
+        unsigned div;
+        int rc;
+
+        tuner_dbg (PREFIX "radio freq counter %d\n", frq);
+
+        if (t->mode == T_STANDBY) {
+                tuner_dbg("TEA5761 set to standby mode\n");
+                buffer[5] |= TEA5761_TNCTRL_MU;
+        } else {
+                buffer[4] |= TEA5761_TNCTRL_PUPD_0;
+        }
+
+
+        if (t->audmode == V4L2_TUNER_MODE_MONO) {
+                tuner_dbg("TEA5761 set to mono\n");
+                buffer[5] |= TEA5761_TNCTRL_MST;
+;
+        } else {
+                tuner_dbg("TEA5761 set to stereo\n");
+        }
+
+        div = (1000 * (frq * 4 / 16 + 700 + 225) ) >> 15;
+        buffer[1] = (div >> 8) & 0x3f;
+        buffer[2] = div & 0xff;
+
+        if (tuner_debug)
+                tea5761_status_dump(buffer);
+
+        if (7 != (rc = i2c_master_send(c, buffer, 7)))
+                tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);
+}
+
+static int tea5761_signal(struct i2c_client *c)
+{
+        unsigned char buffer[16];
+        int rc;
+        struct tuner *t = i2c_get_clientdata(c);
+
+        memset(buffer, 0, sizeof(buffer));
+        if (16 != (rc = i2c_master_recv(c, buffer, 16)))
+                tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);
+
+        return ((buffer[9] & TEA5761_TUNCHECK_LEV_MASK) << (13 - 4));
+}
+
+static int tea5761_stereo(struct i2c_client *c)
+{
+        unsigned char buffer[16];
+        int rc;
+        struct tuner *t = i2c_get_clientdata(c);
+
+        memset(buffer, 0, sizeof(buffer));
+        if (16 != (rc = i2c_master_recv(c, buffer, 16)))
+                tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);
+
+        rc = buffer[9] & TEA5761_TUNCHECK_STEREO;
+
+        tuner_dbg("TEA5761 radio ST GET = %02x\n", rc);
+
+        return (rc ? V4L2_TUNER_SUB_STEREO : 0);
+}
+
+int tea5761_autodetection(struct i2c_client *c)
+{
+        unsigned char buffer[16];
+        int rc;
+        struct tuner *t = i2c_get_clientdata(c);
+
+        if (16 != (rc = i2c_master_recv(c, buffer, 16))) {
+                tuner_warn("it is not a TEA5761. Received %i chars.\n", rc);
+                return EINVAL;
+        }
+
+        if (!((buffer[13] != 0x2b) || (buffer[14] != 0x57) || (buffer[15] != 0x061))) {
+                tuner_warn("Manufacturer ID= 0x%02x, Chip ID = %02x%02x. It is not a TEA5761\n",buffer[13],buffer[14],buffer[15]);
+                return EINVAL;
+        }
+        tuner_warn("TEA5761 detected.\n");
+        return 0;
+}
+
+static struct tuner_operations tea5761_tuner_ops = {
+        .set_tv_freq    = set_tv_freq,
+        .set_radio_freq = set_radio_freq,
+        .has_signal     = tea5761_signal,
+        .is_stereo      = tea5761_stereo,
+};
+
+int tea5761_tuner_init(struct i2c_client *c)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+
+        if (tea5761_autodetection(c) == EINVAL)
+                return EINVAL;
+
+        tuner_info("type set to %d (%s)\n", t->type, "Philips TEA5761HN FM Radio");
+        strlcpy(c->name, "tea5761", sizeof(c->name));
+
+        memcpy(&t->ops, &tea5761_tuner_ops, sizeof(struct tuner_operations));
+
+        return (0);
+}
diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c
index d1c41781ccc4..4985d47a508f 100644
--- a/drivers/media/video/tea5767.c
+++ b/drivers/media/video/tea5767.c
@@ -13,7 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <linux/delay.h>
-#include <media/tuner.h>
+#include "tuner-driver.h"
 
 #define PREFIX "TEA5767 "
 
@@ -343,6 +343,14 @@ int tea5767_autodetection(struct i2c_client *c)
         return 0;
 }
 
+static struct tuner_operations tea5767_tuner_ops = {
+        .set_tv_freq    = set_tv_freq,
+        .set_radio_freq = set_radio_freq,
+        .has_signal     = tea5767_signal,
+        .is_stereo      = tea5767_stereo,
+        .standby        = tea5767_standby,
+};
+
 int tea5767_tuner_init(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
@@ -350,11 +358,7 @@ int tea5767_tuner_init(struct i2c_client *c)
         tuner_info("type set to %d (%s)\n", t->type, "Philips TEA5767HN FM Radio");
         strlcpy(c->name, "tea5767", sizeof(c->name));
 
-        t->set_tv_freq = set_tv_freq;
-        t->set_radio_freq = set_radio_freq;
-        t->has_signal = tea5767_signal;
-        t->is_stereo = tea5767_stereo;
-        t->standby = tea5767_standby;
+        memcpy(&t->ops, &tea5767_tuner_ops, sizeof(struct tuner_operations));
 
         return (0);
 }
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 505591a7abe9..e646465464a1 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -20,11 +20,15 @@
 
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
+#include "tuner-driver.h"
 
 #define UNSET (-1U)
 
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
+#ifdef CONFIG_TUNER_TEA5761
+        0x10,
+#endif
         0x42, 0x43, 0x4a, 0x4b,                 /* tda8290 */
         0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
         0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
@@ -77,7 +81,7 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
                 tuner_warn ("tuner type not set\n");
                 return;
         }
-        if (NULL == t->set_tv_freq) {
+        if (NULL == t->ops.set_tv_freq) {
                 tuner_warn ("Tuner has no way to set tv freq\n");
                 return;
         }
@@ -92,7 +96,7 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
                 else
                         freq = tv_range[1] * 16;
         }
-        t->set_tv_freq(c, freq);
+        t->ops.set_tv_freq(c, freq);
 }
 
 static void set_radio_freq(struct i2c_client *c, unsigned int freq)
@@ -103,7 +107,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq)
                 tuner_warn ("tuner type not set\n");
                 return;
         }
-        if (NULL == t->set_radio_freq) {
+        if (NULL == t->ops.set_radio_freq) {
                 tuner_warn ("tuner has no way to set radio frequency\n");
                 return;
         }
@@ -119,7 +123,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq)
                         freq = radio_range[1] * 16000;
         }
 
-        t->set_radio_freq(c, freq);
+        t->ops.set_radio_freq(c, freq);
 }
 
 static void set_freq(struct i2c_client *c, unsigned long freq)
@@ -174,6 +178,14 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 return;
         }
 
+        /* discard private data, in case set_type() was previously called */
+        if (t->ops.release)
+                t->ops.release(c);
+        else {
+                kfree(t->priv);
+                t->priv = NULL;
+        }
+
         switch (t->type) {
         case TUNER_MT2032:
                 microtune_init(c);
@@ -189,6 +201,16 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 }
                 t->mode_mask = T_RADIO;
                 break;
+#ifdef CONFIG_TUNER_TEA5761
+        case TUNER_TEA5761:
+                if (tea5761_tuner_init(c) == EINVAL) {
+                        t->type = TUNER_ABSENT;
+                        t->mode_mask = T_UNINITIALIZED;
+                        return;
+                }
+                t->mode_mask = T_RADIO;
+                break;
+#endif
         case TUNER_PHILIPS_FMD1216ME_MK3:
                 buffer[0] = 0x0b;
                 buffer[1] = 0xdc;
@@ -408,11 +430,11 @@ static void tuner_status(struct i2c_client *client)
         tuner_info("Standard:        0x%08lx\n", (unsigned long)t->std);
         if (t->mode != V4L2_TUNER_RADIO)
                return;
-        if (t->has_signal) {
-                tuner_info("Signal strength: %d\n", t->has_signal(client));
+        if (t->ops.has_signal) {
+                tuner_info("Signal strength: %d\n", t->ops.has_signal(client));
         }
-        if (t->is_stereo) {
-                tuner_info("Stereo:          %s\n", t->is_stereo(client) ? "yes" : "no");
+        if (t->ops.is_stereo) {
+                tuner_info("Stereo:          %s\n", t->ops.is_stereo(client) ? "yes" : "no");
         }
 }
 
@@ -437,10 +459,9 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         memcpy(&t->i2c, &client_template, sizeof(struct i2c_client));
         i2c_set_clientdata(&t->i2c, t);
         t->type = UNSET;
-        t->radio_if2 = 10700 * 1000;    /* 10.7MHz - FM radio */
         t->audmode = V4L2_TUNER_MODE_STEREO;
         t->mode_mask = T_UNINITIALIZED;
-        t->tuner_status = tuner_status;
+        t->ops.tuner_status = tuner_status;
 
         if (show_i2c) {
                 unsigned char buffer[16];
@@ -460,6 +481,19 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         /* autodetection code based on the i2c addr */
         if (!no_autodetect) {
                 switch (addr) {
+#ifdef CONFIG_TUNER_TEA5761
+                case 0x10:
+                        if (tea5761_autodetection(&t->i2c) != EINVAL) {
+                                t->type = TUNER_TEA5761;
+                                t->mode_mask = T_RADIO;
+                                t->mode = T_STANDBY;
+                                t->radio_freq = 87.5 * 16000; /* Sets freq to FM range */
+                                default_mode_mask &= ~T_RADIO;
+
+                                goto register_client;
+                        }
+                        break;
+#endif
                 case 0x42:
                 case 0x43:
                 case 0x4a:
@@ -533,6 +567,11 @@ static int tuner_detach(struct i2c_client *client)
                 return err;
         }
 
+        if (t->ops.release)
+                t->ops.release(client);
+        else {
+                kfree(t->priv);
+        }
         kfree(t);
         return 0;
 }
@@ -553,8 +592,8 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode,
 
         if (check_mode(t, cmd) == EINVAL) {
                 t->mode = T_STANDBY;
-                if (t->standby)
-                        t->standby (client);
+                if (t->ops.standby)
+                        t->ops.standby (client);
                 return EINVAL;
         }
         return 0;
@@ -602,8 +641,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL)
                         return 0;
                 t->mode = T_STANDBY;
-                if (t->standby)
-                        t->standby (client);
+                if (t->ops.standby)
+                        t->ops.standby (client);
                 break;
 #ifdef CONFIG_VIDEO_V4L1
         case VIDIOCSAUDIO:
@@ -662,10 +701,10 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                                 return 0;
 
                         if (V4L2_TUNER_RADIO == t->mode) {
-                                if (t->has_signal)
-                                        vt->signal = t->has_signal(client);
-                                if (t->is_stereo) {
-                                        if (t->is_stereo(client))
+                                if (t->ops.has_signal)
+                                        vt->signal = t->ops.has_signal(client);
+                                if (t->ops.is_stereo) {
+                                        if (t->ops.is_stereo(client))
                                                 vt->flags |=
                                                     VIDEO_TUNER_STEREO_ON;
                                         else
@@ -693,8 +732,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         if (check_v4l2(t) == EINVAL)
                                 return 0;
 
-                        if (V4L2_TUNER_RADIO == t->mode && t->is_stereo)
-                                va->mode = t->is_stereo(client)
+                        if (V4L2_TUNER_RADIO == t->mode && t->ops.is_stereo)
+                                va->mode = t->ops.is_stereo(client)
                                     ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;
                         return 0;
                 }
@@ -759,8 +798,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         switch_v4l2();
 
                         tuner->type = t->mode;
-                        if (t->get_afc)
-                                tuner->afc=t->get_afc(client);
+                        if (t->ops.get_afc)
+                                tuner->afc=t->ops.get_afc(client);
                         if (t->mode == V4L2_TUNER_ANALOG_TV)
                                 tuner->capability |= V4L2_TUNER_CAP_NORM;
                         if (t->mode != V4L2_TUNER_RADIO) {
@@ -770,13 +809,13 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         }
 
                         /* radio mode */
-                        if (t->has_signal)
-                                tuner->signal = t->has_signal(client);
+                        if (t->ops.has_signal)
+                                tuner->signal = t->ops.has_signal(client);
 
                         tuner->rxsubchans =
                                 V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-                        if (t->is_stereo) {
-                                tuner->rxsubchans = t->is_stereo(client) ?
+                        if (t->ops.is_stereo) {
+                                tuner->rxsubchans = t->ops.is_stereo(client) ?
                                         V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO;
                         }
 
@@ -804,8 +843,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         break;
                 }
         case VIDIOC_LOG_STATUS:
-                if (t->tuner_status)
-                        t->tuner_status(client);
+                if (t->ops.tuner_status)
+                        t->ops.tuner_status(client);
                 break;
         }
 
diff --git a/drivers/media/video/tuner-driver.h b/drivers/media/video/tuner-driver.h
new file mode 100644
index 000000000000..0334a9125077
--- /dev/null
+++ b/drivers/media/video/tuner-driver.h
@@ -0,0 +1,107 @@
+/*
+    tuner-driver.h - interface for different tuners
+
+    Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
+    minor modifications by Ralph Metzler (rjkm@thp.uni-koeln.de)
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __TUNER_HW_H__
+#define __TUNER_HW_H__
+
+#include <linux/videodev2.h>
+#include <linux/i2c.h>
+
+extern unsigned const int tuner_count;
+
+struct tuner_operations {
+        void (*set_tv_freq)(struct i2c_client *c, unsigned int freq);
+        void (*set_radio_freq)(struct i2c_client *c, unsigned int freq);
+        int  (*has_signal)(struct i2c_client *c);
+        int  (*is_stereo)(struct i2c_client *c);
+        int  (*get_afc)(struct i2c_client *c);
+        void (*tuner_status)(struct i2c_client *c);
+        void (*standby)(struct i2c_client *c);
+        void (*release)(struct i2c_client *c);
+};
+
+struct tuner {
+        /* device */
+        struct i2c_client i2c;
+
+        unsigned int type;      /* chip type */
+
+        unsigned int mode;
+        unsigned int mode_mask; /* Combination of allowable modes */
+
+        unsigned int tv_freq;   /* keep track of the current settings */
+        unsigned int radio_freq;
+        u16          last_div;
+        unsigned int audmode;
+        v4l2_std_id  std;
+
+        int          using_v4l2;
+        void *priv;
+
+        /* used by tda9887 */
+        unsigned int       tda9887_config;
+
+        unsigned int config;
+        int (*tuner_callback) (void *dev, int command,int arg);
+
+        struct tuner_operations ops;
+};
+
+/* ------------------------------------------------------------------------ */
+
+extern int default_tuner_init(struct i2c_client *c);
+
+extern int tda9887_tuner_init(struct i2c_client *c);
+
+extern int microtune_init(struct i2c_client *c);
+
+extern int tda8290_init(struct i2c_client *c);
+extern int tda8290_probe(struct i2c_client *c);
+
+extern int tea5761_tuner_init(struct i2c_client *c);
+extern int tea5761_autodetection(struct i2c_client *c);
+
+extern int tea5767_autodetection(struct i2c_client *c);
+extern int tea5767_tuner_init(struct i2c_client *c);
+
+/* ------------------------------------------------------------------------ */
+
+#define tuner_warn(fmt, arg...) do {\
+        printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
+                        i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+#define tuner_info(fmt, arg...) do {\
+        printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
+                        i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+#define tuner_dbg(fmt, arg...) do {\
+        extern int tuner_debug; \
+        if (tuner_debug) \
+                printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
+                        i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+
+#endif /* __TUNER_HW_H__ */
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index c40b92ce1fad..2d57e8bc0db3 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -8,6 +8,8 @@
 #include <linux/videodev.h>
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
+#include <media/tuner-types.h>
+#include "tuner-driver.h"
 
 static int offset = 0;
 module_param(offset, int, 0664);
@@ -54,9 +56,9 @@ MODULE_PARM_DESC(offset,"Allows to specify an offset for tuner");
     sound 2          33.16  -      -
     NICAM            33.05  33.05  39.80
  */
-#define PHILIPS_MF_SET_BG       0x01 /* Bit 2 must be zero, Bit 3 is system output */
-#define PHILIPS_MF_SET_PAL_L    0x03 // France
-#define PHILIPS_MF_SET_PAL_L2   0x02 // L'
+#define PHILIPS_MF_SET_STD_BG   0x01 /* Bit 2 must be zero, Bit 3 is system output */
+#define PHILIPS_MF_SET_STD_L    0x03 /* Used on Secam France */
+#define PHILIPS_MF_SET_STD_LC   0x02 /* Used on SECAM L' */
 
 /* Control byte */
 
@@ -207,11 +209,11 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                 /* 0x04 -> ??? PAL others / SECAM others ??? */
                 cb &= ~0x03;
                 if (t->std & V4L2_STD_SECAM_L) //also valid for V4L2_STD_SECAM
-                        cb |= PHILIPS_MF_SET_PAL_L;
+                        cb |= PHILIPS_MF_SET_STD_L;
                 else if (t->std & V4L2_STD_SECAM_LC)
-                        cb |= PHILIPS_MF_SET_PAL_L2;
+                        cb |= PHILIPS_MF_SET_STD_LC;
                 else /* V4L2_STD_B|V4L2_STD_GH */
-                        cb |= PHILIPS_MF_SET_BG;
+                        cb |= PHILIPS_MF_SET_STD_BG;
                 break;
 
         case TUNER_TEMIC_4046FM5:
@@ -479,6 +481,13 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
                 tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
 }
 
+static struct tuner_operations simple_tuner_ops = {
+        .set_tv_freq    = default_set_tv_freq,
+        .set_radio_freq = default_set_radio_freq,
+        .has_signal     = tuner_signal,
+        .is_stereo      = tuner_stereo,
+};
+
 int default_tuner_init(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
@@ -487,11 +496,7 @@ int default_tuner_init(struct i2c_client *c)
                    t->type, tuners[t->type].name);
         strlcpy(c->name, tuners[t->type].name, sizeof(c->name));
 
-        t->set_tv_freq = default_set_tv_freq;
-        t->set_radio_freq = default_set_radio_freq;
-        t->has_signal = tuner_signal;
-        t->is_stereo = tuner_stereo;
-        t->standby = NULL;
+        memcpy(&t->ops, &simple_tuner_ops, sizeof(struct tuner_operations));
 
         return 0;
 }
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index 74c3e6f96f1a..417f642b4359 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -594,19 +594,19 @@ static struct tuner_params tuner_philips_pal_mk_params[] = {
         },
 };
 
-/* ------------ TUNER_PHILIPS_ATSC - Philips ATSC ------------ */
+/* ---- TUNER_PHILIPS_ATSC - Philips FCV1236D (ATSC/NTSC) ---- */
 
-static struct tuner_range tuner_philips_atsc_ranges[] = {
+static struct tuner_range tuner_philips_fcv1236d_ranges[] = {
         { 16 * 157.25 /*MHz*/, 0x8e, 0xa0, },
-        { 16 * 454.00 /*MHz*/, 0x8e, 0x90, },
+        { 16 * 451.25 /*MHz*/, 0x8e, 0x90, },
         { 16 * 999.99        , 0x8e, 0x30, },
 };
 
-static struct tuner_params tuner_philips_atsc_params[] = {
+static struct tuner_params tuner_philips_fcv1236d_params[] = {
         {
                 .type   = TUNER_PARAM_TYPE_NTSC,
-                .ranges = tuner_philips_atsc_ranges,
-                .count  = ARRAY_SIZE(tuner_philips_atsc_ranges),
+                .ranges = tuner_philips_fcv1236d_ranges,
+                .count  = ARRAY_SIZE(tuner_philips_fcv1236d_ranges),
         },
 };
 
@@ -1296,9 +1296,9 @@ struct tunertype tuners[] = {
                 .count  = ARRAY_SIZE(tuner_philips_pal_mk_params),
         },
         [TUNER_PHILIPS_ATSC] = { /* Philips ATSC */
-                .name   = "Philips 1236D ATSC/NTSC dual in",
-                .params = tuner_philips_atsc_params,
-                .count  = ARRAY_SIZE(tuner_philips_atsc_params),
+                .name   = "Philips FCV1236D ATSC/NTSC dual in",
+                .params = tuner_philips_fcv1236d_params,
+                .count  = ARRAY_SIZE(tuner_philips_fcv1236d_params),
         },
         [TUNER_PHILIPS_FM1236_MK3] = { /* Philips NTSC */
                 .name   = "Philips NTSC MK3 (FM1236MK3 or FM1236/F)",
@@ -1463,6 +1463,10 @@ struct tunertype tuners[] = {
                 .name   = "Philips TDA988[5,6,7] IF PLL Demodulator",
                 /* see tda9887.c for details */
         },
+        [TUNER_TEA5761] = { /* Philips RADIO */
+                .name   = "Philips TEA5761 FM Radio",
+                /* see tea5767.c for details */
+        },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index a1136da74ba8..fdc3def437b1 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -183,7 +183,7 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,        "Silicon TDA8275C1 8290 FM"},
         { TUNER_ABSENT,        "Thompson DTT757"},
         /* 80-89 */
-        { TUNER_ABSENT,        "Philips FQ1216LME MK3"},
+        { TUNER_PHILIPS_FM1216ME_MK3, "Philips FQ1216LME MK3"},
         { TUNER_LG_PAL_NEW_TAPC, "LG TAPC G701D"},
         { TUNER_LG_NTSC_NEW_TAPC, "LG TAPC H791F"},
         { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"},
@@ -490,7 +490,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         to indicate 4052 mux was removed in favor of using MSP
                         inputs directly. */
                         audioic = eeprom_data[i+2] & 0x7f;
-                        if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                        if (audioic < ARRAY_SIZE(audioIC))
                                 tvee->audio_processor = audioIC[audioic].id;
                         else
                                 tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
@@ -523,7 +523,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         to indicate 4052 mux was removed in favor of using MSP
                         inputs directly. */
                         audioic = eeprom_data[i+1] & 0x7f;
-                        if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                        if (audioic < ARRAY_SIZE(audioIC))
                                 tvee->audio_processor = audioIC[audioic].id;
                         else
                                 tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
@@ -678,7 +678,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                 tveeprom_info("audio processor is unknown (no idx)\n");
                 tvee->audio_processor=AUDIO_CHIP_UNKNOWN;
         } else {
-                if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                if (audioic < ARRAY_SIZE(audioIC))
                         tveeprom_info("audio processor is %s (idx %d)\n",
                                         audioIC[audioic].name,audioic);
                 else
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index d5ec05f56adf..e2f1c972754b 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -1006,7 +1006,7 @@ static int tvp5150_command(struct i2c_client *c,
                 {
                         struct v4l2_control *ctrl = arg;
                         u8 i, n;
-                        n = sizeof(tvp5150_qctrl) / sizeof(tvp5150_qctrl[0]);
+                        n = ARRAY_SIZE(tvp5150_qctrl);
                         for (i = 0; i < n; i++)
                                 if (ctrl->id == tvp5150_qctrl[i].id) {
                                         if (ctrl->value <
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index abe214619092..491505d6fdee 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -236,7 +236,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
         input_dev->name = "Konicawc snapshot button";
         input_dev->phys = cam->input_physname;
         usb_to_input_id(dev, &input_dev->id);
-        input_dev->cdev.dev = &dev->dev;
+        input_dev->dev.parent = &dev->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY);
         input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index ec0ff2247f06..dd1a6d6bbc9e 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -100,7 +100,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
         input_dev->name = "QCM button";
         input_dev->phys = cam->input_physname;
         usb_to_input_id(dev, &input_dev->id);
-        input_dev->cdev.dev = &dev->dev;
+        input_dev->dev.parent = &dev->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY);
         input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
@@ -439,7 +439,7 @@ static int qcm_sensor_init(struct uvd *uvd)
         int ret;
         int i;
 
-        for (i=0; i < sizeof(regval_table)/sizeof(regval_table[0]) ; i++) {
+        for (i=0; i < ARRAY_SIZE(regval_table) ; i++) {
                 CHECK_RET(ret, qcm_stv_setb(uvd->dev,
                                         regval_table[i].reg,
                                         regval_table[i].val));
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 982b115193f8..2d9c0dd3b733 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -42,7 +42,6 @@
 #include <linux/usb.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
-#include <linux/proc_fs.h>
 #include <linux/mutex.h>
 #include "usbvideo.h"
 
@@ -417,11 +416,6 @@ struct vicam_camera {
         u8 open_count;
         u8 bulkEndpoint;
         int needsDummyRead;
-
-#if defined(CONFIG_VIDEO_PROC_FS)
-        struct proc_dir_entry *proc_dir;
-#endif
-
 };
 
 static int vicam_probe( struct usb_interface *intf, const struct usb_device_id *id);
@@ -1065,175 +1059,6 @@ vicam_mmap(struct file *file, struct vm_area_struct *vma)
         return 0;
 }
 
-#if defined(CONFIG_VIDEO_PROC_FS)
-
-static struct proc_dir_entry *vicam_proc_root = NULL;
-
-static int vicam_read_helper(char *page, char **start, off_t off,
-                                int count, int *eof, int value)
-{
-        char *out = page;
-        int len;
-
-        out += sprintf(out, "%d",value);
-
-        len = out - page;
-        len -= off;
-        if (len < count) {
-                *eof = 1;
-                if (len <= 0)
-                        return 0;
-        } else
-                len = count;
-
-        *start = page + off;
-        return len;
-}
-
-static int vicam_read_proc_shutter(char *page, char **start, off_t off,
-                                int count, int *eof, void *data)
-{
-        return vicam_read_helper(page,start,off,count,eof,
-                                ((struct vicam_camera *)data)->shutter_speed);
-}
-
-static int vicam_read_proc_gain(char *page, char **start, off_t off,
-                                int count, int *eof, void *data)
-{
-        return vicam_read_helper(page,start,off,count,eof,
-                                ((struct vicam_camera *)data)->gain);
-}
-
-static int
-vicam_write_proc_shutter(struct file *file, const char *buffer,
-                         unsigned long count, void *data)
-{
-        u16 stmp;
-        char kbuf[8];
-        struct vicam_camera *cam = (struct vicam_camera *) data;
-
-        if (count > 6)
-                return -EINVAL;
-
-        if (copy_from_user(kbuf, buffer, count))
-                return -EFAULT;
-
-        stmp = (u16) simple_strtoul(kbuf, NULL, 10);
-        if (stmp < 4 || stmp > 32000)
-                return -EINVAL;
-
-        cam->shutter_speed = stmp;
-
-        return count;
-}
-
-static int
-vicam_write_proc_gain(struct file *file, const char *buffer,
-                      unsigned long count, void *data)
-{
-        u16 gtmp;
-        char kbuf[8];
-
-        struct vicam_camera *cam = (struct vicam_camera *) data;
-
-        if (count > 4)
-                return -EINVAL;
-
-        if (copy_from_user(kbuf, buffer, count))
-                return -EFAULT;
-
-        gtmp = (u16) simple_strtoul(kbuf, NULL, 10);
-        if (gtmp > 255)
-                return -EINVAL;
-        cam->gain = gtmp;
-
-        return count;
-}
-
-static void
-vicam_create_proc_root(void)
-{
-        vicam_proc_root = proc_mkdir("video/vicam", NULL);
-
-        if (vicam_proc_root)
-                vicam_proc_root->owner = THIS_MODULE;
-        else
-                printk(KERN_ERR
-                       "could not create /proc entry for vicam!");
-}
-
-static void
-vicam_destroy_proc_root(void)
-{
-        if (vicam_proc_root)
-                remove_proc_entry("video/vicam", 0);
-}
-
-static void
-vicam_create_proc_entry(struct vicam_camera *cam)
-{
-        char name[64];
-        struct proc_dir_entry *ent;
-
-        DBG(KERN_INFO "vicam: creating proc entry\n");
-
-        if (!vicam_proc_root || !cam) {
-                printk(KERN_INFO
-                       "vicam: could not create proc entry, %s pointer is null.\n",
-                       (!cam ? "camera" : "root"));
-                return;
-        }
-
-        sprintf(name, "video%d", cam->vdev.minor);
-
-        cam->proc_dir = proc_mkdir(name, vicam_proc_root);
-
-        if ( !cam->proc_dir )
-                return; // FIXME: We should probably return an error here
-
-        ent = create_proc_entry("shutter", S_IFREG | S_IRUGO | S_IWUSR,
-                                cam->proc_dir);
-        if (ent) {
-                ent->data = cam;
-                ent->read_proc = vicam_read_proc_shutter;
-                ent->write_proc = vicam_write_proc_shutter;
-                ent->size = 64;
-        }
-
-        ent = create_proc_entry("gain", S_IFREG | S_IRUGO | S_IWUSR,
-                                cam->proc_dir);
-        if (ent) {
-                ent->data = cam;
-                ent->read_proc = vicam_read_proc_gain;
-                ent->write_proc = vicam_write_proc_gain;
-                ent->size = 64;
-        }
-}
-
-static void
-vicam_destroy_proc_entry(void *ptr)
-{
-        struct vicam_camera *cam = (struct vicam_camera *) ptr;
-        char name[16];
-
-        if ( !cam->proc_dir )
-                return;
-
-        sprintf(name, "video%d", cam->vdev.minor);
-        remove_proc_entry("shutter", cam->proc_dir);
-        remove_proc_entry("gain", cam->proc_dir);
-        remove_proc_entry(name,vicam_proc_root);
-        cam->proc_dir = NULL;
-
-}
-
-#else
-static inline void vicam_create_proc_root(void) { }
-static inline void vicam_destroy_proc_root(void) { }
-static inline void vicam_create_proc_entry(struct vicam_camera *cam) { }
-static inline void vicam_destroy_proc_entry(void *ptr) { }
-#endif
-
 static const struct file_operations vicam_fops = {
         .owner          = THIS_MODULE,
         .open           = vicam_open,
@@ -1330,8 +1155,6 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
                 return -EIO;
         }
 
-        vicam_create_proc_entry(cam);
-
         printk(KERN_INFO "ViCam webcam driver now controlling video device %d\n",cam->vdev.minor);
 
         usb_set_intfdata (intf, cam);
@@ -1363,8 +1186,6 @@ vicam_disconnect(struct usb_interface *intf)
 
         cam->udev = NULL;
 
-        vicam_destroy_proc_entry(cam);
-
         /* the only thing left to do is synchronize with
          * our close/release function on who should release
          * the camera memory. if there are any users using the
@@ -1390,7 +1211,6 @@ usb_vicam_init(void)
 {
         int retval;
         DBG(KERN_INFO "ViCam-based WebCam driver startup\n");
-        vicam_create_proc_root();
         retval = usb_register(&vicam_driver);
         if (retval)
                 printk(KERN_WARNING "usb_register failed!\n");
@@ -1404,7 +1224,6 @@ usb_vicam_exit(void)
                "ViCam-based WebCam driver shutdown\n");
 
         usb_deregister(&vicam_driver);
-        vicam_destroy_proc_root();
 }
 
 module_init(usb_vicam_init);
diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index 51ab265d566a..380564cd3317 100644
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -79,7 +79,7 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                 .Interface     = -1,
                 .Codec         = CODEC_SAA7113,
                 .VideoChannels = 2,
-                .VideoNorm     = V4L2_STD_PAL,
+                .VideoNorm     = V4L2_STD_NTSC,
                 .AudioChannels = 1,
                 .Radio         = 0,
                 .vbi           = 1,
@@ -311,8 +311,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                 .vbi           = 1,
                 .Tuner         = 1,
                 .TunerType     = TUNER_PHILIPS_SECAM,
-                .X_Offset      = -1,
-                .Y_Offset      = -1,
+                .X_Offset      = 0x80,
+                .Y_Offset      = 0x16,
                 .ModelString   = "Hauppauge WinTV USB (PAL/SECAM L)",
         },
         [HPG_WINTV_PAL_D_K] = {
@@ -586,7 +586,7 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                 .Radio         = 0,
                 .vbi           = 1,
                 .Tuner         = 1,
-                .TunerType     = TUNER_PHILIPS_PAL,
+                .TunerType     = TUNER_LG_PAL_NEW_TAPC,
                 .X_Offset      = 0,
                 .Y_Offset      = 3,
                 .Dvi_yuv_override = 1,
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 7df071eb0a3b..5b1e346df206 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -1742,7 +1742,7 @@ static int usbvision_set_video_format(struct usb_usbvision *usbvision, int forma
                 format = ISOC_MODE_YUV420;
         }
         value[0] = 0x0A;  //TODO: See the effect of the filter
-        value[1] = format;
+        value[1] = format; // Sets the VO_MODE register which follows FILT_CONT
         rc = usb_control_msg(usbvision->dev, usb_sndctrlpipe(usbvision->dev, 1),
                              USBVISION_OP_CODE,
                              USB_DIR_OUT | USB_TYPE_VENDOR |
@@ -1831,10 +1831,10 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width,
                 frameRate = FRAMERATE_MAX;
         }
 
-        if (usbvision->tvnorm->id & V4L2_STD_625_50) {
+        if (usbvision->tvnormId & V4L2_STD_625_50) {
                 frameDrop = frameRate * 32 / 25 - 1;
         }
-        else if (usbvision->tvnorm->id & V4L2_STD_525_60) {
+        else if (usbvision->tvnormId & V4L2_STD_525_60) {
                 frameDrop = frameRate * 32 / 30 - 1;
         }
 
@@ -2067,7 +2067,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
         }
 
 
-        if (usbvision->tvnorm->id & V4L2_STD_PAL) {
+        if (usbvision->tvnormId & V4L2_STD_PAL) {
                 value[0] = 0xC0;
                 value[1] = 0x02;        //0x02C0 -> 704 Input video line length
                 value[2] = 0x20;
@@ -2076,7 +2076,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
                 value[5] = 0x00;        //0x0060 -> 96 Input video h offset
                 value[6] = 0x16;
                 value[7] = 0x00;        //0x0016 -> 22 Input video v offset
-        } else if (usbvision->tvnorm->id & V4L2_STD_SECAM) {
+        } else if (usbvision->tvnormId & V4L2_STD_SECAM) {
                 value[0] = 0xC0;
                 value[1] = 0x02;        //0x02C0 -> 704 Input video line length
                 value[2] = 0x20;
@@ -2537,7 +2537,9 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision)
 
 int usbvision_muxsel(struct usb_usbvision *usbvision, int channel)
 {
-        int mode[4];
+        /* inputs #0 and #3 are constant for every SAA711x. */
+        /* inputs #1 and #2 are variable for SAA7111 and SAA7113 */
+        int mode[4]= {SAA7115_COMPOSITE0, 0, 0, SAA7115_COMPOSITE3};
         int audio[]= {1, 0, 0, 0};
         struct v4l2_routing route;
         //channel 0 is TV with audiochannel 1 (tuner mono)
@@ -2547,10 +2549,6 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel)
 
         RESTRICT_TO_RANGE(channel, 0, usbvision->video_inputs);
         usbvision->ctl_input = channel;
-          route.input = SAA7115_COMPOSITE1;
-          route.output = 0;
-          call_i2c_clients(usbvision, VIDIOC_INT_S_VIDEO_ROUTING,&route);
-          call_i2c_clients(usbvision, VIDIOC_S_INPUT, &usbvision->ctl_input);
 
         // set the new channel
         // Regular USB TV Tuners -> channel: 0 = Television, 1 = Composite, 2 = S-Video
@@ -2558,28 +2556,27 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel)
 
         switch (usbvision_device_data[usbvision->DevModel].Codec) {
                 case CODEC_SAA7113:
-                        if (SwitchSVideoInput) { // To handle problems with S-Video Input for some devices.  Use SwitchSVideoInput parameter when loading the module.
-                                mode[2] = 1;
+                        mode[1] = SAA7115_COMPOSITE2;
+                        if (SwitchSVideoInput) {
+                                /* To handle problems with S-Video Input for
+                                 * some devices.  Use SwitchSVideoInput
+                                 * parameter when loading the module.*/
+                                mode[2] = SAA7115_COMPOSITE1;
                         }
                         else {
-                                mode[2] = 7;
-                        }
-                        if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
-                                mode[0] = 0; mode[1] = 2; mode[3] = 3;  // Special for four input devices
-                        }
-                        else {
-                                mode[0] = 0; mode[1] = 2; //modes for regular saa7113 devices
+                                mode[2] = SAA7115_SVIDEO1;
                         }
                         break;
                 case CODEC_SAA7111:
-                        mode[0] = 0; mode[1] = 1; mode[2] = 7; //modes for saa7111
-                        break;
                 default:
-                        mode[0] = 0; mode[1] = 1; mode[2] = 7; //default modes
+                        /* modes for saa7111 */
+                        mode[1] = SAA7115_COMPOSITE1;
+                        mode[2] = SAA7115_SVIDEO1;
+                        break;
         }
         route.input = mode[channel];
+        route.output = 0;
         call_i2c_clients(usbvision, VIDIOC_INT_S_VIDEO_ROUTING,&route);
-        usbvision->channel = channel;
         usbvision_set_audio(usbvision, audio[channel]);
         return 0;
 }
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index aa3258bbb4af..868b6886fe7f 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -36,7 +36,8 @@
  *     - use submit_urb for all setup packets
  *     - Fix memory settings for nt1004. It is 4 times as big as the
  *       nt1003 memory.
- *     - Add audio on endpoint 3 for nt1004 chip.  Seems impossible, needs a codec interface.  Which one?
+ *     - Add audio on endpoint 3 for nt1004 chip.
+ *         Seems impossible, needs a codec interface.  Which one?
  *     - Clean up the driver.
  *     - optimization for performance.
  *     - Add Videotext capability (VBI).  Working on it.....
@@ -77,7 +78,8 @@
 #include "usbvision.h"
 #include "usbvision-cards.h"
 
-#define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>, Dwaine Garden <DwaineGarden@rogers.com>"
+#define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>,\
+ Dwaine Garden <DwaineGarden@rogers.com>"
 #define DRIVER_NAME "usbvision"
 #define DRIVER_ALIAS "USBVision"
 #define DRIVER_DESC "USBVision USB Video Device Driver for Linux"
@@ -85,20 +87,25 @@
 #define USBVISION_DRIVER_VERSION_MAJOR 0
 #define USBVISION_DRIVER_VERSION_MINOR 9
 #define USBVISION_DRIVER_VERSION_PATCHLEVEL 9
-#define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,USBVISION_DRIVER_VERSION_MINOR,USBVISION_DRIVER_VERSION_PATCHLEVEL)
-#define USBVISION_VERSION_STRING __stringify(USBVISION_DRIVER_VERSION_MAJOR) "." __stringify(USBVISION_DRIVER_VERSION_MINOR) "." __stringify(USBVISION_DRIVER_VERSION_PATCHLEVEL)
+#define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,\
+USBVISION_DRIVER_VERSION_MINOR,\
+USBVISION_DRIVER_VERSION_PATCHLEVEL)
+#define USBVISION_VERSION_STRING __stringify(USBVISION_DRIVER_VERSION_MAJOR)\
+ "." __stringify(USBVISION_DRIVER_VERSION_MINOR)\
+ "." __stringify(USBVISION_DRIVER_VERSION_PATCHLEVEL)
 
 #define ENABLE_HEXDUMP  0       /* Enable if you need it */
 
 
 #ifdef USBVISION_DEBUG
         #define PDEBUG(level, fmt, args...) \
-                if (video_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
+                if (video_debug & (level)) \
+                        info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ ,\
+                                ## args)
 #else
         #define PDEBUG(level, fmt, args...) do {} while(0)
 #endif
 
-#define DBG_IOCTL       1<<0
 #define DBG_IO          1<<1
 #define DBG_PROBE       1<<2
 #define DBG_MMAP        1<<3
@@ -108,7 +115,8 @@
 #define goto2next(str)  while(*str!=' ') str++; while(*str==' ') str++;
 
 
-static int usbvision_nr = 0;                    // sequential number of usbvision device
+/* sequential number of usbvision device */
+static int usbvision_nr = 0;
 
 static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = {
         { 1, 1,  8, V4L2_PIX_FMT_GREY    , "GREY" },
@@ -121,55 +129,32 @@ static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = {
         { 1, 2, 16, V4L2_PIX_FMT_YUV422P , "YUV422P" }
 };
 
-/* supported tv norms */
-static struct usbvision_tvnorm tvnorms[] = {
-        {
-                .name = "PAL",
-                .id = V4L2_STD_PAL,
-        }, {
-                .name = "NTSC",
-                .id = V4L2_STD_NTSC,
-        }, {
-                 .name = "SECAM",
-                 .id = V4L2_STD_SECAM,
-        }, {
-                .name = "PAL-M",
-                .id = V4L2_STD_PAL_M,
-        }
-};
-
-#define TVNORMS ARRAY_SIZE(tvnorms)
-
-// Function prototypes
+/* Function prototypes */
 static void usbvision_release(struct usb_usbvision *usbvision);
 
-// Default initalization of device driver parameters
-static int isocMode = ISOC_MODE_COMPRESS;               // Set the default format for ISOC endpoint
-static int video_debug = 0;                             // Set the default Debug Mode of the device driver
-static int PowerOnAtOpen = 1;                           // Set the default device to power on at startup
-static int video_nr = -1;                               // Sequential Number of Video Device
-static int radio_nr = -1;                               // Sequential Number of Radio Device
-static int vbi_nr = -1;                                 // Sequential Number of VBI Device
-
-// Grab parameters for the device driver
-
-#if defined(module_param)                               // Showing parameters under SYSFS
+/* Default initalization of device driver parameters */
+/* Set the default format for ISOC endpoint */
+static int isocMode = ISOC_MODE_COMPRESS;
+/* Set the default Debug Mode of the device driver */
+static int video_debug = 0;
+/* Set the default device to power on at startup */
+static int PowerOnAtOpen = 1;
+/* Sequential Number of Video Device */
+static int video_nr = -1;
+/* Sequential Number of Radio Device */
+static int radio_nr = -1;
+/* Sequential Number of VBI Device */
+static int vbi_nr = -1;
+
+/* Grab parameters for the device driver */
+
+/* Showing parameters under SYSFS */
 module_param(isocMode, int, 0444);
 module_param(video_debug, int, 0444);
 module_param(PowerOnAtOpen, int, 0444);
 module_param(video_nr, int, 0444);
 module_param(radio_nr, int, 0444);
 module_param(vbi_nr, int, 0444);
-#else                                                   // Old Style
-MODULE_PARAM(isocMode, "i");
-MODULE_PARM(video_debug, "i");                          // Grab the Debug Mode of the device driver
-MODULE_PARM(adjustCompression, "i");                    // Grab the compression to be adaptive
-MODULE_PARM(PowerOnAtOpen, "i");                        // Grab the device to power on at startup
-MODULE_PARM(SwitchSVideoInput, "i");                    // To help people with Black and White output with using s-video input.  Some cables and input device are wired differently.
-MODULE_PARM(video_nr, "i");                             // video_nr option allows to specify a certain /dev/videoX device (like /dev/video0 or /dev/video1 ...)
-MODULE_PARM(radio_nr, "i");                             // radio_nr option allows to specify a certain /dev/radioX device (like /dev/radio0 or /dev/radio1 ...)
-MODULE_PARM(vbi_nr, "i");                               // vbi_nr option allows to specify a certain /dev/vbiX device (like /dev/vbi0 or /dev/vbi1 ...)
-#endif
 
 MODULE_PARM_DESC(isocMode, " Set the default format for ISOC endpoint.  Default: 0x60 (Compression On)");
 MODULE_PARM_DESC(video_debug, " Set the default Debug Mode of the device driver.  Default: 0 (Off)");
@@ -187,19 +172,21 @@ MODULE_VERSION(USBVISION_VERSION_STRING);
 MODULE_ALIAS(DRIVER_ALIAS);
 
 
-/****************************************************************************************/
-/* SYSFS Code - Copied from the stv680.c usb module.                                    */
-/* Device information is located at /sys/class/video4linux/video0                       */
-/* Device parameters information is located at /sys/module/usbvision                    */
-/* Device USB Information is located at /sys/bus/usb/drivers/USBVision Video Grabber    */
-/****************************************************************************************/
+/*****************************************************************************/
+/* SYSFS Code - Copied from the stv680.c usb module.                         */
+/* Device information is located at /sys/class/video4linux/video0            */
+/* Device parameters information is located at /sys/module/usbvision         */
+/* Device USB Information is located at                                      */
+/*   /sys/bus/usb/drivers/USBVision Video Grabber                            */
+/*****************************************************************************/
 
 
 #define YES_NO(x) ((x) ? "Yes" : "No")
 
 static inline struct usb_usbvision *cd_to_usbvision(struct class_device *cd)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         return video_get_drvdata(vdev);
 }
 
@@ -211,15 +198,18 @@ static CLASS_DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
 
 static ssize_t show_model(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
-        return sprintf(buf, "%s\n", usbvision_device_data[usbvision->DevModel].ModelString);
+        return sprintf(buf, "%s\n",
+                       usbvision_device_data[usbvision->DevModel].ModelString);
 }
 static CLASS_DEVICE_ATTR(model, S_IRUGO, show_model, NULL);
 
 static ssize_t show_hue(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_HUE;
@@ -232,7 +222,8 @@ static CLASS_DEVICE_ATTR(hue, S_IRUGO, show_hue, NULL);
 
 static ssize_t show_contrast(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_CONTRAST;
@@ -245,7 +236,8 @@ static CLASS_DEVICE_ATTR(contrast, S_IRUGO, show_contrast, NULL);
 
 static ssize_t show_brightness(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_BRIGHTNESS;
@@ -258,7 +250,8 @@ static CLASS_DEVICE_ATTR(brightness, S_IRUGO, show_brightness, NULL);
 
 static ssize_t show_saturation(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         struct v4l2_control ctrl;
         ctrl.id = V4L2_CID_SATURATION;
@@ -271,23 +264,28 @@ static CLASS_DEVICE_ATTR(saturation, S_IRUGO, show_saturation, NULL);
 
 static ssize_t show_streaming(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
-        return sprintf(buf, "%s\n", YES_NO(usbvision->streaming==Stream_On?1:0));
+        return sprintf(buf, "%s\n",
+                       YES_NO(usbvision->streaming==Stream_On?1:0));
 }
 static CLASS_DEVICE_ATTR(streaming, S_IRUGO, show_streaming, NULL);
 
 static ssize_t show_compression(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
-        return sprintf(buf, "%s\n", YES_NO(usbvision->isocMode==ISOC_MODE_COMPRESS));
+        return sprintf(buf, "%s\n",
+                       YES_NO(usbvision->isocMode==ISOC_MODE_COMPRESS));
 }
 static CLASS_DEVICE_ATTR(compression, S_IRUGO, show_compression, NULL);
 
 static ssize_t show_device_bridge(struct class_device *cd, char *buf)
 {
-        struct video_device *vdev = container_of(cd, struct video_device, class_dev);
+        struct video_device *vdev =
+                container_of(cd, struct video_device, class_dev);
         struct usb_usbvision *usbvision = video_get_drvdata(vdev);
         return sprintf(buf, "%d\n", usbvision->bridgeType);
 }
@@ -376,7 +374,8 @@ static void usbvision_remove_sysfs(struct video_device *vdev)
 static int usbvision_v4l2_open(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "open");
@@ -390,7 +389,8 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
                 /* Allocate memory for the scratch ring buffer */
                 errCode = usbvision_scratch_alloc(usbvision);
                 if (isocMode==ISOC_MODE_COMPRESS) {
-                        /* Allocate intermediate decompression buffers only if needed */
+                        /* Allocate intermediate decompression buffers
+                           only if needed */
                         errCode = usbvision_decompress_alloc(usbvision);
                 }
                 if (errCode) {
@@ -421,11 +421,10 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
                 if (!errCode) {
                         usbvision_begin_streaming(usbvision);
                         errCode = usbvision_init_isoc(usbvision);
-                        /* device needs to be initialized before isoc transfer */
+                        /* device must be initialized before isoc transfer */
                         usbvision_muxsel(usbvision,0);
                         usbvision->user++;
-                }
-                else {
+                } else {
                         if (PowerOnAtOpen) {
                                 usbvision_i2c_unregister(usbvision);
                                 usbvision_power_off(usbvision);
@@ -456,7 +455,8 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
 static int usbvision_v4l2_close(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
         PDEBUG(DBG_IO, "close");
         down(&usbvision->lock);
@@ -473,7 +473,8 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
         usbvision->user--;
 
         if (PowerOnAtOpen) {
-                /* power off in a little while to avoid off/on every close/open short sequences */
+                /* power off in a little while
+                   to avoid off/on every close/open short sequences */
                 usbvision_set_powerOffTimer(usbvision);
                 usbvision->initialized = 0;
         }
@@ -498,583 +499,612 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
  * This is part of Video 4 Linux API. The procedure handles ioctl() calls.
  *
  */
-static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
-                                 unsigned int cmd, void *arg)
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int vidioc_g_register (struct file *file, void *priv,
+                                struct v4l2_register *reg)
 {
         struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
-
-        if (!USBVISION_IS_OPERATIONAL(usbvision))
-                return -EFAULT;
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int errCode;
 
-        switch (cmd) {
+        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
+                return -EINVAL;
+        /* NT100x has a 8-bit register space */
+        errCode = usbvision_read_reg(usbvision, reg->reg&0xff);
+        if (errCode < 0) {
+                err("%s: VIDIOC_DBG_G_REGISTER failed: error %d",
+                    __FUNCTION__, errCode);
+                return errCode;
+        }
+        return 0;
+}
 
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-                /* ioctls to allow direct acces to the NT100x registers */
-                case VIDIOC_DBG_G_REGISTER:
-                case VIDIOC_DBG_S_REGISTER:
-                {
-                        struct v4l2_register *reg = arg;
-                        int errCode;
-
-                        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
-                                return -EINVAL;
-                        if (!capable(CAP_SYS_ADMIN))
-                                return -EPERM;
-                        /* NT100x has a 8-bit register space */
-                        if (cmd == VIDIOC_DBG_G_REGISTER)
-                                errCode = usbvision_read_reg(usbvision, reg->reg&0xff);
-                        else
-                                errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
-                        if (errCode < 0) {
-                                err("%s: VIDIOC_DBG_%c_REGISTER failed: error %d", __FUNCTION__,
-                                    cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S', errCode);
-                                return errCode;
-                        }
-                        if (cmd == VIDIOC_DBG_S_REGISTER)
-                                reg->val = (u8)errCode;
+static int vidioc_s_register (struct file *file, void *priv,
+                                struct v4l2_register *reg)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int errCode;
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_DBG_%c_REGISTER reg=0x%02X, value=0x%02X",
-                               cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S',
-                               (unsigned int)reg->reg, (unsigned int)reg->val);
-                        return 0;
-                }
+        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
+                return -EINVAL;
+        /* NT100x has a 8-bit register space */
+        reg->val = (u8)usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
+        if (reg->val < 0) {
+                err("%s: VIDIOC_DBG_S_REGISTER failed: error %d",
+                    __FUNCTION__, errCode);
+                return errCode;
+        }
+        return 0;
+}
 #endif
-                case VIDIOC_QUERYCAP:
-                {
-                        struct v4l2_capability *vc=arg;
-
-                        memset(vc, 0, sizeof(*vc));
-                        strlcpy(vc->driver, "USBVision", sizeof(vc->driver));
-                        strlcpy(vc->card, usbvision_device_data[usbvision->DevModel].ModelString,
-                                sizeof(vc->card));
-                        strlcpy(vc->bus_info, usbvision->dev->dev.bus_id,
-                                sizeof(vc->bus_info));
-                        vc->version = USBVISION_DRIVER_VERSION;
-                        vc->capabilities = V4L2_CAP_VIDEO_CAPTURE |
-                                V4L2_CAP_AUDIO |
-                                V4L2_CAP_READWRITE |
-                                V4L2_CAP_STREAMING |
-                                (usbvision->have_tuner ? V4L2_CAP_TUNER : 0);
-                        PDEBUG(DBG_IOCTL, "VIDIOC_QUERYCAP");
-                        return 0;
-                }
-                case VIDIOC_ENUMINPUT:
-                {
-                        struct v4l2_input *vi = arg;
-                        int chan;
-
-                        if ((vi->index >= usbvision->video_inputs) || (vi->index < 0) )
-                                return -EINVAL;
-                        if (usbvision->have_tuner) {
-                                chan = vi->index;
-                        }
-                        else {
-                                chan = vi->index + 1; //skip Television string
-                        }
-                        switch(chan) {
-                                case 0:
-                                        if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
-                                                strcpy(vi->name, "White Video Input");
-                                        }
-                                        else {
-                                                strcpy(vi->name, "Television");
-                                                vi->type = V4L2_INPUT_TYPE_TUNER;
-                                                vi->audioset = 1;
-                                                vi->tuner = chan;
-                                                vi->std = V4L2_STD_PAL | V4L2_STD_NTSC | V4L2_STD_SECAM;
-                                        }
-                                        break;
-                                case 1:
-                                        vi->type = V4L2_INPUT_TYPE_CAMERA;
-                                        if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
-                                                strcpy(vi->name, "Green Video Input");
-                                        }
-                                        else {
-                                                strcpy(vi->name, "Composite Video Input");
-                                        }
-                                        vi->std = V4L2_STD_PAL;
-                                        break;
-                                case 2:
-                                        vi->type = V4L2_INPUT_TYPE_CAMERA;
-                                        if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
-                                                strcpy(vi->name, "Yellow Video Input");
-                                        }
-                                        else {
-                                        strcpy(vi->name, "S-Video Input");
-                                        }
-                                        vi->std = V4L2_STD_PAL;
-                                        break;
-                                case 3:
-                                        vi->type = V4L2_INPUT_TYPE_CAMERA;
-                                        strcpy(vi->name, "Red Video Input");
-                                        vi->std = V4L2_STD_PAL;
-                                        break;
-                        }
-                        PDEBUG(DBG_IOCTL, "VIDIOC_ENUMINPUT name=%s:%d tuners=%d type=%d norm=%x",
-                               vi->name, vi->index, vi->tuner,vi->type,(int)vi->std);
-                        return 0;
-                }
-                case VIDIOC_ENUMSTD:
-                {
-                        struct v4l2_standard *e = arg;
-                        unsigned int i;
-                        int ret;
-
-                        i = e->index;
-                        if (i >= TVNORMS)
-                                return -EINVAL;
-                        ret = v4l2_video_std_construct(e, tvnorms[e->index].id,
-                                                       tvnorms[e->index].name);
-                        e->index = i;
-                        if (ret < 0)
-                                return ret;
-                        return 0;
+
+static int vidioc_querycap (struct file *file, void  *priv,
+                                        struct v4l2_capability *vc)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+
+        strlcpy(vc->driver, "USBVision", sizeof(vc->driver));
+        strlcpy(vc->card,
+                usbvision_device_data[usbvision->DevModel].ModelString,
+                sizeof(vc->card));
+        strlcpy(vc->bus_info, usbvision->dev->dev.bus_id,
+                sizeof(vc->bus_info));
+        vc->version = USBVISION_DRIVER_VERSION;
+        vc->capabilities = V4L2_CAP_VIDEO_CAPTURE |
+                V4L2_CAP_AUDIO |
+                V4L2_CAP_READWRITE |
+                V4L2_CAP_STREAMING |
+                (usbvision->have_tuner ? V4L2_CAP_TUNER : 0);
+        return 0;
+}
+
+static int vidioc_enum_input (struct file *file, void *priv,
+                                struct v4l2_input *vi)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int chan;
+
+        if ((vi->index >= usbvision->video_inputs) || (vi->index < 0) )
+                return -EINVAL;
+        if (usbvision->have_tuner) {
+                chan = vi->index;
+        } else {
+                chan = vi->index + 1; /*skip Television string*/
+        }
+        /* Determine the requested input characteristics
+           specific for each usbvision card model */
+        switch(chan) {
+        case 0:
+                if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
+                        strcpy(vi->name, "White Video Input");
+                } else {
+                        strcpy(vi->name, "Television");
+                        vi->type = V4L2_INPUT_TYPE_TUNER;
+                        vi->audioset = 1;
+                        vi->tuner = chan;
+                        vi->std = USBVISION_NORMS;
                 }
-                case VIDIOC_G_INPUT:
-                {
-                        int *input = arg;
-                        *input = usbvision->ctl_input;
-                        return 0;
+                break;
+        case 1:
+                vi->type = V4L2_INPUT_TYPE_CAMERA;
+                if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
+                        strcpy(vi->name, "Green Video Input");
+                } else {
+                        strcpy(vi->name, "Composite Video Input");
                 }
-                case VIDIOC_S_INPUT:
-                {
-                        int *input = arg;
-                        if ((*input >= usbvision->video_inputs) || (*input < 0) )
-                                return -EINVAL;
-                        usbvision->ctl_input = *input;
-
-                        down(&usbvision->lock);
-                        usbvision_muxsel(usbvision, usbvision->ctl_input);
-                        usbvision_set_input(usbvision);
-                        usbvision_set_output(usbvision, usbvision->curwidth, usbvision->curheight);
-                        up(&usbvision->lock);
-                        return 0;
+                vi->std = V4L2_STD_PAL;
+                break;
+        case 2:
+                vi->type = V4L2_INPUT_TYPE_CAMERA;
+                if (usbvision_device_data[usbvision->DevModel].VideoChannels == 4) {
+                        strcpy(vi->name, "Yellow Video Input");
+                } else {
+                        strcpy(vi->name, "S-Video Input");
                 }
-                case VIDIOC_G_STD:
-                {
-                        v4l2_std_id *id = arg;
+                vi->std = V4L2_STD_PAL;
+                break;
+        case 3:
+                vi->type = V4L2_INPUT_TYPE_CAMERA;
+                strcpy(vi->name, "Red Video Input");
+                vi->std = V4L2_STD_PAL;
+                break;
+        }
+        return 0;
+}
 
-                        *id = usbvision->tvnorm->id;
+static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_G_STD std_id=%s", usbvision->tvnorm->name);
-                        return 0;
-                }
-                case VIDIOC_S_STD:
-                {
-                        v4l2_std_id *id = arg;
-                        unsigned int i;
-
-                        for (i = 0; i < TVNORMS; i++)
-                                if (*id == tvnorms[i].id)
-                                        break;
-                        if (i == TVNORMS)
-                                for (i = 0; i < TVNORMS; i++)
-                                        if (*id & tvnorms[i].id)
-                                                break;
-                        if (i == TVNORMS)
-                                return -EINVAL;
-
-                        down(&usbvision->lock);
-                        usbvision->tvnorm = &tvnorms[i];
-
-                        call_i2c_clients(usbvision, VIDIOC_S_STD,
-                                         &usbvision->tvnorm->id);
+        *input = usbvision->ctl_input;
+        return 0;
+}
 
-                        up(&usbvision->lock);
+static int vidioc_s_input (struct file *file, void *priv, unsigned int input)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_S_STD std_id=%s", usbvision->tvnorm->name);
-                        return 0;
-                }
-                case VIDIOC_G_TUNER:
-                {
-                        struct v4l2_tuner *vt = arg;
-
-                        if (!usbvision->have_tuner || vt->index)        // Only tuner 0
-                                return -EINVAL;
-                        strcpy(vt->name, "Television");
-                        /* Let clients fill in the remainder of this struct */
-                        call_i2c_clients(usbvision,VIDIOC_G_TUNER,vt);
-
-                        PDEBUG(DBG_IOCTL, "VIDIOC_G_TUNER signal=%x, afc=%x",vt->signal,vt->afc);
-                        return 0;
-                }
-                case VIDIOC_S_TUNER:
-                {
-                        struct v4l2_tuner *vt = arg;
-
-                        // Only no or one tuner for now
-                        if (!usbvision->have_tuner || vt->index)
-                                return -EINVAL;
-                        /* let clients handle this */
-                        call_i2c_clients(usbvision,VIDIOC_S_TUNER,vt);
-
-                        PDEBUG(DBG_IOCTL, "VIDIOC_S_TUNER");
-                        return 0;
-                }
-                case VIDIOC_G_FREQUENCY:
-                {
-                        struct v4l2_frequency *freq = arg;
-
-                        freq->tuner = 0; // Only one tuner
-                        freq->type = V4L2_TUNER_ANALOG_TV;
-                        freq->frequency = usbvision->freq;
-                        PDEBUG(DBG_IOCTL, "VIDIOC_G_FREQUENCY freq=0x%X", (unsigned)freq->frequency);
-                        return 0;
-                }
-                case VIDIOC_S_FREQUENCY:
-                {
-                        struct v4l2_frequency *freq = arg;
-
-                        // Only no or one tuner for now
-                        if (!usbvision->have_tuner || freq->tuner)
-                                return -EINVAL;
-
-                        usbvision->freq = freq->frequency;
-                        call_i2c_clients(usbvision, cmd, freq);
-                        PDEBUG(DBG_IOCTL, "VIDIOC_S_FREQUENCY freq=0x%X", (unsigned)freq->frequency);
-                        return 0;
-                }
-                case VIDIOC_G_AUDIO:
-                {
-                        struct v4l2_audio *v = arg;
-                        memset(v,0, sizeof(v));
-                        strcpy(v->name, "TV");
-                        PDEBUG(DBG_IOCTL, "VIDIOC_G_AUDIO");
-                        return 0;
-                }
-                case VIDIOC_S_AUDIO:
-                {
-                        struct v4l2_audio *v = arg;
-                        if(v->index) {
-                                return -EINVAL;
-                        }
-                        PDEBUG(DBG_IOCTL, "VIDIOC_S_AUDIO");
-                        return 0;
-                }
-                case VIDIOC_QUERYCTRL:
-                {
-                        struct v4l2_queryctrl *ctrl = arg;
-                        int id=ctrl->id;
+        if ((input >= usbvision->video_inputs) || (input < 0) )
+                return -EINVAL;
 
-                        memset(ctrl,0,sizeof(*ctrl));
-                        ctrl->id=id;
+        down(&usbvision->lock);
+        usbvision_muxsel(usbvision, input);
+        usbvision_set_input(usbvision);
+        usbvision_set_output(usbvision,
+                             usbvision->curwidth,
+                             usbvision->curheight);
+        up(&usbvision->lock);
+        return 0;
+}
 
-                        call_i2c_clients(usbvision, cmd, arg);
+static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        usbvision->tvnormId=*id;
 
-                        if (ctrl->type)
-                                return 0;
-                        else
-                                return -EINVAL;
+        down(&usbvision->lock);
+        call_i2c_clients(usbvision, VIDIOC_S_STD,
+                         &usbvision->tvnormId);
+        up(&usbvision->lock);
+        /* propagate the change to the decoder */
+        usbvision_muxsel(usbvision, usbvision->ctl_input);
 
-                        PDEBUG(DBG_IOCTL,"VIDIOC_QUERYCTRL id=%x value=%x",ctrl->id,ctrl->type);
-                }
-                case VIDIOC_G_CTRL:
-                {
-                        struct v4l2_control *ctrl = arg;
-                        call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);
-                        PDEBUG(DBG_IOCTL,"VIDIOC_G_CTRL id=%x value=%x",ctrl->id,ctrl->value);
-                        return 0;
-                }
-                case VIDIOC_S_CTRL:
-                {
-                        struct v4l2_control *ctrl = arg;
+        return 0;
+}
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_S_CTRL id=%x value=%x",ctrl->id,ctrl->value);
-                        call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl);
-                        return 0;
-                }
-                case VIDIOC_REQBUFS:
-                {
-                        struct v4l2_requestbuffers *vr = arg;
-                        int ret;
+static int vidioc_g_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *vt)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
-                        RESTRICT_TO_RANGE(vr->count,1,USBVISION_NUMFRAMES);
+        if (!usbvision->have_tuner || vt->index)        // Only tuner 0
+                return -EINVAL;
+        if(usbvision->radio) {
+                strcpy(vt->name, "Radio");
+                vt->type = V4L2_TUNER_RADIO;
+        } else {
+                strcpy(vt->name, "Television");
+        }
+        /* Let clients fill in the remainder of this struct */
+        call_i2c_clients(usbvision,VIDIOC_G_TUNER,vt);
 
-                        // Check input validity : the user must do a VIDEO CAPTURE and MMAP method.
-                        if((vr->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
-                           (vr->memory != V4L2_MEMORY_MMAP))
-                                return -EINVAL;
+        return 0;
+}
 
-                        if(usbvision->streaming == Stream_On) {
-                                if ((ret = usbvision_stream_interrupt(usbvision)))
-                                    return ret;
-                        }
+static int vidioc_s_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *vt)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
-                        usbvision_frames_free(usbvision);
-                        usbvision_empty_framequeues(usbvision);
-                        vr->count = usbvision_frames_alloc(usbvision,vr->count);
+        // Only no or one tuner for now
+        if (!usbvision->have_tuner || vt->index)
+                return -EINVAL;
+        /* let clients handle this */
+        call_i2c_clients(usbvision,VIDIOC_S_TUNER,vt);
 
-                        usbvision->curFrame = NULL;
+        return 0;
+}
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_REQBUFS count=%d",vr->count);
-                        return 0;
-                }
-                case VIDIOC_QUERYBUF:
-                {
-                        struct v4l2_buffer *vb = arg;
-                        struct usbvision_frame *frame;
+static int vidioc_g_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *freq)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
-                        // FIXME : must control that buffers are mapped (VIDIOC_REQBUFS has been called)
+        freq->tuner = 0; // Only one tuner
+        if(usbvision->radio) {
+                freq->type = V4L2_TUNER_RADIO;
+        } else {
+                freq->type = V4L2_TUNER_ANALOG_TV;
+        }
+        freq->frequency = usbvision->freq;
 
-                        if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
-                                return -EINVAL;
-                        }
-                        if(vb->index>=usbvision->num_frames)  {
-                                return -EINVAL;
-                        }
-                        // Updating the corresponding frame state
-                        vb->flags = 0;
-                        frame = &usbvision->frame[vb->index];
-                        if(frame->grabstate >= FrameState_Ready)
-                                vb->flags |= V4L2_BUF_FLAG_QUEUED;
-                        if(frame->grabstate >= FrameState_Done)
-                                vb->flags |= V4L2_BUF_FLAG_DONE;
-                        if(frame->grabstate == FrameState_Unused)
-                                vb->flags |= V4L2_BUF_FLAG_MAPPED;
-                        vb->memory = V4L2_MEMORY_MMAP;
-
-                        vb->m.offset = vb->index*PAGE_ALIGN(usbvision->max_frame_size);
-
-                        vb->memory = V4L2_MEMORY_MMAP;
-                        vb->field = V4L2_FIELD_NONE;
-                        vb->length = usbvision->curwidth*usbvision->curheight*usbvision->palette.bytes_per_pixel;
-                        vb->timestamp = usbvision->frame[vb->index].timestamp;
-                        vb->sequence = usbvision->frame[vb->index].sequence;
-                        return 0;
-                }
-                case VIDIOC_QBUF:
-                {
-                        struct v4l2_buffer *vb = arg;
-                        struct usbvision_frame *frame;
-                        unsigned long lock_flags;
-
-                        // FIXME : works only on VIDEO_CAPTURE MODE, MMAP.
-                        if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
-                                return -EINVAL;
-                        }
-                        if(vb->index>=usbvision->num_frames)  {
-                                return -EINVAL;
-                        }
+        return 0;
+}
 
-                        frame = &usbvision->frame[vb->index];
+static int vidioc_s_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *freq)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
-                        if (frame->grabstate != FrameState_Unused) {
-                                return -EAGAIN;
-                        }
+        // Only no or one tuner for now
+        if (!usbvision->have_tuner || freq->tuner)
+                return -EINVAL;
 
-                        /* Mark it as ready and enqueue frame */
-                        frame->grabstate = FrameState_Ready;
-                        frame->scanstate = ScanState_Scanning;
-                        frame->scanlength = 0;  /* Accumulated in usbvision_parse_data() */
+        usbvision->freq = freq->frequency;
+        call_i2c_clients(usbvision, VIDIOC_S_FREQUENCY, freq);
 
-                        vb->flags &= ~V4L2_BUF_FLAG_DONE;
+        return 0;
+}
 
-                        /* set v4l2_format index */
-                        frame->v4l2_format = usbvision->palette;
+static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
-                        spin_lock_irqsave(&usbvision->queue_lock, lock_flags);
-                        list_add_tail(&usbvision->frame[vb->index].frame, &usbvision->inqueue);
-                        spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags);
+        memset(a,0,sizeof(*a));
+        if(usbvision->radio) {
+                strcpy(a->name,"Radio");
+        } else {
+                strcpy(a->name, "TV");
+        }
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_QBUF frame #%d",vb->index);
-                        return 0;
-                }
-                case VIDIOC_DQBUF:
-                {
-                        struct v4l2_buffer *vb = arg;
-                        int ret;
-                        struct usbvision_frame *f;
-                        unsigned long lock_flags;
-
-                        if (vb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                                return -EINVAL;
-
-                        if (list_empty(&(usbvision->outqueue))) {
-                                if (usbvision->streaming == Stream_Idle)
-                                        return -EINVAL;
-                                ret = wait_event_interruptible
-                                        (usbvision->wait_frame,
-                                         !list_empty(&(usbvision->outqueue)));
-                                if (ret)
-                                        return ret;
-                        }
+        return 0;
+}
 
-                        spin_lock_irqsave(&usbvision->queue_lock, lock_flags);
-                        f = list_entry(usbvision->outqueue.next,
-                                       struct usbvision_frame, frame);
-                        list_del(usbvision->outqueue.next);
-                        spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags);
-
-                        f->grabstate = FrameState_Unused;
-
-                        vb->memory = V4L2_MEMORY_MMAP;
-                        vb->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE;
-                        vb->index = f->index;
-                        vb->sequence = f->sequence;
-                        vb->timestamp = f->timestamp;
-                        vb->field = V4L2_FIELD_NONE;
-                        vb->bytesused = f->scanlength;
-
-                        return 0;
-                }
-                case VIDIOC_STREAMON:
-                {
-                        int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
+static int vidioc_s_audio (struct file *file, void *fh,
+                          struct v4l2_audio *a)
+{
+        if(a->index) {
+                return -EINVAL;
+        }
 
-                        usbvision->streaming = Stream_On;
+        return 0;
+}
 
-                        call_i2c_clients(usbvision,VIDIOC_STREAMON , &b);
+static int vidioc_queryctrl (struct file *file, void *priv,
+                            struct v4l2_queryctrl *ctrl)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int id=ctrl->id;
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_STREAMON");
+        memset(ctrl,0,sizeof(*ctrl));
+        ctrl->id=id;
 
-                        return 0;
-                }
-                case VIDIOC_STREAMOFF:
-                {
-                        int *type = arg;
-                        int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-                        if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                                return -EINVAL;
-
-                        if(usbvision->streaming == Stream_On) {
-                                usbvision_stream_interrupt(usbvision);
-                                // Stop all video streamings
-                                call_i2c_clients(usbvision,VIDIOC_STREAMOFF , &b);
-                        }
-                        usbvision_empty_framequeues(usbvision);
+        call_i2c_clients(usbvision, VIDIOC_QUERYCTRL, ctrl);
 
-                        PDEBUG(DBG_IOCTL, "VIDIOC_STREAMOFF");
-                        return 0;
-                }
-                case VIDIOC_ENUM_FMT:
-                {
-                        struct v4l2_fmtdesc *vfd = arg;
+        if (!ctrl->type)
+                return -EINVAL;
 
-                        if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {
-                                return -EINVAL;
-                        }
-                        vfd->flags = 0;
-                        vfd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                        strcpy(vfd->description,usbvision_v4l2_format[vfd->index].desc);
-                        vfd->pixelformat = usbvision_v4l2_format[vfd->index].format;
-                        memset(vfd->reserved, 0, sizeof(vfd->reserved));
-                        return 0;
-                }
-                case VIDIOC_G_FMT:
-                {
-                        struct v4l2_format *vf = arg;
-
-                        switch (vf->type) {
-                                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                                {
-                                        vf->fmt.pix.width = usbvision->curwidth;
-                                        vf->fmt.pix.height = usbvision->curheight;
-                                        vf->fmt.pix.pixelformat = usbvision->palette.format;
-                                        vf->fmt.pix.bytesperline =  usbvision->curwidth*usbvision->palette.bytes_per_pixel;
-                                        vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*usbvision->curheight;
-                                        vf->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
-                                        vf->fmt.pix.field = V4L2_FIELD_NONE; /* Always progressive image */
-                                        PDEBUG(DBG_IOCTL, "VIDIOC_G_FMT w=%d, h=%d, format=%s",
-                                               vf->fmt.pix.width, vf->fmt.pix.height,usbvision->palette.desc);
-                                        return 0;
-                                }
-                                default:
-                                        PDEBUG(DBG_IOCTL, "VIDIOC_G_FMT invalid type %d",vf->type);
-                                        return -EINVAL;
-                        }
-                        return 0;
-                }
-                case VIDIOC_TRY_FMT:
-                case VIDIOC_S_FMT:
-                {
-                        struct v4l2_format *vf = arg;
-                        int formatIdx,ret;
-
-                        switch(vf->type) {
-                                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                                {
-                                        /* Find requested format in available ones */
-                                        for(formatIdx=0;formatIdx<USBVISION_SUPPORTED_PALETTES;formatIdx++) {
-                                                if(vf->fmt.pix.pixelformat == usbvision_v4l2_format[formatIdx].format) {
-                                                        usbvision->palette = usbvision_v4l2_format[formatIdx];
-                                                        break;
-                                                }
-                                        }
-                                        /* robustness */
-                                        if(formatIdx == USBVISION_SUPPORTED_PALETTES) {
-                                                return -EINVAL;
-                                        }
-                                        RESTRICT_TO_RANGE(vf->fmt.pix.width, MIN_FRAME_WIDTH, MAX_FRAME_WIDTH);
-                                        RESTRICT_TO_RANGE(vf->fmt.pix.height, MIN_FRAME_HEIGHT, MAX_FRAME_HEIGHT);
-
-                                        vf->fmt.pix.bytesperline = vf->fmt.pix.width*usbvision->palette.bytes_per_pixel;
-                                        vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*vf->fmt.pix.height;
-
-                                        if(cmd == VIDIOC_TRY_FMT) {
-                                                PDEBUG(DBG_IOCTL, "VIDIOC_TRY_FMT grabdisplay w=%d, h=%d, format=%s",
-                                               vf->fmt.pix.width, vf->fmt.pix.height,usbvision->palette.desc);
-                                                return 0;
-                                        }
-
-                                        /* stop io in case it is already in progress */
-                                        if(usbvision->streaming == Stream_On) {
-                                                if ((ret = usbvision_stream_interrupt(usbvision)))
-                                                        return ret;
-                                        }
-                                        usbvision_frames_free(usbvision);
-                                        usbvision_empty_framequeues(usbvision);
-
-                                        usbvision->curFrame = NULL;
-
-                                        // by now we are committed to the new data...
-                                        down(&usbvision->lock);
-                                        usbvision_set_output(usbvision, vf->fmt.pix.width, vf->fmt.pix.height);
-                                        up(&usbvision->lock);
-
-                                        PDEBUG(DBG_IOCTL, "VIDIOC_S_FMT grabdisplay w=%d, h=%d, format=%s",
-                                               vf->fmt.pix.width, vf->fmt.pix.height,usbvision->palette.desc);
-                                        return 0;
-                                }
-                                default:
-                                        return -EINVAL;
-                        }
-                }
-                default:
-                        return -ENOIOCTLCMD;
+        return 0;
+}
+
+static int vidioc_g_ctrl (struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);
+
+        return 0;
+}
+
+static int vidioc_s_ctrl (struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl);
+
+        return 0;
+}
+
+static int vidioc_reqbufs (struct file *file,
+                           void *priv, struct v4l2_requestbuffers *vr)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int ret;
+
+        RESTRICT_TO_RANGE(vr->count,1,USBVISION_NUMFRAMES);
+
+        /* Check input validity:
+           the user must do a VIDEO CAPTURE and MMAP method. */
+        if((vr->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
+           (vr->memory != V4L2_MEMORY_MMAP))
+                return -EINVAL;
+
+        if(usbvision->streaming == Stream_On) {
+                if ((ret = usbvision_stream_interrupt(usbvision)))
+                        return ret;
         }
+
+        usbvision_frames_free(usbvision);
+        usbvision_empty_framequeues(usbvision);
+        vr->count = usbvision_frames_alloc(usbvision,vr->count);
+
+        usbvision->curFrame = NULL;
+
         return 0;
 }
 
-static int usbvision_v4l2_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
+static int vidioc_querybuf (struct file *file,
+                            void *priv, struct v4l2_buffer *vb)
 {
-        return video_usercopy(inode, file, cmd, arg, usbvision_v4l2_do_ioctl);
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usbvision_frame *frame;
+
+        /* FIXME : must control
+           that buffers are mapped (VIDIOC_REQBUFS has been called) */
+        if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
+                return -EINVAL;
+        }
+        if(vb->index>=usbvision->num_frames)  {
+                return -EINVAL;
+        }
+        /* Updating the corresponding frame state */
+        vb->flags = 0;
+        frame = &usbvision->frame[vb->index];
+        if(frame->grabstate >= FrameState_Ready)
+                vb->flags |= V4L2_BUF_FLAG_QUEUED;
+        if(frame->grabstate >= FrameState_Done)
+                vb->flags |= V4L2_BUF_FLAG_DONE;
+        if(frame->grabstate == FrameState_Unused)
+                vb->flags |= V4L2_BUF_FLAG_MAPPED;
+        vb->memory = V4L2_MEMORY_MMAP;
+
+        vb->m.offset = vb->index*PAGE_ALIGN(usbvision->max_frame_size);
+
+        vb->memory = V4L2_MEMORY_MMAP;
+        vb->field = V4L2_FIELD_NONE;
+        vb->length = usbvision->curwidth*
+                usbvision->curheight*
+                usbvision->palette.bytes_per_pixel;
+        vb->timestamp = usbvision->frame[vb->index].timestamp;
+        vb->sequence = usbvision->frame[vb->index].sequence;
+        return 0;
+}
+
+static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usbvision_frame *frame;
+        unsigned long lock_flags;
+
+        /* FIXME : works only on VIDEO_CAPTURE MODE, MMAP. */
+        if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
+                return -EINVAL;
+        }
+        if(vb->index>=usbvision->num_frames)  {
+                return -EINVAL;
+        }
+
+        frame = &usbvision->frame[vb->index];
+
+        if (frame->grabstate != FrameState_Unused) {
+                return -EAGAIN;
+        }
+
+        /* Mark it as ready and enqueue frame */
+        frame->grabstate = FrameState_Ready;
+        frame->scanstate = ScanState_Scanning;
+        frame->scanlength = 0;  /* Accumulated in usbvision_parse_data() */
+
+        vb->flags &= ~V4L2_BUF_FLAG_DONE;
+
+        /* set v4l2_format index */
+        frame->v4l2_format = usbvision->palette;
+
+        spin_lock_irqsave(&usbvision->queue_lock, lock_flags);
+        list_add_tail(&usbvision->frame[vb->index].frame, &usbvision->inqueue);
+        spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags);
+
+        return 0;
 }
 
+static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int ret;
+        struct usbvision_frame *f;
+        unsigned long lock_flags;
+
+        if (vb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        if (list_empty(&(usbvision->outqueue))) {
+                if (usbvision->streaming == Stream_Idle)
+                        return -EINVAL;
+                ret = wait_event_interruptible
+                        (usbvision->wait_frame,
+                         !list_empty(&(usbvision->outqueue)));
+                if (ret)
+                        return ret;
+        }
+
+        spin_lock_irqsave(&usbvision->queue_lock, lock_flags);
+        f = list_entry(usbvision->outqueue.next,
+                       struct usbvision_frame, frame);
+        list_del(usbvision->outqueue.next);
+        spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags);
+
+        f->grabstate = FrameState_Unused;
+
+        vb->memory = V4L2_MEMORY_MMAP;
+        vb->flags = V4L2_BUF_FLAG_MAPPED |
+                V4L2_BUF_FLAG_QUEUED |
+                V4L2_BUF_FLAG_DONE;
+        vb->index = f->index;
+        vb->sequence = f->sequence;
+        vb->timestamp = f->timestamp;
+        vb->field = V4L2_FIELD_NONE;
+        vb->bytesused = f->scanlength;
+
+        return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+        usbvision->streaming = Stream_On;
+        call_i2c_clients(usbvision,VIDIOC_STREAMON , &b);
+
+        return 0;
+}
+
+static int vidioc_streamoff(struct file *file,
+                            void *priv, enum v4l2_buf_type type)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+        if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        if(usbvision->streaming == Stream_On) {
+                usbvision_stream_interrupt(usbvision);
+                /* Stop all video streamings */
+                call_i2c_clients(usbvision,VIDIOC_STREAMOFF , &b);
+        }
+        usbvision_empty_framequeues(usbvision);
+
+        return 0;
+}
+
+static int vidioc_enum_fmt_cap (struct file *file, void  *priv,
+                                        struct v4l2_fmtdesc *vfd)
+{
+        if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {
+                return -EINVAL;
+        }
+        vfd->flags = 0;
+        vfd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        strcpy(vfd->description,usbvision_v4l2_format[vfd->index].desc);
+        vfd->pixelformat = usbvision_v4l2_format[vfd->index].format;
+        memset(vfd->reserved, 0, sizeof(vfd->reserved));
+        return 0;
+}
+
+static int vidioc_g_fmt_cap (struct file *file, void *priv,
+                                        struct v4l2_format *vf)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        vf->fmt.pix.width = usbvision->curwidth;
+        vf->fmt.pix.height = usbvision->curheight;
+        vf->fmt.pix.pixelformat = usbvision->palette.format;
+        vf->fmt.pix.bytesperline =
+                usbvision->curwidth*usbvision->palette.bytes_per_pixel;
+        vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*usbvision->curheight;
+        vf->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+        vf->fmt.pix.field = V4L2_FIELD_NONE; /* Always progressive image */
+
+        return 0;
+}
+
+static int vidioc_try_fmt_cap (struct file *file, void *priv,
+                               struct v4l2_format *vf)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int formatIdx;
+
+        /* Find requested format in available ones */
+        for(formatIdx=0;formatIdx<USBVISION_SUPPORTED_PALETTES;formatIdx++) {
+                if(vf->fmt.pix.pixelformat ==
+                   usbvision_v4l2_format[formatIdx].format) {
+                        usbvision->palette = usbvision_v4l2_format[formatIdx];
+                        break;
+                }
+        }
+        /* robustness */
+        if(formatIdx == USBVISION_SUPPORTED_PALETTES) {
+                return -EINVAL;
+        }
+        RESTRICT_TO_RANGE(vf->fmt.pix.width, MIN_FRAME_WIDTH, MAX_FRAME_WIDTH);
+        RESTRICT_TO_RANGE(vf->fmt.pix.height, MIN_FRAME_HEIGHT, MAX_FRAME_HEIGHT);
+
+        vf->fmt.pix.bytesperline = vf->fmt.pix.width*
+                usbvision->palette.bytes_per_pixel;
+        vf->fmt.pix.sizeimage = vf->fmt.pix.bytesperline*vf->fmt.pix.height;
+
+        return 0;
+}
+
+static int vidioc_s_fmt_cap(struct file *file, void *priv,
+                               struct v4l2_format *vf)
+{
+        struct video_device *dev = video_devdata(file);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
+        int ret;
+
+        if( 0 != (ret=vidioc_try_fmt_cap (file, priv, vf)) ) {
+                return ret;
+        }
+
+        /* stop io in case it is already in progress */
+        if(usbvision->streaming == Stream_On) {
+                if ((ret = usbvision_stream_interrupt(usbvision)))
+                        return ret;
+        }
+        usbvision_frames_free(usbvision);
+        usbvision_empty_framequeues(usbvision);
+
+        usbvision->curFrame = NULL;
+
+        /* by now we are committed to the new data... */
+        down(&usbvision->lock);
+        usbvision_set_output(usbvision, vf->fmt.pix.width, vf->fmt.pix.height);
+        up(&usbvision->lock);
+
+        return 0;
+}
 
 static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
                       size_t count, loff_t *ppos)
 {
         struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
         int noblock = file->f_flags & O_NONBLOCK;
         unsigned long lock_flags;
 
         int ret,i;
         struct usbvision_frame *frame;
 
-        PDEBUG(DBG_IO, "%s: %ld bytes, noblock=%d", __FUNCTION__, (unsigned long)count, noblock);
+        PDEBUG(DBG_IO, "%s: %ld bytes, noblock=%d", __FUNCTION__,
+               (unsigned long)count, noblock);
 
         if (!USBVISION_IS_OPERATIONAL(usbvision) || (buf == NULL))
                 return -EFAULT;
 
-        /* This entry point is compatible with the mmap routines so that a user can do either
-           VIDIOC_QBUF/VIDIOC_DQBUF to get frames or call read on the device. */
+        /* This entry point is compatible with the mmap routines
+           so that a user can do either VIDIOC_QBUF/VIDIOC_DQBUF
+           to get frames or call read on the device. */
         if(!usbvision->num_frames) {
-                /* First, allocate some frames to work with if this has not been done with
-                 VIDIOC_REQBUF */
+                /* First, allocate some frames to work with
+                   if this has not been done with VIDIOC_REQBUF */
                 usbvision_frames_free(usbvision);
                 usbvision_empty_framequeues(usbvision);
                 usbvision_frames_alloc(usbvision,USBVISION_NUMFRAMES);
@@ -1086,21 +1116,24 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
                 call_i2c_clients(usbvision,VIDIOC_STREAMON , NULL);
         }
 
-        /* Then, enqueue as many frames as possible (like a user of VIDIOC_QBUF would do) */
+        /* Then, enqueue as many frames as possible
+           (like a user of VIDIOC_QBUF would do) */
         for(i=0;i<usbvision->num_frames;i++) {
                 frame = &usbvision->frame[i];
                 if(frame->grabstate == FrameState_Unused) {
                         /* Mark it as ready and enqueue frame */
                         frame->grabstate = FrameState_Ready;
                         frame->scanstate = ScanState_Scanning;
-                        frame->scanlength = 0;  /* Accumulated in usbvision_parse_data() */
+                        /* Accumulated in usbvision_parse_data() */
+                        frame->scanlength = 0;
 
                         /* set v4l2_format index */
                         frame->v4l2_format = usbvision->palette;
 
                         spin_lock_irqsave(&usbvision->queue_lock, lock_flags);
                         list_add_tail(&frame->frame, &usbvision->inqueue);
-                        spin_unlock_irqrestore(&usbvision->queue_lock, lock_flags);
+                        spin_unlock_irqrestore(&usbvision->queue_lock,
+                                               lock_flags);
                 }
         }
 
@@ -1128,8 +1161,9 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
                 return 0;
         }
 
-        PDEBUG(DBG_IO, "%s: frmx=%d, bytes_read=%ld, scanlength=%ld", __FUNCTION__,
-                       frame->index, frame->bytes_read, frame->scanlength);
+        PDEBUG(DBG_IO, "%s: frmx=%d, bytes_read=%ld, scanlength=%ld",
+               __FUNCTION__,
+               frame->index, frame->bytes_read, frame->scanlength);
 
         /* copy bytes to user space; we allow for partials reads */
         if ((count + frame->bytes_read) > (unsigned long)frame->scanlength)
@@ -1140,10 +1174,11 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
         }
 
         frame->bytes_read += count;
-        PDEBUG(DBG_IO, "%s: {copy} count used=%ld, new bytes_read=%ld", __FUNCTION__,
-                       (unsigned long)count, frame->bytes_read);
+        PDEBUG(DBG_IO, "%s: {copy} count used=%ld, new bytes_read=%ld",
+               __FUNCTION__,
+               (unsigned long)count, frame->bytes_read);
 
-        // For now, forget the frame if it has not been read in one shot.
+        /* For now, forget the frame if it has not been read in one shot. */
 /*      if (frame->bytes_read >= frame->scanlength) {// All data has been read */
                 frame->bytes_read = 0;
 
@@ -1162,7 +1197,8 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
         u32 i;
 
         struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
 
         PDEBUG(DBG_MMAP, "mmap");
 
@@ -1180,11 +1216,13 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
         }
 
         for (i = 0; i < usbvision->num_frames; i++) {
-                if (((PAGE_ALIGN(usbvision->max_frame_size)*i) >> PAGE_SHIFT) == vma->vm_pgoff)
+                if (((PAGE_ALIGN(usbvision->max_frame_size)*i) >> PAGE_SHIFT) ==
+                    vma->vm_pgoff)
                         break;
         }
         if (i == usbvision->num_frames) {
-                PDEBUG(DBG_MMAP, "mmap: user supplied mapping address is out of range");
+                PDEBUG(DBG_MMAP,
+                       "mmap: user supplied mapping address is out of range");
                 up(&usbvision->lock);
                 return -EINVAL;
         }
@@ -1218,8 +1256,8 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
 static int usbvision_radio_open(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
-        struct v4l2_frequency freq;
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "%s:", __FUNCTION__);
@@ -1249,8 +1287,6 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)
                 // If so far no errors then we shall start the radio
                 usbvision->radio = 1;
                 call_i2c_clients(usbvision,AUDC_SET_RADIO,&usbvision->tuner_type);
-                freq.frequency = 1517; //SWR3 @ 94.8MHz
-                call_i2c_clients(usbvision, VIDIOC_S_FREQUENCY, &freq);
                 usbvision_set_audio(usbvision, USBVISION_AUDIO_RADIO);
                 usbvision->user++;
         }
@@ -1270,7 +1306,8 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)
 static int usbvision_radio_close(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision =
+                (struct usb_usbvision *) video_get_drvdata(dev);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "");
@@ -1304,149 +1341,6 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
         return errCode;
 }
 
-static int usbvision_do_radio_ioctl(struct inode *inode, struct file *file,
-                                 unsigned int cmd, void *arg)
-{
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
-
-        if (!USBVISION_IS_OPERATIONAL(usbvision))
-                return -EIO;
-
-        switch (cmd) {
-                case VIDIOC_QUERYCAP:
-                {
-                        struct v4l2_capability *vc=arg;
-
-                        memset(vc, 0, sizeof(*vc));
-                        strlcpy(vc->driver, "USBVision", sizeof(vc->driver));
-                        strlcpy(vc->card, usbvision_device_data[usbvision->DevModel].ModelString,
-                                sizeof(vc->card));
-                        strlcpy(vc->bus_info, usbvision->dev->dev.bus_id,
-                                sizeof(vc->bus_info));
-                        vc->version = USBVISION_DRIVER_VERSION;
-                        vc->capabilities = (usbvision->have_tuner ? V4L2_CAP_TUNER : 0);
-                        PDEBUG(DBG_IO, "VIDIOC_QUERYCAP");
-                        return 0;
-                }
-                case VIDIOC_QUERYCTRL:
-                {
-                        struct v4l2_queryctrl *ctrl = arg;
-                        int id=ctrl->id;
-
-                        memset(ctrl,0,sizeof(*ctrl));
-                        ctrl->id=id;
-
-                        call_i2c_clients(usbvision, cmd, arg);
-                        PDEBUG(DBG_IO,"VIDIOC_QUERYCTRL id=%x value=%x",ctrl->id,ctrl->type);
-
-                        if (ctrl->type)
-                                return 0;
-                        else
-                                return -EINVAL;
-
-                }
-                case VIDIOC_G_CTRL:
-                {
-                        struct v4l2_control *ctrl = arg;
-
-                        call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);
-                        PDEBUG(DBG_IO,"VIDIOC_G_CTRL id=%x value=%x",ctrl->id,ctrl->value);
-                        return 0;
-                }
-                case VIDIOC_S_CTRL:
-                {
-                        struct v4l2_control *ctrl = arg;
-
-                        call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl);
-                        PDEBUG(DBG_IO, "VIDIOC_S_CTRL id=%x value=%x",ctrl->id,ctrl->value);
-                        return 0;
-                }
-                case VIDIOC_G_TUNER:
-                {
-                        struct v4l2_tuner *t = arg;
-
-                        if (t->index > 0)
-                                return -EINVAL;
-
-                        memset(t,0,sizeof(*t));
-                        strcpy(t->name, "Radio");
-                        t->type = V4L2_TUNER_RADIO;
-
-                        /* Let clients fill in the remainder of this struct */
-                        call_i2c_clients(usbvision,VIDIOC_G_TUNER,t);
-                        PDEBUG(DBG_IO, "VIDIOC_G_TUNER signal=%x, afc=%x",t->signal,t->afc);
-                        return 0;
-                }
-                case VIDIOC_S_TUNER:
-                {
-                        struct v4l2_tuner *vt = arg;
-
-                        // Only no or one tuner for now
-                        if (!usbvision->have_tuner || vt->index)
-                                return -EINVAL;
-                        /* let clients handle this */
-                        call_i2c_clients(usbvision,VIDIOC_S_TUNER,vt);
-
-                        PDEBUG(DBG_IO, "VIDIOC_S_TUNER");
-                        return 0;
-                }
-                case VIDIOC_G_AUDIO:
-                {
-                        struct v4l2_audio *a = arg;
-
-                        memset(a,0,sizeof(*a));
-                        strcpy(a->name,"Radio");
-                        PDEBUG(DBG_IO, "VIDIOC_G_AUDIO");
-                        return 0;
-                }
-                case VIDIOC_S_AUDIO:
-                case VIDIOC_S_INPUT:
-                case VIDIOC_S_STD:
-                return 0;
-
-                case VIDIOC_G_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
-
-                        memset(f,0,sizeof(*f));
-
-                        f->type = V4L2_TUNER_RADIO;
-                        f->frequency = usbvision->freq;
-                        call_i2c_clients(usbvision, cmd, f);
-                        PDEBUG(DBG_IO, "VIDIOC_G_FREQUENCY freq=0x%X", (unsigned)f->frequency);
-
-                        return 0;
-                }
-                case VIDIOC_S_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
-
-                        if (f->tuner != 0)
-                                return -EINVAL;
-                        usbvision->freq = f->frequency;
-                        call_i2c_clients(usbvision, cmd, f);
-                        PDEBUG(DBG_IO, "VIDIOC_S_FREQUENCY freq=0x%X", (unsigned)f->frequency);
-
-                        return 0;
-                }
-                default:
-                {
-                        PDEBUG(DBG_IO, "%s: Unknown command %x", __FUNCTION__, cmd);
-                        return -ENOIOCTLCMD;
-                }
-        }
-        return 0;
-}
-
-
-static int usbvision_radio_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
-{
-        return video_usercopy(inode, file, cmd, arg, usbvision_do_radio_ioctl);
-}
-
-
 /*
  * Here comes the stuff for vbi on usbvision based devices
  *
@@ -1454,21 +1348,21 @@ static int usbvision_radio_ioctl(struct inode *inode, struct file *file,
 static int usbvision_vbi_open(struct inode *inode, struct file *file)
 {
         /* TODO */
-        return -EINVAL;
+        return -ENODEV;
 
 }
 
 static int usbvision_vbi_close(struct inode *inode, struct file *file)
 {
         /* TODO */
-        return -EINVAL;
+        return -ENODEV;
 }
 
 static int usbvision_do_vbi_ioctl(struct inode *inode, struct file *file,
                                  unsigned int cmd, void *arg)
 {
         /* TODO */
-        return -EINVAL;
+        return -ENOIOCTLCMD;
 }
 
 static int usbvision_vbi_ioctl(struct inode *inode, struct file *file,
@@ -1489,8 +1383,11 @@ static const struct file_operations usbvision_fops = {
         .release        = usbvision_v4l2_close,
         .read           = usbvision_v4l2_read,
         .mmap           = usbvision_v4l2_mmap,
-        .ioctl          = usbvision_v4l2_ioctl,
+        .ioctl          = video_ioctl2,
         .llseek         = no_llseek,
+/*      .poll          = video_poll, */
+        .mmap          = usbvision_v4l2_mmap,
+        .compat_ioctl  = v4l_compat_ioctl32,
 };
 static struct video_device usbvision_video_template = {
         .owner             = THIS_MODULE,
@@ -1500,6 +1397,39 @@ static struct video_device usbvision_video_template = {
         .name           = "usbvision-video",
         .release        = video_device_release,
         .minor          = -1,
+        .vidioc_querycap      = vidioc_querycap,
+        .vidioc_enum_fmt_cap  = vidioc_enum_fmt_cap,
+        .vidioc_g_fmt_cap     = vidioc_g_fmt_cap,
+        .vidioc_try_fmt_cap   = vidioc_try_fmt_cap,
+        .vidioc_s_fmt_cap     = vidioc_s_fmt_cap,
+        .vidioc_reqbufs       = vidioc_reqbufs,
+        .vidioc_querybuf      = vidioc_querybuf,
+        .vidioc_qbuf          = vidioc_qbuf,
+        .vidioc_dqbuf         = vidioc_dqbuf,
+        .vidioc_s_std         = vidioc_s_std,
+        .vidioc_enum_input    = vidioc_enum_input,
+        .vidioc_g_input       = vidioc_g_input,
+        .vidioc_s_input       = vidioc_s_input,
+        .vidioc_queryctrl     = vidioc_queryctrl,
+        .vidioc_g_audio       = vidioc_g_audio,
+        .vidioc_g_audio       = vidioc_s_audio,
+        .vidioc_g_ctrl        = vidioc_g_ctrl,
+        .vidioc_s_ctrl        = vidioc_s_ctrl,
+        .vidioc_streamon      = vidioc_streamon,
+        .vidioc_streamoff     = vidioc_streamoff,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+/*      .vidiocgmbuf          = vidiocgmbuf, */
+#endif
+        .vidioc_g_tuner       = vidioc_g_tuner,
+        .vidioc_s_tuner       = vidioc_s_tuner,
+        .vidioc_g_frequency   = vidioc_g_frequency,
+        .vidioc_s_frequency   = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .vidioc_g_register    = vidioc_g_register,
+        .vidioc_s_register    = vidioc_s_register,
+#endif
+        .tvnorms              = USBVISION_NORMS,
+        .current_norm         = V4L2_STD_PAL
 };
 
 
@@ -1508,8 +1438,9 @@ static const struct file_operations usbvision_radio_fops = {
         .owner             = THIS_MODULE,
         .open           = usbvision_radio_open,
         .release        = usbvision_radio_close,
-        .ioctl          = usbvision_radio_ioctl,
+        .ioctl          = video_ioctl2,
         .llseek         = no_llseek,
+        .compat_ioctl  = v4l_compat_ioctl32,
 };
 
 static struct video_device usbvision_radio_template=
@@ -1518,12 +1449,27 @@ static struct video_device usbvision_radio_template=
         .type           = VID_TYPE_TUNER,
         .hardware       = VID_HARDWARE_USBVISION,
         .fops           = &usbvision_radio_fops,
-        .release        = video_device_release,
         .name           = "usbvision-radio",
+        .release        = video_device_release,
         .minor          = -1,
+        .vidioc_querycap      = vidioc_querycap,
+        .vidioc_enum_input    = vidioc_enum_input,
+        .vidioc_g_input       = vidioc_g_input,
+        .vidioc_s_input       = vidioc_s_input,
+        .vidioc_queryctrl     = vidioc_queryctrl,
+        .vidioc_g_audio       = vidioc_g_audio,
+        .vidioc_g_audio       = vidioc_s_audio,
+        .vidioc_g_ctrl        = vidioc_g_ctrl,
+        .vidioc_s_ctrl        = vidioc_s_ctrl,
+        .vidioc_g_tuner       = vidioc_g_tuner,
+        .vidioc_s_tuner       = vidioc_s_tuner,
+        .vidioc_g_frequency   = vidioc_g_frequency,
+        .vidioc_s_frequency   = vidioc_s_frequency,
+
+        .tvnorms              = USBVISION_NORMS,
+        .current_norm         = V4L2_STD_PAL
 };
 
-
 // vbi template
 static const struct file_operations usbvision_vbi_fops = {
         .owner             = THIS_MODULE,
@@ -1531,6 +1477,7 @@ static const struct file_operations usbvision_vbi_fops = {
         .release        = usbvision_vbi_close,
         .ioctl          = usbvision_vbi_ioctl,
         .llseek         = no_llseek,
+        .compat_ioctl  = v4l_compat_ioctl32,
 };
 
 static struct video_device usbvision_vbi_template=
@@ -1574,11 +1521,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 {
         // vbi Device:
         if (usbvision->vbi) {
-                PDEBUG(DBG_PROBE, "unregister /dev/vbi%d [v4l2]", usbvision->vbi->minor & 0x1f);
+                PDEBUG(DBG_PROBE, "unregister /dev/vbi%d [v4l2]",
+                       usbvision->vbi->minor & 0x1f);
                 if (usbvision->vbi->minor != -1) {
                         video_unregister_device(usbvision->vbi);
-                }
-                else {
+                } else {
                         video_device_release(usbvision->vbi);
                 }
                 usbvision->vbi = NULL;
@@ -1586,11 +1533,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 
         // Radio Device:
         if (usbvision->rdev) {
-                PDEBUG(DBG_PROBE, "unregister /dev/radio%d [v4l2]", usbvision->rdev->minor & 0x1f);
+                PDEBUG(DBG_PROBE, "unregister /dev/radio%d [v4l2]",
+                       usbvision->rdev->minor & 0x1f);
                 if (usbvision->rdev->minor != -1) {
                         video_unregister_device(usbvision->rdev);
-                }
-                else {
+                } else {
                         video_device_release(usbvision->rdev);
                 }
                 usbvision->rdev = NULL;
@@ -1598,11 +1545,11 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 
         // Video Device:
         if (usbvision->vdev) {
-                PDEBUG(DBG_PROBE, "unregister /dev/video%d [v4l2]", usbvision->vdev->minor & 0x1f);
+                PDEBUG(DBG_PROBE, "unregister /dev/video%d [v4l2]",
+                       usbvision->vdev->minor & 0x1f);
                 if (usbvision->vdev->minor != -1) {
                         video_unregister_device(usbvision->vdev);
-                }
-                else {
+                } else {
                         video_device_release(usbvision->vdev);
                 }
                 usbvision->vdev = NULL;
@@ -1613,37 +1560,52 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
 {
         // Video Device:
-        usbvision->vdev = usbvision_vdev_init(usbvision, &usbvision_video_template, "USBVision Video");
+        usbvision->vdev = usbvision_vdev_init(usbvision,
+                                              &usbvision_video_template,
+                                              "USBVision Video");
         if (usbvision->vdev == NULL) {
                 goto err_exit;
         }
-        if (video_register_device(usbvision->vdev, VFL_TYPE_GRABBER, video_nr)<0) {
+        if (video_register_device(usbvision->vdev,
+                                  VFL_TYPE_GRABBER,
+                                  video_nr)<0) {
                 goto err_exit;
         }
-        printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n", usbvision->nr,usbvision->vdev->minor & 0x1f);
+        printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n",
+               usbvision->nr,usbvision->vdev->minor & 0x1f);
 
         // Radio Device:
         if (usbvision_device_data[usbvision->DevModel].Radio) {
                 // usbvision has radio
-                usbvision->rdev = usbvision_vdev_init(usbvision, &usbvision_radio_template, "USBVision Radio");
+                usbvision->rdev = usbvision_vdev_init(usbvision,
+                                                      &usbvision_radio_template,
+                                                      "USBVision Radio");
                 if (usbvision->rdev == NULL) {
                         goto err_exit;
                 }
-                if (video_register_device(usbvision->rdev, VFL_TYPE_RADIO, radio_nr)<0) {
+                if (video_register_device(usbvision->rdev,
+                                          VFL_TYPE_RADIO,
+                                          radio_nr)<0) {
                         goto err_exit;
                 }
-                printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n", usbvision->nr, usbvision->rdev->minor & 0x1f);
+                printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n",
+                       usbvision->nr, usbvision->rdev->minor & 0x1f);
         }
         // vbi Device:
         if (usbvision_device_data[usbvision->DevModel].vbi) {
-                usbvision->vbi = usbvision_vdev_init(usbvision, &usbvision_vbi_template, "USBVision VBI");
+                usbvision->vbi = usbvision_vdev_init(usbvision,
+                                                     &usbvision_vbi_template,
+                                                     "USBVision VBI");
                 if (usbvision->vdev == NULL) {
                         goto err_exit;
                 }
-                if (video_register_device(usbvision->vbi, VFL_TYPE_VBI, vbi_nr)<0) {
+                if (video_register_device(usbvision->vbi,
+                                          VFL_TYPE_VBI,
+                                          vbi_nr)<0) {
                         goto err_exit;
                 }
-                printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n", usbvision->nr,usbvision->vbi->minor & 0x1f);
+                printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n",
+                       usbvision->nr,usbvision->vbi->minor & 0x1f);
         }
         // all done
         return 0;
@@ -1657,7 +1619,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
 /*
  * usbvision_alloc()
  *
- * This code allocates the struct usb_usbvision. It is filled with default values.
+ * This code allocates the struct usb_usbvision.
+ * It is filled with default values.
  *
  * Returns NULL on error, a pointer to usb_usbvision else.
  *
@@ -1666,7 +1629,8 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
 {
         struct usb_usbvision *usbvision;
 
-        if ((usbvision = kzalloc(sizeof(struct usb_usbvision), GFP_KERNEL)) == NULL) {
+        if ((usbvision = kzalloc(sizeof(struct usb_usbvision), GFP_KERNEL)) ==
+            NULL) {
                 goto err_exit;
         }
 
@@ -1728,11 +1692,11 @@ static void usbvision_release(struct usb_usbvision *usbvision)
 }
 
 
-/******************************** usb interface *****************************************/
+/*********************** usb interface **********************************/
 
 static void usbvision_configure_video(struct usb_usbvision *usbvision)
 {
-        int model,i;
+        int model;
 
         if (usbvision == NULL)
                 return;
@@ -1741,25 +1705,23 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision)
         usbvision->palette = usbvision_v4l2_format[2]; // V4L2_PIX_FMT_RGB24;
 
         if (usbvision_device_data[usbvision->DevModel].Vin_Reg2_override) {
-                usbvision->Vin_Reg2_Preset = usbvision_device_data[usbvision->DevModel].Vin_Reg2;
+                usbvision->Vin_Reg2_Preset =
+                        usbvision_device_data[usbvision->DevModel].Vin_Reg2;
         } else {
                 usbvision->Vin_Reg2_Preset = 0;
         }
 
-        for (i = 0; i < TVNORMS; i++)
-                if (usbvision_device_data[model].VideoNorm == tvnorms[i].mode)
-                        break;
-        if (i == TVNORMS)
-                i = 0;
-        usbvision->tvnorm = &tvnorms[i];        /* set default norm */
+        usbvision->tvnormId = usbvision_device_data[model].VideoNorm;
 
         usbvision->video_inputs = usbvision_device_data[model].VideoChannels;
         usbvision->ctl_input = 0;
 
         /* This should be here to make i2c clients to be able to register */
-        usbvision_audio_off(usbvision); //first switch off audio
+        /* first switch off audio */
+        usbvision_audio_off(usbvision);
         if (!PowerOnAtOpen) {
-                usbvision_power_on(usbvision);  //and then power up the noisy tuner
+                /* and then power up the noisy tuner */
+                usbvision_power_on(usbvision);
                 usbvision_i2c_register(usbvision);
         }
 }
@@ -1796,18 +1758,22 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
 
         if (usbvision_device_data[model].Interface >= 0) {
                 interface = &dev->actconfig->interface[usbvision_device_data[model].Interface]->altsetting[0];
-        }
-        else {
+        } else {
                 interface = &dev->actconfig->interface[ifnum]->altsetting[0];
         }
         endpoint = &interface->endpoint[1].desc;
-        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC) {
-                err("%s: interface %d. has non-ISO endpoint!", __FUNCTION__, ifnum);
-                err("%s: Endpoint attributes %d", __FUNCTION__, endpoint->bmAttributes);
+        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
+            USB_ENDPOINT_XFER_ISOC) {
+                err("%s: interface %d. has non-ISO endpoint!",
+                    __FUNCTION__, ifnum);
+                err("%s: Endpoint attributes %d",
+                    __FUNCTION__, endpoint->bmAttributes);
                 return -ENODEV;
         }
-        if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
-                err("%s: interface %d. has ISO OUT endpoint!", __FUNCTION__, ifnum);
+        if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
+            USB_DIR_OUT) {
+                err("%s: interface %d. has ISO OUT endpoint!",
+                    __FUNCTION__, ifnum);
                 return -ENODEV;
         }
 
@@ -1818,11 +1784,9 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
 
         if (dev->descriptor.bNumConfigurations > 1) {
                 usbvision->bridgeType = BRIDGE_NT1004;
-        }
-        else if (model == DAZZLE_DVC_90_REV_1_SECAM) {
+        } else if (model == DAZZLE_DVC_90_REV_1_SECAM) {
                 usbvision->bridgeType = BRIDGE_NT1005;
-        }
-        else {
+        } else {
                 usbvision->bridgeType = BRIDGE_NT1003;
         }
         PDEBUG(DBG_PROBE, "bridgeType %d", usbvision->bridgeType);
@@ -1919,11 +1883,11 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
         up(&usbvision->lock);
 
         if (usbvision->user) {
-                printk(KERN_INFO "%s: In use, disconnect pending\n", __FUNCTION__);
+                printk(KERN_INFO "%s: In use, disconnect pending\n",
+                       __FUNCTION__);
                 wake_up_interruptible(&usbvision->wait_frame);
                 wake_up_interruptible(&usbvision->wait_stream);
-        }
-        else {
+        } else {
                 usbvision_release(usbvision);
         }
 
@@ -1950,7 +1914,6 @@ static int __init usbvision_init(void)
 
         PDEBUG(DBG_PROBE, "");
 
-        PDEBUG(DBG_IOCTL, "IOCTL   debugging is enabled [video]");
         PDEBUG(DBG_IO,  "IO      debugging is enabled [video]");
         PDEBUG(DBG_PROBE, "PROBE   debugging is enabled [video]");
         PDEBUG(DBG_MMAP, "MMAP    debugging is enabled [video]");
diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index c759d00d7014..c5b6c501c869 100644
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -221,6 +221,8 @@ enum {
 
 #define I2C_USB_ADAP_MAX        16
 
+#define USBVISION_NORMS (V4L2_STD_PAL | V4L2_STD_NTSC | V4L2_STD_SECAM | V4L2_STD_PAL_M)
+
 /* ----------------------------------------------------------------- */
 /* usbvision video structures                                        */
 /* ----------------------------------------------------------------- */
@@ -301,14 +303,6 @@ struct usbvision_frame_header {
         __u16 frameHeight;                              /* 10 - 11 after endian correction*/
 };
 
-/* tvnorms */
-struct usbvision_tvnorm {
-        char *name;
-        v4l2_std_id id;
-        /* mode for saa7113h */
-        int mode;
-};
-
 struct usbvision_frame {
         char *data;                                     /* Frame buffer */
         struct usbvision_frame_header isocHeader;       /* Header from stream */
@@ -386,7 +380,6 @@ struct usb_usbvision {
         int tuner_type;
         int tuner_addr;
         int bridgeType;                                                 // NT1003, NT1004, NT1005
-        int channel;
         int radio;
         int video_inputs;                                               // # of inputs
         unsigned long freq;
@@ -441,7 +434,7 @@ struct usb_usbvision {
 
         struct v4l2_capability vcap;                                    /* Video capabilities */
         unsigned int ctl_input;                                         /* selected input */
-        struct usbvision_tvnorm *tvnorm;                                /* selected tv norm */
+        v4l2_std_id tvnormId;                                           /* selected tv norm */
         unsigned char video_endp;                                       /* 0x82 for USBVISION devices based */
 
         // Decompression stuff:
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 0c658b74f2c4..e94a9a6036f5 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -2077,12 +2077,10 @@ static int vino_wait_for_frame(struct vino_channel_settings *vcs)
         init_waitqueue_entry(&wait, current);
         /* add ourselves into wait queue */
         add_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait);
-        /* and set current state */
-        set_current_state(TASK_INTERRUPTIBLE);
 
         /* to ensure that schedule_timeout will return immediately
-         * if VINO interrupt was triggred meanwhile */
-        schedule_timeout(HZ / 10);
+         * if VINO interrupt was triggered meanwhile */
+        schedule_timeout_interruptible(HZ / 10);
 
         if (signal_pending(current))
                 err = -EINTR;
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 3ef4d0159c33..f6d3a9460ccc 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -25,6 +25,7 @@
 #include <linux/pci.h>
 #include <linux/random.h>
 #include <linux/version.h>
+#include <linux/mutex.h>
 #include <linux/videodev2.h>
 #include <linux/dma-mapping.h>
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
@@ -145,9 +146,6 @@ struct vivi_buffer {
 
         struct vivi_fmt        *fmt;
 
-#ifdef CONFIG_VIVI_SCATTER
-        struct sg_to_addr      *to_addr;
-#endif
 };
 
 struct vivi_dmaqueue {
@@ -168,7 +166,7 @@ static LIST_HEAD(vivi_devlist);
 struct vivi_dev {
         struct list_head           vivi_devlist;
 
-        struct semaphore           lock;
+        struct mutex               lock;
 
         int                        users;
 
@@ -232,68 +230,13 @@ static u8 bars[8][3] = {
 #define TSTAMP_MAX_Y TSTAMP_MIN_Y+15
 #define TSTAMP_MIN_X 64
 
-#ifdef CONFIG_VIVI_SCATTER
-static void prep_to_addr(struct sg_to_addr to_addr[],
-                         struct videobuf_buffer *vb)
-{
-        int i, pos=0;
-
-        for (i=0;i<vb->dma.nr_pages;i++) {
-                to_addr[i].sg=&vb->dma.sglist[i];
-                to_addr[i].pos=pos;
-                pos += vb->dma.sglist[i].length;
-        }
-}
-
-static int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
-{
-        int p1=0,p2=pages-1,p3=pages/2;
-
-        /* Sanity test */
-        BUG_ON (pos>=to_addr[p2].pos+to_addr[p2].sg->length);
-
-        while (p1+1<p2) {
-                if (pos < to_addr[p3].pos) {
-                        p2=p3;
-                } else {
-                        p1=p3;
-                }
-                p3=(p1+p2)/2;
-        }
-        if (pos >= to_addr[p2].pos)
-                p1=p2;
-
-        return (p1);
-}
-#endif
 
-#ifdef CONFIG_VIVI_SCATTER
-static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
-                     int hmax, int line, char *timestr)
-#else
 static void gen_line(char *basep,int inipos,int wmax,
                      int hmax, int line, char *timestr)
-#endif
 {
         int  w,i,j,pos=inipos,y;
         char *p,*s;
         u8   chr,r,g,b,color;
-#ifdef CONFIG_VIVI_SCATTER
-        int pgpos,oldpg;
-        char *basep;
-        struct page *pg;
-
-        unsigned long flags;
-        spinlock_t spinlock;
-
-        spin_lock_init(&spinlock);
-
-        /* Get first addr pointed to pixel position */
-        oldpg=get_addr_pos(pos,pages,to_addr);
-        pg=pfn_to_page(sg_dma_address(to_addr[oldpg].sg) >> PAGE_SHIFT);
-        spin_lock_irqsave(&spinlock,flags);
-        basep = kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[oldpg].sg->offset;
-#endif
 
         /* We will just duplicate the second pixel at the packet */
         wmax/=2;
@@ -305,18 +248,7 @@ static void gen_line(char *basep,int inipos,int wmax,
                 b=bars[w*7/wmax][2];
 
                 for (color=0;color<4;color++) {
-#ifdef CONFIG_VIVI_SCATTER
-                        pgpos=get_addr_pos(pos,pages,to_addr);
-                        if (pgpos!=oldpg) {
-                                pg=pfn_to_page(sg_dma_address(to_addr[pgpos].sg) >> PAGE_SHIFT);
-                                kunmap_atomic(basep, KM_BOUNCE_READ);
-                                basep= kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[pgpos].sg->offset;
-                                oldpg=pgpos;
-                        }
-                        p=basep+pos-to_addr[pgpos].pos;
-#else
                         p=basep+pos;
-#endif
 
                         switch (color) {
                                 case 0:
@@ -361,23 +293,7 @@ static void gen_line(char *basep,int inipos,int wmax,
 
                                 pos=inipos+j*2;
                                 for (color=0;color<4;color++) {
-#ifdef CONFIG_VIVI_SCATTER
-                                        pgpos=get_addr_pos(pos,pages,to_addr);
-                                        if (pgpos!=oldpg) {
-                                                pg=pfn_to_page(sg_dma_address(
-                                                                to_addr[pgpos].sg)
-                                                                >> PAGE_SHIFT);
-                                                kunmap_atomic(basep,
-                                                                KM_BOUNCE_READ);
-                                                basep= kmap_atomic(pg,
-                                                        KM_BOUNCE_READ)+
-                                                        to_addr[pgpos].sg->offset;
-                                                oldpg=pgpos;
-                                        }
-                                        p=basep+pos-to_addr[pgpos].pos;
-#else
                                         p=basep+pos;
-#endif
 
                                         y=TO_Y(r,g,b);
 
@@ -402,12 +318,7 @@ static void gen_line(char *basep,int inipos,int wmax,
 
 
 end:
-#ifdef CONFIG_VIVI_SCATTER
-        kunmap_atomic(basep, KM_BOUNCE_READ);
-        spin_unlock_irqrestore(&spinlock,flags);
-#else
         return;
-#endif
 }
 static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
 {
@@ -415,35 +326,16 @@ static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
         int hmax  = buf->vb.height;
         int wmax  = buf->vb.width;
         struct timeval ts;
-#ifdef CONFIG_VIVI_SCATTER
-        struct sg_to_addr *to_addr=buf->to_addr;
-        struct videobuf_buffer *vb=&buf->vb;
-#else
         char *tmpbuf;
-#endif
-
-#ifdef CONFIG_VIVI_SCATTER
-        /* Test if DMA mapping is ready */
-        if (!sg_dma_address(&vb->dma.sglist[0]))
-                return;
-
-        prep_to_addr(to_addr,vb);
 
-        /* Check if there is enough memory */
-        BUG_ON(buf->vb.dma.nr_pages << PAGE_SHIFT < (buf->vb.width*buf->vb.height)*2);
-#else
         if (buf->vb.dma.varea) {
                 tmpbuf=kmalloc (wmax*2, GFP_KERNEL);
         } else {
                 tmpbuf=buf->vb.dma.vmalloc;
         }
 
-#endif
 
         for (h=0;h<hmax;h++) {
-#ifdef CONFIG_VIVI_SCATTER
-                gen_line(to_addr,pos,vb->dma.nr_pages,wmax,hmax,h,dev->timestr);
-#else
                 if (buf->vb.dma.varea) {
                         gen_line(tmpbuf,0,wmax,hmax,h,dev->timestr);
                         /* FIXME: replacing to __copy_to_user */
@@ -452,7 +344,6 @@ static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
                 } else {
                         gen_line(tmpbuf,pos,wmax,hmax,h,dev->timestr);
                 }
-#endif
                 pos += wmax*2;
         }
 
@@ -718,11 +609,6 @@ static void free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
         if (in_interrupt())
                 BUG();
 
-#ifdef CONFIG_VIVI_SCATTER
-        /*FIXME: Maybe a spinlock is required here */
-        kfree(buf->to_addr);
-        buf->to_addr=NULL;
-#endif
 
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_unmap(vq, &buf->vb.dma);
@@ -768,12 +654,6 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
 
         buf->vb.state = STATE_PREPARED;
 
-#ifdef CONFIG_VIVI_SCATTER
-        if (NULL == (buf->to_addr = kmalloc(sizeof(*buf->to_addr) * vb->dma.nr_pages,GFP_KERNEL))) {
-                rc=-ENOMEM;
-                goto fail;
-        }
-#endif
         return 0;
 
 fail:
@@ -838,40 +718,6 @@ static void buffer_release(struct videobuf_queue *vq, struct videobuf_buffer *vb
         free_buffer(vq,buf);
 }
 
-#ifdef CONFIG_VIVI_SCATTER
-static int vivi_map_sg(void *dev, struct scatterlist *sg, int nents,
-                       int direction)
-{
-        int i;
-
-        dprintk(1,"%s, number of pages=%d\n",__FUNCTION__,nents);
-        BUG_ON(direction == DMA_NONE);
-
-        for (i = 0; i < nents; i++ ) {
-                BUG_ON(!sg[i].page);
-
-                sg_dma_address(&sg[i]) = page_to_phys(sg[i].page) + sg[i].offset;
-        }
-
-        return nents;
-}
-
-static int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,
-                         int direction)
-{
-        dprintk(1,"%s\n",__FUNCTION__);
-        return 0;
-}
-
-static int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist, int nr_pages,
-                            int direction)
-{
-//      dprintk(1,"%s\n",__FUNCTION__);
-
-//      flush_write_buffers();
-        return 0;
-}
-#endif
 
 static struct videobuf_queue_ops vivi_video_qops = {
         .buf_setup      = buffer_setup,
@@ -893,16 +739,16 @@ static struct videobuf_queue_ops vivi_video_qops = {
 static int res_get(struct vivi_dev *dev, struct vivi_fh *fh)
 {
         /* is it free? */
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         if (dev->resources) {
                 /* no, someone else uses it */
-                up(&dev->lock);
+                mutex_unlock(&dev->lock);
                 return 0;
         }
         /* it's free, grab it */
         dev->resources =1;
         dprintk(1,"res: get\n");
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
         return 1;
 }
 
@@ -913,10 +759,10 @@ static int res_locked(struct vivi_dev *dev)
 
 static void res_free(struct vivi_dev *dev, struct vivi_fh *fh)
 {
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         dev->resources = 0;
         dprintk(1,"res: put\n");
-        up(&dev->lock);
+        mutex_lock(&dev->lock);
 }
 
 /* ------------------------------------------------------------------
@@ -1260,19 +1106,11 @@ static int vivi_open(struct inode *inode, struct file *file)
         sprintf(dev->timestr,"%02d:%02d:%02d:%03d",
                         dev->h,dev->m,dev->s,(dev->us+500)/1000);
 
-#ifdef CONFIG_VIVI_SCATTER
-        videobuf_queue_init(&fh->vb_vidq,VIDEOBUF_DMA_SCATTER, &vivi_video_qops,
-                        NULL, NULL,
-                        fh->type,
-                        V4L2_FIELD_INTERLACED,
-                        sizeof(struct vivi_buffer),fh);
-#else
         videobuf_queue_init(&fh->vb_vidq, &vivi_video_qops,
                         NULL, NULL,
                         fh->type,
                         V4L2_FIELD_INTERLACED,
                         sizeof(struct vivi_buffer),fh);
-#endif
 
         return 0;
 }
@@ -1423,7 +1261,7 @@ static int __init vivi_init(void)
         init_waitqueue_head(&dev->vidq.wq);
 
         /* initialize locks */
-        init_MUTEX(&dev->lock);
+        mutex_init(&dev->lock);
 
         dev->vidq.timeout.function = vivi_vid_timeout;
         dev->vidq.timeout.data     = (unsigned long)dev;
diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig
index 47cd93f9c7de..edb00293cd59 100644
--- a/drivers/media/video/zc0301/Kconfig
+++ b/drivers/media/video/zc0301/Kconfig
@@ -1,6 +1,6 @@
 config USB_ZC0301
         tristate "USB ZC0301[P] Image Processor and Control Chip support"
-        depends on VIDEO_V4L1
+        depends on VIDEO_V4L2
         ---help---
           Say Y here if you want support for cameras based on the ZC0301 or
           ZC0301P Image Processors and Control Chips.
diff --git a/drivers/media/video/zc0301/zc0301.h b/drivers/media/video/zc0301/zc0301.h
index 710f12eb9126..a2de50efa31a 100644
--- a/drivers/media/video/zc0301/zc0301.h
+++ b/drivers/media/video/zc0301/zc0301.h
@@ -36,6 +36,7 @@
 #include <linux/rwsem.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
+#include <linux/kref.h>
 
 #include "zc0301_sensor.h"
 
@@ -98,7 +99,7 @@ struct zc0301_module_param {
         u16 frame_timeout;
 };
 
-static DECLARE_RWSEM(zc0301_disconnect);
+static DECLARE_RWSEM(zc0301_dev_lock);
 
 struct zc0301_device {
         struct video_device* v4ldev;
@@ -121,12 +122,14 @@ struct zc0301_device {
 
         struct zc0301_module_param module_param;
 
+        struct kref kref;
         enum zc0301_dev_state state;
         u8 users;
 
-        struct mutex dev_mutex, fileop_mutex;
+        struct completion probe;
+        struct mutex open_mutex, fileop_mutex;
         spinlock_t queue_lock;
-        wait_queue_head_t open, wait_frame, wait_stream;
+        wait_queue_head_t wait_open, wait_frame, wait_stream;
 };
 
 /*****************************************************************************/
@@ -156,8 +159,8 @@ do {                                                                          \
                 else if ((level) == 2)                                        \
                         dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
                 else if ((level) >= 3)                                        \
-                        dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
-                                 __FUNCTION__, __LINE__ , ## args);           \
+                        dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n",   \
+                                 __FILE__, __FUNCTION__, __LINE__ , ## args); \
         }                                                                     \
 } while (0)
 #       define KDBG(level, fmt, args...)                                      \
@@ -166,8 +169,8 @@ do {                                                                          \
                 if ((level) == 1 || (level) == 2)                             \
                         pr_info("zc0301: " fmt "\n", ## args);                \
                 else if ((level) == 3)                                        \
-                        pr_debug("zc0301: [%s:%d] " fmt "\n", __FUNCTION__,   \
-                                 __LINE__ , ## args);                         \
+                        pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__,   \
+                                 __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
 } while (0)
 #       define V4LDBG(level, name, cmd)                                       \
@@ -183,8 +186,8 @@ do {                                                                          \
 
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
-dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",                              \
-         __FUNCTION__, __LINE__ , ## args)
+dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __FUNCTION__,   \
+         __LINE__ , ## args)
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index f1120551c70c..703b741e46df 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -49,11 +49,11 @@
 
 #define ZC0301_MODULE_NAME    "V4L2 driver for ZC0301[P] "                    \
                               "Image Processor and Control Chip"
-#define ZC0301_MODULE_AUTHOR  "(C) 2006 Luca Risolia"
+#define ZC0301_MODULE_AUTHOR  "(C) 2006-2007 Luca Risolia"
 #define ZC0301_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
 #define ZC0301_MODULE_LICENSE "GPL"
-#define ZC0301_MODULE_VERSION "1:1.07"
-#define ZC0301_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 7)
+#define ZC0301_MODULE_VERSION "1:1.10"
+#define ZC0301_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 10)
 
 /*****************************************************************************/
 
@@ -573,7 +573,8 @@ static int zc0301_init(struct zc0301_device* cam)
         int err = 0;
 
         if (!(cam->state & DEV_INITIALIZED)) {
-                init_waitqueue_head(&cam->open);
+                mutex_init(&cam->open_mutex);
+                init_waitqueue_head(&cam->wait_open);
                 qctrl = s->qctrl;
                 rect = &(s->cropcap.defrect);
                 cam->compression.quality = ZC0301_COMPRESSION_QUALITY;
@@ -634,59 +635,73 @@ static int zc0301_init(struct zc0301_device* cam)
         return 0;
 }
 
+/*****************************************************************************/
 
-static void zc0301_release_resources(struct zc0301_device* cam)
+static void zc0301_release_resources(struct kref *kref)
 {
+        struct zc0301_device *cam = container_of(kref, struct zc0301_device,
+                                                 kref);
         DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor);
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
+        usb_put_dev(cam->usbdev);
         kfree(cam->control_buffer);
+        kfree(cam);
 }
 
-/*****************************************************************************/
 
 static int zc0301_open(struct inode* inode, struct file* filp)
 {
         struct zc0301_device* cam;
         int err = 0;
 
-        /*
-           This is the only safe way to prevent race conditions with
-           disconnect
-        */
-        if (!down_read_trylock(&zc0301_disconnect))
+        if (!down_read_trylock(&zc0301_dev_lock))
                 return -ERESTARTSYS;
 
         cam = video_get_drvdata(video_devdata(filp));
 
-        if (mutex_lock_interruptible(&cam->dev_mutex)) {
-                up_read(&zc0301_disconnect);
+        if (wait_for_completion_interruptible(&cam->probe)) {
+                up_read(&zc0301_dev_lock);
                 return -ERESTARTSYS;
         }
 
+        kref_get(&cam->kref);
+
+        if (mutex_lock_interruptible(&cam->open_mutex)) {
+                kref_put(&cam->kref, zc0301_release_resources);
+                up_read(&zc0301_dev_lock);
+                return -ERESTARTSYS;
+        }
+
+        if (cam->state & DEV_DISCONNECTED) {
+                DBG(1, "Device not present");
+                err = -ENODEV;
+                goto out;
+        }
+
         if (cam->users) {
                 DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor);
+                DBG(3, "Simultaneous opens are not supported");
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
                         err = -EWOULDBLOCK;
                         goto out;
                 }
-                mutex_unlock(&cam->dev_mutex);
-                err = wait_event_interruptible_exclusive(cam->open,
-                                                  cam->state & DEV_DISCONNECTED
+                DBG(2, "A blocking open() has been requested. Wait for the "
+                       "device to be released...");
+                up_read(&zc0301_dev_lock);
+                err = wait_event_interruptible_exclusive(cam->wait_open,
+                                                (cam->state & DEV_DISCONNECTED)
                                                          || !cam->users);
-                if (err) {
-                        up_read(&zc0301_disconnect);
-                        return err;
-                }
+                down_read(&zc0301_dev_lock);
+                if (err)
+                        goto out;
                 if (cam->state & DEV_DISCONNECTED) {
-                        up_read(&zc0301_disconnect);
-                        return -ENODEV;
+                        err = -ENODEV;
+                        goto out;
                 }
-                mutex_lock(&cam->dev_mutex);
         }
 
-
         if (cam->state & DEV_MISCONFIGURED) {
                 err = zc0301_init(cam);
                 if (err) {
@@ -711,36 +726,32 @@ static int zc0301_open(struct inode* inode, struct file* filp)
         DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor);
 
 out:
-        mutex_unlock(&cam->dev_mutex);
-        up_read(&zc0301_disconnect);
+        mutex_unlock(&cam->open_mutex);
+        if (err)
+                kref_put(&cam->kref, zc0301_release_resources);
+        up_read(&zc0301_dev_lock);
         return err;
 }
 
 
 static int zc0301_release(struct inode* inode, struct file* filp)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device* cam;
 
-        mutex_lock(&cam->dev_mutex); /* prevent disconnect() to be called */
+        down_write(&zc0301_dev_lock);
 
-        zc0301_stop_transfer(cam);
+        cam = video_get_drvdata(video_devdata(filp));
 
+        zc0301_stop_transfer(cam);
         zc0301_release_buffers(cam);
-
-        if (cam->state & DEV_DISCONNECTED) {
-                zc0301_release_resources(cam);
-                usb_put_dev(cam->usbdev);
-                mutex_unlock(&cam->dev_mutex);
-                kfree(cam);
-                return 0;
-        }
-
         cam->users--;
-        wake_up_interruptible_nr(&cam->open, 1);
+        wake_up_interruptible_nr(&cam->wait_open, 1);
 
         DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor);
 
-        mutex_unlock(&cam->dev_mutex);
+        kref_put(&cam->kref, zc0301_release_resources);
+
+        up_write(&zc0301_dev_lock);
 
         return 0;
 }
@@ -775,7 +786,7 @@ zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                 DBG(3, "Close and open the device again to choose the read "
                        "method");
                 mutex_unlock(&cam->fileop_mutex);
-                return -EINVAL;
+                return -EBUSY;
         }
 
         if (cam->io == IO_NONE) {
@@ -953,7 +964,12 @@ static int zc0301_mmap(struct file* filp, struct vm_area_struct *vma)
                 return -EIO;
         }
 
-        if (cam->io != IO_MMAP || !(vma->vm_flags & VM_WRITE) ||
+        if (!(vma->vm_flags & (VM_WRITE | VM_READ))) {
+                mutex_unlock(&cam->fileop_mutex);
+                return -EACCES;
+        }
+
+        if (cam->io != IO_MMAP ||
             size != PAGE_ALIGN(cam->frame[0].buf.length)) {
                 mutex_unlock(&cam->fileop_mutex);
                 return -EINVAL;
@@ -984,7 +1000,6 @@ static int zc0301_mmap(struct file* filp, struct vm_area_struct *vma)
 
         vma->vm_ops = &zc0301_vm_ops;
         vma->vm_private_data = &cam->frame[i];
-
         zc0301_vm_open(vma);
 
         mutex_unlock(&cam->fileop_mutex);
@@ -1211,7 +1226,7 @@ zc0301_vidioc_s_crop(struct zc0301_device* cam, void __user * arg)
                         if (cam->frame[i].vma_use_count) {
                                 DBG(3, "VIDIOC_S_CROP failed. "
                                        "Unmap the buffers first.");
-                                return -EINVAL;
+                                return -EBUSY;
                         }
 
         if (!s->set_crop) {
@@ -1434,7 +1449,7 @@ zc0301_vidioc_try_s_fmt(struct zc0301_device* cam, unsigned int cmd,
                         if (cam->frame[i].vma_use_count) {
                                 DBG(3, "VIDIOC_S_FMT failed. "
                                        "Unmap the buffers first.");
-                                return -EINVAL;
+                                return -EBUSY;
                         }
 
         if (cam->stream == STREAM_ON)
@@ -1544,14 +1559,14 @@ zc0301_vidioc_reqbufs(struct zc0301_device* cam, void __user * arg)
         if (cam->io == IO_READ) {
                 DBG(3, "Close and open the device again to choose the mmap "
                        "I/O method");
-                return -EINVAL;
+                return -EBUSY;
         }
 
         for (i = 0; i < cam->nbuffers; i++)
                 if (cam->frame[i].vma_use_count) {
                         DBG(3, "VIDIOC_REQBUFS failed. "
                                "Previous buffers are still mapped.");
-                        return -EINVAL;
+                        return -EBUSY;
                 }
 
         if (cam->stream == STREAM_ON)
@@ -1699,9 +1714,6 @@ zc0301_vidioc_streamon(struct zc0301_device* cam, void __user * arg)
         if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
                 return -EINVAL;
 
-        if (list_empty(&cam->inqueue))
-                return -EINVAL;
-
         cam->stream = STREAM_ON;
 
         DBG(3, "Stream on");
@@ -1949,8 +1961,6 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        mutex_init(&cam->dev_mutex);
-
         DBG(2, "ZC0301[P] Image Processor and Control Chip detected "
                "(vid/pid 0x%04X:0x%04X)",id->idVendor, id->idProduct);
 
@@ -1982,7 +1992,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->v4ldev->release = video_device_release;
         video_set_drvdata(cam->v4ldev, cam);
 
-        mutex_lock(&cam->dev_mutex);
+        init_completion(&cam->probe);
 
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
                                     video_nr[dev_nr]);
@@ -1992,7 +2002,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                         DBG(1, "Free /dev/videoX node not found");
                 video_nr[dev_nr] = -1;
                 dev_nr = (dev_nr < ZC0301_MAX_DEVICES-1) ? dev_nr+1 : 0;
-                mutex_unlock(&cam->dev_mutex);
+                complete_all(&cam->probe);
                 goto fail;
         }
 
@@ -2004,8 +2014,10 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         dev_nr = (dev_nr < ZC0301_MAX_DEVICES-1) ? dev_nr+1 : 0;
 
         usb_set_intfdata(intf, cam);
+        kref_init(&cam->kref);
+        usb_get_dev(cam->usbdev);
 
-        mutex_unlock(&cam->dev_mutex);
+        complete_all(&cam->probe);
 
         return 0;
 
@@ -2022,40 +2034,31 @@ fail:
 
 static void zc0301_usb_disconnect(struct usb_interface* intf)
 {
-        struct zc0301_device* cam = usb_get_intfdata(intf);
-
-        if (!cam)
-                return;
+        struct zc0301_device* cam;
 
-        down_write(&zc0301_disconnect);
+        down_write(&zc0301_dev_lock);
 
-        mutex_lock(&cam->dev_mutex);
+        cam = usb_get_intfdata(intf);
 
         DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
-        wake_up_interruptible_all(&cam->open);
-
         if (cam->users) {
                 DBG(2, "Device /dev/video%d is open! Deregistration and "
-                       "memory deallocation are deferred on close.",
+                       "memory deallocation are deferred.",
                     cam->v4ldev->minor);
                 cam->state |= DEV_MISCONFIGURED;
                 zc0301_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;
                 wake_up_interruptible(&cam->wait_frame);
                 wake_up(&cam->wait_stream);
-                usb_get_dev(cam->usbdev);
-        } else {
+        } else
                 cam->state |= DEV_DISCONNECTED;
-                zc0301_release_resources(cam);
-        }
 
-        mutex_unlock(&cam->dev_mutex);
+        wake_up_interruptible_all(&cam->wait_open);
 
-        if (!cam->users)
-                kfree(cam);
+        kref_put(&cam->kref, zc0301_release_resources);
 
-        up_write(&zc0301_disconnect);
+        up_write(&zc0301_dev_lock);
 }
 
 
diff --git a/drivers/media/video/zc0301/zc0301_pas202bcb.c b/drivers/media/video/zc0301/zc0301_pas202bcb.c
index 3efb92a0d0da..24b0dfba357e 100644
--- a/drivers/media/video/zc0301/zc0301_pas202bcb.c
+++ b/drivers/media/video/zc0301/zc0301_pas202bcb.c
@@ -327,6 +327,7 @@ static struct zc0301_sensor pas202bcb = {
                 .height = 480,
                 .pixelformat = V4L2_PIX_FMT_JPEG,
                 .priv = 8,
+                .colorspace = V4L2_COLORSPACE_JPEG,
         },
 };
 
diff --git a/drivers/media/video/zc0301/zc0301_pb0330.c b/drivers/media/video/zc0301/zc0301_pb0330.c
index 5784b1d1491c..9519aba3612e 100644
--- a/drivers/media/video/zc0301/zc0301_pb0330.c
+++ b/drivers/media/video/zc0301/zc0301_pb0330.c
@@ -157,6 +157,7 @@ static struct zc0301_sensor pb0330 = {
                 .height = 480,
                 .pixelformat = V4L2_PIX_FMT_JPEG,
                 .priv = 8,
+                .colorspace = V4L2_COLORSPACE_JPEG,
         },
 };
 
diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h
index 44e82cff9319..70fe6fc6cdd5 100644
--- a/drivers/media/video/zc0301/zc0301_sensor.h
+++ b/drivers/media/video/zc0301/zc0301_sensor.h
@@ -23,7 +23,7 @@
 #define _ZC0301_SENSOR_H_
 
 #include <linux/usb.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/device.h>
 #include <linux/stddef.h>
 #include <linux/errno.h>
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index cf0ed6cbb0e3..17118a490f81 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -183,14 +183,7 @@ static const int zoran_num_formats =
     (sizeof(zoran_formats) / sizeof(struct zoran_format));
 
 // RJ: Test only - want to test BUZ_USE_HIMEM even when CONFIG_BIGPHYS_AREA is defined
-#if !defined(CONFIG_BIGPHYS_AREA)
-//#undef CONFIG_BIGPHYS_AREA
-#define BUZ_USE_HIMEM
-#endif
 
-#if defined(CONFIG_BIGPHYS_AREA)
-#   include <linux/bigphysarea.h>
-#endif
 
 extern int *zr_debug;
 
@@ -250,7 +243,6 @@ static void jpg_fbuffer_free(struct file *file);
  *   Linux with the necessary memory left over).
  */
 
-#if defined(BUZ_USE_HIMEM) && !defined(CONFIG_BIGPHYS_AREA)
 static unsigned long
 get_high_mem (unsigned long size)
 {
@@ -314,7 +306,6 @@ get_high_mem (unsigned long size)
 
         return hi_mem_ph;
 }
-#endif
 
 static int
 v4l_fbuffer_alloc (struct file *file)
@@ -323,9 +314,7 @@ v4l_fbuffer_alloc (struct file *file)
         struct zoran *zr = fh->zr;
         int i, off;
         unsigned char *mem;
-#if defined(BUZ_USE_HIMEM) && !defined(CONFIG_BIGPHYS_AREA)
         unsigned long pmem = 0;
-#endif
 
         /* we might have old buffers lying around... */
         if (fh->v4l_buffers.ready_to_be_freed) {
@@ -369,39 +358,6 @@ v4l_fbuffer_alloc (struct file *file)
                                 ZR_DEVNAME(zr), i, (unsigned long) mem,
                                 virt_to_bus(mem));
                 } else {
-#if defined(CONFIG_BIGPHYS_AREA)
-                        /* Use bigphysarea_alloc_pages */
-
-                        int n =
-                            (fh->v4l_buffers.buffer_size + PAGE_SIZE -
-                             1) / PAGE_SIZE;
-
-                        mem =
-                            (unsigned char *) bigphysarea_alloc_pages(n, 0,
-                                                                      GFP_KERNEL);
-                        if (mem == 0) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: v4l_fbuffer_alloc() - bigphysarea_alloc_pages for V4L buf %d failed\n",
-                                        ZR_DEVNAME(zr), i);
-                                v4l_fbuffer_free(file);
-                                return -ENOBUFS;
-                        }
-                        fh->v4l_buffers.buffer[i].fbuffer = mem;
-                        fh->v4l_buffers.buffer[i].fbuffer_phys =
-                            virt_to_phys(mem);
-                        fh->v4l_buffers.buffer[i].fbuffer_bus =
-                            virt_to_bus(mem);
-                        dprintk(4,
-                                KERN_INFO
-                                "%s: Bigphysarea frame %d mem 0x%x (bus: 0x%x)\n",
-                                ZR_DEVNAME(zr), i, (unsigned) mem,
-                                (unsigned) virt_to_bus(mem));
-
-                        /* Zero out the allocated memory */
-                        memset(fh->v4l_buffers.buffer[i].fbuffer, 0,
-                               fh->v4l_buffers.buffer_size);
-#elif defined(BUZ_USE_HIMEM)
 
                         /* Use high memory which has been left at boot time */
 
@@ -441,20 +397,6 @@ v4l_fbuffer_alloc (struct file *file)
                                 fh->v4l_buffers.buffer[i].fbuffer_bus =
                                     pmem + i * fh->v4l_buffers.buffer_size;
                         }
-#else
-                        /* No bigphysarea present, usage of high memory disabled,
-                         * but user wants buffers of more than MAX_KMALLOC_MEM */
-                        dprintk(1,
-                                KERN_ERR
-                                "%s: v4l_fbuffer_alloc() - no bigphysarea_patch present, usage of high memory disabled,\n",
-                                ZR_DEVNAME(zr));
-                        dprintk(1,
-                                KERN_ERR
-                                "%s: v4l_fbuffer_alloc() - sorry, could not allocate %d V4L buffers of size %d KB.\n",
-                                ZR_DEVNAME(zr), fh->v4l_buffers.num_buffers,
-                                fh->v4l_buffers.buffer_size >> 10);
-                        return -ENOBUFS;
-#endif
                 }
         }
 
@@ -485,11 +427,6 @@ v4l_fbuffer_free (struct file *file)
                                 ClearPageReserved(MAP_NR(mem + off));
                         kfree((void *) fh->v4l_buffers.buffer[i].fbuffer);
                 }
-#if defined(CONFIG_BIGPHYS_AREA)
-                else
-                        bigphysarea_free_pages((void *) fh->v4l_buffers.
-                                               buffer[i].fbuffer);
-#endif
                 fh->v4l_buffers.buffer[i].fbuffer = NULL;
         }
 
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index b5d3364c94c7..6f1892585cbb 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -92,6 +92,7 @@ static struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0784, 0x0040), .driver_info = METHOD1 },
         {USB_DEVICE(0x06d6, 0x0034), .driver_info = METHOD0 },
         {USB_DEVICE(0x0a17, 0x0062), .driver_info = METHOD2 },
+        {USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 },
         {}                      /* Terminating entry */
 };
 
@@ -792,6 +793,7 @@ static int zr364xx_probe(struct usb_interface *intf,
 {
         struct usb_device *udev = interface_to_usbdev(intf);
         struct zr364xx_camera *cam = NULL;
+        int err;
 
         DBG("probing...");
 
@@ -799,12 +801,11 @@ static int zr364xx_probe(struct usb_interface *intf,
         info("model %04x:%04x detected", udev->descriptor.idVendor,
              udev->descriptor.idProduct);
 
-        if ((cam =
-             kmalloc(sizeof(struct zr364xx_camera), GFP_KERNEL)) == NULL) {
+        cam = kzalloc(sizeof(struct zr364xx_camera), GFP_KERNEL);
+        if (cam == NULL) {
                 info("cam: out of memory !");
-                return -ENODEV;
+                return -ENOMEM;
         }
-        memset(cam, 0x00, sizeof(struct zr364xx_camera));
         /* save the init method used by this camera */
         cam->method = id->driver_info;
 
@@ -812,7 +813,7 @@ static int zr364xx_probe(struct usb_interface *intf,
         if (cam->vdev == NULL) {
                 info("cam->vdev: out of memory !");
                 kfree(cam);
-                return -ENODEV;
+                return -ENOMEM;
         }
         memcpy(cam->vdev, &zr364xx_template, sizeof(zr364xx_template));
         video_set_drvdata(cam->vdev, cam);
@@ -858,12 +859,13 @@ static int zr364xx_probe(struct usb_interface *intf,
         cam->brightness = 64;
         mutex_init(&cam->lock);
 
-        if (video_register_device(cam->vdev, VFL_TYPE_GRABBER, -1) == -1) {
+        err = video_register_device(cam->vdev, VFL_TYPE_GRABBER, -1);
+        if (err) {
                 info("video_register_device failed");
                 video_device_release(cam->vdev);
                 kfree(cam->buffer);
                 kfree(cam);
-                return -ENODEV;
+                return err;
         }
 
         usb_set_intfdata(intf, cam);
@@ -905,7 +907,7 @@ static struct usb_driver zr364xx_driver = {
 static int __init zr364xx_init(void)
 {
         int retval;
-        retval = usb_register(&zr364xx_driver) < 0;
+        retval = usb_register(&zr364xx_driver);
         if (retval)
                 info("usb_register failed!");
         else