Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (120 commits)
  cx231xx: Convert to snd_card_create()
  V4L/DVB (11440): PWC: fix build error when CONFIG_INPUT=m
  V4L/DVB (11439): UVC: uvc_status_cleanup(): undefined reference to `input_unregister_device'
  V4L/DVB (11438): au0828: fix Kconfig dependance
  V4L/DVB (11437): pvrusb2: Drop client_register/unregister stubs
  V4L/DVB (11436): radio-mr800: convert to to v4l2_device
  V4L/DVB (11435): dsbr100 radio: convert to to v4l2_device
  V4L/DVB: zr364xx: remove unused #include <version.h>
  V4L/DVB: usbvision: remove unused #include <version.h>
  V4L/DVB (11427): gspca - m5602: Minor cleanups
  V4L/DVB (11426): gspca - m5602: Don't touch hflip/vflip register on Read/Modify/Write
  V4L/DVB (11425): gspca - m5602: Move the vflip quirk to probe stage.
  V4L/DVB (11424): gspca - m5602-ov9650: Use the local ctrl cache. Adjust image on vflip.
  V4L/DVB (11423): gspca - m5602-ov9650: Add a disconnect hook, setup a ctrl cache ctrl.
  V4L/DVB (11422): gspca - m5602-ov9650: Replace a magic constant with a define
  V4L/DVB (11421): gspca - m5602-ov9650: Synthesize modesetting.
  V4L/DVB (11420): gspca - m5602: Improve error handling in the ov9650 driver
  V4L/DVB (11419): gspca - m5602-ov9650: Don't read exposure data from COM1.
  V4L/DVB (11418): gspca - m5602-ov9650: Auto white balancing is on by default
  V4L/DVB (11417): gspca - m5602-ov9650: Autogain is on by default
  ...

200 files changed, 18702 insertions, 3343 deletions

diff --git a/Documentation/video4linux/pxa_camera.txt b/Documentation/video4linux/pxa_camera.txt
new file mode 100644
index 000000000000..b1137f9a53eb
--- /dev/null
+++ b/Documentation/video4linux/pxa_camera.txt
@@ -0,0 +1,125 @@
+                              PXA-Camera Host Driver
+                              ======================
+
+Constraints
+-----------
+  a) Image size for YUV422P format
+     All YUV422P images are enforced to have width x height % 16 = 0.
+     This is due to DMA constraints, which transfers only planes of 8 byte
+     multiples.
+
+
+Global video workflow
+---------------------
+  a) QCI stopped
+     Initialy, the QCI interface is stopped.
+     When a buffer is queued (pxa_videobuf_ops->buf_queue), the QCI starts.
+
+  b) QCI started
+     More buffers can be queued while the QCI is started without halting the
+     capture.  The new buffers are "appended" at the tail of the DMA chain, and
+     smoothly captured one frame after the other.
+
+     Once a buffer is filled in the QCI interface, it is marked as "DONE" and
+     removed from the active buffers list. It can be then requeud or dequeued by
+     userland application.
+
+     Once the last buffer is filled in, the QCI interface stops.
+
+
+DMA usage
+---------
+  a) DMA flow
+     - first buffer queued for capture
+       Once a first buffer is queued for capture, the QCI is started, but data
+       transfer is not started. On "End Of Frame" interrupt, the irq handler
+       starts the DMA chain.
+     - capture of one videobuffer
+       The DMA chain starts transfering data into videobuffer RAM pages.
+       When all pages are transfered, the DMA irq is raised on "ENDINTR" status
+     - finishing one videobuffer
+       The DMA irq handler marks the videobuffer as "done", and removes it from
+       the active running queue
+       Meanwhile, the next videobuffer (if there is one), is transfered by DMA
+     - finishing the last videobuffer
+       On the DMA irq of the last videobuffer, the QCI is stopped.
+
+  b) DMA prepared buffer will have this structure
+
+     +------------+-----+---------------+-----------------+
+     | desc-sg[0] | ... | desc-sg[last] | finisher/linker |
+     +------------+-----+---------------+-----------------+
+
+     This structure is pointed by dma->sg_cpu.
+     The descriptors are used as follows :
+      - desc-sg[i]: i-th descriptor, transfering the i-th sg
+        element to the video buffer scatter gather
+      - finisher: has ddadr=DADDR_STOP, dcmd=ENDIRQEN
+      - linker: has ddadr= desc-sg[0] of next video buffer, dcmd=0
+
+     For the next schema, let's assume d0=desc-sg[0] .. dN=desc-sg[N],
+     "f" stands for finisher and "l" for linker.
+     A typical running chain is :
+
+         Videobuffer 1         Videobuffer 2
+     +---------+----+---+  +----+----+----+---+
+     | d0 | .. | dN | l |  | d0 | .. | dN | f |
+     +---------+----+-|-+  ^----+----+----+---+
+                      |    |
+                      +----+
+
+     After the chaining is finished, the chain looks like :
+
+         Videobuffer 1         Videobuffer 2         Videobuffer 3
+     +---------+----+---+  +----+----+----+---+  +----+----+----+---+
+     | d0 | .. | dN | l |  | d0 | .. | dN | l |  | d0 | .. | dN | f |
+     +---------+----+-|-+  ^----+----+----+-|-+  ^----+----+----+---+
+                      |    |                |    |
+                      +----+                +----+
+                                           new_link
+
+  c) DMA hot chaining timeslice issue
+
+     As DMA chaining is done while DMA _is_ running, the linking may be done
+     while the DMA jumps from one Videobuffer to another. On the schema, that
+     would be a problem if the following sequence is encountered :
+
+      - DMA chain is Videobuffer1 + Videobuffer2
+      - pxa_videobuf_queue() is called to queue Videobuffer3
+      - DMA controller finishes Videobuffer2, and DMA stops
+      =>
+         Videobuffer 1         Videobuffer 2
+     +---------+----+---+  +----+----+----+---+
+     | d0 | .. | dN | l |  | d0 | .. | dN | f |
+     +---------+----+-|-+  ^----+----+----+-^-+
+                      |    |                |
+                      +----+                +-- DMA DDADR loads DDADR_STOP
+
+      - pxa_dma_add_tail_buf() is called, the Videobuffer2 "finisher" is
+        replaced by a "linker" to Videobuffer3 (creation of new_link)
+      - pxa_videobuf_queue() finishes
+      - the DMA irq handler is called, which terminates Videobuffer2
+      - Videobuffer3 capture is not scheduled on DMA chain (as it stopped !!!)
+
+         Videobuffer 1         Videobuffer 2         Videobuffer 3
+     +---------+----+---+  +----+----+----+---+  +----+----+----+---+
+     | d0 | .. | dN | l |  | d0 | .. | dN | l |  | d0 | .. | dN | f |
+     +---------+----+-|-+  ^----+----+----+-|-+  ^----+----+----+---+
+                      |    |                |    |
+                      +----+                +----+
+                                           new_link
+                                          DMA DDADR still is DDADR_STOP
+
+      - pxa_camera_check_link_miss() is called
+        This checks if the DMA is finished and a buffer is still on the
+        pcdev->capture list. If that's the case, the capture will be restarted,
+        and Videobuffer3 is scheduled on DMA chain.
+      - the DMA irq handler finishes
+
+     Note: if DMA stops just after pxa_camera_check_link_miss() reads DDADR()
+     value, we have the guarantee that the DMA irq handler will be called back
+     when the DMA will finish the buffer, and pxa_camera_check_link_miss() will
+     be called again, to reschedule Videobuffer3.
+
+--
+Author: Robert Jarzmik <robert.jarzmik@free.fr>
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index a31177390e55..854808b67fae 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -90,7 +90,7 @@ up before calling v4l2_device_register then it will be untouched. If dev is
 NULL, then you *must* setup v4l2_dev->name before calling v4l2_device_register.
 
 The first 'dev' argument is normally the struct device pointer of a pci_dev,
-usb_device or platform_device. It is rare for dev to be NULL, but it happens
+usb_interface or platform_device. It is rare for dev to be NULL, but it happens
 with ISA devices or when one device creates multiple PCI devices, thus making
 it impossible to associate v4l2_dev with a particular parent.
 
@@ -351,17 +351,6 @@ And this to go from an i2c_client to a v4l2_subdev struct:
 
         struct v4l2_subdev *sd = i2c_get_clientdata(client);
 
-Finally you need to make a command function to make driver->command()
-call the right subdev_ops functions:
-
-static int subdev_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-        return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
-If driver->command is never used then you can leave this out. Eventually the
-driver->command usage should be removed from v4l.
-
 Make sure to call v4l2_device_unregister_subdev(sd) when the remove() callback
 is called. This will unregister the sub-device from the bridge driver. It is
 safe to call this even if the sub-device was never registered.
@@ -375,14 +364,12 @@ from the remove() callback ensures that this is always done correctly.
 
 The bridge driver also has some helper functions it can use:
 
-struct v4l2_subdev *sd = v4l2_i2c_new_subdev(adapter, "module_foo", "chipid", 0x36);
+struct v4l2_subdev *sd = v4l2_i2c_new_subdev(v4l2_dev, adapter,
+               "module_foo", "chipid", 0x36);
 
 This loads the given module (can be NULL if no module needs to be loaded) and
 calls i2c_new_device() with the given i2c_adapter and chip/address arguments.
-If all goes well, then it registers the subdev with the v4l2_device. It gets
-the v4l2_device by calling i2c_get_adapdata(adapter), so you should make sure
-to call i2c_set_adapdata(adapter, v4l2_device) when you setup the i2c_adapter
-in your driver.
+If all goes well, then it registers the subdev with the v4l2_device.
 
 You can also use v4l2_i2c_new_probed_subdev() which is very similar to
 v4l2_i2c_new_subdev(), except that it has an array of possible I2C addresses
diff --git a/MAINTAINERS b/MAINTAINERS
index 9673cd28a69b..914f283dac08 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1544,7 +1544,6 @@ S:	Maintained
 DVB SUBSYSTEM AND DRIVERS
 P:      LinuxTV.org Project
 M:      linux-media@vger.kernel.org
-L:      linux-dvb@linuxtv.org (subscription required)
 W:      http://linuxtv.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
diff --git a/arch/arm/mach-mx1/Makefile b/arch/arm/mach-mx1/Makefile
index 82f1309568ef..7f86fe073ec6 100644
--- a/arch/arm/mach-mx1/Makefile
+++ b/arch/arm/mach-mx1/Makefile
@@ -6,6 +6,9 @@
 
 obj-y                   += generic.o clock.o devices.o
 
+# Support for CMOS sensor interface
+obj-$(CONFIG_MX1_VIDEO) += ksym_mx1.o mx1_camera_fiq.o
+
 # Specific board support
 obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o
 obj-$(CONFIG_MACH_SCB9328) += scb9328.o
\ No newline at end of file
diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c
index 97f42d96d7a1..76d1ffb48079 100644
--- a/arch/arm/mach-mx1/devices.c
+++ b/arch/arm/mach-mx1/devices.c
@@ -44,7 +44,7 @@ static struct resource imx_csi_resources[] = {
 static u64 imx_csi_dmamask = 0xffffffffUL;
 
 struct platform_device imx_csi_device = {
-        .name           = "imx-csi",
+        .name           = "mx1-camera",
         .id             = 0, /* This is used to put cameras on this interface */
         .dev            = {
                 .dma_mask = &imx_csi_dmamask,
diff --git a/arch/arm/mach-mx1/ksym_mx1.c b/arch/arm/mach-mx1/ksym_mx1.c
new file mode 100644
index 000000000000..b09ee12a4ff0
--- /dev/null
+++ b/arch/arm/mach-mx1/ksym_mx1.c
@@ -0,0 +1,18 @@
+/*
+ * Exported ksyms of ARCH_MX1
+ *
+ * Copyright (C) 2008, Darius Augulis <augulis.darius@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+
+#include <mach/mx1_camera.h>
+
+/* IMX camera FIQ handler */
+EXPORT_SYMBOL(mx1_camera_sof_fiq_start);
+EXPORT_SYMBOL(mx1_camera_sof_fiq_end);
diff --git a/arch/arm/mach-mx1/mx1_camera_fiq.S b/arch/arm/mach-mx1/mx1_camera_fiq.S
new file mode 100644
index 000000000000..9c69aa65bf17
--- /dev/null
+++ b/arch/arm/mach-mx1/mx1_camera_fiq.S
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (C) 2008 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ *
+ *  Based on linux/arch/arm/lib/floppydma.S
+ *      Copyright (C) 1995, 1996 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+                .text
+                .global mx1_camera_sof_fiq_end
+                .global mx1_camera_sof_fiq_start
+mx1_camera_sof_fiq_start:
+                @ enable dma
+                ldr     r12, [r9]
+                orr     r12, r12, #0x00000001
+                str     r12, [r9]
+                @ unmask DMA interrupt
+                ldr     r12, [r8]
+                bic     r12, r12, r13
+                str     r12, [r8]
+                @ disable SOF interrupt
+                ldr     r12, [r10]
+                bic     r12, r12, #0x00010000
+                str     r12, [r10]
+                @ clear SOF flag
+                mov     r12, #0x00010000
+                str     r12, [r11]
+                @ return from FIQ
+                subs    pc, lr, #4
+mx1_camera_sof_fiq_end:
diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c
index ca46f4801c3d..9957a11533a4 100644
--- a/arch/arm/mach-mx3/clock.c
+++ b/arch/arm/mach-mx3/clock.c
@@ -533,7 +533,7 @@ static struct clk_lookup lookups[] __initdata = {
         _REGISTER_CLOCK(NULL, "kpp", kpp_clk)
         _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1)
         _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2)
-        _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk)
+        _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk)
         _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk)
         _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk)
         _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
index e0783e619580..eca37d09f3f8 100644
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
@@ -24,4 +24,12 @@
 #define PHYS_OFFSET             UL(0x80000000)
 #endif
 
+#if defined(CONFIG_MX1_VIDEO)
+/*
+ * Increase size of DMA-consistent memory region.
+ * This is required for i.MX camera driver to capture at least four VGA frames.
+ */
+#define CONSISTENT_DMA_SIZE SZ_4M
+#endif /* CONFIG_MX1_VIDEO */
+
 #endif /* __ASM_ARCH_MXC_MEMORY_H__ */
diff --git a/arch/arm/plat-mxc/include/mach/mx1_camera.h b/arch/arm/plat-mxc/include/mach/mx1_camera.h
new file mode 100644
index 000000000000..4fd6c70314b4
--- /dev/null
+++ b/arch/arm/plat-mxc/include/mach/mx1_camera.h
@@ -0,0 +1,35 @@
+/*
+ * mx1_camera.h - i.MX1/i.MXL camera driver header file
+ *
+ * Copyright (c) 2008, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ * Copyright (C) 2009, Darius Augulis <augulis.darius@gmail.com>
+ *
+ * Based on PXA camera.h file:
+ * Copyright (C) 2003, Intel Corporation
+ * Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_ARCH_CAMERA_H_
+#define __ASM_ARCH_CAMERA_H_
+
+#define MX1_CAMERA_DATA_HIGH    1
+#define MX1_CAMERA_PCLK_RISING  2
+#define MX1_CAMERA_VSYNC_HIGH   4
+
+extern unsigned char mx1_camera_sof_fiq_start, mx1_camera_sof_fiq_end;
+
+/**
+ * struct mx1_camera_pdata - i.MX1/i.MXL camera platform data
+ * @mclk_10khz: master clock frequency in 10kHz units
+ * @flags:      MX1 camera platform flags
+ */
+struct mx1_camera_pdata {
+        unsigned long mclk_10khz;
+        unsigned long flags;
+};
+
+#endif /* __ASM_ARCH_CAMERA_H_ */
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 6103caad1644..60955a70d880 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -294,7 +294,7 @@ config DVB_USB_DTV5100
 
 config DVB_USB_AF9015
         tristate "Afatech AF9015 DVB-T USB2.0 support"
-        depends on DVB_USB && EXPERIMENTAL
+        depends on DVB_USB
         select DVB_AF9013
         select DVB_PLL              if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_MT2060   if !MEDIA_TUNER_CUSTOMISE
@@ -309,6 +309,6 @@ config DVB_USB_CE6230
         tristate "Intel CE6230 DVB-T USB2.0 support"
         depends on DVB_USB && EXPERIMENTAL
         select DVB_ZL10353
-        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Intel CE6230 DVB-T USB2.0 receiver
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index f0ba8b07b84f..53bfc8e42fb9 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -782,17 +782,14 @@ static int af9015_read_config(struct usb_device *udev)
                                   ARRAY_SIZE(af9015_ir_table_leadtek);
                                 break;
                         case USB_VID_VISIONPLUS:
-                                if (udev->descriptor.idProduct ==
-                                cpu_to_le16(USB_PID_AZUREWAVE_AD_TU700)) {
-                                        af9015_properties[i].rc_key_map =
-                                          af9015_rc_keys_twinhan;
-                                        af9015_properties[i].rc_key_map_size =
-                                          ARRAY_SIZE(af9015_rc_keys_twinhan);
-                                        af9015_config.ir_table =
-                                          af9015_ir_table_twinhan;
-                                        af9015_config.ir_table_size =
-                                          ARRAY_SIZE(af9015_ir_table_twinhan);
-                                }
+                                af9015_properties[i].rc_key_map =
+                                  af9015_rc_keys_twinhan;
+                                af9015_properties[i].rc_key_map_size =
+                                  ARRAY_SIZE(af9015_rc_keys_twinhan);
+                                af9015_config.ir_table =
+                                  af9015_ir_table_twinhan;
+                                af9015_config.ir_table_size =
+                                  ARRAY_SIZE(af9015_ir_table_twinhan);
                                 break;
                         case USB_VID_KWORLD_2:
                                 /* TODO: use correct rc keys */
@@ -833,6 +830,16 @@ static int af9015_read_config(struct usb_device *udev)
                                           af9015_ir_table_msi;
                                         af9015_config.ir_table_size =
                                           ARRAY_SIZE(af9015_ir_table_msi);
+                                } else if (udev->descriptor.idProduct ==
+                                        cpu_to_le16(USB_PID_TREKSTOR_DVBT)) {
+                                        af9015_properties[i].rc_key_map =
+                                          af9015_rc_keys_trekstor;
+                                        af9015_properties[i].rc_key_map_size =
+                                          ARRAY_SIZE(af9015_rc_keys_trekstor);
+                                        af9015_config.ir_table =
+                                          af9015_ir_table_trekstor;
+                                        af9015_config.ir_table_size =
+                                          ARRAY_SIZE(af9015_ir_table_trekstor);
                                 }
                                 break;
                         case USB_VID_AVERMEDIA:
@@ -981,6 +988,21 @@ error:
         if (ret)
                 err("eeprom read failed:%d", ret);
 
+        /* AverMedia AVerTV Volar Black HD (A850) device have bad EEPROM
+           content :-( Override some wrong values here. */
+        if (le16_to_cpu(udev->descriptor.idVendor) == USB_VID_AVERMEDIA &&
+            le16_to_cpu(udev->descriptor.idProduct) == USB_PID_AVERMEDIA_A850) {
+                deb_info("%s: AverMedia A850: overriding config\n", __func__);
+                /* disable dual mode */
+                af9015_config.dual_mode = 0;
+                 /* disable 2nd adapter */
+                for (i = 0; i < af9015_properties_count; i++)
+                        af9015_properties[i].num_adapters = 1;
+
+                /* set correct IF */
+                af9015_af9013_config[0].tuner_if = 4570;
+        }
+
         return ret;
 }
 
@@ -1237,6 +1259,9 @@ static struct usb_device_id af9015_usb_table[] = {
 /* 15 */{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGI_VOX_MINI_III)},
         {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U)},
         {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_2)},
+        {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_3)},
+        {USB_DEVICE(USB_VID_AFATECH,   USB_PID_TREKSTOR_DVBT)},
+        {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)},
         {0},
 };
 MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1401,7 +1426,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 
                 .i2c_algo = &af9015_i2c_algo,
 
-                .num_device_descs = 7,
+                .num_device_descs = 9,
                 .devices = {
                         {
                                 .name = "Xtensions XD-380",
@@ -1437,7 +1462,19 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                 .name = "KWorld USB DVB-T TV Stick II " \
                                         "(VS-DVB-T 395U)",
                                 .cold_ids = {&af9015_usb_table[16],
-                                             &af9015_usb_table[17], NULL},
+                                             &af9015_usb_table[17],
+                                             &af9015_usb_table[18], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "TrekStor DVB-T USB Stick",
+                                .cold_ids = {&af9015_usb_table[19], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "AverMedia AVerTV Volar Black HD " \
+                                        "(A850)",
+                                .cold_ids = {&af9015_usb_table[20], NULL},
                                 .warm_ids = {NULL},
                         },
                 }
diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
index 00e25714662a..8d81a17c116d 100644
--- a/drivers/media/dvb/dvb-usb/af9015.h
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -64,14 +64,6 @@
 
 #define AF9015_EEPROM_OFFSET (AF9015_EEPROM_SAW_BW2 - AF9015_EEPROM_SAW_BW1)
 
-#define AF9015_GPIO_ON (1 << 0)
-#define AF9015_GPIO_EN (1 << 1)
-#define AF9015_GPIO_O  (1 << 2)
-#define AF9015_GPIO_I  (1 << 3)
-
-#define AF9015_GPIO_TUNER_ON  (AF9015_GPIO_ON|AF9015_GPIO_EN)
-#define AF9015_GPIO_TUNER_OFF (AF9015_GPIO_ON|AF9015_GPIO_EN|AF9015_GPIO_O)
-
 struct req_t {
         u8  cmd;       /* [0] */
         /*  seq */     /* [1] */
@@ -120,11 +112,11 @@ struct af9015_config {
 
 enum af9015_remote {
         AF9015_REMOTE_NONE                    = 0,
-        AF9015_REMOTE_A_LINK_DTU_M,
+/* 1 */ AF9015_REMOTE_A_LINK_DTU_M,
         AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3,
         AF9015_REMOTE_MYGICTV_U718,
         AF9015_REMOTE_DIGITTRADE_DVB_T,
-        AF9015_REMOTE_AVERMEDIA_KS,
+/* 5 */ AF9015_REMOTE_AVERMEDIA_KS,
 };
 
 /* Leadtek WinFast DTV Dongle Gold */
@@ -691,4 +683,67 @@ static u8 af9015_ir_table_digittrade[] = {
         0x00, 0xff, 0x1d, 0xe2, 0x40, 0x00, 0x00,
 };
 
+/* TREKSTOR DVB-T USB Stick */
+static struct dvb_usb_rc_key af9015_rc_keys_trekstor[] = {
+        { 0x07, 0x04, KEY_AGAIN },              /* Home */
+        { 0x07, 0x05, KEY_MUTE },               /* Mute */
+        { 0x07, 0x06, KEY_UP },                 /* Up */
+        { 0x07, 0x07, KEY_DOWN },               /* Down */
+        { 0x07, 0x09, KEY_RIGHT },              /* Right */
+        { 0x07, 0x0a, KEY_ENTER },              /* OK */
+        { 0x07, 0x0b, KEY_FASTFORWARD },        /* Fast forward */
+        { 0x07, 0x0c, KEY_REWIND },             /* Rewind */
+        { 0x07, 0x0d, KEY_PLAY },               /* Play/Pause */
+        { 0x07, 0x0e, KEY_VOLUMEUP },           /* Volume + */
+        { 0x07, 0x0f, KEY_VOLUMEDOWN },         /* Volume - */
+        { 0x07, 0x10, KEY_RECORD },             /* Record */
+        { 0x07, 0x11, KEY_STOP },               /* Stop */
+        { 0x07, 0x12, KEY_ZOOM },               /* TV */
+        { 0x07, 0x13, KEY_EPG },                /* Info/EPG */
+        { 0x07, 0x14, KEY_CHANNELDOWN },        /* Channel - */
+        { 0x07, 0x15, KEY_CHANNELUP },          /* Channel + */
+        { 0x07, 0x1e, KEY_1 },
+        { 0x07, 0x1f, KEY_2 },
+        { 0x07, 0x20, KEY_3 },
+        { 0x07, 0x21, KEY_4 },
+        { 0x07, 0x22, KEY_5 },
+        { 0x07, 0x23, KEY_6 },
+        { 0x07, 0x24, KEY_7 },
+        { 0x07, 0x25, KEY_8 },
+        { 0x07, 0x26, KEY_9 },
+        { 0x07, 0x08, KEY_LEFT },               /* LEFT */
+        { 0x07, 0x27, KEY_0 },
+};
+
+static u8 af9015_ir_table_trekstor[] = {
+        0x00, 0xff, 0x86, 0x79, 0x04, 0x07, 0x00,
+        0x00, 0xff, 0x85, 0x7a, 0x05, 0x07, 0x00,
+        0x00, 0xff, 0x87, 0x78, 0x06, 0x07, 0x00,
+        0x00, 0xff, 0x8c, 0x73, 0x07, 0x07, 0x00,
+        0x00, 0xff, 0x89, 0x76, 0x09, 0x07, 0x00,
+        0x00, 0xff, 0x88, 0x77, 0x0a, 0x07, 0x00,
+        0x00, 0xff, 0x8a, 0x75, 0x0b, 0x07, 0x00,
+        0x00, 0xff, 0x9e, 0x61, 0x0c, 0x07, 0x00,
+        0x00, 0xff, 0x8d, 0x72, 0x0d, 0x07, 0x00,
+        0x00, 0xff, 0x8b, 0x74, 0x0e, 0x07, 0x00,
+        0x00, 0xff, 0x9b, 0x64, 0x0f, 0x07, 0x00,
+        0x00, 0xff, 0x9d, 0x62, 0x10, 0x07, 0x00,
+        0x00, 0xff, 0x8e, 0x71, 0x11, 0x07, 0x00,
+        0x00, 0xff, 0x9c, 0x63, 0x12, 0x07, 0x00,
+        0x00, 0xff, 0x8f, 0x70, 0x13, 0x07, 0x00,
+        0x00, 0xff, 0x93, 0x6c, 0x14, 0x07, 0x00,
+        0x00, 0xff, 0x97, 0x68, 0x15, 0x07, 0x00,
+        0x00, 0xff, 0x92, 0x6d, 0x1e, 0x07, 0x00,
+        0x00, 0xff, 0x96, 0x69, 0x1f, 0x07, 0x00,
+        0x00, 0xff, 0x9a, 0x65, 0x20, 0x07, 0x00,
+        0x00, 0xff, 0x91, 0x6e, 0x21, 0x07, 0x00,
+        0x00, 0xff, 0x95, 0x6a, 0x22, 0x07, 0x00,
+        0x00, 0xff, 0x99, 0x66, 0x23, 0x07, 0x00,
+        0x00, 0xff, 0x90, 0x6f, 0x24, 0x07, 0x00,
+        0x00, 0xff, 0x94, 0x6b, 0x25, 0x07, 0x00,
+        0x00, 0xff, 0x98, 0x67, 0x26, 0x07, 0x00,
+        0x00, 0xff, 0x9f, 0x60, 0x08, 0x07, 0x00,
+        0x00, 0xff, 0x84, 0x7b, 0x27, 0x07, 0x00,
+};
+
 #endif
diff --git a/drivers/media/dvb/dvb-usb/ce6230.c b/drivers/media/dvb/dvb-usb/ce6230.c
index 5862820f109f..52badc00e673 100644
--- a/drivers/media/dvb/dvb-usb/ce6230.c
+++ b/drivers/media/dvb/dvb-usb/ce6230.c
@@ -250,6 +250,7 @@ static int ce6230_probe(struct usb_interface *intf,
 
 static struct usb_device_id ce6230_table[] = {
         { USB_DEVICE(USB_VID_INTEL, USB_PID_INTEL_CE9500) },
+        { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A310) },
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, ce6230_table);
@@ -284,13 +285,18 @@ static struct dvb_usb_device_properties ce6230_properties = {
 
         .i2c_algo = &ce6230_i2c_algo,
 
-        .num_device_descs = 1,
+        .num_device_descs = 2,
         .devices = {
                 {
                         .name = "Intel CE9500 reference design",
                         .cold_ids = {NULL},
                         .warm_ids = {&ce6230_table[0], NULL},
                 },
+                {
+                        .name = "AVerMedia A310 USB 2.0 DVB-T tuner",
+                        .cold_ids = {NULL},
+                        .warm_ids = {&ce6230_table[1], NULL},
+                },
         }
 };
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index dc7ea21cd139..f506c74119f3 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -65,6 +65,7 @@
 #define USB_PID_AFATECH_AF9005                          0x9020
 #define USB_PID_AFATECH_AF9015_9015                     0x9015
 #define USB_PID_AFATECH_AF9015_9016                     0x9016
+#define USB_PID_TREKSTOR_DVBT                           0x901b
 #define USB_VID_ALINK_DTU                               0xf170
 #define USB_PID_ANSONIC_DVBT_USB                        0x6000
 #define USB_PID_ANYSEE                                  0x861f
@@ -102,6 +103,7 @@
 #define USB_PID_KWORLD_399U                             0xe399
 #define USB_PID_KWORLD_395U                             0xe396
 #define USB_PID_KWORLD_395U_2                           0xe39b
+#define USB_PID_KWORLD_395U_3                           0xe395
 #define USB_PID_KWORLD_PC160_2T                         0xc160
 #define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
 #define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
@@ -167,6 +169,8 @@
 #define USB_PID_AVERMEDIA_VOLAR_X                       0xa815
 #define USB_PID_AVERMEDIA_VOLAR_X_2                     0x8150
 #define USB_PID_AVERMEDIA_A309                          0xa309
+#define USB_PID_AVERMEDIA_A310                          0xa310
+#define USB_PID_AVERMEDIA_A850                          0x850a
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2      0x0081
diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c
index 12f7730184ad..32526f103b59 100644
--- a/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/drivers/media/dvb/firewire/firedtv-avc.c
@@ -151,7 +151,7 @@ static void debug_fcp(const u8 *data, int length)
                 subunit_type = data[1] >> 3;
                 subunit_id = data[1] & 7;
                 op = subunit_type == 0x1e || subunit_id == 5 ? ~0 : data[2];
-                printk(KERN_INFO "%ssu=%x.%x l=%zu: %-8s - %s\n",
+                printk(KERN_INFO "%ssu=%x.%x l=%d: %-8s - %s\n",
                        prefix, subunit_type, subunit_id, length,
                        debug_fcp_ctype(data[0]),
                        debug_fcp_opcode(op, data, length));
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index a486a7f81fa9..23e4cffeba38 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -513,6 +513,13 @@ config DVB_LGS8GL5
         help
           A DMB-TH tuner module. Say Y when you want to support this frontend.
 
+config DVB_LGS8GXX
+        tristate "Legend Silicon LGS8913/LGS8GL5/LGS8GXX DMB-TH demodulator"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DMB-TH tuner module. Say Y when you want to support this frontend.
+
 comment "Tools to develop new frontends"
 
 config DVB_DUMMY_FE
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 65a336aa1db6..bc2b00abd106 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_DVB_TDA10048) += tda10048.o
 obj-$(CONFIG_DVB_TUNER_CX24113) += cx24113.o
 obj-$(CONFIG_DVB_S5H1411) += s5h1411.o
 obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o
+obj-$(CONFIG_DVB_LGS8GXX) += lgs8gxx.o
 obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o
 obj-$(CONFIG_DVB_AF9013) += af9013.o
 obj-$(CONFIG_DVB_CX24116) += cx24116.o
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index d63e1527dc88..9e9a75576a1d 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -652,7 +652,7 @@ static int au8522_reset(struct v4l2_subdev *sd, u32 val)
 }
 
 static int au8522_s_video_routing(struct v4l2_subdev *sd,
-                                  const struct v4l2_routing *route)
+                                        u32 input, u32 output, u32 config)
 {
         struct au8522_state *state = to_state(sd);
 
@@ -663,11 +663,11 @@ static int au8522_s_video_routing(struct v4l2_subdev *sd,
            closed), and then came back to analog mode */
         au8522_writereg(state, 0x106, 1);
 
-        if (route->input == AU8522_COMPOSITE_CH1) {
+        if (input == AU8522_COMPOSITE_CH1) {
                 au8522_setup_cvbs_mode(state);
-        } else if (route->input == AU8522_SVIDEO_CH13) {
+        } else if (input == AU8522_SVIDEO_CH13) {
                 au8522_setup_svideo_mode(state);
-        } else if (route->input == AU8522_COMPOSITE_CH4_SIF) {
+        } else if (input == AU8522_COMPOSITE_CH4_SIF) {
                 au8522_setup_cvbs_tuner_mode(state);
         } else {
                 printk(KERN_ERR "au8522 mode not currently supported\n");
@@ -677,10 +677,10 @@ static int au8522_s_video_routing(struct v4l2_subdev *sd,
 }
 
 static int au8522_s_audio_routing(struct v4l2_subdev *sd,
-                                  const struct v4l2_routing *route)
+                                        u32 input, u32 output, u32 config)
 {
         struct au8522_state *state = to_state(sd);
-        set_audio_input(state, route->input);
+        set_audio_input(state, input);
         return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c
new file mode 100644
index 000000000000..f9785dfe735b
--- /dev/null
+++ b/drivers/media/dvb/frontends/lgs8gxx.c
@@ -0,0 +1,816 @@
+/*
+ *    Support for Legend Silicon DMB-TH demodulator
+ *    LGS8913, LGS8GL5
+ *    experimental support LGS8G42, LGS8G52
+ *
+ *    Copyright (C) 2007,2008 David T.L. Wong <davidtlwong@gmail.com>
+ *    Copyright (C) 2008 Sirius International (Hong Kong) Limited
+ *    Timothy Lee <timothy.lee@siriushk.com> (for initial work on LGS8GL5)
+ *
+ *    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.
+ *
+ */
+
+#include <asm/div64.h>
+
+#include "dvb_frontend.h"
+
+#include "lgs8gxx.h"
+#include "lgs8gxx_priv.h"
+
+#define dprintk(args...) \
+        do { \
+                if (debug) \
+                        printk(KERN_DEBUG "lgs8gxx: " args); \
+        } while (0)
+
+static int debug;
+static int fake_signal_str;
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+module_param(fake_signal_str, int, 0644);
+MODULE_PARM_DESC(fake_signal_str, "fake signal strength for LGS8913."
+"Signal strength calculation is slow.(default:off).");
+
+/* LGS8GXX internal helper functions */
+
+static int lgs8gxx_write_reg(struct lgs8gxx_state *priv, u8 reg, u8 data)
+{
+        int ret;
+        u8 buf[] = { reg, data };
+        struct i2c_msg msg = { .flags = 0, .buf = buf, .len = 2 };
+
+        msg.addr = priv->config->demod_address;
+        if (reg >= 0xC0)
+                msg.addr += 0x02;
+
+        if (debug >= 2)
+                printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n",
+                        __func__, reg, data);
+
+        ret = i2c_transfer(priv->i2c, &msg, 1);
+
+        if (ret != 1)
+                dprintk(KERN_DEBUG "%s: error reg=0x%x, data=0x%x, ret=%i\n",
+                        __func__, reg, data, ret);
+
+        return (ret != 1) ? -1 : 0;
+}
+
+static int lgs8gxx_read_reg(struct lgs8gxx_state *priv, u8 reg, u8 *p_data)
+{
+        int ret;
+        u8 dev_addr;
+
+        u8 b0[] = { reg };
+        u8 b1[] = { 0 };
+        struct i2c_msg msg[] = {
+                { .flags = 0, .buf = b0, .len = 1 },
+                { .flags = I2C_M_RD, .buf = b1, .len = 1 },
+        };
+
+        dev_addr = priv->config->demod_address;
+        if (reg >= 0xC0)
+                dev_addr += 0x02;
+        msg[1].addr =  msg[0].addr = dev_addr;
+
+        ret = i2c_transfer(priv->i2c, msg, 2);
+        if (ret != 2) {
+                dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n",
+                        __func__, reg, ret);
+                return -1;
+        }
+
+        *p_data = b1[0];
+        if (debug >= 2)
+                printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n",
+                        __func__, reg, b1[0]);
+        return 0;
+}
+
+static int lgs8gxx_soft_reset(struct lgs8gxx_state *priv)
+{
+        lgs8gxx_write_reg(priv, 0x02, 0x00);
+        msleep(1);
+        lgs8gxx_write_reg(priv, 0x02, 0x01);
+        msleep(100);
+
+        return 0;
+}
+
+static int lgs8gxx_set_ad_mode(struct lgs8gxx_state *priv)
+{
+        const struct lgs8gxx_config *config = priv->config;
+        u8 if_conf;
+
+        if_conf = 0x10; /* AGC output on; */
+
+        if_conf |=
+                ((config->ext_adc) ? 0x80 : 0x00) |
+                ((config->if_neg_center) ? 0x04 : 0x00) |
+                ((config->if_freq == 0) ? 0x08 : 0x00) | /* Baseband */
+                ((config->ext_adc && config->adc_signed) ? 0x02 : 0x00) |
+                ((config->ext_adc && config->if_neg_edge) ? 0x01 : 0x00);
+
+        if (config->ext_adc &&
+                (config->prod == LGS8GXX_PROD_LGS8G52)) {
+                lgs8gxx_write_reg(priv, 0xBA, 0x40);
+        }
+
+        lgs8gxx_write_reg(priv, 0x07, if_conf);
+
+        return 0;
+}
+
+static int lgs8gxx_set_if_freq(struct lgs8gxx_state *priv, u32 freq /*in kHz*/)
+{
+        u64 val;
+        u32 v32;
+        u32 if_clk;
+
+        if_clk = priv->config->if_clk_freq;
+
+        val = freq;
+        if (freq != 0) {
+                val *= (u64)1 << 32;
+                if (if_clk != 0)
+                        do_div(val, if_clk);
+                v32 = val & 0xFFFFFFFF;
+                dprintk("Set IF Freq to %dkHz\n", freq);
+        } else {
+                v32 = 0;
+                dprintk("Set IF Freq to baseband\n");
+        }
+        dprintk("AFC_INIT_FREQ = 0x%08X\n", v32);
+
+        lgs8gxx_write_reg(priv, 0x09, 0xFF & (v32));
+        lgs8gxx_write_reg(priv, 0x0A, 0xFF & (v32 >> 8));
+        lgs8gxx_write_reg(priv, 0x0B, 0xFF & (v32 >> 16));
+        lgs8gxx_write_reg(priv, 0x0C, 0xFF & (v32 >> 24));
+
+        return 0;
+}
+
+static int lgs8gxx_set_mode_auto(struct lgs8gxx_state *priv)
+{
+        u8 t;
+
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913)
+                lgs8gxx_write_reg(priv, 0xC6, 0x01);
+
+        lgs8gxx_read_reg(priv, 0x7E, &t);
+        lgs8gxx_write_reg(priv, 0x7E, t | 0x01);
+
+        /* clear FEC self reset */
+        lgs8gxx_read_reg(priv, 0xC5, &t);
+        lgs8gxx_write_reg(priv, 0xC5, t & 0xE0);
+
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913) {
+                /* FEC auto detect */
+                lgs8gxx_write_reg(priv, 0xC1, 0x03);
+
+                lgs8gxx_read_reg(priv, 0x7C, &t);
+                t = (t & 0x8C) | 0x03;
+                lgs8gxx_write_reg(priv, 0x7C, t);
+        }
+
+
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913) {
+                /* BER test mode */
+                lgs8gxx_read_reg(priv, 0xC3, &t);
+                t = (t & 0xEF) |  0x10;
+                lgs8gxx_write_reg(priv, 0xC3, t);
+        }
+
+        if (priv->config->prod == LGS8GXX_PROD_LGS8G52)
+                lgs8gxx_write_reg(priv, 0xD9, 0x40);
+
+        return 0;
+}
+
+static int lgs8gxx_set_mode_manual(struct lgs8gxx_state *priv)
+{
+        int ret = 0;
+        u8 t;
+
+        /* turn off auto-detect; manual settings */
+        lgs8gxx_write_reg(priv, 0x7E, 0);
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913)
+                lgs8gxx_write_reg(priv, 0xC1, 0);
+
+        ret = lgs8gxx_read_reg(priv, 0xC5, &t);
+        t = (t & 0xE0) | 0x06;
+        lgs8gxx_write_reg(priv, 0xC5, t);
+
+        lgs8gxx_soft_reset(priv);
+
+        return 0;
+}
+
+static int lgs8gxx_is_locked(struct lgs8gxx_state *priv, u8 *locked)
+{
+        int ret = 0;
+        u8 t;
+
+        ret = lgs8gxx_read_reg(priv, 0x4B, &t);
+        if (ret != 0)
+                return ret;
+
+        *locked = ((t & 0xC0) == 0xC0) ? 1 : 0;
+        return 0;
+}
+
+static int lgs8gxx_is_autodetect_finished(struct lgs8gxx_state *priv,
+                                          u8 *finished)
+{
+        int ret = 0;
+        u8 t;
+
+        ret = lgs8gxx_read_reg(priv, 0xA4, &t);
+        if (ret != 0)
+                return ret;
+
+        *finished = ((t & 0x3) == 0x1) ? 1 : 0;
+
+        return 0;
+}
+
+static int lgs8gxx_autolock_gi(struct lgs8gxx_state *priv, u8 gi, u8 *locked)
+{
+        int err;
+        u8 ad_fini = 0;
+
+        if (gi == GI_945)
+                dprintk("try GI 945\n");
+        else if (gi == GI_595)
+                dprintk("try GI 595\n");
+        else if (gi == GI_420)
+                dprintk("try GI 420\n");
+        lgs8gxx_write_reg(priv, 0x04, gi);
+        lgs8gxx_soft_reset(priv);
+        msleep(50);
+        err = lgs8gxx_is_autodetect_finished(priv, &ad_fini);
+        if (err != 0)
+                return err;
+        if (ad_fini) {
+                err = lgs8gxx_is_locked(priv, locked);
+                if (err != 0)
+                        return err;
+        }
+
+        return 0;
+}
+
+static int lgs8gxx_auto_detect(struct lgs8gxx_state *priv,
+                               u8 *detected_param, u8 *gi)
+{
+        int i, j;
+        int err = 0;
+        u8 locked = 0, tmp_gi;
+
+        dprintk("%s\n", __func__);
+
+        lgs8gxx_set_mode_auto(priv);
+        /* Guard Interval */
+        lgs8gxx_write_reg(priv, 0x03, 00);
+
+        for (i = 0; i < 2; i++) {
+                for (j = 0; j < 2; j++) {
+                        tmp_gi = GI_945;
+                        err = lgs8gxx_autolock_gi(priv, GI_945, &locked);
+                        if (err)
+                                goto out;
+                        if (locked)
+                                goto locked;
+                }
+                for (j = 0; j < 2; j++) {
+                        tmp_gi = GI_420;
+                        err = lgs8gxx_autolock_gi(priv, GI_420, &locked);
+                        if (err)
+                                goto out;
+                        if (locked)
+                                goto locked;
+                }
+                tmp_gi = GI_595;
+                err = lgs8gxx_autolock_gi(priv, GI_595, &locked);
+                if (err)
+                        goto out;
+                if (locked)
+                        goto locked;
+        }
+
+locked:
+        if ((err == 0) && (locked == 1)) {
+                u8 t;
+
+                lgs8gxx_read_reg(priv, 0xA2, &t);
+                *detected_param = t;
+
+                if (tmp_gi == GI_945)
+                        dprintk("GI 945 locked\n");
+                else if (tmp_gi == GI_595)
+                        dprintk("GI 595 locked\n");
+                else if (tmp_gi == GI_420)
+                        dprintk("GI 420 locked\n");
+                *gi = tmp_gi;
+        }
+        if (!locked)
+                err = -1;
+
+out:
+        return err;
+}
+
+static void lgs8gxx_auto_lock(struct lgs8gxx_state *priv)
+{
+        s8 err;
+        u8 gi = 0x2;
+        u8 detected_param = 0;
+
+        err = lgs8gxx_auto_detect(priv, &detected_param, &gi);
+
+        if (err != 0) {
+                dprintk("lgs8gxx_auto_detect failed\n");
+        }
+
+        /* Apply detected parameters */
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913) {
+                u8 inter_leave_len = detected_param & TIM_MASK ;
+                inter_leave_len = (inter_leave_len == TIM_LONG) ? 0x60 : 0x40;
+                detected_param &= CF_MASK | SC_MASK  | LGS_FEC_MASK;
+                detected_param |= inter_leave_len;
+        }
+        lgs8gxx_write_reg(priv, 0x7D, detected_param);
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913)
+                lgs8gxx_write_reg(priv, 0xC0, detected_param);
+        /* lgs8gxx_soft_reset(priv); */
+
+        /* Enter manual mode */
+        lgs8gxx_set_mode_manual(priv);
+
+        switch (gi) {
+        case GI_945:
+                priv->curr_gi = 945; break;
+        case GI_595:
+                priv->curr_gi = 595; break;
+        case GI_420:
+                priv->curr_gi = 420; break;
+        default:
+                priv->curr_gi = 945; break;
+        }
+}
+
+static int lgs8gxx_set_mpeg_mode(struct lgs8gxx_state *priv,
+        u8 serial, u8 clk_pol, u8 clk_gated)
+{
+        int ret = 0;
+        u8 t;
+
+        ret = lgs8gxx_read_reg(priv, 0xC2, &t);
+        if (ret != 0)
+                return ret;
+
+        t &= 0xF8;
+        t |= serial ? TS_SERIAL : TS_PARALLEL;
+        t |= clk_pol ? TS_CLK_INVERTED : TS_CLK_NORMAL;
+        t |= clk_gated ? TS_CLK_GATED : TS_CLK_FREERUN;
+
+        ret = lgs8gxx_write_reg(priv, 0xC2, t);
+        if (ret != 0)
+                return ret;
+
+        return 0;
+}
+
+
+/* LGS8913 demod frontend functions */
+
+static int lgs8913_init(struct lgs8gxx_state *priv)
+{
+        u8 t;
+
+        /* LGS8913 specific */
+        lgs8gxx_write_reg(priv, 0xc1, 0x3);
+
+        lgs8gxx_read_reg(priv, 0x7c, &t);
+        lgs8gxx_write_reg(priv, 0x7c, (t&0x8c) | 0x3);
+
+        /* LGS8913 specific */
+        lgs8gxx_read_reg(priv, 0xc3, &t);
+        lgs8gxx_write_reg(priv, 0xc3, t&0x10);
+
+
+        return 0;
+}
+
+static int lgs8gxx_init(struct dvb_frontend *fe)
+{
+        struct lgs8gxx_state *priv =
+                (struct lgs8gxx_state *)fe->demodulator_priv;
+        const struct lgs8gxx_config *config = priv->config;
+        u8 data = 0;
+        s8 err;
+        dprintk("%s\n", __func__);
+
+        lgs8gxx_read_reg(priv, 0, &data);
+        dprintk("reg 0 = 0x%02X\n", data);
+
+        /* Setup MPEG output format */
+        err = lgs8gxx_set_mpeg_mode(priv, config->serial_ts,
+                                    config->ts_clk_pol,
+                                    config->ts_clk_gated);
+        if (err != 0)
+                return -EIO;
+
+        if (config->prod == LGS8GXX_PROD_LGS8913)
+                lgs8913_init(priv);
+        lgs8gxx_set_if_freq(priv, priv->config->if_freq);
+        if (config->prod != LGS8GXX_PROD_LGS8913)
+                lgs8gxx_set_ad_mode(priv);
+
+        return 0;
+}
+
+static void lgs8gxx_release(struct dvb_frontend *fe)
+{
+        struct lgs8gxx_state *state = fe->demodulator_priv;
+        dprintk("%s\n", __func__);
+
+        kfree(state);
+}
+
+
+static int lgs8gxx_write(struct dvb_frontend *fe, u8 *buf, int len)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+
+        if (len != 2)
+                return -EINVAL;
+
+        return lgs8gxx_write_reg(priv, buf[0], buf[1]);
+}
+
+static int lgs8gxx_set_fe(struct dvb_frontend *fe,
+                          struct dvb_frontend_parameters *fe_params)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+
+        dprintk("%s\n", __func__);
+
+        /* set frequency */
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, fe_params);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
+        }
+
+        /* start auto lock */
+        lgs8gxx_auto_lock(priv);
+
+        msleep(10);
+
+        return 0;
+}
+
+static int lgs8gxx_get_fe(struct dvb_frontend *fe,
+                          struct dvb_frontend_parameters *fe_params)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+        u8 t;
+
+        dprintk("%s\n", __func__);
+
+        /* TODO: get real readings from device */
+        /* inversion status */
+        fe_params->inversion = INVERSION_OFF;
+
+        /* bandwidth */
+        fe_params->u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
+
+
+        lgs8gxx_read_reg(priv, 0x7D, &t);
+        fe_params->u.ofdm.code_rate_HP = FEC_AUTO;
+        fe_params->u.ofdm.code_rate_LP = FEC_AUTO;
+
+        /* constellation */
+        switch (t & SC_MASK) {
+        case SC_QAM64:
+                fe_params->u.ofdm.constellation = QAM_64;
+                break;
+        case SC_QAM32:
+                fe_params->u.ofdm.constellation = QAM_32;
+                break;
+        case SC_QAM16:
+                fe_params->u.ofdm.constellation = QAM_16;
+                break;
+        case SC_QAM4:
+        case SC_QAM4NR:
+                fe_params->u.ofdm.constellation = QPSK;
+                break;
+        default:
+                fe_params->u.ofdm.constellation = QAM_64;
+        }
+
+        /* transmission mode */
+        fe_params->u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;
+
+        /* guard interval */
+        fe_params->u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;
+
+        /* hierarchy */
+        fe_params->u.ofdm.hierarchy_information = HIERARCHY_NONE;
+
+        return 0;
+}
+
+static
+int lgs8gxx_get_tune_settings(struct dvb_frontend *fe,
+                              struct dvb_frontend_tune_settings *fesettings)
+{
+        /* FIXME: copy from tda1004x.c */
+        fesettings->min_delay_ms = 800;
+        fesettings->step_size = 0;
+        fesettings->max_drift = 0;
+        return 0;
+}
+
+static int lgs8gxx_read_status(struct dvb_frontend *fe, fe_status_t *fe_status)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+        s8 ret;
+        u8 t;
+
+        dprintk("%s\n", __func__);
+
+        ret = lgs8gxx_read_reg(priv, 0x4B, &t);
+        if (ret != 0)
+                return -EIO;
+
+        dprintk("Reg 0x4B: 0x%02X\n", t);
+
+        *fe_status = 0;
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913) {
+                if ((t & 0x40) == 0x40)
+                        *fe_status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
+                if ((t & 0x80) == 0x80)
+                        *fe_status |= FE_HAS_VITERBI | FE_HAS_SYNC |
+                                FE_HAS_LOCK;
+        } else {
+                if ((t & 0x80) == 0x80)
+                        *fe_status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |
+                                FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
+        }
+
+        /* success */
+        dprintk("%s: fe_status=0x%x\n", __func__, *fe_status);
+        return 0;
+}
+
+static int lgs8gxx_read_signal_agc(struct lgs8gxx_state *priv, u16 *signal)
+{
+        u16 v;
+        u8 agc_lvl[2], cat;
+
+        dprintk("%s()\n", __func__);
+        lgs8gxx_read_reg(priv, 0x3F, &agc_lvl[0]);
+        lgs8gxx_read_reg(priv, 0x3E, &agc_lvl[1]);
+
+        v = agc_lvl[0];
+        v <<= 8;
+        v |= agc_lvl[1];
+
+        dprintk("agc_lvl: 0x%04X\n", v);
+
+        if (v < 0x100)
+                cat = 0;
+        else if (v < 0x190)
+                cat = 5;
+        else if (v < 0x2A8)
+                cat = 4;
+        else if (v < 0x381)
+                cat = 3;
+        else if (v < 0x400)
+                cat = 2;
+        else if (v == 0x400)
+                cat = 1;
+        else
+                cat = 0;
+
+        *signal = cat;
+
+        return 0;
+}
+
+static int lgs8913_read_signal_strength(struct lgs8gxx_state *priv, u16 *signal)
+{
+        u8 t; s8 ret;
+        s16 max_strength = 0;
+        u8 str;
+        u16 i, gi = priv->curr_gi;
+
+        dprintk("%s\n", __func__);
+
+        ret = lgs8gxx_read_reg(priv, 0x4B, &t);
+        if (ret != 0)
+                return -EIO;
+
+        if (fake_signal_str) {
+                if ((t & 0xC0) == 0xC0) {
+                        dprintk("Fake signal strength as 50\n");
+                        *signal = 0x32;
+                } else
+                        *signal = 0;
+                return 0;
+        }
+
+        dprintk("gi = %d\n", gi);
+        for (i = 0; i < gi; i++) {
+
+                if ((i & 0xFF) == 0)
+                        lgs8gxx_write_reg(priv, 0x84, 0x03 & (i >> 8));
+                lgs8gxx_write_reg(priv, 0x83, i & 0xFF);
+
+                lgs8gxx_read_reg(priv, 0x94, &str);
+                if (max_strength < str)
+                        max_strength = str;
+        }
+
+        *signal = max_strength;
+        dprintk("%s: signal=0x%02X\n", __func__, *signal);
+
+        lgs8gxx_read_reg(priv, 0x95, &t);
+        dprintk("%s: AVG Noise=0x%02X\n", __func__, t);
+
+        return 0;
+}
+
+static int lgs8gxx_read_signal_strength(struct dvb_frontend *fe, u16 *signal)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+
+        if (priv->config->prod == LGS8GXX_PROD_LGS8913)
+                return lgs8913_read_signal_strength(priv, signal);
+        else
+                return lgs8gxx_read_signal_agc(priv, signal);
+}
+
+static int lgs8gxx_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+        u8 t;
+        *snr = 0;
+
+        lgs8gxx_read_reg(priv, 0x95, &t);
+        dprintk("AVG Noise=0x%02X\n", t);
+        *snr = 256 - t;
+        *snr <<= 8;
+        dprintk("snr=0x%x\n", *snr);
+
+        return 0;
+}
+
+static int lgs8gxx_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        *ucblocks = 0;
+        dprintk("%s: ucblocks=0x%x\n", __func__, *ucblocks);
+        return 0;
+}
+
+static int lgs8gxx_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+        u8 r0, r1, r2, r3;
+        u32 total_cnt, err_cnt;
+
+        dprintk("%s\n", __func__);
+
+        lgs8gxx_write_reg(priv, 0xc6, 0x01);
+        lgs8gxx_write_reg(priv, 0xc6, 0x41);
+        lgs8gxx_write_reg(priv, 0xc6, 0x01);
+
+        msleep(200);
+
+        lgs8gxx_write_reg(priv, 0xc6, 0x81);
+        lgs8gxx_read_reg(priv, 0xd0, &r0);
+        lgs8gxx_read_reg(priv, 0xd1, &r1);
+        lgs8gxx_read_reg(priv, 0xd2, &r2);
+        lgs8gxx_read_reg(priv, 0xd3, &r3);
+        total_cnt = (r3 << 24) | (r2 << 16) | (r1 << 8) | (r0);
+        lgs8gxx_read_reg(priv, 0xd4, &r0);
+        lgs8gxx_read_reg(priv, 0xd5, &r1);
+        lgs8gxx_read_reg(priv, 0xd6, &r2);
+        lgs8gxx_read_reg(priv, 0xd7, &r3);
+        err_cnt = (r3 << 24) | (r2 << 16) | (r1 << 8) | (r0);
+        dprintk("error=%d total=%d\n", err_cnt, total_cnt);
+
+        if (total_cnt == 0)
+                *ber = 0;
+        else
+                *ber = err_cnt * 100 / total_cnt;
+
+        dprintk("%s: ber=0x%x\n", __func__, *ber);
+        return 0;
+}
+
+static int lgs8gxx_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
+{
+        struct lgs8gxx_state *priv = fe->demodulator_priv;
+
+        if (priv->config->tuner_address == 0)
+                return 0;
+        if (enable) {
+                u8 v = 0x80 | priv->config->tuner_address;
+                return lgs8gxx_write_reg(priv, 0x01, v);
+        }
+        return lgs8gxx_write_reg(priv, 0x01, 0);
+}
+
+static struct dvb_frontend_ops lgs8gxx_ops = {
+        .info = {
+                .name = "Legend Silicon LGS8913/LGS8GXX DMB-TH",
+                .type = FE_OFDM,
+                .frequency_min = 474000000,
+                .frequency_max = 858000000,
+                .frequency_stepsize = 10000,
+                .caps =
+                        FE_CAN_FEC_AUTO |
+                        FE_CAN_QAM_AUTO |
+                        FE_CAN_TRANSMISSION_MODE_AUTO |
+                        FE_CAN_GUARD_INTERVAL_AUTO
+        },
+
+        .release = lgs8gxx_release,
+
+        .init = lgs8gxx_init,
+        .write = lgs8gxx_write,
+        .i2c_gate_ctrl = lgs8gxx_i2c_gate_ctrl,
+
+        .set_frontend = lgs8gxx_set_fe,
+        .get_frontend = lgs8gxx_get_fe,
+        .get_tune_settings = lgs8gxx_get_tune_settings,
+
+        .read_status = lgs8gxx_read_status,
+        .read_ber = lgs8gxx_read_ber,
+        .read_signal_strength = lgs8gxx_read_signal_strength,
+        .read_snr = lgs8gxx_read_snr,
+        .read_ucblocks = lgs8gxx_read_ucblocks,
+};
+
+struct dvb_frontend *lgs8gxx_attach(const struct lgs8gxx_config *config,
+        struct i2c_adapter *i2c)
+{
+        struct lgs8gxx_state *priv = NULL;
+        u8 data = 0;
+
+        dprintk("%s()\n", __func__);
+
+        if (config == NULL || i2c == NULL)
+                return NULL;
+
+        priv = kzalloc(sizeof(struct lgs8gxx_state), GFP_KERNEL);
+        if (priv == NULL)
+                goto error_out;
+
+        priv->config = config;
+        priv->i2c = i2c;
+
+        /* check if the demod is there */
+        if (lgs8gxx_read_reg(priv, 0, &data) != 0) {
+                dprintk("%s lgs8gxx not found at i2c addr 0x%02X\n",
+                        __func__, priv->config->demod_address);
+                goto error_out;
+        }
+
+        lgs8gxx_read_reg(priv, 1, &data);
+
+        memcpy(&priv->frontend.ops, &lgs8gxx_ops,
+               sizeof(struct dvb_frontend_ops));
+        priv->frontend.demodulator_priv = priv;
+
+        return &priv->frontend;
+
+error_out:
+        dprintk("%s() error_out\n", __func__);
+        kfree(priv);
+        return NULL;
+
+}
+EXPORT_SYMBOL(lgs8gxx_attach);
+
+MODULE_DESCRIPTION("Legend Silicon LGS8913/LGS8GXX DMB-TH demodulator driver");
+MODULE_AUTHOR("David T. L. Wong <davidtlwong@gmail.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/lgs8gxx.h b/drivers/media/dvb/frontends/lgs8gxx.h
new file mode 100644
index 000000000000..321d366a8307
--- /dev/null
+++ b/drivers/media/dvb/frontends/lgs8gxx.h
@@ -0,0 +1,90 @@
+/*
+ *    Support for Legend Silicon DMB-TH demodulator
+ *    LGS8913, LGS8GL5
+ *    experimental support LGS8G42, LGS8G52
+ *
+ *    Copyright (C) 2007,2008 David T.L. Wong <davidtlwong@gmail.com>
+ *    Copyright (C) 2008 Sirius International (Hong Kong) Limited
+ *    Timothy Lee <timothy.lee@siriushk.com> (for initial work on LGS8GL5)
+ *
+ *    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 __LGS8GXX_H__
+#define __LGS8GXX_H__
+
+#include <linux/dvb/frontend.h>
+#include <linux/i2c.h>
+
+#define LGS8GXX_PROD_LGS8913 0
+#define LGS8GXX_PROD_LGS8GL5 1
+#define LGS8GXX_PROD_LGS8G42 3
+#define LGS8GXX_PROD_LGS8G52 4
+#define LGS8GXX_PROD_LGS8G54 5
+
+struct lgs8gxx_config {
+
+        /* product type */
+        u8 prod;
+
+        /* the demodulator's i2c address */
+        u8 demod_address;
+
+        /* parallel or serial transport stream */
+        u8 serial_ts;
+
+        /* transport stream polarity*/
+        u8 ts_clk_pol;
+
+        /* transport stream clock gated by ts_valid */
+        u8 ts_clk_gated;
+
+        /* A/D Clock frequency */
+        u32 if_clk_freq; /* in kHz */
+
+        /* IF frequency */
+        u32 if_freq; /* in kHz */
+
+        /*Use External ADC*/
+        u8 ext_adc;
+
+        /*External ADC output two's complement*/
+        u8 adc_signed;
+
+        /*Sample IF data at falling edge of IF_CLK*/
+        u8 if_neg_edge;
+
+        /*IF use Negative center frequency*/
+        u8 if_neg_center;
+
+        /* slave address and configuration of the tuner */
+        u8 tuner_address;
+};
+
+#if defined(CONFIG_DVB_LGS8GXX) || \
+        (defined(CONFIG_DVB_LGS8GXX_MODULE) && defined(MODULE))
+extern struct dvb_frontend *lgs8gxx_attach(const struct lgs8gxx_config *config,
+                                           struct i2c_adapter *i2c);
+#else
+static inline
+struct dvb_frontend *lgs8gxx_attach(const struct lgs8gxx_config *config,
+                                    struct i2c_adapter *i2c) {
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_LGS8GXX */
+
+#endif /* __LGS8GXX_H__ */
diff --git a/drivers/media/dvb/frontends/lgs8gxx_priv.h b/drivers/media/dvb/frontends/lgs8gxx_priv.h
new file mode 100644
index 000000000000..9776d30686dc
--- /dev/null
+++ b/drivers/media/dvb/frontends/lgs8gxx_priv.h
@@ -0,0 +1,70 @@
+/*
+ *    Support for Legend Silicon DMB-TH demodulator
+ *    LGS8913, LGS8GL5
+ *    experimental support LGS8G42, LGS8G52
+ *
+ *    Copyright (C) 2007,2008 David T.L. Wong <davidtlwong@gmail.com>
+ *    Copyright (C) 2008 Sirius International (Hong Kong) Limited
+ *    Timothy Lee <timothy.lee@siriushk.com> (for initial work on LGS8GL5)
+ *
+ *    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 LGS8913_PRIV_H
+#define LGS8913_PRIV_H
+
+struct lgs8gxx_state {
+        struct i2c_adapter *i2c;
+        /* configuration settings */
+        const struct lgs8gxx_config *config;
+        struct dvb_frontend frontend;
+        u16 curr_gi; /* current guard interval */
+};
+
+#define SC_MASK         0x1C    /* Sub-Carrier Modulation Mask */
+#define SC_QAM64        0x10    /* 64QAM modulation */
+#define SC_QAM32        0x0C    /* 32QAM modulation */
+#define SC_QAM16        0x08    /* 16QAM modulation */
+#define SC_QAM4NR       0x04    /* 4QAM modulation */
+#define SC_QAM4         0x00    /* 4QAM modulation */
+
+#define LGS_FEC_MASK    0x03    /* FEC Rate Mask */
+#define LGS_FEC_0_4     0x00    /* FEC Rate 0.4 */
+#define LGS_FEC_0_6     0x01    /* FEC Rate 0.6 */
+#define LGS_FEC_0_8     0x02    /* FEC Rate 0.8 */
+
+#define TIM_MASK          0x20  /* Time Interleave Length Mask */
+#define TIM_LONG          0x00  /* Time Interleave Length = 720 */
+#define TIM_MIDDLE     0x20   /* Time Interleave Length = 240 */
+
+#define CF_MASK 0x80    /* Control Frame Mask */
+#define CF_EN   0x80    /* Control Frame On */
+
+#define GI_MASK 0x03    /* Guard Interval Mask */
+#define GI_420  0x00    /* 1/9 Guard Interval */
+#define GI_595  0x01    /* */
+#define GI_945  0x02    /* 1/4 Guard Interval */
+
+
+#define TS_PARALLEL     0x00    /* Parallel TS Output a.k.a. SPI */
+#define TS_SERIAL       0x01    /* Serial TS Output a.k.a. SSI */
+#define TS_CLK_NORMAL           0x00    /* MPEG Clock Normal */
+#define TS_CLK_INVERTED         0x02    /* MPEG Clock Inverted */
+#define TS_CLK_GATED            0x00    /* MPEG clock gated */
+#define TS_CLK_FREERUN          0x04    /* MPEG clock free running*/
+
+
+#endif
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index cc54ed4efc48..613576202294 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -33,6 +33,9 @@
 
  History:
 
+ Version 0.45:
+        Converted to v4l2_device.
+
  Version 0.44:
         Add suspend/resume functions, fix unplug of device,
         a lot of cleanups and fixes by Alexey Klimov <klimov.linux@gmail.com>
@@ -88,7 +91,7 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/videodev2.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 
@@ -97,39 +100,8 @@
  */
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 
-#define DRIVER_VERSION "v0.44"
-#define RADIO_VERSION KERNEL_VERSION(0, 4, 4)
-
-static struct v4l2_queryctrl radio_qctrl[] = {
-        {
-                .id            = V4L2_CID_AUDIO_MUTE,
-                .name          = "Mute",
-                .minimum       = 0,
-                .maximum       = 1,
-                .default_value = 1,
-                .type          = V4L2_CTRL_TYPE_BOOLEAN,
-        },
-/* HINT: the disabled controls are only here to satify kradio and such apps */
-        {       .id             = V4L2_CID_AUDIO_VOLUME,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_BALANCE,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_BASS,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_TREBLE,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_LOUDNESS,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-};
+#define DRIVER_VERSION "v0.45"
+#define RADIO_VERSION KERNEL_VERSION(0, 4, 5)
 
 #define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>"
 #define DRIVER_DESC "D-Link DSB-R100 USB FM radio driver"
@@ -167,6 +139,8 @@ module_param(radio_nr, int, 0);
 struct dsbr100_device {
         struct usb_device *usbdev;
         struct video_device videodev;
+        struct v4l2_device v4l2_dev;
+
         u8 *transfer_buffer;
         struct mutex lock;      /* buffer locking */
         int curfreq;
@@ -384,6 +358,7 @@ static void usb_dsbr100_disconnect(struct usb_interface *intf)
         mutex_unlock(&radio->lock);
 
         video_unregister_device(&radio->videodev);
+        v4l2_device_disconnect(&radio->v4l2_dev);
 }
 
 
@@ -479,14 +454,11 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 static int vidioc_queryctrl(struct file *file, void *priv,
                                 struct v4l2_queryctrl *qc)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
-                if (qc->id && qc->id == radio_qctrl[i].id) {
-                        memcpy(qc, &(radio_qctrl[i]), sizeof(*qc));
-                        return 0;
-                }
+        switch (qc->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
         }
+
         return -EINVAL;
 }
 
@@ -656,6 +628,7 @@ static void usb_dsbr100_video_device_release(struct video_device *videodev)
 {
         struct dsbr100_device *radio = videodev_to_radio(videodev);
 
+        v4l2_device_unregister(&radio->v4l2_dev);
         kfree(radio->transfer_buffer);
         kfree(radio);
 }
@@ -683,22 +656,15 @@ static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
         .vidioc_s_input     = vidioc_s_input,
 };
 
-/* V4L2 interface */
-static struct video_device dsbr100_videodev_data = {
-        .name           = "D-Link DSB-R 100",
-        .fops           = &usb_dsbr100_fops,
-        .ioctl_ops      = &usb_dsbr100_ioctl_ops,
-        .release        = usb_dsbr100_video_device_release,
-};
-
 /* check if the device is present and register with v4l and usb if it is */
 static int usb_dsbr100_probe(struct usb_interface *intf,
                                 const struct usb_device_id *id)
 {
         struct dsbr100_device *radio;
+        struct v4l2_device *v4l2_dev;
         int retval;
 
-        radio = kmalloc(sizeof(struct dsbr100_device), GFP_KERNEL);
+        radio = kzalloc(sizeof(struct dsbr100_device), GFP_KERNEL);
 
         if (!radio)
                 return -ENOMEM;
@@ -710,17 +676,35 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
                 return -ENOMEM;
         }
 
+        v4l2_dev = &radio->v4l2_dev;
+
+        retval = v4l2_device_register(&intf->dev, v4l2_dev);
+        if (retval < 0) {
+                v4l2_err(v4l2_dev, "couldn't register v4l2_device\n");
+                kfree(radio->transfer_buffer);
+                kfree(radio);
+                return retval;
+        }
+
+        strlcpy(radio->videodev.name, v4l2_dev->name, sizeof(radio->videodev.name));
+        radio->videodev.v4l2_dev = v4l2_dev;
+        radio->videodev.fops = &usb_dsbr100_fops;
+        radio->videodev.ioctl_ops = &usb_dsbr100_ioctl_ops;
+        radio->videodev.release = usb_dsbr100_video_device_release;
+
         mutex_init(&radio->lock);
-        radio->videodev = dsbr100_videodev_data;
 
         radio->removed = 0;
         radio->users = 0;
         radio->usbdev = interface_to_usbdev(intf);
         radio->curfreq = FREQ_MIN * FREQ_MUL;
+
         video_set_drvdata(&radio->videodev, radio);
+
         retval = video_register_device(&radio->videodev, VFL_TYPE_RADIO, radio_nr);
         if (retval < 0) {
-                dev_err(&intf->dev, "couldn't register video device\n");
+                v4l2_err(v4l2_dev, "couldn't register video device\n");
+                v4l2_device_unregister(v4l2_dev);
                 kfree(radio->transfer_buffer);
                 kfree(radio);
                 return -EIO;
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index ac82e33cb6fc..35edee009ba8 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -355,20 +355,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int rtrack_open(struct file *file)
-{
-        return 0;
-}
-
-static int rtrack_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations rtrack_fops = {
         .owner          = THIS_MODULE,
-        .open           = rtrack_open,
-        .release        = rtrack_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 49299f7fd834..8daf809eb01a 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -318,20 +318,8 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         return -EINVAL;
 }
 
-static int aztech_open(struct file *file)
-{
-        return 0;
-}
-
-static int aztech_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations aztech_fops = {
         .owner          = THIS_MODULE,
-        .open           = aztech_open,
-        .release        = aztech_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 09265d25725e..c3f579de6e71 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -356,20 +356,8 @@ static struct pci_device_id gemtek_pci_id[] =
 
 MODULE_DEVICE_TABLE(pci, gemtek_pci_id);
 
-static int gemtek_pci_open(struct file *file)
-{
-        return 0;
-}
-
-static int gemtek_pci_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations gemtek_pci_fops = {
         .owner          = THIS_MODULE,
-        .open           = gemtek_pci_open,
-        .release        = gemtek_pci_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 150464426d1d..73985f641f07 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -375,20 +375,9 @@ static int gemtek_probe(struct gemtek *gt)
 /*
  * Video 4 Linux stuff.
  */
-static int gemtek_open(struct file *file)
-{
-        return 0;
-}
-
-static int gemtek_release(struct file *file)
-{
-        return 0;
-}
 
 static const struct v4l2_file_operations gemtek_fops = {
         .owner          = THIS_MODULE,
-        .open           = gemtek_open,
-        .release        = gemtek_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 01a6d22950ad..64d737c35acf 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -292,20 +292,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int maestro_open(struct file *file)
-{
-        return 0;
-}
-
-static int maestro_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations maestro_fops = {
         .owner          = THIS_MODULE,
-        .open           = maestro_open,
-        .release        = maestro_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 2606f0b30355..3da51fe8fb93 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -339,20 +339,8 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         return -EINVAL;
 }
 
-static int maxiradio_open(struct file *file)
-{
-        return 0;
-}
-
-static int maxiradio_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations maxiradio_fops = {
         .owner          = THIS_MODULE,
-        .open           = maxiradio_open,
-        .release        = maxiradio_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index ded25bfb366e..cab19d05e02f 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -43,6 +43,7 @@
  *                      Douglas Schilling Landgraf <dougsland@gmail.com> and
  *                      David Ellingsworth <david@identd.dyndns.org>
  *                      for discussion, help and support.
+ * Version 0.11:        Converted to v4l2_device.
  *
  * Many things to do:
  *      - Correct power managment of device (suspend & resume)
@@ -59,7 +60,7 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/videodev2.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO */
@@ -67,8 +68,8 @@
 /* driver and module definitions */
 #define DRIVER_AUTHOR "Alexey Klimov <klimov.linux@gmail.com>"
 #define DRIVER_DESC "AverMedia MR 800 USB FM radio driver"
-#define DRIVER_VERSION "0.10"
-#define RADIO_VERSION KERNEL_VERSION(0, 1, 0)
+#define DRIVER_VERSION "0.11"
+#define RADIO_VERSION KERNEL_VERSION(0, 1, 1)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -113,38 +114,6 @@ static int radio_nr = -1;
 module_param(radio_nr, int, 0);
 MODULE_PARM_DESC(radio_nr, "Radio Nr");
 
-static struct v4l2_queryctrl radio_qctrl[] = {
-        {
-                .id            = V4L2_CID_AUDIO_MUTE,
-                .name          = "Mute",
-                .minimum       = 0,
-                .maximum       = 1,
-                .step          = 1,
-                .default_value = 1,
-                .type          = V4L2_CTRL_TYPE_BOOLEAN,
-        },
-/* HINT: the disabled controls are only here to satify kradio and such apps */
-        {       .id             = V4L2_CID_AUDIO_VOLUME,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_BALANCE,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_BASS,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_TREBLE,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_LOUDNESS,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-};
-
 static int usb_amradio_probe(struct usb_interface *intf,
                              const struct usb_device_id *id);
 static void usb_amradio_disconnect(struct usb_interface *intf);
@@ -159,6 +128,7 @@ struct amradio_device {
         /* reference to USB and video device */
         struct usb_device *usbdev;
         struct video_device *videodev;
+        struct v4l2_device v4l2_dev;
 
         unsigned char *buffer;
         struct mutex lock;      /* buffer locking */
@@ -329,6 +299,7 @@ static void usb_amradio_disconnect(struct usb_interface *intf)
 
         usb_set_intfdata(intf, NULL);
         video_unregister_device(radio->videodev);
+        v4l2_device_disconnect(&radio->v4l2_dev);
 }
 
 /* vidioc_querycap - query device capabilities */
@@ -463,14 +434,11 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 static int vidioc_queryctrl(struct file *file, void *priv,
                                 struct v4l2_queryctrl *qc)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
-                if (qc->id && qc->id == radio_qctrl[i].id) {
-                        memcpy(qc, &(radio_qctrl[i]), sizeof(*qc));
-                        return 0;
-                }
+        switch (qc->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
         }
+
         return -EINVAL;
 }
 
@@ -671,34 +639,29 @@ static const struct v4l2_ioctl_ops usb_amradio_ioctl_ops = {
         .vidioc_s_input     = vidioc_s_input,
 };
 
-static void usb_amradio_device_release(struct video_device *videodev)
+static void usb_amradio_video_device_release(struct video_device *videodev)
 {
         struct amradio_device *radio = video_get_drvdata(videodev);
 
         /* we call v4l to free radio->videodev */
         video_device_release(videodev);
 
+        v4l2_device_unregister(&radio->v4l2_dev);
+
         /* free rest memory */
         kfree(radio->buffer);
         kfree(radio);
 }
 
-/* V4L2 interface */
-static struct video_device amradio_videodev_template = {
-        .name           = "AverMedia MR 800 USB FM Radio",
-        .fops           = &usb_amradio_fops,
-        .ioctl_ops      = &usb_amradio_ioctl_ops,
-        .release        = usb_amradio_device_release,
-};
-
 /* check if the device is present and register with v4l and usb if it is */
 static int usb_amradio_probe(struct usb_interface *intf,
                                 const struct usb_device_id *id)
 {
         struct amradio_device *radio;
+        struct v4l2_device *v4l2_dev;
         int retval;
 
-        radio = kmalloc(sizeof(struct amradio_device), GFP_KERNEL);
+        radio = kzalloc(sizeof(struct amradio_device), GFP_KERNEL);
 
         if (!radio) {
                 dev_err(&intf->dev, "kmalloc for amradio_device failed\n");
@@ -713,6 +676,15 @@ static int usb_amradio_probe(struct usb_interface *intf,
                 return -ENOMEM;
         }
 
+        v4l2_dev = &radio->v4l2_dev;
+        retval = v4l2_device_register(&intf->dev, v4l2_dev);
+        if (retval < 0) {
+                dev_err(&intf->dev, "couldn't register v4l2_device\n");
+                kfree(radio->buffer);
+                kfree(radio);
+                return retval;
+        }
+
         radio->videodev = video_device_alloc();
 
         if (!radio->videodev) {
@@ -722,8 +694,11 @@ static int usb_amradio_probe(struct usb_interface *intf,
                 return -ENOMEM;
         }
 
-        memcpy(radio->videodev, &amradio_videodev_template,
-                sizeof(amradio_videodev_template));
+        strlcpy(radio->videodev->name, v4l2_dev->name, sizeof(radio->videodev->name));
+        radio->videodev->v4l2_dev = v4l2_dev;
+        radio->videodev->fops = &usb_amradio_fops;
+        radio->videodev->ioctl_ops = &usb_amradio_ioctl_ops;
+        radio->videodev->release = usb_amradio_video_device_release;
 
         radio->removed = 0;
         radio->users = 0;
@@ -734,10 +709,12 @@ static int usb_amradio_probe(struct usb_interface *intf,
         mutex_init(&radio->lock);
 
         video_set_drvdata(radio->videodev, radio);
+
         retval = video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr);
         if (retval < 0) {
                 dev_err(&intf->dev, "could not register video device\n");
                 video_device_release(radio->videodev);
+                v4l2_device_unregister(v4l2_dev);
                 kfree(radio->buffer);
                 kfree(radio);
                 return -EIO;
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index d1e6b01d4eca..9cb193fa6e33 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -260,20 +260,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int rtrack2_open(struct file *file)
-{
-        return 0;
-}
-
-static int rtrack2_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations rtrack2_fops = {
         .owner          = THIS_MODULE,
-        .open           = rtrack2_open,
-        .release        = rtrack2_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index f4784f0d1a88..1dba8f0832a0 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -260,20 +260,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int fmi_open(struct file *file)
-{
-        return 0;
-}
-
-static int fmi_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations fmi_fops = {
         .owner          = THIS_MODULE,
-        .open           = fmi_open,
-        .release        = fmi_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 0ba9d88a80fc..c09ca8600ea1 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -377,20 +377,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int fmr2_open(struct file *file)
-{
-        return 0;
-}
-
-static int fmr2_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations fmr2_fops = {
         .owner          = THIS_MODULE,
-        .open           = fmr2_open,
-        .release        = fmr2_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 713e242ba8b2..92c297796a9f 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1686,7 +1686,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         /* show some infos about the specific si470x device */
         if (si470x_get_all_registers(radio) < 0) {
                 retval = -EIO;
-                goto err_all;
+                goto err_video;
         }
         printk(KERN_INFO DRIVER_NAME ": DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
                         radio->registers[DEVICEID], radio->registers[CHIPID]);
@@ -1694,7 +1694,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         /* get software and hardware versions */
         if (si470x_get_scratch_page_versions(radio) < 0) {
                 retval = -EIO;
-                goto err_all;
+                goto err_video;
         }
         printk(KERN_INFO DRIVER_NAME
                         ": software version %d, hardware version %d\n",
@@ -1727,7 +1727,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         radio->buffer = kmalloc(radio->buf_size, GFP_KERNEL);
         if (!radio->buffer) {
                 retval = -EIO;
-                goto err_all;
+                goto err_video;
         }
 
         /* rds buffer configuration */
@@ -1749,8 +1749,9 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
 
         return 0;
 err_all:
-        video_device_release(radio->videodev);
         kfree(radio->buffer);
+err_video:
+        video_device_release(radio->videodev);
 err_radio:
         kfree(radio);
 err_initial:
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 5b007f5c74b2..699db9acaaf7 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -332,20 +332,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int terratec_open(struct file *file)
-{
-        return 0;
-}
-
-static int terratec_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations terratec_fops = {
         .owner          = THIS_MODULE,
-        .open           = terratec_open,
-        .release        = terratec_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index d1be6492a07b..6f9ecc359356 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -338,20 +338,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int trust_open(struct file *file)
-{
-        return 0;
-}
-
-static int trust_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations trust_fops = {
         .owner          = THIS_MODULE,
-        .open           = trust_open,
-        .release        = trust_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 92d923c7f360..3a98f1399495 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -314,20 +314,8 @@ static int vidioc_log_status(struct file *file, void *priv)
         return 0;
 }
 
-static int typhoon_open(struct file *file)
-{
-        return 0;
-}
-
-static int typhoon_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations typhoon_fops = {
         .owner          = THIS_MODULE,
-        .open           = typhoon_open,
-        .release        = typhoon_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 1f85f2024dc0..80e98b6422fe 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -370,21 +370,9 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return a->index ? -EINVAL : 0;
 }
 
-static int zoltrix_open(struct file *file)
-{
-        return 0;
-}
-
-static int zoltrix_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations zoltrix_fops =
 {
         .owner          = THIS_MODULE,
-        .open           = zoltrix_open,
-        .release        = zoltrix_release,
         .ioctl          = video_ioctl2,
 };
 
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 76bad5819592..9d48da2fb013 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -746,6 +746,18 @@ config SOC_CAMERA_OV772X
         help
           This is a ov772x camera driver
 
+config MX1_VIDEO
+        bool
+
+config VIDEO_MX1
+        tristate "i.MX1/i.MXL CMOS Sensor Interface driver"
+        depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA
+        select FIQ
+        select VIDEOBUF_DMA_CONTIG
+        select MX1_VIDEO
+        ---help---
+          This is a v4l2 driver for the i.MX1/i.MXL CMOS Sensor Interface
+
 config VIDEO_MX3
         tristate "i.MX3x Camera Sensor Interface driver"
         depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA
@@ -795,6 +807,8 @@ source "drivers/media/video/hdpvr/Kconfig"
 
 source "drivers/media/video/em28xx/Kconfig"
 
+source "drivers/media/video/cx231xx/Kconfig"
+
 source "drivers/media/video/usbvision/Kconfig"
 
 source "drivers/media/video/usbvideo/Kconfig"
@@ -904,5 +918,4 @@ config USB_S2255
           This driver can be compiled as a module, called s2255drv.
 
 endif # V4L_USB_DRIVERS
-
 endif # VIDEO_CAPTURE_DRIVERS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index b9046744463b..3f1a0350a569 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -10,7 +10,7 @@ stkwebcam-objs	:=	stk-webcam.o stk-sensor.o
 
 omap2cam-objs   :=      omap24xxcam.o omap24xxcam-dma.o
 
-videodev-objs   :=      v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-subdev.o
+videodev-objs   :=      v4l2-dev.o v4l2-ioctl.o v4l2-device.o
 
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o
 ifeq ($(CONFIG_COMPAT),y)
@@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o
 obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
+obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
 obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
 obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o
 obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o
@@ -133,6 +134,7 @@ obj-$(CONFIG_VIDEO_CX18) += cx18/
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 obj-$(CONFIG_VIDEO_CX23885) += cx23885/
 
+obj-$(CONFIG_VIDEO_MX1)                 += mx1_camera.o
 obj-$(CONFIG_VIDEO_MX3)                 += mx3_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)              += pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)       += sh_mobile_ceu_camera.o
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 873c30a41bd7..97b003449c91 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -219,18 +219,19 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int adv7170_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int adv7170_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct adv7170 *encoder = to_adv7170(sd);
 
-        /* RJ: route->input = 0: input is from decoder
-           route->input = 1: input is from ZR36060
-           route->input = 2: color bar */
+        /* RJ: input = 0: input is from decoder
+           input = 1: input is from ZR36060
+           input = 2: color bar */
 
         v4l2_dbg(1, debug, sd, "set input from %s\n",
-                        route->input == 0 ? "decoder" : "ZR36060");
+                        input == 0 ? "decoder" : "ZR36060");
 
-        switch (route->input) {
+        switch (input) {
         case 0:
                 adv7170_write(sd, 0x01, 0x20);
                 adv7170_write(sd, 0x08, TR1CAPT);       /* TR1 */
@@ -250,11 +251,11 @@ static int adv7170_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *
                 break;
 
         default:
-                v4l2_dbg(1, debug, sd, "illegal input: %d\n", route->input);
+                v4l2_dbg(1, debug, sd, "illegal input: %d\n", input);
                 return -EINVAL;
         }
-        v4l2_dbg(1, debug, sd, "switched to %s\n", inputs[route->input]);
-        encoder->input = route->input;
+        v4l2_dbg(1, debug, sd, "switched to %s\n", inputs[input]);
+        encoder->input = input;
         return 0;
 }
 
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index ff1210303295..cf8c06c85ded 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -237,15 +237,16 @@ static int adv7175_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int adv7175_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int adv7175_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct adv7175 *encoder = to_adv7175(sd);
 
-        /* RJ: route->input = 0: input is from decoder
-           route->input = 1: input is from ZR36060
-           route->input = 2: color bar */
+        /* RJ: input = 0: input is from decoder
+           input = 1: input is from ZR36060
+           input = 2: color bar */
 
-        switch (route->input) {
+        switch (input) {
         case 0:
                 adv7175_write(sd, 0x01, 0x00);
 
@@ -288,11 +289,11 @@ static int adv7175_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *
                 break;
 
         default:
-                v4l2_dbg(1, debug, sd, "illegal input: %d\n", route->input);
+                v4l2_dbg(1, debug, sd, "illegal input: %d\n", input);
                 return -EINVAL;
         }
-        v4l2_dbg(1, debug, sd, "switched to %s\n", inputs[route->input]);
-        encoder->input = route->input;
+        v4l2_dbg(1, debug, sd, "switched to %s\n", inputs[input]);
+        encoder->input = input;
         return 0;
 }
 
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index 05cdf494dfb0..0c3a5ba0e857 100644
--- a/drivers/media/video/au0828/Kconfig
+++ b/drivers/media/video/au0828/Kconfig
@@ -4,6 +4,7 @@ config VIDEO_AU0828
         depends on I2C && INPUT && DVB_CORE && USB && VIDEO_V4L2
         select I2C_ALGOBIT
         select VIDEO_TVEEPROM
+        select VIDEOBUF_VMALLOC
         select DVB_AU8522 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index 1aabaa7e55bb..053bbe8c8e3a 100644
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -46,6 +46,7 @@ struct au0828_board au0828_boards[] = {
                 .name   = "Hauppauge HVR850",
                 .tuner_type = TUNER_XC5000,
                 .tuner_addr = 0x61,
+                .i2c_clk_divider = AU0828_I2C_CLK_30KHZ,
                 .input = {
                         {
                                 .type = AU0828_VMUX_TELEVISION,
@@ -70,6 +71,13 @@ struct au0828_board au0828_boards[] = {
                 .name   = "Hauppauge HVR950Q",
                 .tuner_type = TUNER_XC5000,
                 .tuner_addr = 0x61,
+                /* The au0828 hardware i2c implementation does not properly
+                   support the xc5000's i2c clock stretching.  So we need to
+                   lower the clock frequency enough where the 15us clock
+                   stretch fits inside of a normal clock cycle, or else the
+                   au0828 fails to set the STOP bit.  A 30 KHz clock puts the
+                   clock pulse width at 18us */
+                .i2c_clk_divider = AU0828_I2C_CLK_30KHZ,
                 .input = {
                         {
                                 .type = AU0828_VMUX_TELEVISION,
@@ -94,16 +102,19 @@ struct au0828_board au0828_boards[] = {
                 .name   = "Hauppauge HVR950Q rev xxF8",
                 .tuner_type = UNSET,
                 .tuner_addr = ADDR_UNSET,
+                .i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
         },
         [AU0828_BOARD_DVICO_FUSIONHDTV7] = {
                 .name   = "DViCO FusionHDTV USB",
                 .tuner_type = UNSET,
                 .tuner_addr = ADDR_UNSET,
+                .i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
         },
         [AU0828_BOARD_HAUPPAUGE_WOODBURY] = {
                 .name = "Hauppauge Woodbury",
                 .tuner_type = UNSET,
                 .tuner_addr = ADDR_UNSET,
+                .i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
         },
 };
 
@@ -200,8 +211,8 @@ void au0828_card_setup(struct au0828_dev *dev)
                 /* Load the analog demodulator driver (note this would need to
                    be abstracted out if we ever need to support a different
                    demod) */
-                sd = v4l2_i2c_new_subdev(&dev->i2c_adap, "au8522", "au8522",
-                                         0x8e >> 1);
+                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "au8522", "au8522", 0x8e >> 1);
                 if (sd == NULL)
                         printk(KERN_ERR "analog subdev registration failed\n");
         }
@@ -209,8 +220,8 @@ void au0828_card_setup(struct au0828_dev *dev)
         /* Setup tuners */
         if (dev->board.tuner_type != TUNER_ABSENT) {
                 /* Load the tuner module, which does the attach */
-                sd = v4l2_i2c_new_subdev(&dev->i2c_adap, "tuner", "tuner",
-                                         dev->board.tuner_addr);
+                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "tuner", "tuner", dev->board.tuner_addr);
                 if (sd == NULL)
                         printk(KERN_ERR "tuner subdev registration fail\n");
 
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c
index 8c761d164442..4cee0b92eeee 100644
--- a/drivers/media/video/au0828/au0828-core.c
+++ b/drivers/media/video/au0828/au0828-core.c
@@ -36,8 +36,6 @@ int au0828_debug;
 module_param_named(debug, au0828_debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages");
 
-static atomic_t au0828_instance = ATOMIC_INIT(0);
-
 #define _AU0828_BULKPIPE 0x03
 #define _BULKPIPESIZE 0xffff
 
@@ -169,7 +167,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
 static int au0828_usb_probe(struct usb_interface *interface,
         const struct usb_device_id *id)
 {
-        int ifnum, retval, i;
+        int ifnum, retval;
         struct au0828_dev *dev;
         struct usb_device *usbdev = interface_to_usbdev(interface);
 
@@ -197,10 +195,7 @@ static int au0828_usb_probe(struct usb_interface *interface,
         usb_set_intfdata(interface, dev);
 
         /* Create the v4l2_device */
-        i = atomic_inc_return(&au0828_instance) - 1;
-        snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s-%03d",
-                 "au0828", i);
-        retval = v4l2_device_register(&dev->usbdev->dev, &dev->v4l2_dev);
+        retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
         if (retval) {
                 printk(KERN_ERR "%s() v4l2_device_register failed\n",
                        __func__);
diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/video/au0828/au0828-i2c.c
index f9a958d0aef1..13e494365e70 100644
--- a/drivers/media/video/au0828/au0828-i2c.c
+++ b/drivers/media/video/au0828/au0828-i2c.c
@@ -39,13 +39,15 @@ MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
 static inline int i2c_slave_did_write_ack(struct i2c_adapter *i2c_adap)
 {
         struct au0828_dev *dev = i2c_adap->algo_data;
-        return au0828_read(dev, REG_201) & 0x08 ? 0 : 1;
+        return au0828_read(dev, AU0828_I2C_STATUS_201) &
+                AU0828_I2C_STATUS_NO_WRITE_ACK ? 0 : 1;
 }
 
 static inline int i2c_slave_did_read_ack(struct i2c_adapter *i2c_adap)
 {
         struct au0828_dev *dev = i2c_adap->algo_data;
-        return au0828_read(dev, REG_201) & 0x02 ? 0 : 1;
+        return au0828_read(dev, AU0828_I2C_STATUS_201) &
+                AU0828_I2C_STATUS_NO_READ_ACK ? 0 : 1;
 }
 
 static int i2c_wait_read_ack(struct i2c_adapter *i2c_adap)
@@ -67,7 +69,8 @@ static int i2c_wait_read_ack(struct i2c_adapter *i2c_adap)
 static inline int i2c_is_read_busy(struct i2c_adapter *i2c_adap)
 {
         struct au0828_dev *dev = i2c_adap->algo_data;
-        return au0828_read(dev, REG_201) & 0x01 ? 0 : 1;
+        return au0828_read(dev, AU0828_I2C_STATUS_201) &
+                AU0828_I2C_STATUS_READ_DONE ? 0 : 1;
 }
 
 static int i2c_wait_read_done(struct i2c_adapter *i2c_adap)
@@ -89,7 +92,8 @@ static int i2c_wait_read_done(struct i2c_adapter *i2c_adap)
 static inline int i2c_is_write_done(struct i2c_adapter *i2c_adap)
 {
         struct au0828_dev *dev = i2c_adap->algo_data;
-        return au0828_read(dev, REG_201) & 0x04 ? 1 : 0;
+        return au0828_read(dev, AU0828_I2C_STATUS_201) &
+                AU0828_I2C_STATUS_WRITE_DONE ? 1 : 0;
 }
 
 static int i2c_wait_write_done(struct i2c_adapter *i2c_adap)
@@ -111,7 +115,8 @@ static int i2c_wait_write_done(struct i2c_adapter *i2c_adap)
 static inline int i2c_is_busy(struct i2c_adapter *i2c_adap)
 {
         struct au0828_dev *dev = i2c_adap->algo_data;
-        return au0828_read(dev, REG_201) & 0x10 ? 1 : 0;
+        return au0828_read(dev, AU0828_I2C_STATUS_201) &
+                AU0828_I2C_STATUS_BUSY ? 1 : 0;
 }
 
 static int i2c_wait_done(struct i2c_adapter *i2c_adap)
@@ -139,19 +144,14 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 
         dprintk(4, "%s()\n", __func__);
 
-        au0828_write(dev, REG_2FF, 0x01);
+        au0828_write(dev, AU0828_I2C_MULTIBYTE_MODE_2FF, 0x01);
 
-        /* FIXME: There is a problem with i2c communications with xc5000 that
-           requires us to slow down the i2c clock until we have a better
-           strategy (such as using the secondary i2c bus to do firmware
-           loading */
-        if ((msg->addr << 1) == 0xc2)
-                au0828_write(dev, REG_202, 0x40);
-        else
-                au0828_write(dev, REG_202, 0x07);
+        /* Set the I2C clock */
+        au0828_write(dev, AU0828_I2C_CLK_DIVIDER_202,
+                     dev->board.i2c_clk_divider);
 
         /* Hardware needs 8 bit addresses */
-        au0828_write(dev, REG_203, msg->addr << 1);
+        au0828_write(dev, AU0828_I2C_DEST_ADDR_203, msg->addr << 1);
 
         dprintk(4, "SEND: %02x\n", msg->addr);
 
@@ -163,7 +163,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                    actual bytes to the bus, just do a read check.  This is
                    consistent with how I saw i2c device checking done in the
                    USB trace of the Windows driver */
-                au0828_write(dev, REG_200, 0x20);
+                au0828_write(dev, AU0828_I2C_TRIGGER_200,
+                             AU0828_I2C_TRIGGER_READ);
+
                 if (!i2c_wait_done(i2c_adap))
                         return -EIO;
 
@@ -177,7 +179,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 
                 dprintk(4, " %02x\n", msg->buf[i]);
 
-                au0828_write(dev, REG_205, msg->buf[i]);
+                au0828_write(dev, AU0828_I2C_WRITE_FIFO_205, msg->buf[i]);
 
                 strobe++;
                 i++;
@@ -186,9 +188,12 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 
                         /* Strobe the byte into the bus */
                         if (i < msg->len)
-                                au0828_write(dev, REG_200, 0x41);
+                                au0828_write(dev, AU0828_I2C_TRIGGER_200,
+                                             AU0828_I2C_TRIGGER_WRITE |
+                                             AU0828_I2C_TRIGGER_HOLD);
                         else
-                                au0828_write(dev, REG_200, 0x01);
+                                au0828_write(dev, AU0828_I2C_TRIGGER_200,
+                                             AU0828_I2C_TRIGGER_WRITE);
 
                         /* Reset strobe trigger */
                         strobe = 0;
@@ -216,25 +221,22 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
 
         dprintk(4, "%s()\n", __func__);
 
-        au0828_write(dev, REG_2FF, 0x01);
+        au0828_write(dev, AU0828_I2C_MULTIBYTE_MODE_2FF, 0x01);
 
-        /* FIXME: There is a problem with i2c communications with xc5000 that
-           requires us to slow down the i2c clock until we have a better
-           strategy (such as using the secondary i2c bus to do firmware
-           loading */
-        if ((msg->addr << 1) == 0xc2)
-                au0828_write(dev, REG_202, 0x40);
-        else
-                au0828_write(dev, REG_202, 0x07);
+        /* Set the I2C clock */
+        au0828_write(dev, AU0828_I2C_CLK_DIVIDER_202,
+                     dev->board.i2c_clk_divider);
 
         /* Hardware needs 8 bit addresses */
-        au0828_write(dev, REG_203, msg->addr << 1);
+        au0828_write(dev, AU0828_I2C_DEST_ADDR_203, msg->addr << 1);
 
         dprintk(4, " RECV:\n");
 
         /* Deal with i2c_scan */
         if (msg->len == 0) {
-                au0828_write(dev, REG_200, 0x20);
+                au0828_write(dev, AU0828_I2C_TRIGGER_200,
+                             AU0828_I2C_TRIGGER_READ);
+
                 if (i2c_wait_read_ack(i2c_adap))
                         return -EIO;
                 return 0;
@@ -245,14 +247,18 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                 i++;
 
                 if (i < msg->len)
-                        au0828_write(dev, REG_200, 0x60);
+                        au0828_write(dev, AU0828_I2C_TRIGGER_200,
+                                     AU0828_I2C_TRIGGER_READ |
+                                     AU0828_I2C_TRIGGER_HOLD);
                 else
-                        au0828_write(dev, REG_200, 0x20);
+                        au0828_write(dev, AU0828_I2C_TRIGGER_200,
+                                     AU0828_I2C_TRIGGER_READ);
 
                 if (!i2c_wait_read_done(i2c_adap))
                         return -EIO;
 
-                msg->buf[i-1] = au0828_read(dev, REG_209) & 0xff;
+                msg->buf[i-1] = au0828_read(dev, AU0828_I2C_READ_FIFO_209) &
+                        0xff;
 
                 dprintk(4, " %02x\n", msg->buf[i-1]);
         }
diff --git a/drivers/media/video/au0828/au0828-reg.h b/drivers/media/video/au0828/au0828-reg.h
index b15e4a3b6fc0..c39f3d2b721e 100644
--- a/drivers/media/video/au0828/au0828-reg.h
+++ b/drivers/media/video/au0828/au0828-reg.h
@@ -30,15 +30,36 @@
 #define AU0828_SENSORCTRL_100 0x100
 #define AU0828_SENSORCTRL_VBI_103 0x103
 
-#define REG_200 0x200
-#define REG_201 0x201
-#define REG_202 0x202
-#define REG_203 0x203
-#define REG_205 0x205
-#define REG_209 0x209
-#define REG_2FF 0x2ff
+/* I2C registers */
+#define AU0828_I2C_TRIGGER_200          0x200
+#define AU0828_I2C_STATUS_201           0x201
+#define AU0828_I2C_CLK_DIVIDER_202      0x202
+#define AU0828_I2C_DEST_ADDR_203        0x203
+#define AU0828_I2C_WRITE_FIFO_205       0x205
+#define AU0828_I2C_READ_FIFO_209        0x209
+#define AU0828_I2C_MULTIBYTE_MODE_2FF   0x2ff
 
 /* Audio registers */
 #define AU0828_AUDIOCTRL_50C 0x50C
 
 #define REG_600 0x600
+
+/*********************************************************************/
+/* Here are constants for values associated with the above registers */
+
+/* I2C Trigger (Reg 0x200) */
+#define AU0828_I2C_TRIGGER_WRITE        0x01
+#define AU0828_I2C_TRIGGER_READ         0x20
+#define AU0828_I2C_TRIGGER_HOLD         0x40
+
+/* I2C Status (Reg 0x201) */
+#define AU0828_I2C_STATUS_READ_DONE     0x01
+#define AU0828_I2C_STATUS_NO_READ_ACK   0x02
+#define AU0828_I2C_STATUS_WRITE_DONE    0x04
+#define AU0828_I2C_STATUS_NO_WRITE_ACK  0x08
+#define AU0828_I2C_STATUS_BUSY          0x10
+
+/* I2C Clock Divider (Reg 0x202) */
+#define AU0828_I2C_CLK_250KHZ 0x07
+#define AU0828_I2C_CLK_100KHZ 0x14
+#define AU0828_I2C_CLK_30KHZ  0x40
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index f7ad4958b94e..27bedc6c7791 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -1100,7 +1100,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm)
            have to make the au0828 bridge adjust the size of its capture
            buffer, which is currently hardcoded at 720x480 */
 
-        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_std, *norm);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, *norm);
         return 0;
 }
 
@@ -1154,7 +1154,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int index)
         struct au0828_fh *fh = priv;
         struct au0828_dev *dev = fh->dev;
         int i;
-        struct v4l2_routing route;
 
         dprintk(1, "VIDIOC_S_INPUT in function %s, input=%d\n", __func__,
                 index);
@@ -1180,9 +1179,8 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int index)
                 break;
         }
 
-        route.input = AUVI_INPUT(index).vmux;
-        route.output = 0;
-        v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing, &route);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing,
+                        AUVI_INPUT(index).vmux, 0, 0);
 
         for (i = 0; i < AU0828_MAX_INPUT; i++) {
                 int enable = 0;
@@ -1205,8 +1203,8 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int index)
                 }
         }
 
-        route.input = AUVI_INPUT(index).amux;
-        v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing, &route);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing,
+                        AUVI_INPUT(index).amux, 0, 0);
         return 0;
 }
 
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 6ed1a6129731..b977915efbd0 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -81,6 +81,7 @@ struct au0828_board {
         char *name;
         unsigned int tuner_type;
         unsigned char tuner_addr;
+        unsigned char i2c_clk_divider;
         struct au0828_input input[AU0828_MAX_INPUT];
 
 };
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index df4516d8dcab..f9330e3529c3 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -292,21 +292,22 @@ static int bt819_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int bt819_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int bt819_s_routing(struct v4l2_subdev *sd,
+                           u32 input, u32 output, u32 config)
 {
         struct bt819 *decoder = to_bt819(sd);
 
-        v4l2_dbg(1, debug, sd, "set input %x\n", route->input);
+        v4l2_dbg(1, debug, sd, "set input %x\n", input);
 
-        if (route->input < 0 || route->input > 7)
+        if (input < 0 || input > 7)
                 return -EINVAL;
 
         if (sd->v4l2_dev == NULL || sd->v4l2_dev->notify == NULL)
                 v4l2_err(sd, "no notify found!\n");
 
-        if (decoder->input != route->input) {
+        if (decoder->input != input) {
                 v4l2_subdev_notify(sd, BT819_FIFO_RESET_LOW, 0);
-                decoder->input = route->input;
+                decoder->input = input;
                 /* select mode */
                 if (decoder->input == 0) {
                         bt819_setbit(decoder, 0x0b, 6, 0);
@@ -444,9 +445,6 @@ static const struct v4l2_subdev_core_ops bt819_core_ops = {
         .g_ctrl = bt819_g_ctrl,
         .s_ctrl = bt819_s_ctrl,
         .queryctrl = bt819_queryctrl,
-};
-
-static const struct v4l2_subdev_tuner_ops bt819_tuner_ops = {
         .s_std = bt819_s_std,
 };
 
@@ -459,7 +457,6 @@ static const struct v4l2_subdev_video_ops bt819_video_ops = {
 
 static const struct v4l2_subdev_ops bt819_ops = {
         .core = &bt819_core_ops,
-        .tuner = &bt819_tuner_ops,
         .video = &bt819_video_ops,
 };
 
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 78db39503947..d0b4d4925ff8 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -142,16 +142,17 @@ static int bt856_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int bt856_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int bt856_s_routing(struct v4l2_subdev *sd,
+                           u32 input, u32 output, u32 config)
 {
         struct bt856 *encoder = to_bt856(sd);
 
-        v4l2_dbg(1, debug, sd, "set input %d\n", route->input);
+        v4l2_dbg(1, debug, sd, "set input %d\n", input);
 
         /* We only have video bus.
-         * route->input= 0: input is from bt819
-         * route->input= 1: input is from ZR36060 */
-        switch (route->input) {
+         * input= 0: input is from bt819
+         * input= 1: input is from ZR36060 */
+        switch (input) {
         case 0:
                 bt856_setbit(encoder, 0xde, 4, 0);
                 bt856_setbit(encoder, 0xde, 3, 1);
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c
index 350cae4b02c3..af7e3a5bac9f 100644
--- a/drivers/media/video/bt866.c
+++ b/drivers/media/video/bt866.c
@@ -99,7 +99,8 @@ static int bt866_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int bt866_s_routing(struct v4l2_subdev *sd,
+                           u32 input, u32 output, u32 config)
 {
         static const __u8 init[] = {
                 0xc8, 0xcc, /* CRSCALE */
@@ -137,7 +138,7 @@ static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *ro
 
         val = encoder->reg[0xdc];
 
-        if (route->input == 0)
+        if (input == 0)
                 val |= 0x40; /* CBSWAP */
         else
                 val &= ~0x40; /* !CBSWAP */
@@ -145,15 +146,15 @@ static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *ro
         bt866_write(encoder, 0xdc, val);
 
         val = encoder->reg[0xcc];
-        if (route->input == 2)
+        if (input == 2)
                 val |= 0x01; /* OSDBAR */
         else
                 val &= ~0x01; /* !OSDBAR */
         bt866_write(encoder, 0xcc, val);
 
-        v4l2_dbg(1, debug, sd, "set input %d\n", route->input);
+        v4l2_dbg(1, debug, sd, "set input %d\n", input);
 
-        switch (route->input) {
+        switch (input) {
         case 0:
         case 1:
         case 2:
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index b9c3ba51fb86..fdb4adff3d28 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -3324,17 +3324,6 @@ void __devinit bttv_init_card1(struct bttv *btv)
 /* initialization part two -- after registering i2c bus */
 void __devinit bttv_init_card2(struct bttv *btv)
 {
-        static const unsigned short tvaudio_addrs[] = {
-                I2C_ADDR_TDA8425   >> 1,
-                I2C_ADDR_TEA6300   >> 1,
-                I2C_ADDR_TEA6420   >> 1,
-                I2C_ADDR_TDA9840   >> 1,
-                I2C_ADDR_TDA985x_L >> 1,
-                I2C_ADDR_TDA985x_H >> 1,
-                I2C_ADDR_TDA9874   >> 1,
-                I2C_ADDR_PIC16C54  >> 1,
-                I2C_CLIENT_END
-        };
         int addr=ADDR_UNSET;
 
         btv->tuner_type = UNSET;
@@ -3512,12 +3501,15 @@ void __devinit bttv_init_card2(struct bttv *btv)
 
                 /* Load tuner module before issuing tuner config call! */
                 if (bttv_tvcards[btv->c.type].has_radio)
-                        v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tuner", "tuner", v4l2_i2c_tuner_addrs(ADDRS_RADIO));
-                v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
-                v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));
+                        v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_RADIO));
+                v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));
 
                 tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
                 tun_setup.type = btv->tuner_type;
@@ -3570,8 +3562,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 };
                 struct v4l2_subdev *sd;
 
-                sd = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "saa6588", "saa6588", addrs);
+                sd = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "saa6588", "saa6588", addrs);
                 btv->has_saa6588 = (sd != NULL);
         }
 
@@ -3595,8 +3587,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         I2C_CLIENT_END
                 };
 
-                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "msp3400", "msp3400", addrs);
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "msp3400", "msp3400", addrs);
                 if (btv->sd_msp34xx)
                         return;
                 goto no_audio;
@@ -3609,16 +3601,16 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         I2C_CLIENT_END
                 };
 
-                if (v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tda7432", "tda7432", addrs))
+                if (v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tda7432", "tda7432", addrs))
                         return;
                 goto no_audio;
         }
 
         case 3: {
                 /* The user specified that we should probe for tvaudio */
-                btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tvaudio", "tvaudio", tvaudio_addrs);
+                btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "tvaudio", "tvaudio", tvaudio_addrs());
                 if (btv->sd_tvaudio)
                         return;
                 goto no_audio;
@@ -3637,21 +3629,13 @@ void __devinit bttv_init_card2(struct bttv *btv)
            it really is a msp3400, so it will return NULL when the device
            found is really something else (e.g. a tea6300). */
         if (!bttv_tvcards[btv->c.type].no_msp34xx) {
-                static const unsigned short addrs[] = {
-                        I2C_ADDR_MSP3400 >> 1,
-                        I2C_CLIENT_END
-                };
-
-                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "msp3400", "msp3400", addrs);
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev_addr(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "msp3400", "msp3400",
+                        I2C_ADDR_MSP3400 >> 1);
         } else if (bttv_tvcards[btv->c.type].msp34xx_alt) {
-                static const unsigned short addrs[] = {
-                        I2C_ADDR_MSP3400_ALT >> 1,
-                        I2C_CLIENT_END
-                };
-
-                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "msp3400", "msp3400", addrs);
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev_addr(&btv->c.v4l2_dev,
+                        &btv->c.i2c_adap, "msp3400", "msp3400",
+                        I2C_ADDR_MSP3400_ALT >> 1);
         }
 
         /* If we found a msp34xx, then we're done. */
@@ -3665,14 +3649,14 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         I2C_CLIENT_END
                 };
 
-                if (v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                                "tda7432", "tda7432", addrs))
+                if (v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                                &btv->c.i2c_adap, "tda7432", "tda7432", addrs))
                         return;
         }
 
         /* Now see if we can find one of the tvaudio devices. */
-        btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
-                        "tvaudio", "tvaudio", tvaudio_addrs);
+        btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.v4l2_dev,
+                &btv->c.i2c_adap, "tvaudio", "tvaudio", tvaudio_addrs());
         if (btv->sd_tvaudio)
                 return;
 
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 7a8ca0d8356f..74f619d6cc93 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1198,7 +1198,7 @@ audio_mux(struct bttv *btv, int input, int mute)
         ctrl.value = btv->mute;
         bttv_call_all(btv, core, s_ctrl, &ctrl);
         if (btv->sd_msp34xx) {
-                struct v4l2_routing route;
+                u32 in;
 
                 /* Note: the inputs tuner/radio/extern/intern are translated
                    to msp routings. This assumes common behavior for all msp3400
@@ -1207,11 +1207,11 @@ audio_mux(struct bttv *btv, int input, int mute)
                    For now this is sufficient. */
                 switch (input) {
                 case TVAUDIO_INPUT_RADIO:
-                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
+                        in = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
                                     MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_EXTERN:
-                        route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
+                        in = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
                                     MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_INTERN:
@@ -1220,7 +1220,7 @@ audio_mux(struct bttv *btv, int input, int mute)
                            input is the BTTV_BOARD_AVERMEDIA98. I wonder how
                            that was tested. My guess is that the whole INTERN
                            input does not work. */
-                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
+                        in = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
                                     MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_TUNER:
@@ -1229,21 +1229,18 @@ audio_mux(struct bttv *btv, int input, int mute)
                            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, \
+                                in = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER2, \
                                         MSP_DSP_IN_TUNER, MSP_DSP_IN_TUNER);
                         else
-                                route.input = MSP_INPUT_DEFAULT;
+                                in = MSP_INPUT_DEFAULT;
                         break;
                 }
-                route.output = MSP_OUTPUT_DEFAULT;
-                v4l2_subdev_call(btv->sd_msp34xx, audio, s_routing, &route);
+                v4l2_subdev_call(btv->sd_msp34xx, audio, s_routing,
+                               in, MSP_OUTPUT_DEFAULT, 0);
         }
         if (btv->sd_tvaudio) {
-                struct v4l2_routing route;
-
-                route.input = input;
-                route.output = 0;
-                v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing, &route);
+                v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing,
+                                input, 0, 0);
         }
         return 0;
 }
@@ -1329,7 +1326,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
                 break;
         }
         id = tvnorm->v4l2_id;
-        bttv_call_all(btv, tuner, s_std, id);
+        bttv_call_all(btv, core, s_std, id);
 
         return 0;
 }
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 96498489199d..a1d0e9c9f286 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -26,7 +26,7 @@
 #define _BTTVP_H_
 
 #include <linux/version.h>
-#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,17)
+#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,18)
 
 #include <linux/types.h>
 #include <linux/wait.h>
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 7abe94d9fb4c..5f582726985d 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1954,7 +1954,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
                 goto out_freeirq;
 
         cam->sensor_addr = 0x42;
-        cam->sensor = v4l2_i2c_new_subdev(&cam->i2c_adapter,
+        cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter,
                         "ov7670", "ov7670", cam->sensor_addr);
         if (cam->sensor == NULL) {
                 ret = -ENODEV;
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 9714059ee949..57dc1704b6c0 100644
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -53,14 +53,15 @@ static inline int cs5345_read(struct v4l2_subdev *sd, u8 reg)
         return i2c_smbus_read_byte_data(client, reg);
 }
 
-static int cs5345_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int cs5345_s_routing(struct v4l2_subdev *sd,
+                            u32 input, u32 output, u32 config)
 {
-        if ((route->input & 0xf) > 6) {
-                v4l2_err(sd, "Invalid input %d.\n", route->input);
+        if ((input & 0xf) > 6) {
+                v4l2_err(sd, "Invalid input %d.\n", input);
                 return -EINVAL;
         }
-        cs5345_write(sd, 0x09, route->input & 0xf);
-        cs5345_write(sd, 0x05, route->input & 0xf0);
+        cs5345_write(sd, 0x09, input & 0xf);
+        cs5345_write(sd, 0x05, input & 0xf0);
         return 0;
 }
 
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 5aeb066857a7..80bca8df9fbf 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -58,17 +58,18 @@ static int cs53l32a_read(struct v4l2_subdev *sd, u8 reg)
         return i2c_smbus_read_byte_data(client, reg);
 }
 
-static int cs53l32a_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int cs53l32a_s_routing(struct v4l2_subdev *sd,
+                              u32 input, u32 output, u32 config)
 {
         /* There are 2 physical inputs, but the second input can be
            placed in two modes, the first mode bypasses the PGA (gain),
            the second goes through the PGA. Hence there are three
            possible inputs to choose from. */
-        if (route->input > 2) {
-                v4l2_err(sd, "Invalid input %d.\n", route->input);
+        if (input > 2) {
+                v4l2_err(sd, "Invalid input %d.\n", input);
                 return -EINVAL;
         }
-        cs53l32a_write(sd, 0x01, 0x01 + (route->input << 4));
+        cs53l32a_write(sd, 0x01, 0x01 + (input << 4));
         return 0;
 }
 
diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c
index bb5c5165dd5f..1519e91c677a 100644
--- a/drivers/media/video/cx18/cx18-audio.c
+++ b/drivers/media/video/cx18/cx18-audio.c
@@ -33,7 +33,6 @@
 int cx18_audio_set_io(struct cx18 *cx)
 {
         const struct cx18_card_audio_input *in;
-        struct v4l2_routing route;
         u32 val;
         int err;
 
@@ -44,13 +43,11 @@ int cx18_audio_set_io(struct cx18 *cx)
                 in = &cx->card->audio_inputs[cx->audio_input];
 
         /* handle muxer chips */
-        route.input = in->muxer_input;
-        route.output = 0;
-        v4l2_subdev_call(cx->sd_extmux, audio, s_routing, &route);
+        v4l2_subdev_call(cx->sd_extmux, audio, s_routing,
+                        in->audio_input, 0, 0);
 
-        route.input = in->audio_input;
         err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl,
-                               audio, s_routing, &route);
+                               audio, s_routing, in->audio_input, 0, 0);
         if (err)
                 return err;
 
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index f4dd9d78eb3d..cf2bd888a429 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -203,43 +203,42 @@ static int cx18_av_reset(struct v4l2_subdev *sd, u32 val)
 
 static int cx18_av_init(struct v4l2_subdev *sd, u32 val)
 {
-        struct cx18_av_state *state = to_cx18_av_state(sd);
         struct cx18 *cx = v4l2_get_subdevdata(sd);
 
-        switch (val) {
-        case CX18_AV_INIT_PLLS:
-                /*
-                 * The crystal freq used in calculations in this driver will be
-                 * 28.636360 MHz.
-                 * Aim to run the PLLs' VCOs near 400 MHz to minimze errors.
-                 */
+        /*
+         * The crystal freq used in calculations in this driver will be
+         * 28.636360 MHz.
+         * Aim to run the PLLs' VCOs near 400 MHz to minimze errors.
+         */
 
-                /*
-                 * VDCLK  Integer = 0x0f, Post Divider = 0x04
-                 * AIMCLK Integer = 0x0e, Post Divider = 0x16
-                 */
-                cx18_av_write4(cx, CXADEC_PLL_CTRL1, 0x160e040f);
+        /*
+         * VDCLK  Integer = 0x0f, Post Divider = 0x04
+         * AIMCLK Integer = 0x0e, Post Divider = 0x16
+         */
+        cx18_av_write4(cx, CXADEC_PLL_CTRL1, 0x160e040f);
 
-                /* VDCLK Fraction = 0x2be2fe */
-                /* xtal * 0xf.15f17f0/4 = 108 MHz: 432 MHz before post divide */
-                cx18_av_write4(cx, CXADEC_VID_PLL_FRAC, 0x002be2fe);
+        /* VDCLK Fraction = 0x2be2fe */
+        /* xtal * 0xf.15f17f0/4 = 108 MHz: 432 MHz before post divide */
+        cx18_av_write4(cx, CXADEC_VID_PLL_FRAC, 0x002be2fe);
 
-                /* AIMCLK Fraction = 0x05227ad */
-                /* xtal * 0xe.2913d68/0x16 = 48000 * 384: 406 MHz pre post-div*/
-                cx18_av_write4(cx, CXADEC_AUX_PLL_FRAC, 0x005227ad);
+        /* AIMCLK Fraction = 0x05227ad */
+        /* xtal * 0xe.2913d68/0x16 = 48000 * 384: 406 MHz pre post-div*/
+        cx18_av_write4(cx, CXADEC_AUX_PLL_FRAC, 0x005227ad);
 
-                /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x16 */
-                cx18_av_write(cx, CXADEC_I2S_MCLK, 0x56);
-                break;
+        /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x16 */
+        cx18_av_write(cx, CXADEC_I2S_MCLK, 0x56);
+        return 0;
+}
 
-        case CX18_AV_INIT_NORMAL:
-        default:
-                if (!state->is_initialized) {
-                        /* initialize on first use */
-                        state->is_initialized = 1;
-                        cx18_av_initialize(cx);
-                }
-                break;
+static int cx18_av_load_fw(struct v4l2_subdev *sd)
+{
+        struct cx18_av_state *state = to_cx18_av_state(sd);
+        struct cx18 *cx = v4l2_get_subdevdata(sd);
+
+        if (!state->is_initialized) {
+                /* initialize on first use */
+                state->is_initialized = 1;
+                cx18_av_initialize(cx);
         }
         return 0;
 }
@@ -548,19 +547,19 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,
 }
 
 static int cx18_av_s_video_routing(struct v4l2_subdev *sd,
-                                   const struct v4l2_routing *route)
+                                   u32 input, u32 output, u32 config)
 {
         struct cx18_av_state *state = to_cx18_av_state(sd);
         struct cx18 *cx = v4l2_get_subdevdata(sd);
-        return set_input(cx, route->input, state->aud_input);
+        return set_input(cx, input, state->aud_input);
 }
 
 static int cx18_av_s_audio_routing(struct v4l2_subdev *sd,
-                                   const struct v4l2_routing *route)
+                                   u32 input, u32 output, u32 config)
 {
         struct cx18_av_state *state = to_cx18_av_state(sd);
         struct cx18 *cx = v4l2_get_subdevdata(sd);
-        return set_input(cx, state->vid_input, route->input);
+        return set_input(cx, state->vid_input, input);
 }
 
 static int cx18_av_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
@@ -1185,10 +1184,12 @@ static const struct v4l2_subdev_core_ops cx18_av_general_ops = {
         .g_chip_ident = cx18_av_g_chip_ident,
         .log_status = cx18_av_log_status,
         .init = cx18_av_init,
+        .load_fw = cx18_av_load_fw,
         .reset = cx18_av_reset,
         .queryctrl = cx18_av_queryctrl,
         .g_ctrl = cx18_av_g_ctrl,
         .s_ctrl = cx18_av_s_ctrl,
+        .s_std = cx18_av_s_std,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .g_register = cx18_av_g_register,
         .s_register = cx18_av_s_register,
@@ -1200,7 +1201,6 @@ static const struct v4l2_subdev_tuner_ops cx18_av_tuner_ops = {
         .s_frequency = cx18_av_s_frequency,
         .g_tuner = cx18_av_g_tuner,
         .s_tuner = cx18_av_s_tuner,
-        .s_std = cx18_av_s_std,
 };
 
 static const struct v4l2_subdev_audio_ops cx18_av_audio_ops = {
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h
index c458120e8c90..9b84a0c58e0e 100644
--- a/drivers/media/video/cx18/cx18-av-core.h
+++ b/drivers/media/video/cx18/cx18-av-core.h
@@ -328,11 +328,6 @@ static inline struct cx18_av_state *to_cx18_av_state(struct v4l2_subdev *sd)
         return container_of(sd, struct cx18_av_state, sd);
 }
 
-enum cx18_av_subdev_init_arg {
-        CX18_AV_INIT_NORMAL = 0,
-        CX18_AV_INIT_PLLS = 1,
-};
-
 /* ----------------------------------------------------------------------- */
 /* cx18_av-core.c                                                          */
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value);
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 210c68aaae00..49b1c3d7b1a8 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -810,7 +810,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
                 CX18_ERR("Could not register A/V decoder subdevice\n");
                 goto free_map;
         }
-        cx18_call_hw(cx, CX18_HW_418_AV, core, init, (u32) CX18_AV_INIT_PLLS);
+        cx18_call_hw(cx, CX18_HW_418_AV, core, init, 0);
 
         /* Initialize GPIO Reset Controller to do chip resets during i2c init */
         if (cx->card->hw_all & CX18_HW_GPIO_RESET_CTRL) {
@@ -1028,7 +1028,7 @@ int cx18_init_on_first_open(struct cx18 *cx)
         cx18_vapi(cx, CX18_APU_STOP, 1, CX18_APU_ENCODING_METHOD_MPEG);
 
         /* Init the A/V decoder, if it hasn't been already */
-        v4l2_subdev_call(cx->sd_av, core, init, (u32) CX18_AV_INIT_NORMAL);
+        v4l2_subdev_call(cx->sd_av, core, load_fw);
 
         vf.tuner = 0;
         vf.type = V4L2_TUNER_ANALOG_TV;
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 4d7d6d5a7f86..b3889c0b2697 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -608,7 +608,7 @@ int cx18_v4l2_close(struct file *filp)
                 /* Mark that the radio is no longer in use */
                 clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags);
                 /* Switch tuner to TV */
-                cx18_call_all(cx, tuner, s_std, cx->std);
+                cx18_call_all(cx, core, s_std, cx->std);
                 /* Select correct audio input (i.e. TV tuner or Line in) */
                 cx18_audio_set_io(cx);
                 if (atomic_read(&cx->ana_capturing) > 0) {
diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index 5518d1424f8f..86a204b5448e 100644
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -156,12 +156,12 @@ static int gpiomux_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 }
 
 static int gpiomux_s_audio_routing(struct v4l2_subdev *sd,
-                                   const struct v4l2_routing *route)
+                                   u32 input, u32 output, u32 config)
 {
         struct cx18 *cx = v4l2_get_subdevdata(sd);
         u32 data;
 
-        switch (route->input) {
+        switch (input) {
         case 0:
                 data = cx->card->gpio_audio_input.tuner;
                 break;
@@ -180,10 +180,10 @@ static int gpiomux_s_audio_routing(struct v4l2_subdev *sd,
 
 static const struct v4l2_subdev_core_ops gpiomux_core_ops = {
         .log_status = gpiomux_log_status,
+        .s_std = gpiomux_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops gpiomux_tuner_ops = {
-        .s_std = gpiomux_s_std,
         .s_radio = gpiomux_s_radio,
 };
 
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index d092643faf46..b9b7064a2be8 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -100,16 +100,16 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
 
         if (hw == CX18_HW_TUNER) {
                 /* special tuner group handling */
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
-                                                cx->card_i2c->radio);
+                sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
+                                adap, mod, type, cx->card_i2c->radio);
                 if (sd != NULL)
                         sd->grp_id = hw;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
-                                                cx->card_i2c->demod);
+                sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
+                                adap, mod, type, cx->card_i2c->demod);
                 if (sd != NULL)
                         sd->grp_id = hw;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
-                                                cx->card_i2c->tv);
+                sd = v4l2_i2c_new_probed_subdev(&cx->v4l2_dev,
+                                adap, mod, type, cx->card_i2c->tv);
                 if (sd != NULL)
                         sd->grp_id = hw;
                 return sd != NULL ? 0 : -1;
@@ -120,7 +120,7 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
                 return -1;
 
         /* It's an I2C device other than an analog tuner */
-        sd = v4l2_i2c_new_subdev(adap, mod, type, hw_addrs[idx]);
+        sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, mod, type, hw_addrs[idx]);
         if (sd != NULL)
                 sd->grp_id = hw;
         return sd != NULL ? 0 : -1;
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index e4c9e3d8bacd..d7b1921e6666 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -705,7 +705,7 @@ int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std)
                         (unsigned long long) cx->std);
 
         /* Tuner */
-        cx18_call_all(cx, tuner, s_std, cx->std);
+        cx18_call_all(cx, core, s_std, cx->std);
         return 0;
 }
 
@@ -926,16 +926,6 @@ static long cx18_default(struct file *file, void *fh, int cmd, void *arg)
         struct cx18 *cx = ((struct cx18_open_id *)fh)->cx;
 
         switch (cmd) {
-        case VIDIOC_INT_S_AUDIO_ROUTING: {
-                struct v4l2_routing *route = arg;
-
-                CX18_DEBUG_IOCTL("VIDIOC_INT_S_AUDIO_ROUTING(%d, %d)\n",
-                        route->input, route->output);
-                cx18_call_hw(cx, cx->card->hw_audio_ctrl, audio, s_routing,
-                             route);
-                break;
-        }
-
         case VIDIOC_INT_RESET: {
                 u32 val = *(u32 *)arg;
 
diff --git a/drivers/media/video/cx18/cx18-video.c b/drivers/media/video/cx18/cx18-video.c
index 6fdadedf17a8..6dc84aac8f44 100644
--- a/drivers/media/video/cx18/cx18-video.c
+++ b/drivers/media/video/cx18/cx18-video.c
@@ -25,20 +25,8 @@
 
 void cx18_video_set_io(struct cx18 *cx)
 {
-        struct v4l2_routing route;
         int inp = cx->active_input;
-        u32 type;
 
-        route.input = cx->card->video_inputs[inp].video_input;
-        route.output = 0;
-        v4l2_subdev_call(cx->sd_av, video, s_routing, &route);
-
-        type = cx->card->video_inputs[inp].video_type;
-
-        if (type == CX18_CARD_INPUT_VID_TUNER)
-                route.input = 0;  /* Tuner */
-        else if (type < CX18_CARD_INPUT_COMPOSITE1)
-                route.input = 2;  /* S-Video */
-        else
-                route.input = 1;  /* Composite */
+        v4l2_subdev_call(cx->sd_av, video, s_routing,
+                        cx->card->video_inputs[inp].video_input, 0, 0);
 }
diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
new file mode 100644
index 000000000000..91156546a07a
--- /dev/null
+++ b/drivers/media/video/cx231xx/Kconfig
@@ -0,0 +1,35 @@
+config VIDEO_CX231XX
+       tristate "Conexant cx231xx USB video capture support"
+       depends on VIDEO_DEV && I2C && INPUT
+       select VIDEO_TUNER
+       select VIDEO_TVEEPROM
+       select VIDEO_IR
+       select VIDEOBUF_VMALLOC
+       select VIDEO_CX25840
+       select VIDEO_CX231XX_ALSA
+
+        ---help---
+          This is a video4linux driver for Conexant 231xx USB based TV cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cx231xx
+
+config VIDEO_CX231XX_ALSA
+    tristate "Conexant Cx231xx ALSA audio module"
+       depends on VIDEO_CX231XX && SND
+       select SND_PCM
+
+       ---help---
+         This is an ALSA driver for Cx231xx USB based TV cards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cx231xx-alsa
+
+config VIDEO_CX231XX_DVB
+       tristate "DVB/ATSC Support for Cx231xx based TV cards"
+       depends on VIDEO_CX231XX && DVB_CORE
+       select VIDEOBUF_DVB
+       select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
+       ---help---
+         This adds support for DVB cards based on the
+         Conexant cx231xx chips.
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
new file mode 100644
index 000000000000..755dd0ce65ff
--- /dev/null
+++ b/drivers/media/video/cx231xx/Makefile
@@ -0,0 +1,14 @@
+cx231xx-objs     := cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o \
+                    cx231xx-avcore.o cx231xx-pcb-cfg.o cx231xx-vbi.o
+
+cx231xx-alsa-objs := cx231xx-audio.o
+
+obj-$(CONFIG_VIDEO_CX231XX) += cx231xx.o
+obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o
+obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
+
+EXTRA_CFLAGS += -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/common/tuners
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
+
diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c
new file mode 100644
index 000000000000..7793d60966db
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-audio.c
@@ -0,0 +1,586 @@
+/*
+ *  Conexant Cx231xx audio extension
+ *
+ *  Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+ *       Based on em28xx driver
+ *
+ *
+ *  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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/usb.h>
+#include <linux/init.h>
+#include <linux/sound.h>
+#include <linux/spinlock.h>
+#include <linux/soundcard.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/proc_fs.h>
+#include <linux/module.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/info.h>
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <media/v4l2-common.h>
+#include "cx231xx.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "activates debug info");
+
+#define dprintk(fmt, arg...) do {                                       \
+                if (debug)                                              \
+                        printk(KERN_INFO "cx231xx-audio %s: " fmt,      \
+                                __func__, ##arg);                       \
+        } while (0)
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+
+static int cx231xx_isoc_audio_deinit(struct cx231xx *dev)
+{
+        int i;
+
+        dprintk("Stopping isoc\n");
+
+        for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
+                if (dev->adev.urb[i]) {
+                        if (!irqs_disabled())
+                                usb_kill_urb(dev->adev.urb[i]);
+                        else
+                                usb_unlink_urb(dev->adev.urb[i]);
+
+                        usb_free_urb(dev->adev.urb[i]);
+                        dev->adev.urb[i] = NULL;
+
+                        kfree(dev->adev.transfer_buffer[i]);
+                        dev->adev.transfer_buffer[i] = NULL;
+                }
+        }
+
+        return 0;
+}
+
+static void cx231xx_audio_isocirq(struct urb *urb)
+{
+        struct cx231xx *dev = urb->context;
+        int i;
+        unsigned int oldptr;
+        int period_elapsed = 0;
+        int status;
+        unsigned char *cp;
+        unsigned int stride;
+        struct snd_pcm_substream *substream;
+        struct snd_pcm_runtime *runtime;
+
+        switch (urb->status) {
+        case 0:         /* success */
+        case -ETIMEDOUT:        /* NAK */
+                break;
+        case -ECONNRESET:       /* kill */
+        case -ENOENT:
+        case -ESHUTDOWN:
+                return;
+        default:                /* error */
+                dprintk("urb completition error %d.\n", urb->status);
+                break;
+        }
+
+        if (dev->adev.capture_pcm_substream) {
+                substream = dev->adev.capture_pcm_substream;
+                runtime = substream->runtime;
+                stride = runtime->frame_bits >> 3;
+
+                for (i = 0; i < urb->number_of_packets; i++) {
+                        int length = urb->iso_frame_desc[i].actual_length /
+                                     stride;
+                        cp = (unsigned char *)urb->transfer_buffer +
+                                              urb->iso_frame_desc[i].offset;
+
+                        if (!length)
+                                continue;
+
+                        oldptr = dev->adev.hwptr_done_capture;
+                        if (oldptr + length >= runtime->buffer_size) {
+                                unsigned int cnt;
+
+                                cnt = runtime->buffer_size - oldptr;
+                                memcpy(runtime->dma_area + oldptr * stride, cp,
+                                       cnt * stride);
+                                memcpy(runtime->dma_area, cp + cnt * stride,
+                                       length * stride - cnt * stride);
+                        } else {
+                                memcpy(runtime->dma_area + oldptr * stride, cp,
+                                       length * stride);
+                        }
+
+                        snd_pcm_stream_lock(substream);
+
+                        dev->adev.hwptr_done_capture += length;
+                        if (dev->adev.hwptr_done_capture >=
+                                                runtime->buffer_size)
+                                dev->adev.hwptr_done_capture -=
+                                                runtime->buffer_size;
+
+                        dev->adev.capture_transfer_done += length;
+                        if (dev->adev.capture_transfer_done >=
+                                runtime->period_size) {
+                                dev->adev.capture_transfer_done -=
+                                                runtime->period_size;
+                                period_elapsed = 1;
+                        }
+                        snd_pcm_stream_unlock(substream);
+                }
+                if (period_elapsed)
+                        snd_pcm_period_elapsed(substream);
+        }
+        urb->status = 0;
+
+        status = usb_submit_urb(urb, GFP_ATOMIC);
+        if (status < 0) {
+                cx231xx_errdev("resubmit of audio urb failed (error=%i)\n",
+                               status);
+        }
+        return;
+}
+
+static int cx231xx_init_audio_isoc(struct cx231xx *dev)
+{
+        int i, errCode;
+        int sb_size;
+
+        cx231xx_info("%s: Starting AUDIO transfers\n", __func__);
+
+        sb_size = CX231XX_NUM_AUDIO_PACKETS * dev->adev.max_pkt_size;
+
+        for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
+                struct urb *urb;
+                int j, k;
+
+                dev->adev.transfer_buffer[i] = kmalloc(sb_size, GFP_ATOMIC);
+                if (!dev->adev.transfer_buffer[i])
+                        return -ENOMEM;
+
+                memset(dev->adev.transfer_buffer[i], 0x80, sb_size);
+                urb = usb_alloc_urb(CX231XX_NUM_AUDIO_PACKETS, GFP_ATOMIC);
+                if (!urb) {
+                        cx231xx_errdev("usb_alloc_urb failed!\n");
+                        for (j = 0; j < i; j++) {
+                                usb_free_urb(dev->adev.urb[j]);
+                                kfree(dev->adev.transfer_buffer[j]);
+                        }
+                        return -ENOMEM;
+                }
+
+                urb->dev = dev->udev;
+                urb->context = dev;
+                urb->pipe = usb_rcvisocpipe(dev->udev,
+                                                dev->adev.end_point_addr);
+                urb->transfer_flags = URB_ISO_ASAP;
+                urb->transfer_buffer = dev->adev.transfer_buffer[i];
+                urb->interval = 1;
+                urb->complete = cx231xx_audio_isocirq;
+                urb->number_of_packets = CX231XX_NUM_AUDIO_PACKETS;
+                urb->transfer_buffer_length = sb_size;
+
+                for (j = k = 0; j < CX231XX_NUM_AUDIO_PACKETS;
+                        j++, k += dev->adev.max_pkt_size) {
+                        urb->iso_frame_desc[j].offset = k;
+                        urb->iso_frame_desc[j].length = dev->adev.max_pkt_size;
+                }
+                dev->adev.urb[i] = urb;
+        }
+
+        for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
+                errCode = usb_submit_urb(dev->adev.urb[i], GFP_ATOMIC);
+                if (errCode < 0) {
+                        cx231xx_isoc_audio_deinit(dev);
+                        return errCode;
+                }
+        }
+
+        return errCode;
+}
+
+static int cx231xx_cmd(struct cx231xx *dev, int cmd, int arg)
+{
+        dprintk("%s transfer\n", (dev->adev.capture_stream == STREAM_ON) ?
+                "stop" : "start");
+
+        switch (cmd) {
+        case CX231XX_CAPTURE_STREAM_EN:
+                if (dev->adev.capture_stream == STREAM_OFF && arg == 1) {
+                        dev->adev.capture_stream = STREAM_ON;
+                        cx231xx_init_audio_isoc(dev);
+                } else if (dev->adev.capture_stream == STREAM_ON && arg == 0) {
+                        dev->adev.capture_stream = STREAM_OFF;
+                        cx231xx_isoc_audio_deinit(dev);
+                } else {
+                        cx231xx_errdev("An underrun very likely occurred. "
+                                       "Ignoring it.\n");
+                }
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
+                                        size_t size)
+{
+        struct snd_pcm_runtime *runtime = subs->runtime;
+
+        dprintk("Allocating vbuffer\n");
+        if (runtime->dma_area) {
+                if (runtime->dma_bytes > size)
+                        return 0;
+
+                vfree(runtime->dma_area);
+        }
+        runtime->dma_area = vmalloc(size);
+        if (!runtime->dma_area)
+                return -ENOMEM;
+
+        runtime->dma_bytes = size;
+
+        return 0;
+}
+
+static struct snd_pcm_hardware snd_cx231xx_hw_capture = {
+        .info = SNDRV_PCM_INFO_BLOCK_TRANSFER   |
+            SNDRV_PCM_INFO_MMAP                 |
+            SNDRV_PCM_INFO_INTERLEAVED          |
+            SNDRV_PCM_INFO_MMAP_VALID,
+
+        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+
+        .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_KNOT,
+
+        .rate_min = 48000,
+        .rate_max = 48000,
+        .channels_min = 2,
+        .channels_max = 2,
+        .buffer_bytes_max = 62720 * 8,  /* just about the value in usbaudio.c */
+        .period_bytes_min = 64,         /* 12544/2, */
+        .period_bytes_max = 12544,
+        .periods_min = 2,
+        .periods_max = 98,              /* 12544, */
+};
+
+static int snd_cx231xx_capture_open(struct snd_pcm_substream *substream)
+{
+        struct cx231xx *dev = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int ret = 0;
+
+        dprintk("opening device and trying to acquire exclusive lock\n");
+
+        if (!dev) {
+                cx231xx_errdev("BUG: cx231xx can't find device struct."
+                               " Can't proceed with open\n");
+                return -ENODEV;
+        }
+
+        /* Sets volume, mute, etc */
+        dev->mute = 0;
+
+        /* set alternate setting for audio interface */
+        /* 1 - 48000 samples per sec */
+        ret = cx231xx_set_alt_setting(dev, INDEX_AUDIO, 1);
+        if (ret < 0) {
+                cx231xx_errdev("failed to set alternate setting !\n");
+
+                return ret;
+        }
+
+        /* inform hardware to start streaming */
+        ret = cx231xx_capture_start(dev, 1, Audio);
+
+        runtime->hw = snd_cx231xx_hw_capture;
+
+        mutex_lock(&dev->lock);
+        dev->adev.users++;
+        mutex_unlock(&dev->lock);
+
+        snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
+        dev->adev.capture_pcm_substream = substream;
+        runtime->private_data = dev;
+
+        return 0;
+}
+
+static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
+{
+        int ret;
+        struct cx231xx *dev = snd_pcm_substream_chip(substream);
+
+        dprintk("closing device\n");
+
+        /* set alternate setting for audio interface */
+        /* 1 - 48000 samples per sec */
+        ret = cx231xx_set_alt_setting(dev, INDEX_AUDIO, 0);
+        if (ret < 0) {
+                cx231xx_errdev("failed to set alternate setting !\n");
+
+                return ret;
+        }
+
+        /* inform hardware to start streaming */
+        ret = cx231xx_capture_start(dev, 0, Audio);
+
+        dev->mute = 1;
+        mutex_lock(&dev->lock);
+        dev->adev.users--;
+        mutex_unlock(&dev->lock);
+
+        if (dev->adev.users == 0 && dev->adev.shutdown == 1) {
+                dprintk("audio users: %d\n", dev->adev.users);
+                dprintk("disabling audio stream!\n");
+                dev->adev.shutdown = 0;
+                dprintk("released lock\n");
+                cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN, 0);
+        }
+        return 0;
+}
+
+static int snd_cx231xx_hw_capture_params(struct snd_pcm_substream *substream,
+                                         struct snd_pcm_hw_params *hw_params)
+{
+        unsigned int channels, rate, format;
+        int ret;
+
+        dprintk("Setting capture parameters\n");
+
+        ret = snd_pcm_alloc_vmalloc_buffer(substream,
+                                           params_buffer_bytes(hw_params));
+        format = params_format(hw_params);
+        rate = params_rate(hw_params);
+        channels = params_channels(hw_params);
+
+        /* TODO: set up cx231xx audio chip to deliver the correct audio format,
+           current default is 48000hz multiplexed => 96000hz mono
+           which shouldn't matter since analogue TV only supports mono */
+        return 0;
+}
+
+static int snd_cx231xx_hw_capture_free(struct snd_pcm_substream *substream)
+{
+        struct cx231xx *dev = snd_pcm_substream_chip(substream);
+
+        dprintk("Stop capture, if needed\n");
+
+        if (dev->adev.capture_stream == STREAM_ON)
+                cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN, CX231XX_STOP_AUDIO);
+
+        return 0;
+}
+
+static int snd_cx231xx_prepare(struct snd_pcm_substream *substream)
+{
+        return 0;
+}
+
+static int snd_cx231xx_capture_trigger(struct snd_pcm_substream *substream,
+                                       int cmd)
+{
+        struct cx231xx *dev = snd_pcm_substream_chip(substream);
+        int retval;
+
+        dprintk("Should %s capture\n", (cmd == SNDRV_PCM_TRIGGER_START) ?
+                "start" : "stop");
+
+        spin_lock(&dev->adev.slock);
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+                cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN,
+                            CX231XX_START_AUDIO);
+                retval = 0;
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+                cx231xx_cmd(dev, CX231XX_CAPTURE_STREAM_EN, CX231XX_STOP_AUDIO);
+                retval = 0;
+                break;
+        default:
+                retval = -EINVAL;
+        }
+
+        spin_unlock(&dev->adev.slock);
+        return retval;
+}
+
+static snd_pcm_uframes_t snd_cx231xx_capture_pointer(struct snd_pcm_substream
+                                                     *substream)
+{
+        struct cx231xx *dev;
+        unsigned long flags;
+        snd_pcm_uframes_t hwptr_done;
+
+        dev = snd_pcm_substream_chip(substream);
+
+        spin_lock_irqsave(&dev->adev.slock, flags);
+        hwptr_done = dev->adev.hwptr_done_capture;
+        spin_unlock_irqrestore(&dev->adev.slock, flags);
+
+        return hwptr_done;
+}
+
+static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
+                                             unsigned long offset)
+{
+        void *pageptr = subs->runtime->dma_area + offset;
+
+        return vmalloc_to_page(pageptr);
+}
+
+static struct snd_pcm_ops snd_cx231xx_pcm_capture = {
+        .open = snd_cx231xx_capture_open,
+        .close = snd_cx231xx_pcm_close,
+        .ioctl = snd_pcm_lib_ioctl,
+        .hw_params = snd_cx231xx_hw_capture_params,
+        .hw_free = snd_cx231xx_hw_capture_free,
+        .prepare = snd_cx231xx_prepare,
+        .trigger = snd_cx231xx_capture_trigger,
+        .pointer = snd_cx231xx_capture_pointer,
+        .page = snd_pcm_get_vmalloc_page,
+};
+
+static int cx231xx_audio_init(struct cx231xx *dev)
+{
+        struct cx231xx_audio *adev = &dev->adev;
+        struct snd_pcm *pcm;
+        struct snd_card *card;
+        static int devnr;
+        int err;
+        struct usb_interface *uif;
+        int i, isoc_pipe = 0;
+
+        if (dev->has_alsa_audio != 1) {
+                /* This device does not support the extension (in this case
+                   the device is expecting the snd-usb-audio module or
+                   doesn't have analog audio support at all) */
+                return 0;
+        }
+
+        cx231xx_info("cx231xx-audio.c: probing for cx231xx "
+                     "non standard usbaudio\n");
+
+        err = snd_card_create(index[devnr], "Cx231xx Audio", THIS_MODULE,
+                              0, &card);
+        if (err < 0)
+                return err;
+
+        spin_lock_init(&adev->slock);
+        err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm);
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
+        }
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+                        &snd_cx231xx_pcm_capture);
+        pcm->info_flags = 0;
+        pcm->private_data = dev;
+        strcpy(pcm->name, "Conexant cx231xx Capture");
+        strcpy(card->driver, "Conexant cx231xx Audio");
+        strcpy(card->shortname, "Cx231xx Audio");
+        strcpy(card->longname, "Conexant cx231xx Audio");
+
+        err = snd_card_register(card);
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        adev->sndcard = card;
+        adev->udev = dev->udev;
+
+        /* compute alternate max packet sizes for Audio */
+        uif =
+            dev->udev->actconfig->interface[dev->current_pcb_config.
+                                            hs_config_info[0].interface_info.
+                                            audio_index + 1];
+
+        adev->end_point_addr =
+            le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
+                        bEndpointAddress);
+
+        adev->num_alt = uif->num_altsetting;
+        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+                     adev->end_point_addr, adev->num_alt);
+        adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);
+
+        if (adev->alt_max_pkt_size == NULL) {
+                cx231xx_errdev("out of memory!\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < adev->num_alt; i++) {
+                u16 tmp =
+                    le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
+                                wMaxPacketSize);
+                adev->alt_max_pkt_size[i] =
+                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
+                cx231xx_info("Alternate setting %i, max size= %i\n", i,
+                             adev->alt_max_pkt_size[i]);
+        }
+
+        return 0;
+}
+
+static int cx231xx_audio_fini(struct cx231xx *dev)
+{
+        if (dev == NULL)
+                return 0;
+
+        if (dev->has_alsa_audio != 1) {
+                /* This device does not support the extension (in this case
+                   the device is expecting the snd-usb-audio module or
+                   doesn't have analog audio support at all) */
+                return 0;
+        }
+
+        if (dev->adev.sndcard) {
+                snd_card_free(dev->adev.sndcard);
+                kfree(dev->adev.alt_max_pkt_size);
+                dev->adev.sndcard = NULL;
+        }
+
+        return 0;
+}
+
+static struct cx231xx_ops audio_ops = {
+        .id = CX231XX_AUDIO,
+        .name = "Cx231xx Audio Extension",
+        .init = cx231xx_audio_init,
+        .fini = cx231xx_audio_fini,
+};
+
+static int __init cx231xx_alsa_register(void)
+{
+        return cx231xx_register_extension(&audio_ops);
+}
+
+static void __exit cx231xx_alsa_unregister(void)
+{
+        cx231xx_unregister_extension(&audio_ops);
+}
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Srinivasa Deevi <srinivasa.deevi@conexant.com>");
+MODULE_DESCRIPTION("Cx231xx Audio driver");
+
+module_init(cx231xx_alsa_register);
+module_exit(cx231xx_alsa_unregister);
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
new file mode 100644
index 000000000000..1be3881be991
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -0,0 +1,2581 @@
+/*
+   cx231xx_avcore.c - driver for Conexant Cx23100/101/102
+                      USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+
+   This program contains the specific code to control the avdecoder chip and
+   other related usb control functions for cx231xx based chipset.
+
+   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.
+ */
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/bitmap.h>
+#include <linux/usb.h>
+#include <linux/i2c.h>
+#include <linux/version.h>
+#include <linux/mm.h>
+#include <linux/mutex.h>
+
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-chip-ident.h>
+
+#include "cx231xx.h"
+
+/******************************************************************************
+                        -: BLOCK ARRANGEMENT :-
+        I2S block ----------------------|
+        [I2S audio]                     |
+                                        |
+        Analog Front End --> Direct IF -|-> Cx25840 --> Audio
+        [video & audio]                 |   [Audio]
+                                        |
+                                        |-> Cx25840 --> Video
+                                            [Video]
+
+*******************************************************************************/
+
+/******************************************************************************
+ *                    A F E - B L O C K    C O N T R O L   functions          *
+ *                              [ANALOG FRONT END]                            *
+ ******************************************************************************/
+static int afe_write_byte(struct cx231xx *dev, u16 saddr, u8 data)
+{
+        return cx231xx_write_i2c_data(dev, AFE_DEVICE_ADDRESS,
+                                        saddr, 2, data, 1);
+}
+
+static int afe_read_byte(struct cx231xx *dev, u16 saddr, u8 *data)
+{
+        int status;
+        u32 temp = 0;
+
+        status = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
+                                        saddr, 2, &temp, 1);
+        *data = (u8) temp;
+        return status;
+}
+
+int cx231xx_afe_init_super_block(struct cx231xx *dev, u32 ref_count)
+{
+        int status = 0;
+        u8 temp = 0;
+        u8 afe_power_status = 0;
+        int i = 0;
+
+        /* super block initialize */
+        temp = (u8) (ref_count & 0xff);
+        status = afe_write_byte(dev, SUP_BLK_TUNE2, temp);
+        if (status < 0)
+                return status;
+
+        status = afe_read_byte(dev, SUP_BLK_TUNE2, &afe_power_status);
+        if (status < 0)
+                return status;
+
+        temp = (u8) ((ref_count & 0x300) >> 8);
+        temp |= 0x40;
+        status = afe_write_byte(dev, SUP_BLK_TUNE1, temp);
+        if (status < 0)
+                return status;
+
+        status = afe_write_byte(dev, SUP_BLK_PLL2, 0x0f);
+        if (status < 0)
+                return status;
+
+        /* enable pll     */
+        while (afe_power_status != 0x18) {
+                status = afe_write_byte(dev, SUP_BLK_PWRDN, 0x18);
+                if (status < 0) {
+                        cx231xx_info(
+                        ": Init Super Block failed in send cmd\n");
+                        break;
+                }
+
+                status = afe_read_byte(dev, SUP_BLK_PWRDN, &afe_power_status);
+                afe_power_status &= 0xff;
+                if (status < 0) {
+                        cx231xx_info(
+                        ": Init Super Block failed in receive cmd\n");
+                        break;
+                }
+                i++;
+                if (i == 10) {
+                        cx231xx_info(
+                        ": Init Super Block force break in loop !!!!\n");
+                        status = -1;
+                        break;
+                }
+        }
+
+        if (status < 0)
+                return status;
+
+        /* start tuning filter */
+        status = afe_write_byte(dev, SUP_BLK_TUNE3, 0x40);
+        if (status < 0)
+                return status;
+
+        msleep(5);
+
+        /* exit tuning */
+        status = afe_write_byte(dev, SUP_BLK_TUNE3, 0x00);
+
+        return status;
+}
+
+int cx231xx_afe_init_channels(struct cx231xx *dev)
+{
+        int status = 0;
+
+        /* power up all 3 channels, clear pd_buffer */
+        status = afe_write_byte(dev, ADC_PWRDN_CLAMP_CH1, 0x00);
+        status = afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2, 0x00);
+        status = afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3, 0x00);
+
+        /* Enable quantizer calibration */
+        status = afe_write_byte(dev, ADC_COM_QUANT, 0x02);
+
+        /* channel initialize, force modulator (fb) reset */
+        status = afe_write_byte(dev, ADC_FB_FRCRST_CH1, 0x17);
+        status = afe_write_byte(dev, ADC_FB_FRCRST_CH2, 0x17);
+        status = afe_write_byte(dev, ADC_FB_FRCRST_CH3, 0x17);
+
+        /* start quantilizer calibration  */
+        status = afe_write_byte(dev, ADC_CAL_ATEST_CH1, 0x10);
+        status = afe_write_byte(dev, ADC_CAL_ATEST_CH2, 0x10);
+        status = afe_write_byte(dev, ADC_CAL_ATEST_CH3, 0x10);
+        msleep(5);
+
+        /* exit modulator (fb) reset */
+        status = afe_write_byte(dev, ADC_FB_FRCRST_CH1, 0x07);
+        status = afe_write_byte(dev, ADC_FB_FRCRST_CH2, 0x07);
+        status = afe_write_byte(dev, ADC_FB_FRCRST_CH3, 0x07);
+
+        /* enable the pre_clamp in each channel for single-ended input */
+        status = afe_write_byte(dev, ADC_NTF_PRECLMP_EN_CH1, 0xf0);
+        status = afe_write_byte(dev, ADC_NTF_PRECLMP_EN_CH2, 0xf0);
+        status = afe_write_byte(dev, ADC_NTF_PRECLMP_EN_CH3, 0xf0);
+
+        /* use diode instead of resistor, so set term_en to 0, res_en to 0  */
+        status = cx231xx_reg_mask_write(dev, AFE_DEVICE_ADDRESS, 8,
+                                   ADC_QGAIN_RES_TRM_CH1, 3, 7, 0x00);
+        status = cx231xx_reg_mask_write(dev, AFE_DEVICE_ADDRESS, 8,
+                                   ADC_QGAIN_RES_TRM_CH2, 3, 7, 0x00);
+        status = cx231xx_reg_mask_write(dev, AFE_DEVICE_ADDRESS, 8,
+                                   ADC_QGAIN_RES_TRM_CH3, 3, 7, 0x00);
+
+        /* dynamic element matching off */
+        status = afe_write_byte(dev, ADC_DCSERVO_DEM_CH1, 0x03);
+        status = afe_write_byte(dev, ADC_DCSERVO_DEM_CH2, 0x03);
+        status = afe_write_byte(dev, ADC_DCSERVO_DEM_CH3, 0x03);
+
+        return status;
+}
+
+int cx231xx_afe_setup_AFE_for_baseband(struct cx231xx *dev)
+{
+        u8 c_value = 0;
+        int status = 0;
+
+        status = afe_read_byte(dev, ADC_PWRDN_CLAMP_CH2, &c_value);
+        c_value &= (~(0x50));
+        status = afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2, c_value);
+
+        return status;
+}
+
+/*
+        The Analog Front End in Cx231xx has 3 channels. These
+        channels are used to share between different inputs
+        like tuner, s-video and composite inputs.
+
+        channel 1 ----- pin 1  to pin4(in reg is 1-4)
+        channel 2 ----- pin 5  to pin8(in reg is 5-8)
+        channel 3 ----- pin 9 to pin 12(in reg is 9-11)
+*/
+int cx231xx_afe_set_input_mux(struct cx231xx *dev, u32 input_mux)
+{
+        u8 ch1_setting = (u8) input_mux;
+        u8 ch2_setting = (u8) (input_mux >> 8);
+        u8 ch3_setting = (u8) (input_mux >> 16);
+        int status = 0;
+        u8 value = 0;
+
+        if (ch1_setting != 0) {
+                status = afe_read_byte(dev, ADC_INPUT_CH1, &value);
+                value &= (!INPUT_SEL_MASK);
+                value |= (ch1_setting - 1) << 4;
+                value &= 0xff;
+                status = afe_write_byte(dev, ADC_INPUT_CH1, value);
+        }
+
+        if (ch2_setting != 0) {
+                status = afe_read_byte(dev, ADC_INPUT_CH2, &value);
+                value &= (!INPUT_SEL_MASK);
+                value |= (ch2_setting - 1) << 4;
+                value &= 0xff;
+                status = afe_write_byte(dev, ADC_INPUT_CH2, value);
+        }
+
+        /* For ch3_setting, the value to put in the register is
+           7 less than the input number */
+        if (ch3_setting != 0) {
+                status = afe_read_byte(dev, ADC_INPUT_CH3, &value);
+                value &= (!INPUT_SEL_MASK);
+                value |= (ch3_setting - 1) << 4;
+                value &= 0xff;
+                status = afe_write_byte(dev, ADC_INPUT_CH3, value);
+        }
+
+        return status;
+}
+
+int cx231xx_afe_set_mode(struct cx231xx *dev, enum AFE_MODE mode)
+{
+        int status = 0;
+
+        /*
+        * FIXME: We need to implement the AFE code for LOW IF and for HI IF.
+        * Currently, only baseband works.
+        */
+
+        switch (mode) {
+        case AFE_MODE_LOW_IF:
+                /* SetupAFEforLowIF();  */
+                break;
+        case AFE_MODE_BASEBAND:
+                status = cx231xx_afe_setup_AFE_for_baseband(dev);
+                break;
+        case AFE_MODE_EU_HI_IF:
+                /* SetupAFEforEuHiIF(); */
+                break;
+        case AFE_MODE_US_HI_IF:
+                /* SetupAFEforUsHiIF(); */
+                break;
+        case AFE_MODE_JAPAN_HI_IF:
+                /* SetupAFEforJapanHiIF(); */
+                break;
+        }
+
+        if ((mode != dev->afe_mode) &&
+                (dev->video_input == CX231XX_VMUX_TELEVISION))
+                status = cx231xx_afe_adjust_ref_count(dev,
+                                                     CX231XX_VMUX_TELEVISION);
+
+        dev->afe_mode = mode;
+
+        return status;
+}
+
+int cx231xx_afe_update_power_control(struct cx231xx *dev,
+                                        enum AV_MODE avmode)
+{
+        u8 afe_power_status = 0;
+        int status = 0;
+
+        switch (dev->model) {
+        case CX231XX_BOARD_CNXT_RDE_250:
+        case CX231XX_BOARD_CNXT_RDU_250:
+                if (avmode == POLARIS_AVMODE_ANALOGT_TV) {
+                        while (afe_power_status != (FLD_PWRDN_TUNING_BIAS |
+                                                FLD_PWRDN_ENABLE_PLL)) {
+                                status = afe_write_byte(dev, SUP_BLK_PWRDN,
+                                                        FLD_PWRDN_TUNING_BIAS |
+                                                        FLD_PWRDN_ENABLE_PLL);
+                                status |= afe_read_byte(dev, SUP_BLK_PWRDN,
+                                                        &afe_power_status);
+                                if (status < 0)
+                                        break;
+                        }
+
+                        status = afe_write_byte(dev, ADC_PWRDN_CLAMP_CH1,
+                                                        0x00);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2,
+                                                        0x00);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
+                                                        0x00);
+                } else if (avmode == POLARIS_AVMODE_DIGITAL) {
+                        status = afe_write_byte(dev, ADC_PWRDN_CLAMP_CH1,
+                                                        0x70);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2,
+                                                        0x70);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
+                                                        0x70);
+
+                        status |= afe_read_byte(dev, SUP_BLK_PWRDN,
+                                                  &afe_power_status);
+                        afe_power_status |= FLD_PWRDN_PD_BANDGAP |
+                                                FLD_PWRDN_PD_BIAS |
+                                                FLD_PWRDN_PD_TUNECK;
+                        status |= afe_write_byte(dev, SUP_BLK_PWRDN,
+                                                   afe_power_status);
+                } else if (avmode == POLARIS_AVMODE_ENXTERNAL_AV) {
+                        while (afe_power_status != (FLD_PWRDN_TUNING_BIAS |
+                                                FLD_PWRDN_ENABLE_PLL)) {
+                                status = afe_write_byte(dev, SUP_BLK_PWRDN,
+                                                        FLD_PWRDN_TUNING_BIAS |
+                                                        FLD_PWRDN_ENABLE_PLL);
+                                status |= afe_read_byte(dev, SUP_BLK_PWRDN,
+                                                        &afe_power_status);
+                                if (status < 0)
+                                        break;
+                        }
+
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH1,
+                                                0x00);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2,
+                                                0x00);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
+                                                0x00);
+                } else {
+                        cx231xx_info("Invalid AV mode input\n");
+                        status = -1;
+                }
+                break;
+        default:
+                if (avmode == POLARIS_AVMODE_ANALOGT_TV) {
+                        while (afe_power_status != (FLD_PWRDN_TUNING_BIAS |
+                                                FLD_PWRDN_ENABLE_PLL)) {
+                                status = afe_write_byte(dev, SUP_BLK_PWRDN,
+                                                        FLD_PWRDN_TUNING_BIAS |
+                                                        FLD_PWRDN_ENABLE_PLL);
+                                status |= afe_read_byte(dev, SUP_BLK_PWRDN,
+                                                        &afe_power_status);
+                                if (status < 0)
+                                        break;
+                        }
+
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH1,
+                                                        0x40);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2,
+                                                        0x40);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
+                                                        0x00);
+                } else if (avmode == POLARIS_AVMODE_DIGITAL) {
+                        status = afe_write_byte(dev, ADC_PWRDN_CLAMP_CH1,
+                                                        0x70);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2,
+                                                        0x70);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
+                                                        0x70);
+
+                        status |= afe_read_byte(dev, SUP_BLK_PWRDN,
+                                                       &afe_power_status);
+                        afe_power_status |= FLD_PWRDN_PD_BANDGAP |
+                                                FLD_PWRDN_PD_BIAS |
+                                                FLD_PWRDN_PD_TUNECK;
+                        status |= afe_write_byte(dev, SUP_BLK_PWRDN,
+                                                        afe_power_status);
+                } else if (avmode == POLARIS_AVMODE_ENXTERNAL_AV) {
+                        while (afe_power_status != (FLD_PWRDN_TUNING_BIAS |
+                                                FLD_PWRDN_ENABLE_PLL)) {
+                                status = afe_write_byte(dev, SUP_BLK_PWRDN,
+                                                        FLD_PWRDN_TUNING_BIAS |
+                                                        FLD_PWRDN_ENABLE_PLL);
+                                status |= afe_read_byte(dev, SUP_BLK_PWRDN,
+                                                        &afe_power_status);
+                                if (status < 0)
+                                        break;
+                        }
+
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH1,
+                                                        0x00);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH2,
+                                                        0x00);
+                        status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
+                                                        0x40);
+                } else {
+                        cx231xx_info("Invalid AV mode input\n");
+                        status = -1;
+                }
+        }                       /* switch  */
+
+        return status;
+}
+
+int cx231xx_afe_adjust_ref_count(struct cx231xx *dev, u32 video_input)
+{
+        u8 input_mode = 0;
+        u8 ntf_mode = 0;
+        int status = 0;
+
+        dev->video_input = video_input;
+
+        if (video_input == CX231XX_VMUX_TELEVISION) {
+                status = afe_read_byte(dev, ADC_INPUT_CH3, &input_mode);
+                status = afe_read_byte(dev, ADC_NTF_PRECLMP_EN_CH3,
+                                        &ntf_mode);
+        } else {
+                status = afe_read_byte(dev, ADC_INPUT_CH1, &input_mode);
+                status = afe_read_byte(dev, ADC_NTF_PRECLMP_EN_CH1,
+                                        &ntf_mode);
+        }
+
+        input_mode = (ntf_mode & 0x3) | ((input_mode & 0x6) << 1);
+
+        switch (input_mode) {
+        case SINGLE_ENDED:
+                dev->afe_ref_count = 0x23C;
+                break;
+        case LOW_IF:
+                dev->afe_ref_count = 0x24C;
+                break;
+        case EU_IF:
+                dev->afe_ref_count = 0x258;
+                break;
+        case US_IF:
+                dev->afe_ref_count = 0x260;
+                break;
+        default:
+                break;
+        }
+
+        status = cx231xx_afe_init_super_block(dev, dev->afe_ref_count);
+
+        return status;
+}
+
+/******************************************************************************
+ *     V I D E O / A U D I O    D E C O D E R    C O N T R O L   functions    *
+ ******************************************************************************/
+static int vid_blk_write_byte(struct cx231xx *dev, u16 saddr, u8 data)
+{
+        return cx231xx_write_i2c_data(dev, VID_BLK_I2C_ADDRESS,
+                                        saddr, 2, data, 1);
+}
+
+static int vid_blk_read_byte(struct cx231xx *dev, u16 saddr, u8 *data)
+{
+        int status;
+        u32 temp = 0;
+
+        status = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
+                                        saddr, 2, &temp, 1);
+        *data = (u8) temp;
+        return status;
+}
+
+static int vid_blk_write_word(struct cx231xx *dev, u16 saddr, u32 data)
+{
+        return cx231xx_write_i2c_data(dev, VID_BLK_I2C_ADDRESS,
+                                        saddr, 2, data, 4);
+}
+
+static int vid_blk_read_word(struct cx231xx *dev, u16 saddr, u32 *data)
+{
+        return cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
+                                        saddr, 2, data, 4);
+}
+
+int cx231xx_set_video_input_mux(struct cx231xx *dev, u8 input)
+{
+        int status = 0;
+
+        switch (INPUT(input)->type) {
+        case CX231XX_VMUX_COMPOSITE1:
+        case CX231XX_VMUX_SVIDEO:
+                if ((dev->current_pcb_config.type == USB_BUS_POWER) &&
+                    (dev->power_mode != POLARIS_AVMODE_ENXTERNAL_AV)) {
+                        /* External AV */
+                        status = cx231xx_set_power_mode(dev,
+                                        POLARIS_AVMODE_ENXTERNAL_AV);
+                        if (status < 0) {
+                                cx231xx_errdev("%s: set_power_mode : Failed to"
+                                                " set Power - errCode [%d]!\n",
+                                                __func__, status);
+                                return status;
+                        }
+                }
+                status = cx231xx_set_decoder_video_input(dev,
+                                                         INPUT(input)->type,
+                                                         INPUT(input)->vmux);
+                break;
+        case CX231XX_VMUX_TELEVISION:
+        case CX231XX_VMUX_CABLE:
+                if ((dev->current_pcb_config.type == USB_BUS_POWER) &&
+                    (dev->power_mode != POLARIS_AVMODE_ANALOGT_TV)) {
+                        /* Tuner */
+                        status = cx231xx_set_power_mode(dev,
+                                                POLARIS_AVMODE_ANALOGT_TV);
+                        if (status < 0) {
+                                cx231xx_errdev("%s: set_power_mode:Failed"
+                                        " to set Power - errCode [%d]!\n",
+                                        __func__, status);
+                                return status;
+                        }
+                }
+                status = cx231xx_set_decoder_video_input(dev,
+                                                        CX231XX_VMUX_COMPOSITE1,
+                                                        INPUT(input)->vmux);
+                break;
+        default:
+                cx231xx_errdev("%s: set_power_mode : Unknown Input %d !\n",
+                     __func__, INPUT(input)->type);
+                break;
+        }
+
+        /* save the selection */
+        dev->video_input = input;
+
+        return status;
+}
+
+int cx231xx_set_decoder_video_input(struct cx231xx *dev,
+                                u8 pin_type, u8 input)
+{
+        int status = 0;
+        u32 value = 0;
+
+        if (pin_type != dev->video_input) {
+                status = cx231xx_afe_adjust_ref_count(dev, pin_type);
+                if (status < 0) {
+                        cx231xx_errdev("%s: adjust_ref_count :Failed to set"
+                                "AFE input mux - errCode [%d]!\n",
+                                __func__, status);
+                        return status;
+                }
+        }
+
+        /* call afe block to set video inputs */
+        status = cx231xx_afe_set_input_mux(dev, input);
+        if (status < 0) {
+                cx231xx_errdev("%s: set_input_mux :Failed to set"
+                                " AFE input mux - errCode [%d]!\n",
+                                __func__, status);
+                return status;
+        }
+
+        switch (pin_type) {
+        case CX231XX_VMUX_COMPOSITE1:
+                status = vid_blk_read_word(dev, AFE_CTRL, &value);
+                value |= (0 << 13) | (1 << 4);
+                value &= ~(1 << 5);
+
+                /* set [24:23] [22:15] to 0  */
+                value &= (~(0x1ff8000));
+                /* set FUNC_MODE[24:23] = 2 IF_MOD[22:15] = 0  */
+                value |= 0x1000000;
+                status = vid_blk_write_word(dev, AFE_CTRL, value);
+
+                status = vid_blk_read_word(dev, OUT_CTRL1, &value);
+                value |= (1 << 7);
+                status = vid_blk_write_word(dev, OUT_CTRL1, value);
+
+                /* Set vip 1.1 output mode */
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        OUT_CTRL1,
+                                                        FLD_OUT_MODE,
+                                                        OUT_MODE_VIP11);
+
+                /* Tell DIF object to go to baseband mode  */
+                status = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);
+                if (status < 0) {
+                        cx231xx_errdev("%s: cx231xx_dif set to By pass"
+                                                   " mode- errCode [%d]!\n",
+                                __func__, status);
+                        return status;
+                }
+
+                /* Read the DFE_CTRL1 register */
+                status = vid_blk_read_word(dev, DFE_CTRL1, &value);
+
+                /* enable the VBI_GATE_EN */
+                value |= FLD_VBI_GATE_EN;
+
+                /* Enable the auto-VGA enable */
+                value |= FLD_VGA_AUTO_EN;
+
+                /* Write it back */
+                status = vid_blk_write_word(dev, DFE_CTRL1, value);
+
+                /* Disable auto config of registers */
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                        VID_BLK_I2C_ADDRESS,
+                                        MODE_CTRL, FLD_ACFG_DIS,
+                                        cx231xx_set_field(FLD_ACFG_DIS, 1));
+
+                /* Set CVBS input mode */
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                        VID_BLK_I2C_ADDRESS,
+                        MODE_CTRL, FLD_INPUT_MODE,
+                        cx231xx_set_field(FLD_INPUT_MODE, INPUT_MODE_CVBS_0));
+                break;
+        case CX231XX_VMUX_SVIDEO:
+                /* Disable the use of  DIF */
+
+                status = vid_blk_read_word(dev, AFE_CTRL, &value);
+
+                /* set [24:23] [22:15] to 0 */
+                value &= (~(0x1ff8000));
+                /* set FUNC_MODE[24:23] = 2
+                IF_MOD[22:15] = 0 DCR_BYP_CH2[4:4] = 1; */
+                value |= 0x1000010;
+                status = vid_blk_write_word(dev, AFE_CTRL, value);
+
+                /* Tell DIF object to go to baseband mode */
+                status = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);
+                if (status < 0) {
+                        cx231xx_errdev("%s: cx231xx_dif set to By pass"
+                                                   " mode- errCode [%d]!\n",
+                                __func__, status);
+                        return status;
+                }
+
+                /* Read the DFE_CTRL1 register */
+                status = vid_blk_read_word(dev, DFE_CTRL1, &value);
+
+                /* enable the VBI_GATE_EN */
+                value |= FLD_VBI_GATE_EN;
+
+                /* Enable the auto-VGA enable */
+                value |= FLD_VGA_AUTO_EN;
+
+                /* Write it back */
+                status = vid_blk_write_word(dev, DFE_CTRL1, value);
+
+                /* Disable auto config of registers  */
+                status =  cx231xx_read_modify_write_i2c_dword(dev,
+                                        VID_BLK_I2C_ADDRESS,
+                                        MODE_CTRL, FLD_ACFG_DIS,
+                                        cx231xx_set_field(FLD_ACFG_DIS, 1));
+
+                /* Set YC input mode */
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                        VID_BLK_I2C_ADDRESS,
+                        MODE_CTRL,
+                        FLD_INPUT_MODE,
+                        cx231xx_set_field(FLD_INPUT_MODE, INPUT_MODE_YC_1));
+
+                /* Chroma to ADC2 */
+                status = vid_blk_read_word(dev, AFE_CTRL, &value);
+                value |= FLD_CHROMA_IN_SEL;     /* set the chroma in select */
+
+                /* Clear VGA_SEL_CH2 and VGA_SEL_CH3 (bits 7 and 8)
+                   This sets them to use video
+                   rather than audio.  Only one of the two will be in use. */
+                value &= ~(FLD_VGA_SEL_CH2 | FLD_VGA_SEL_CH3);
+
+                status = vid_blk_write_word(dev, AFE_CTRL, value);
+
+                status = cx231xx_afe_set_mode(dev, AFE_MODE_BASEBAND);
+                break;
+        case CX231XX_VMUX_TELEVISION:
+        case CX231XX_VMUX_CABLE:
+        default:
+                switch (dev->model) {
+                case CX231XX_BOARD_CNXT_RDE_250:
+                case CX231XX_BOARD_CNXT_RDU_250:
+                        /* Disable the use of  DIF   */
+
+                        status = vid_blk_read_word(dev, AFE_CTRL, &value);
+                        value |= (0 << 13) | (1 << 4);
+                        value &= ~(1 << 5);
+
+                        /* set [24:23] [22:15] to 0 */
+                        value &= (~(0x1FF8000));
+                        /* set FUNC_MODE[24:23] = 2 IF_MOD[22:15] = 0 */
+                        value |= 0x1000000;
+                        status = vid_blk_write_word(dev, AFE_CTRL, value);
+
+                        status = vid_blk_read_word(dev, OUT_CTRL1, &value);
+                        value |= (1 << 7);
+                        status = vid_blk_write_word(dev, OUT_CTRL1, value);
+
+                        /* Set vip 1.1 output mode */
+                        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        OUT_CTRL1, FLD_OUT_MODE,
+                                                        OUT_MODE_VIP11);
+
+                        /* Tell DIF object to go to baseband mode */
+                        status = cx231xx_dif_set_standard(dev,
+                                                          DIF_USE_BASEBAND);
+                        if (status < 0) {
+                                cx231xx_errdev("%s: cx231xx_dif set to By pass"
+                                                " mode- errCode [%d]!\n",
+                                                __func__, status);
+                                return status;
+                        }
+
+                        /* Read the DFE_CTRL1 register */
+                        status = vid_blk_read_word(dev, DFE_CTRL1, &value);
+
+                        /* enable the VBI_GATE_EN */
+                        value |= FLD_VBI_GATE_EN;
+
+                        /* Enable the auto-VGA enable */
+                        value |= FLD_VGA_AUTO_EN;
+
+                        /* Write it back */
+                        status = vid_blk_write_word(dev, DFE_CTRL1, value);
+
+                        /* Disable auto config of registers */
+                        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                        VID_BLK_I2C_ADDRESS,
+                                        MODE_CTRL, FLD_ACFG_DIS,
+                                        cx231xx_set_field(FLD_ACFG_DIS, 1));
+
+                        /* Set CVBS input mode */
+                        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                VID_BLK_I2C_ADDRESS,
+                                MODE_CTRL, FLD_INPUT_MODE,
+                                cx231xx_set_field(FLD_INPUT_MODE,
+                                                INPUT_MODE_CVBS_0));
+                        break;
+                default:
+                        /* Enable the DIF for the tuner */
+
+                        /* Reinitialize the DIF */
+                        status = cx231xx_dif_set_standard(dev, dev->norm);
+                        if (status < 0) {
+                                cx231xx_errdev("%s: cx231xx_dif set to By pass"
+                                                " mode- errCode [%d]!\n",
+                                                __func__, status);
+                                return status;
+                        }
+
+                        /* Make sure bypass is cleared */
+                        status = vid_blk_read_word(dev, DIF_MISC_CTRL, &value);
+
+                        /* Clear the bypass bit */
+                        value &= ~FLD_DIF_DIF_BYPASS;
+
+                        /* Enable the use of the DIF block */
+                        status = vid_blk_write_word(dev, DIF_MISC_CTRL, value);
+
+                        /* Read the DFE_CTRL1 register */
+                        status = vid_blk_read_word(dev, DFE_CTRL1, &value);
+
+                        /* Disable the VBI_GATE_EN */
+                        value &= ~FLD_VBI_GATE_EN;
+
+                        /* Enable the auto-VGA enable, AGC, and
+                           set the skip count to 2 */
+                        value |= FLD_VGA_AUTO_EN | FLD_AGC_AUTO_EN | 0x00200000;
+
+                        /* Write it back */
+                        status = vid_blk_write_word(dev, DFE_CTRL1, value);
+
+                        /* Wait until AGC locks up */
+                        msleep(1);
+
+                        /* Disable the auto-VGA enable AGC */
+                        value &= ~(FLD_VGA_AUTO_EN);
+
+                        /* Write it back */
+                        status = vid_blk_write_word(dev, DFE_CTRL1, value);
+
+                        /* Enable Polaris B0 AGC output */
+                        status = vid_blk_read_word(dev, PIN_CTRL, &value);
+                        value |= (FLD_OEF_AGC_RF) |
+                                 (FLD_OEF_AGC_IFVGA) |
+                                 (FLD_OEF_AGC_IF);
+                        status = vid_blk_write_word(dev, PIN_CTRL, value);
+
+                        /* Set vip 1.1 output mode */
+                        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                VID_BLK_I2C_ADDRESS,
+                                                OUT_CTRL1, FLD_OUT_MODE,
+                                                OUT_MODE_VIP11);
+
+                        /* Disable auto config of registers */
+                        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                        VID_BLK_I2C_ADDRESS,
+                                        MODE_CTRL, FLD_ACFG_DIS,
+                                        cx231xx_set_field(FLD_ACFG_DIS, 1));
+
+                        /* Set CVBS input mode */
+                        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                VID_BLK_I2C_ADDRESS,
+                                MODE_CTRL, FLD_INPUT_MODE,
+                                cx231xx_set_field(FLD_INPUT_MODE,
+                                                INPUT_MODE_CVBS_0));
+
+                        /* Set some bits in AFE_CTRL so that channel 2 or 3
+                         * is ready to receive audio */
+                        /* Clear clamp for channels 2 and 3      (bit 16-17) */
+                        /* Clear droop comp                      (bit 19-20) */
+                        /* Set VGA_SEL (for audio control)       (bit 7-8) */
+                        status = vid_blk_read_word(dev, AFE_CTRL, &value);
+
+                        value |= FLD_VGA_SEL_CH3 | FLD_VGA_SEL_CH2;
+
+                        status = vid_blk_write_word(dev, AFE_CTRL, value);
+                        break;
+
+                }
+                break;
+        }
+
+        /* Set raw VBI mode */
+        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                VID_BLK_I2C_ADDRESS,
+                                OUT_CTRL1, FLD_VBIHACTRAW_EN,
+                                cx231xx_set_field(FLD_VBIHACTRAW_EN, 1));
+
+        status = vid_blk_read_word(dev, OUT_CTRL1, &value);
+        if (value & 0x02) {
+                value |= (1 << 19);
+                status = vid_blk_write_word(dev, OUT_CTRL1, value);
+        }
+
+        return status;
+}
+
+/*
+ * Handle any video-mode specific overrides that are different
+ * on a per video standards basis after touching the MODE_CTRL
+ * register which resets many values for autodetect
+ */
+int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev)
+{
+        int status = 0;
+
+        cx231xx_info("do_mode_ctrl_overrides : 0x%x\n",
+                     (unsigned int)dev->norm);
+
+        /* Change the DFE_CTRL3 bp_percent to fix flagging */
+        status = vid_blk_write_word(dev, DFE_CTRL3, 0xCD3F0280);
+
+        if (dev->norm & (V4L2_STD_NTSC | V4L2_STD_PAL_M)) {
+                cx231xx_info("do_mode_ctrl_overrides NTSC\n");
+
+                /* Move the close caption lines out of active video,
+                   adjust the active video start point */
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        VERT_TIM_CTRL,
+                                                        FLD_VBLANK_CNT, 0x18);
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        VERT_TIM_CTRL,
+                                                        FLD_VACTIVE_CNT,
+                                                        0x1E6000);
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        VERT_TIM_CTRL,
+                                                        FLD_V656BLANK_CNT,
+                                                        0x1E000000);
+
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        HORIZ_TIM_CTRL,
+                                                        FLD_HBLANK_CNT,
+                                                        cx231xx_set_field
+                                                        (FLD_HBLANK_CNT, 0x79));
+        } else if (dev->norm & V4L2_STD_SECAM) {
+                cx231xx_info("do_mode_ctrl_overrides SECAM\n");
+                status =  cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        VERT_TIM_CTRL,
+                                                        FLD_VBLANK_CNT, 0x24);
+                /* Adjust the active video horizontal start point */
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        HORIZ_TIM_CTRL,
+                                                        FLD_HBLANK_CNT,
+                                                        cx231xx_set_field
+                                                        (FLD_HBLANK_CNT, 0x85));
+        } else {
+                cx231xx_info("do_mode_ctrl_overrides PAL\n");
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        VERT_TIM_CTRL,
+                                                        FLD_VBLANK_CNT, 0x24);
+                /* Adjust the active video horizontal start point */
+                status = cx231xx_read_modify_write_i2c_dword(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        HORIZ_TIM_CTRL,
+                                                        FLD_HBLANK_CNT,
+                                                        cx231xx_set_field
+                                                        (FLD_HBLANK_CNT, 0x85));
+        }
+
+        return status;
+}
+
+int cx231xx_set_audio_input(struct cx231xx *dev, u8 input)
+{
+        int status = 0;
+        enum AUDIO_INPUT ainput = AUDIO_INPUT_LINE;
+
+        switch (INPUT(input)->amux) {
+        case CX231XX_AMUX_VIDEO:
+                ainput = AUDIO_INPUT_TUNER_TV;
+                break;
+        case CX231XX_AMUX_LINE_IN:
+                status = cx231xx_i2s_blk_set_audio_input(dev, input);
+                ainput = AUDIO_INPUT_LINE;
+                break;
+        default:
+                break;
+        }
+
+        status = cx231xx_set_audio_decoder_input(dev, ainput);
+
+        return status;
+}
+
+int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
+                                    enum AUDIO_INPUT audio_input)
+{
+        u32 dwval;
+        int status;
+        u8 gen_ctrl;
+        u32 value = 0;
+
+        /* Put it in soft reset   */
+        status = vid_blk_read_byte(dev, GENERAL_CTL, &gen_ctrl);
+        gen_ctrl |= 1;
+        status = vid_blk_write_byte(dev, GENERAL_CTL, gen_ctrl);
+
+        switch (audio_input) {
+        case AUDIO_INPUT_LINE:
+                /* setup AUD_IO control from Merlin paralle output */
+                value = cx231xx_set_field(FLD_AUD_CHAN1_SRC,
+                                          AUD_CHAN_SRC_PARALLEL);
+                status = vid_blk_write_word(dev, AUD_IO_CTRL, value);
+
+                /* setup input to Merlin, SRC2 connect to AC97
+                   bypass upsample-by-2, slave mode, sony mode, left justify
+                   adr 091c, dat 01000000 */
+                status = vid_blk_read_word(dev, AC97_CTL, &dwval);
+
+                status = vid_blk_write_word(dev, AC97_CTL,
+                                           (dwval | FLD_AC97_UP2X_BYPASS));
+
+                /* select the parallel1 and SRC3 */
+                status = vid_blk_write_word(dev, BAND_OUT_SEL,
+                                cx231xx_set_field(FLD_SRC3_IN_SEL, 0x0) |
+                                cx231xx_set_field(FLD_SRC3_CLK_SEL, 0x0) |
+                                cx231xx_set_field(FLD_PARALLEL1_SRC_SEL, 0x0));
+
+                /* unmute all, AC97 in, independence mode
+                   adr 08d0, data 0x00063073 */
+                status = vid_blk_write_word(dev, PATH1_CTL1, 0x00063073);
+
+                /* set AVC maximum threshold, adr 08d4, dat ffff0024 */
+                status = vid_blk_read_word(dev, PATH1_VOL_CTL, &dwval);
+                status = vid_blk_write_word(dev, PATH1_VOL_CTL,
+                                           (dwval | FLD_PATH1_AVC_THRESHOLD));
+
+                /* set SC maximum threshold, adr 08ec, dat ffffb3a3 */
+                status = vid_blk_read_word(dev, PATH1_SC_CTL, &dwval);
+                status = vid_blk_write_word(dev, PATH1_SC_CTL,
+                                           (dwval | FLD_PATH1_SC_THRESHOLD));
+                break;
+
+        case AUDIO_INPUT_TUNER_TV:
+        default:
+
+                /* Setup SRC sources and clocks */
+                status = vid_blk_write_word(dev, BAND_OUT_SEL,
+                        cx231xx_set_field(FLD_SRC6_IN_SEL, 0x00)         |
+                        cx231xx_set_field(FLD_SRC6_CLK_SEL, 0x01)        |
+                        cx231xx_set_field(FLD_SRC5_IN_SEL, 0x00)         |
+                        cx231xx_set_field(FLD_SRC5_CLK_SEL, 0x02)        |
+                        cx231xx_set_field(FLD_SRC4_IN_SEL, 0x02)         |
+                        cx231xx_set_field(FLD_SRC4_CLK_SEL, 0x03)        |
+                        cx231xx_set_field(FLD_SRC3_IN_SEL, 0x00)         |
+                        cx231xx_set_field(FLD_SRC3_CLK_SEL, 0x00)        |
+                        cx231xx_set_field(FLD_BASEBAND_BYPASS_CTL, 0x00) |
+                        cx231xx_set_field(FLD_AC97_SRC_SEL, 0x03)        |
+                        cx231xx_set_field(FLD_I2S_SRC_SEL, 0x00)         |
+                        cx231xx_set_field(FLD_PARALLEL2_SRC_SEL, 0x02)   |
+                        cx231xx_set_field(FLD_PARALLEL1_SRC_SEL, 0x01));
+
+                /* Setup the AUD_IO control */
+                status = vid_blk_write_word(dev, AUD_IO_CTRL,
+                        cx231xx_set_field(FLD_I2S_PORT_DIR, 0x00)  |
+                        cx231xx_set_field(FLD_I2S_OUT_SRC, 0x00)   |
+                        cx231xx_set_field(FLD_AUD_CHAN3_SRC, 0x00) |
+                        cx231xx_set_field(FLD_AUD_CHAN2_SRC, 0x00) |
+                        cx231xx_set_field(FLD_AUD_CHAN1_SRC, 0x03));
+
+                status = vid_blk_write_word(dev, PATH1_CTL1, 0x1F063870);
+
+                /* setAudioStandard(_audio_standard); */
+
+                status = vid_blk_write_word(dev, PATH1_CTL1, 0x00063870);
+                switch (dev->model) {
+                case CX231XX_BOARD_CNXT_RDE_250:
+                case CX231XX_BOARD_CNXT_RDU_250:
+                        status = cx231xx_read_modify_write_i2c_dword(dev,
+                                        VID_BLK_I2C_ADDRESS,
+                                        CHIP_CTRL,
+                                        FLD_SIF_EN,
+                                        cx231xx_set_field(FLD_SIF_EN, 1));
+                        break;
+                default:
+                        break;
+                }
+                break;
+
+        case AUDIO_INPUT_TUNER_FM:
+                /*  use SIF for FM radio
+                   setupFM();
+                   setAudioStandard(_audio_standard);
+                 */
+                break;
+
+        case AUDIO_INPUT_MUTE:
+                status = vid_blk_write_word(dev, PATH1_CTL1, 0x1F011012);
+                break;
+        }
+
+        /* Take it out of soft reset */
+        status = vid_blk_read_byte(dev, GENERAL_CTL, &gen_ctrl);
+        gen_ctrl &= ~1;
+        status = vid_blk_write_byte(dev, GENERAL_CTL, gen_ctrl);
+
+        return status;
+}
+
+/* Set resolution of the video */
+int cx231xx_resolution_set(struct cx231xx *dev)
+{
+        int width, height;
+        u32 hscale, vscale;
+        int status = 0;
+
+        width = dev->width;
+        height = dev->height;
+
+        get_scale(dev, width, height, &hscale, &vscale);
+
+        /* set horzontal scale */
+        status = vid_blk_write_word(dev, HSCALE_CTRL, hscale);
+
+        /* set vertical scale */
+        status = vid_blk_write_word(dev, VSCALE_CTRL, vscale);
+
+        return status;
+}
+
+/******************************************************************************
+ *                    C H I P Specific  C O N T R O L   functions             *
+ ******************************************************************************/
+int cx231xx_init_ctrl_pin_status(struct cx231xx *dev)
+{
+        u32 value;
+        int status = 0;
+
+        status = vid_blk_read_word(dev, PIN_CTRL, &value);
+        value |= (~dev->board.ctl_pin_status_mask);
+        status = vid_blk_write_word(dev, PIN_CTRL, value);
+
+        return status;
+}
+
+int cx231xx_set_agc_analog_digital_mux_select(struct cx231xx *dev,
+                                              u8 analog_or_digital)
+{
+        int status = 0;
+
+        /* first set the direction to output */
+        status = cx231xx_set_gpio_direction(dev,
+                                            dev->board.
+                                            agc_analog_digital_select_gpio, 1);
+
+        /* 0 - demod ; 1 - Analog mode */
+        status = cx231xx_set_gpio_value(dev,
+                                   dev->board.agc_analog_digital_select_gpio,
+                                   analog_or_digital);
+
+        return status;
+}
+
+int cx231xx_enable_i2c_for_tuner(struct cx231xx *dev, u8 I2CIndex)
+{
+        u8 value[4] = { 0, 0, 0, 0 };
+        int status = 0;
+
+        cx231xx_info("Changing the i2c port for tuner to %d\n", I2CIndex);
+
+        status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER,
+                                       PWR_CTL_EN, value, 4);
+        if (status < 0)
+                return status;
+
+        if (I2CIndex == I2C_1) {
+                if (value[0] & I2C_DEMOD_EN) {
+                        value[0] &= ~I2C_DEMOD_EN;
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                   PWR_CTL_EN, value, 4);
+                }
+        } else {
+                if (!(value[0] & I2C_DEMOD_EN)) {
+                        value[0] |= I2C_DEMOD_EN;
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                   PWR_CTL_EN, value, 4);
+                }
+        }
+
+        return status;
+
+}
+
+/******************************************************************************
+ *                 D I F - B L O C K    C O N T R O L   functions             *
+ ******************************************************************************/
+int cx231xx_dif_configure_C2HH_for_low_IF(struct cx231xx *dev, u32 mode,
+                                          u32 function_mode, u32 standard)
+{
+        int status = 0;
+
+        if (mode == V4L2_TUNER_RADIO) {
+                /* C2HH */
+                /* lo if big signal */
+                status = cx231xx_reg_mask_write(dev,
+                                VID_BLK_I2C_ADDRESS, 32,
+                                AFE_CTRL_C2HH_SRC_CTRL, 30, 31, 0x1);
+                /* FUNC_MODE = DIF */
+                status = cx231xx_reg_mask_write(dev,
+                                VID_BLK_I2C_ADDRESS, 32,
+                                AFE_CTRL_C2HH_SRC_CTRL, 23, 24, function_mode);
+                /* IF_MODE */
+                status = cx231xx_reg_mask_write(dev,
+                                VID_BLK_I2C_ADDRESS, 32,
+                                AFE_CTRL_C2HH_SRC_CTRL, 15, 22, 0xFF);
+                /* no inv */
+                status = cx231xx_reg_mask_write(dev,
+                                VID_BLK_I2C_ADDRESS, 32,
+                                AFE_CTRL_C2HH_SRC_CTRL, 9, 9, 0x1);
+        } else if (standard != DIF_USE_BASEBAND) {
+                if (standard & V4L2_STD_MN) {
+                        /* lo if big signal */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 30, 31, 0x1);
+                        /* FUNC_MODE = DIF */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 23, 24,
+                                        function_mode);
+                        /* IF_MODE */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 15, 22, 0xb);
+                        /* no inv */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 9, 9, 0x1);
+                        /* 0x124, AUD_CHAN1_SRC = 0x3 */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AUD_IO_CTRL, 0, 31, 0x00000003);
+                } else if ((standard == V4L2_STD_PAL_I) |
+                        (standard & V4L2_STD_SECAM)) {
+                        /* C2HH setup */
+                        /* lo if big signal */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 30, 31, 0x1);
+                        /* FUNC_MODE = DIF */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 23, 24,
+                                        function_mode);
+                        /* IF_MODE */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 15, 22, 0xF);
+                        /* no inv */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 9, 9, 0x1);
+                } else {
+                        /* default PAL BG */
+                        /* C2HH setup */
+                        /* lo if big signal */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 30, 31, 0x1);
+                        /* FUNC_MODE = DIF */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 23, 24,
+                                        function_mode);
+                        /* IF_MODE */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 15, 22, 0xE);
+                        /* no inv */
+                        status = cx231xx_reg_mask_write(dev,
+                                        VID_BLK_I2C_ADDRESS, 32,
+                                        AFE_CTRL_C2HH_SRC_CTRL, 9, 9, 0x1);
+                }
+        }
+
+        return status;
+}
+
+int cx231xx_dif_set_standard(struct cx231xx *dev, u32 standard)
+{
+        int status = 0;
+        u32 dif_misc_ctrl_value = 0;
+        u32 func_mode = 0;
+
+        cx231xx_info("%s: setStandard to %x\n", __func__, standard);
+
+        status = vid_blk_read_word(dev, DIF_MISC_CTRL, &dif_misc_ctrl_value);
+        if (standard != DIF_USE_BASEBAND)
+                dev->norm = standard;
+
+        switch (dev->model) {
+        case CX231XX_BOARD_CNXT_RDE_250:
+        case CX231XX_BOARD_CNXT_RDU_250:
+                func_mode = 0x03;
+                break;
+        default:
+                func_mode = 0x01;
+        }
+
+        status = cx231xx_dif_configure_C2HH_for_low_IF(dev, dev->active_mode,
+                                                  func_mode, standard);
+
+        if (standard == DIF_USE_BASEBAND) {     /* base band */
+                /* There is a different SRC_PHASE_INC value
+                   for baseband vs. DIF */
+                status = vid_blk_write_word(dev, DIF_SRC_PHASE_INC, 0xDF7DF83);
+                status = vid_blk_read_word(dev, DIF_MISC_CTRL,
+                                                &dif_misc_ctrl_value);
+                dif_misc_ctrl_value |= FLD_DIF_DIF_BYPASS;
+                status = vid_blk_write_word(dev, DIF_MISC_CTRL,
+                                                dif_misc_ctrl_value);
+        } else if (standard & V4L2_STD_PAL_D) {
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL, 0, 31, 0x6503bc0c);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL1, 0, 31, 0xbd038c85);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL2, 0, 31, 0x1db4640a);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL3, 0, 31, 0x00008800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_REF, 0, 31, 0x444C1380);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_IF, 0, 31, 0xDA302600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_INT, 0, 31, 0xDA261700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_RF, 0, 31, 0xDA262600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_INT_CURRENT, 0, 31,
+                                           0x26001700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_RF_CURRENT, 0, 31,
+                                           0x00002660);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VIDEO_AGC_CTRL, 0, 31,
+                                           0x72500800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VID_AUD_OVERRIDE, 0, 31,
+                                           0x27000100);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AV_SEP_CTRL, 0, 31, 0x3F3934EA);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_COMP_FLT_CTRL, 0, 31,
+                                           0x00000000);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_PHASE_INC, 0, 31,
+                                           0x1befbf06);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_GAIN_CONTROL, 0, 31,
+                                           0x000035e8);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_RPT_VARIANCE, 0, 31, 0x00000000);
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value |= 0x3a023F11;
+        } else if (standard & V4L2_STD_PAL_I) {
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL, 0, 31, 0x6503bc0c);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL1, 0, 31, 0xbd038c85);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL2, 0, 31, 0x1db4640a);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL3, 0, 31, 0x00008800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_REF, 0, 31, 0x444C1380);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_IF, 0, 31, 0xDA302600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_INT, 0, 31, 0xDA261700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_RF, 0, 31, 0xDA262600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_INT_CURRENT, 0, 31,
+                                           0x26001700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_RF_CURRENT, 0, 31,
+                                           0x00002660);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VIDEO_AGC_CTRL, 0, 31,
+                                           0x72500800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VID_AUD_OVERRIDE, 0, 31,
+                                           0x27000100);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AV_SEP_CTRL, 0, 31, 0x5F39A934);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_COMP_FLT_CTRL, 0, 31,
+                                           0x00000000);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_PHASE_INC, 0, 31,
+                                           0x1befbf06);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_GAIN_CONTROL, 0, 31,
+                                           0x000035e8);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_RPT_VARIANCE, 0, 31, 0x00000000);
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value |= 0x3a033F11;
+        } else if (standard & V4L2_STD_PAL_M) {
+                /* improved Low Frequency Phase Noise */
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL, 0xFF01FF0C);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL1, 0xbd038c85);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL2, 0x1db4640a);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL3, 0x00008800);
+                status = vid_blk_write_word(dev, DIF_AGC_IF_REF, 0x444C1380);
+                status = vid_blk_write_word(dev, DIF_AGC_IF_INT_CURRENT,
+                                                0x26001700);
+                status = vid_blk_write_word(dev, DIF_AGC_RF_CURRENT,
+                                                0x00002660);
+                status = vid_blk_write_word(dev, DIF_VIDEO_AGC_CTRL,
+                                                0x72500800);
+                status = vid_blk_write_word(dev, DIF_VID_AUD_OVERRIDE,
+                                                0x27000100);
+                status = vid_blk_write_word(dev, DIF_AV_SEP_CTRL, 0x012c405d);
+                status = vid_blk_write_word(dev, DIF_COMP_FLT_CTRL,
+                                                0x009f50c1);
+                status = vid_blk_write_word(dev, DIF_SRC_PHASE_INC,
+                                                0x1befbf06);
+                status = vid_blk_write_word(dev, DIF_SRC_GAIN_CONTROL,
+                                                0x000035e8);
+                status = vid_blk_write_word(dev, DIF_SOFT_RST_CTRL_REVB,
+                                                0x00000000);
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value |= 0x3A0A3F10;
+        } else if (standard & (V4L2_STD_PAL_N | V4L2_STD_PAL_Nc)) {
+                /* improved Low Frequency Phase Noise */
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL, 0xFF01FF0C);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL1, 0xbd038c85);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL2, 0x1db4640a);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL3, 0x00008800);
+                status = vid_blk_write_word(dev, DIF_AGC_IF_REF, 0x444C1380);
+                status = vid_blk_write_word(dev, DIF_AGC_IF_INT_CURRENT,
+                                                0x26001700);
+                status = vid_blk_write_word(dev, DIF_AGC_RF_CURRENT,
+                                                0x00002660);
+                status = vid_blk_write_word(dev, DIF_VIDEO_AGC_CTRL,
+                                                0x72500800);
+                status = vid_blk_write_word(dev, DIF_VID_AUD_OVERRIDE,
+                                                0x27000100);
+                status = vid_blk_write_word(dev, DIF_AV_SEP_CTRL,
+                                                0x012c405d);
+                status = vid_blk_write_word(dev, DIF_COMP_FLT_CTRL,
+                                                0x009f50c1);
+                status = vid_blk_write_word(dev, DIF_SRC_PHASE_INC,
+                                                0x1befbf06);
+                status = vid_blk_write_word(dev, DIF_SRC_GAIN_CONTROL,
+                                                0x000035e8);
+                status = vid_blk_write_word(dev, DIF_SOFT_RST_CTRL_REVB,
+                                                0x00000000);
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value = 0x3A093F10;
+        } else if (standard &
+                  (V4L2_STD_SECAM_B | V4L2_STD_SECAM_D | V4L2_STD_SECAM_G |
+                   V4L2_STD_SECAM_K | V4L2_STD_SECAM_K1)) {
+
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL, 0, 31, 0x6503bc0c);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL1, 0, 31, 0xbd038c85);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL2, 0, 31, 0x1db4640a);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL3, 0, 31, 0x00008800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_REF, 0, 31, 0x888C0380);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_IF, 0, 31, 0xe0262600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_INT, 0, 31, 0xc2171700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_RF, 0, 31, 0xc2262600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_INT_CURRENT, 0, 31,
+                                           0x26001700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_RF_CURRENT, 0, 31,
+                                           0x00002660);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VID_AUD_OVERRIDE, 0, 31,
+                                           0x27000100);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AV_SEP_CTRL, 0, 31, 0x3F3530ec);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_COMP_FLT_CTRL, 0, 31,
+                                           0x00000000);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_PHASE_INC, 0, 31,
+                                           0x1befbf06);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_GAIN_CONTROL, 0, 31,
+                                           0x000035e8);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_RPT_VARIANCE, 0, 31, 0x00000000);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VIDEO_AGC_CTRL, 0, 31,
+                                           0xf4000000);
+
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value |= 0x3a023F11;
+        } else if (standard & (V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC)) {
+                /* Is it SECAM_L1? */
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL, 0, 31, 0x6503bc0c);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL1, 0, 31, 0xbd038c85);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL2, 0, 31, 0x1db4640a);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL3, 0, 31, 0x00008800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_REF, 0, 31, 0x888C0380);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_IF, 0, 31, 0xe0262600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_INT, 0, 31, 0xc2171700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_RF, 0, 31, 0xc2262600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_INT_CURRENT, 0, 31,
+                                           0x26001700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_RF_CURRENT, 0, 31,
+                                           0x00002660);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VID_AUD_OVERRIDE, 0, 31,
+                                           0x27000100);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AV_SEP_CTRL, 0, 31, 0x3F3530ec);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_COMP_FLT_CTRL, 0, 31,
+                                           0x00000000);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_PHASE_INC, 0, 31,
+                                           0x1befbf06);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_GAIN_CONTROL, 0, 31,
+                                           0x000035e8);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_RPT_VARIANCE, 0, 31, 0x00000000);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VIDEO_AGC_CTRL, 0, 31,
+                                           0xf2560000);
+
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value |= 0x3a023F11;
+
+        } else if (standard & V4L2_STD_NTSC_M) {
+                /* V4L2_STD_NTSC_M (75 IRE Setup) Or
+                   V4L2_STD_NTSC_M_JP (Japan,  0 IRE Setup) */
+
+                /* For NTSC the centre frequency of video coming out of
+                   sidewinder is around 7.1MHz or 3.6MHz depending on the
+                   spectral inversion. so for a non spectrally inverted channel
+                   the pll freq word is 0x03420c49
+                 */
+
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL, 0x6503BC0C);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL1, 0xBD038C85);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL2, 0x1DB4640A);
+                status = vid_blk_write_word(dev, DIF_PLL_CTRL3, 0x00008800);
+                status = vid_blk_write_word(dev, DIF_AGC_IF_REF, 0x444C0380);
+                status = vid_blk_write_word(dev, DIF_AGC_IF_INT_CURRENT,
+                                                0x26001700);
+                status = vid_blk_write_word(dev, DIF_AGC_RF_CURRENT,
+                                                0x00002660);
+                status = vid_blk_write_word(dev, DIF_VIDEO_AGC_CTRL,
+                                                0x04000800);
+                status = vid_blk_write_word(dev, DIF_VID_AUD_OVERRIDE,
+                                                0x27000100);
+                status = vid_blk_write_word(dev, DIF_AV_SEP_CTRL, 0x01296e1f);
+
+                status = vid_blk_write_word(dev, DIF_COMP_FLT_CTRL,
+                                                0x009f50c1);
+                status = vid_blk_write_word(dev, DIF_SRC_PHASE_INC,
+                                                0x1befbf06);
+                status = vid_blk_write_word(dev, DIF_SRC_GAIN_CONTROL,
+                                                0x000035e8);
+
+                status = vid_blk_write_word(dev, DIF_AGC_CTRL_IF, 0xC2262600);
+                status = vid_blk_write_word(dev, DIF_AGC_CTRL_INT,
+                                                0xC2262600);
+                status = vid_blk_write_word(dev, DIF_AGC_CTRL_RF, 0xC2262600);
+
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value |= 0x3a003F10;
+        } else {
+                /* default PAL BG */
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL, 0, 31, 0x6503bc0c);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL1, 0, 31, 0xbd038c85);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL2, 0, 31, 0x1db4640a);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_PLL_CTRL3, 0, 31, 0x00008800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_REF, 0, 31, 0x444C1380);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_IF, 0, 31, 0xDA302600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_INT, 0, 31, 0xDA261700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_CTRL_RF, 0, 31, 0xDA262600);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_IF_INT_CURRENT, 0, 31,
+                                           0x26001700);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AGC_RF_CURRENT, 0, 31,
+                                           0x00002660);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VIDEO_AGC_CTRL, 0, 31,
+                                           0x72500800);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_VID_AUD_OVERRIDE, 0, 31,
+                                           0x27000100);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_AV_SEP_CTRL, 0, 31, 0x3F3530EC);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_COMP_FLT_CTRL, 0, 31,
+                                           0x00A653A8);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_PHASE_INC, 0, 31,
+                                           0x1befbf06);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_SRC_GAIN_CONTROL, 0, 31,
+                                           0x000035e8);
+                status = cx231xx_reg_mask_write(dev, VID_BLK_I2C_ADDRESS, 32,
+                                           DIF_RPT_VARIANCE, 0, 31, 0x00000000);
+                /* Save the Spec Inversion value */
+                dif_misc_ctrl_value &= FLD_DIF_SPEC_INV;
+                dif_misc_ctrl_value |= 0x3a013F11;
+        }
+
+        /* The AGC values should be the same for all standards,
+           AUD_SRC_SEL[19] should always be disabled    */
+        dif_misc_ctrl_value &= ~FLD_DIF_AUD_SRC_SEL;
+
+        /* It is still possible to get Set Standard calls even when we
+           are in FM mode.
+           This is done to override the value for FM. */
+        if (dev->active_mode == V4L2_TUNER_RADIO)
+                dif_misc_ctrl_value = 0x7a080000;
+
+        /* Write the calculated value for misc ontrol register      */
+        status = vid_blk_write_word(dev, DIF_MISC_CTRL, dif_misc_ctrl_value);
+
+        return status;
+}
+
+int cx231xx_tuner_pre_channel_change(struct cx231xx *dev)
+{
+        int status = 0;
+        u32 dwval;
+
+        /* Set the RF and IF k_agc values to 3 */
+        status = vid_blk_read_word(dev, DIF_AGC_IF_REF, &dwval);
+        dwval &= ~(FLD_DIF_K_AGC_RF | FLD_DIF_K_AGC_IF);
+        dwval |= 0x33000000;
+
+        status = vid_blk_write_word(dev, DIF_AGC_IF_REF, dwval);
+
+        return status;
+}
+
+int cx231xx_tuner_post_channel_change(struct cx231xx *dev)
+{
+        int status = 0;
+        u32 dwval;
+
+        /* Set the RF and IF k_agc values to 4 for PAL/NTSC and 8 for
+         * SECAM L/B/D standards */
+        status = vid_blk_read_word(dev, DIF_AGC_IF_REF, &dwval);
+        dwval &= ~(FLD_DIF_K_AGC_RF | FLD_DIF_K_AGC_IF);
+
+        if (dev->norm & (V4L2_STD_SECAM_L | V4L2_STD_SECAM_B |
+                         V4L2_STD_SECAM_D))
+                dwval |= 0x88000000;
+        else
+                dwval |= 0x44000000;
+
+        status = vid_blk_write_word(dev, DIF_AGC_IF_REF, dwval);
+
+        return status;
+}
+
+/******************************************************************************
+ *                  I 2 S - B L O C K    C O N T R O L   functions            *
+ ******************************************************************************/
+int cx231xx_i2s_blk_initialize(struct cx231xx *dev)
+{
+        int status = 0;
+        u32 value;
+
+        status = cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                       CH_PWR_CTRL1, 1, &value, 1);
+        /* enables clock to delta-sigma and decimation filter */
+        value |= 0x80;
+        status = cx231xx_write_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                        CH_PWR_CTRL1, 1, value, 1);
+        /* power up all channel */
+        status = cx231xx_write_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                        CH_PWR_CTRL2, 1, 0x00, 1);
+
+        return status;
+}
+
+int cx231xx_i2s_blk_update_power_control(struct cx231xx *dev,
+                                        enum AV_MODE avmode)
+{
+        int status = 0;
+        u32 value = 0;
+
+        if (avmode != POLARIS_AVMODE_ENXTERNAL_AV) {
+                status = cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                          CH_PWR_CTRL2, 1, &value, 1);
+                value |= 0xfe;
+                status = cx231xx_write_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                                CH_PWR_CTRL2, 1, value, 1);
+        } else {
+                status = cx231xx_write_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                                CH_PWR_CTRL2, 1, 0x00, 1);
+        }
+
+        return status;
+}
+
+/* set i2s_blk for audio input types */
+int cx231xx_i2s_blk_set_audio_input(struct cx231xx *dev, u8 audio_input)
+{
+        int status = 0;
+
+        switch (audio_input) {
+        case CX231XX_AMUX_LINE_IN:
+                status = cx231xx_write_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                                CH_PWR_CTRL2, 1, 0x00, 1);
+                status = cx231xx_write_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                                CH_PWR_CTRL1, 1, 0x80, 1);
+                break;
+        case CX231XX_AMUX_VIDEO:
+        default:
+                break;
+        }
+
+        dev->ctl_ainput = audio_input;
+
+        return status;
+}
+
+/******************************************************************************
+ *                  P O W E R      C O N T R O L   functions                  *
+ ******************************************************************************/
+int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
+{
+        u8 value[4] = { 0, 0, 0, 0 };
+        u32 tmp = 0;
+        int status = 0;
+
+        if (dev->power_mode != mode)
+                dev->power_mode = mode;
+        else {
+                cx231xx_info(" setPowerMode::mode = %d, No Change req.\n",
+                             mode);
+                return 0;
+        }
+
+        cx231xx_info(" setPowerMode::mode = %d\n", mode);
+
+        status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN, value,
+                                       4);
+        if (status < 0)
+                return status;
+
+        tmp = *((u32 *) value);
+
+        switch (mode) {
+        case POLARIS_AVMODE_ENXTERNAL_AV:
+
+                tmp &= (~PWR_MODE_MASK);
+
+                tmp |= PWR_AV_EN;
+                value[0] = (u8) tmp;
+                value[1] = (u8) (tmp >> 8);
+                value[2] = (u8) (tmp >> 16);
+                value[3] = (u8) (tmp >> 24);
+                status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                PWR_CTL_EN, value, 4);
+                msleep(PWR_SLEEP_INTERVAL);
+
+                tmp |= PWR_ISO_EN;
+                value[0] = (u8) tmp;
+                value[1] = (u8) (tmp >> 8);
+                value[2] = (u8) (tmp >> 16);
+                value[3] = (u8) (tmp >> 24);
+                status =
+                    cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, PWR_CTL_EN,
+                                           value, 4);
+                msleep(PWR_SLEEP_INTERVAL);
+
+                tmp |= POLARIS_AVMODE_ENXTERNAL_AV;
+                value[0] = (u8) tmp;
+                value[1] = (u8) (tmp >> 8);
+                value[2] = (u8) (tmp >> 16);
+                value[3] = (u8) (tmp >> 24);
+                status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                PWR_CTL_EN, value, 4);
+
+                /* reset state of xceive tuner */
+                dev->xc_fw_load_done = 0;
+                break;
+
+        case POLARIS_AVMODE_ANALOGT_TV:
+
+                tmp &= (~PWR_DEMOD_EN);
+                tmp |= (I2C_DEMOD_EN);
+                value[0] = (u8) tmp;
+                value[1] = (u8) (tmp >> 8);
+                value[2] = (u8) (tmp >> 16);
+                value[3] = (u8) (tmp >> 24);
+                status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                PWR_CTL_EN, value, 4);
+                msleep(PWR_SLEEP_INTERVAL);
+
+                if (!(tmp & PWR_TUNER_EN)) {
+                        tmp |= (PWR_TUNER_EN);
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+
+                if (!(tmp & PWR_AV_EN)) {
+                        tmp |= PWR_AV_EN;
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+                if (!(tmp & PWR_ISO_EN)) {
+                        tmp |= PWR_ISO_EN;
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+
+                if (!(tmp & POLARIS_AVMODE_ANALOGT_TV)) {
+                        tmp |= POLARIS_AVMODE_ANALOGT_TV;
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+
+                if ((dev->model == CX231XX_BOARD_CNXT_RDE_250) ||
+                    (dev->model == CX231XX_BOARD_CNXT_RDU_250)) {
+                        /* tuner path to channel 1 from port 3 */
+                        cx231xx_enable_i2c_for_tuner(dev, I2C_3);
+
+                        if (dev->cx231xx_reset_analog_tuner)
+                                dev->cx231xx_reset_analog_tuner(dev);
+                }
+                break;
+
+        case POLARIS_AVMODE_DIGITAL:
+                if (!(tmp & PWR_TUNER_EN)) {
+                        tmp |= (PWR_TUNER_EN);
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+                if (!(tmp & PWR_AV_EN)) {
+                        tmp |= PWR_AV_EN;
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+                if (!(tmp & PWR_ISO_EN)) {
+                        tmp |= PWR_ISO_EN;
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+
+                tmp |= POLARIS_AVMODE_DIGITAL | I2C_DEMOD_EN;
+                value[0] = (u8) tmp;
+                value[1] = (u8) (tmp >> 8);
+                value[2] = (u8) (tmp >> 16);
+                value[3] = (u8) (tmp >> 24);
+                status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                PWR_CTL_EN, value, 4);
+                msleep(PWR_SLEEP_INTERVAL);
+
+                if (!(tmp & PWR_DEMOD_EN)) {
+                        tmp |= PWR_DEMOD_EN;
+                        value[0] = (u8) tmp;
+                        value[1] = (u8) (tmp >> 8);
+                        value[2] = (u8) (tmp >> 16);
+                        value[3] = (u8) (tmp >> 24);
+                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                        PWR_CTL_EN, value, 4);
+                        msleep(PWR_SLEEP_INTERVAL);
+                }
+
+                if ((dev->model == CX231XX_BOARD_CNXT_RDE_250) ||
+                    (dev->model == CX231XX_BOARD_CNXT_RDU_250)) {
+                        /* tuner path to channel 1 from port 3 */
+                        cx231xx_enable_i2c_for_tuner(dev, I2C_3);
+
+                        if (dev->cx231xx_reset_analog_tuner)
+                                dev->cx231xx_reset_analog_tuner(dev);
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        msleep(PWR_SLEEP_INTERVAL);
+
+        /* For power saving, only enable Pwr_resetout_n
+           when digital TV is selected. */
+        if (mode == POLARIS_AVMODE_DIGITAL) {
+                tmp |= PWR_RESETOUT_EN;
+                value[0] = (u8) tmp;
+                value[1] = (u8) (tmp >> 8);
+                value[2] = (u8) (tmp >> 16);
+                value[3] = (u8) (tmp >> 24);
+                status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
+                                                PWR_CTL_EN, value, 4);
+                msleep(PWR_SLEEP_INTERVAL);
+        }
+
+        /* update power control for afe */
+        status = cx231xx_afe_update_power_control(dev, mode);
+
+        /* update power control for i2s_blk */
+        status = cx231xx_i2s_blk_update_power_control(dev, mode);
+
+        status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN, value,
+                                       4);
+        cx231xx_info(" The data of PWR_CTL_EN register 0x74"
+                                 "=0x%0x,0x%0x,0x%0x,0x%0x\n",
+                     value[0], value[1], value[2], value[3]);
+
+        return status;
+}
+
+int cx231xx_power_suspend(struct cx231xx *dev)
+{
+        u8 value[4] = { 0, 0, 0, 0 };
+        u32 tmp = 0;
+        int status = 0;
+
+        status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN,
+                                       value, 4);
+        if (status > 0)
+                return status;
+
+        tmp = *((u32 *) value);
+        tmp &= (~PWR_MODE_MASK);
+
+        value[0] = (u8) tmp;
+        value[1] = (u8) (tmp >> 8);
+        value[2] = (u8) (tmp >> 16);
+        value[3] = (u8) (tmp >> 24);
+        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, PWR_CTL_EN,
+                                        value, 4);
+
+        return status;
+}
+
+/******************************************************************************
+ *                  S T R E A M    C O N T R O L   functions                  *
+ ******************************************************************************/
+int cx231xx_start_stream(struct cx231xx *dev, u32 ep_mask)
+{
+        u8 value[4] = { 0x0, 0x0, 0x0, 0x0 };
+        u32 tmp = 0;
+        int status = 0;
+
+        cx231xx_info("cx231xx_start_stream():: ep_mask = %x\n", ep_mask);
+        status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET,
+                                       value, 4);
+        if (status < 0)
+                return status;
+
+        tmp = *((u32 *) value);
+        tmp |= ep_mask;
+        value[0] = (u8) tmp;
+        value[1] = (u8) (tmp >> 8);
+        value[2] = (u8) (tmp >> 16);
+        value[3] = (u8) (tmp >> 24);
+
+        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, EP_MODE_SET,
+                                        value, 4);
+
+        return status;
+}
+
+int cx231xx_stop_stream(struct cx231xx *dev, u32 ep_mask)
+{
+        u8 value[4] = { 0x0, 0x0, 0x0, 0x0 };
+        u32 tmp = 0;
+        int status = 0;
+
+        cx231xx_info("cx231xx_stop_stream():: ep_mask = %x\n", ep_mask);
+        status =
+            cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET, value, 4);
+        if (status < 0)
+                return status;
+
+        tmp = *((u32 *) value);
+        tmp &= (~ep_mask);
+        value[0] = (u8) tmp;
+        value[1] = (u8) (tmp >> 8);
+        value[2] = (u8) (tmp >> 16);
+        value[3] = (u8) (tmp >> 24);
+
+        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, EP_MODE_SET,
+                                        value, 4);
+
+        return status;
+}
+
+int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
+{
+        int status = 0;
+
+        if (dev->udev->speed == USB_SPEED_HIGH) {
+                switch (media_type) {
+                case 81: /* audio */
+                        cx231xx_info("%s: Audio enter HANC\n", __func__);
+                        status =
+                            cx231xx_mode_register(dev, TS_MODE_REG, 0x9300);
+                        break;
+
+                case 2: /* vbi */
+                        cx231xx_info("%s: set vanc registers\n", __func__);
+                        status = cx231xx_mode_register(dev, TS_MODE_REG, 0x300);
+                        break;
+
+                case 3: /* sliced cc */
+                        cx231xx_info("%s: set hanc registers\n", __func__);
+                        status =
+                            cx231xx_mode_register(dev, TS_MODE_REG, 0x1300);
+                        break;
+
+                case 0: /* video */
+                        cx231xx_info("%s: set video registers\n", __func__);
+                        status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
+                        break;
+
+                case 4: /* ts1 */
+                        cx231xx_info("%s: set ts1 registers\n", __func__);
+                        status = cx231xx_mode_register(dev, TS_MODE_REG, 0x101);
+                        status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);
+                        break;
+                case 6: /* ts1 parallel mode */
+                        cx231xx_info("%s: set ts1 parrallel mode registers\n",
+                                     __func__);
+                        status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
+                        status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);
+                        break;
+                }
+        } else {
+                status = cx231xx_mode_register(dev, TS_MODE_REG, 0x101);
+        }
+
+        return status;
+}
+
+int cx231xx_capture_start(struct cx231xx *dev, int start, u8 media_type)
+{
+        int rc;
+        u32 ep_mask = -1;
+        struct pcb_config *pcb_config;
+
+        /* get EP for media type */
+        pcb_config = (struct pcb_config *)&dev->current_pcb_config;
+
+        if (pcb_config->config_num == 1) {
+                switch (media_type) {
+                case 0: /* Video */
+                        ep_mask = ENABLE_EP4;   /* ep4  [00:1000] */
+                        break;
+                case 1: /* Audio */
+                        ep_mask = ENABLE_EP3;   /* ep3  [00:0100] */
+                        break;
+                case 2: /* Vbi */
+                        ep_mask = ENABLE_EP5;   /* ep5 [01:0000] */
+                        break;
+                case 3: /* Sliced_cc */
+                        ep_mask = ENABLE_EP6;   /* ep6 [10:0000] */
+                        break;
+                case 4: /* ts1 */
+                case 6: /* ts1 parallel mode */
+                        ep_mask = ENABLE_EP1;   /* ep1 [00:0001] */
+                        break;
+                case 5: /* ts2 */
+                        ep_mask = ENABLE_EP2;   /* ep2 [00:0010] */
+                        break;
+                }
+
+        } else if (pcb_config->config_num > 1) {
+                switch (media_type) {
+                case 0: /* Video */
+                        ep_mask = ENABLE_EP4;   /* ep4  [00:1000] */
+                        break;
+                case 1: /* Audio */
+                        ep_mask = ENABLE_EP3;   /* ep3  [00:0100] */
+                        break;
+                case 2: /* Vbi */
+                        ep_mask = ENABLE_EP5;   /* ep5 [01:0000] */
+                        break;
+                case 3: /* Sliced_cc */
+                        ep_mask = ENABLE_EP6;   /* ep6 [10:0000] */
+                        break;
+                case 4: /* ts1 */
+                case 6: /* ts1 parallel mode */
+                        ep_mask = ENABLE_EP1;   /* ep1 [00:0001] */
+                        break;
+                case 5: /* ts2 */
+                        ep_mask = ENABLE_EP2;   /* ep2 [00:0010] */
+                        break;
+                }
+
+        }
+
+        if (start) {
+                rc = cx231xx_initialize_stream_xfer(dev, media_type);
+
+                if (rc < 0)
+                        return rc;
+
+                /* enable video capture */
+                if (ep_mask > 0)
+                        rc = cx231xx_start_stream(dev, ep_mask);
+        } else {
+                /* disable video capture */
+                if (ep_mask > 0)
+                        rc = cx231xx_stop_stream(dev, ep_mask);
+        }
+
+        if (dev->mode == CX231XX_ANALOG_MODE)
+                ;/* do any in Analog mode */
+        else
+                ;/* do any in digital mode */
+
+        return rc;
+}
+EXPORT_SYMBOL_GPL(cx231xx_capture_start);
+
+/*****************************************************************************
+*                   G P I O   B I T control functions                        *
+******************************************************************************/
+int cx231xx_set_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val)
+{
+        int status = 0;
+
+        status = cx231xx_send_gpio_cmd(dev, gpio_bit, gpio_val, 4, 0, 0);
+
+        return status;
+}
+
+int cx231xx_get_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val)
+{
+        int status = 0;
+
+        status = cx231xx_send_gpio_cmd(dev, gpio_bit, gpio_val, 4, 0, 1);
+
+        return status;
+}
+
+/*
+* cx231xx_set_gpio_direction
+*      Sets the direction of the GPIO pin to input or output
+*
+* Parameters :
+*      pin_number : The GPIO Pin number to program the direction for
+*                   from 0 to 31
+*      pin_value : The Direction of the GPIO Pin under reference.
+*                      0 = Input direction
+*                      1 = Output direction
+*/
+int cx231xx_set_gpio_direction(struct cx231xx *dev,
+                               int pin_number, int pin_value)
+{
+        int status = 0;
+        u32 value = 0;
+
+        /* Check for valid pin_number - if 32 , bail out */
+        if (pin_number >= 32)
+                return -EINVAL;
+
+        /* input */
+        if (pin_value == 0)
+                value = dev->gpio_dir & (~(1 << pin_number));   /* clear */
+        else
+                value = dev->gpio_dir | (1 << pin_number);
+
+        status = cx231xx_set_gpio_bit(dev, value, (u8 *) &dev->gpio_val);
+
+        /* cache the value for future */
+        dev->gpio_dir = value;
+
+        return status;
+}
+
+/*
+* cx231xx_set_gpio_value
+*      Sets the value of the GPIO pin to Logic high or low. The Pin under
+*      reference should ALREADY BE SET IN OUTPUT MODE !!!!!!!!!
+*
+* Parameters :
+*      pin_number : The GPIO Pin number to program the direction for
+*      pin_value : The value of the GPIO Pin under reference.
+*                      0 = set it to 0
+*                      1 = set it to 1
+*/
+int cx231xx_set_gpio_value(struct cx231xx *dev, int pin_number, int pin_value)
+{
+        int status = 0;
+        u32 value = 0;
+
+        /* Check for valid pin_number - if 0xFF , bail out */
+        if (pin_number >= 32)
+                return -EINVAL;
+
+        /* first do a sanity check - if the Pin is not output, make it output */
+        if ((dev->gpio_dir & (1 << pin_number)) == 0x00) {
+                /* It was in input mode */
+                value = dev->gpio_dir | (1 << pin_number);
+                dev->gpio_dir = value;
+                status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                              (u8 *) &dev->gpio_val);
+                value = 0;
+        }
+
+        if (pin_value == 0)
+                value = dev->gpio_val & (~(1 << pin_number));
+        else
+                value = dev->gpio_val | (1 << pin_number);
+
+        /* store the value */
+        dev->gpio_val = value;
+
+        /* toggle bit0 of GP_IO */
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        return status;
+}
+
+/*****************************************************************************
+*                      G P I O I2C related functions                         *
+******************************************************************************/
+int cx231xx_gpio_i2c_start(struct cx231xx *dev)
+{
+        int status = 0;
+
+        /* set SCL to output 1 ; set SDA to output 1 */
+        dev->gpio_dir |= 1 << dev->board.tuner_scl_gpio;
+        dev->gpio_dir |= 1 << dev->board.tuner_sda_gpio;
+        dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+        dev->gpio_val |= 1 << dev->board.tuner_sda_gpio;
+
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+        if (status < 0)
+                return -EINVAL;
+
+        /* set SCL to output 1; set SDA to output 0 */
+        dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+        dev->gpio_val &= ~(1 << dev->board.tuner_sda_gpio);
+
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+        if (status < 0)
+                return -EINVAL;
+
+        /* set SCL to output 0; set SDA to output 0      */
+        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+        dev->gpio_val &= ~(1 << dev->board.tuner_sda_gpio);
+
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+        if (status < 0)
+                return -EINVAL;
+
+        return status;
+}
+
+int cx231xx_gpio_i2c_end(struct cx231xx *dev)
+{
+        int status = 0;
+
+        /* set SCL to output 0; set SDA to output 0      */
+        dev->gpio_dir |= 1 << dev->board.tuner_scl_gpio;
+        dev->gpio_dir |= 1 << dev->board.tuner_sda_gpio;
+
+        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+        dev->gpio_val &= ~(1 << dev->board.tuner_sda_gpio);
+
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+        if (status < 0)
+                return -EINVAL;
+
+        /* set SCL to output 1; set SDA to output 0      */
+        dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+        dev->gpio_val &= ~(1 << dev->board.tuner_sda_gpio);
+
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+        if (status < 0)
+                return -EINVAL;
+
+        /* set SCL to input ,release SCL cable control
+           set SDA to input ,release SDA cable control */
+        dev->gpio_dir &= ~(1 << dev->board.tuner_scl_gpio);
+        dev->gpio_dir &= ~(1 << dev->board.tuner_sda_gpio);
+
+        status =
+            cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+        if (status < 0)
+                return -EINVAL;
+
+        return status;
+}
+
+int cx231xx_gpio_i2c_write_byte(struct cx231xx *dev, u8 data)
+{
+        int status = 0;
+        u8 i;
+
+        /* set SCL to output ; set SDA to output */
+        dev->gpio_dir |= 1 << dev->board.tuner_scl_gpio;
+        dev->gpio_dir |= 1 << dev->board.tuner_sda_gpio;
+
+        for (i = 0; i < 8; i++) {
+                if (((data << i) & 0x80) == 0) {
+                        /* set SCL to output 0; set SDA to output 0     */
+                        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+                        dev->gpio_val &= ~(1 << dev->board.tuner_sda_gpio);
+                        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                                      (u8 *)&dev->gpio_val);
+
+                        /* set SCL to output 1; set SDA to output 0     */
+                        dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+                        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                                      (u8 *)&dev->gpio_val);
+
+                        /* set SCL to output 0; set SDA to output 0     */
+                        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+                        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                                      (u8 *)&dev->gpio_val);
+                } else {
+                        /* set SCL to output 0; set SDA to output 1     */
+                        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+                        dev->gpio_val |= 1 << dev->board.tuner_sda_gpio;
+                        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                                      (u8 *)&dev->gpio_val);
+
+                        /* set SCL to output 1; set SDA to output 1     */
+                        dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+                        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                                      (u8 *)&dev->gpio_val);
+
+                        /* set SCL to output 0; set SDA to output 1     */
+                        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+                        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                                      (u8 *)&dev->gpio_val);
+                }
+        }
+        return status;
+}
+
+int cx231xx_gpio_i2c_read_byte(struct cx231xx *dev, u8 * buf)
+{
+        u8 value = 0;
+        int status = 0;
+        u32 gpio_logic_value = 0;
+        u8 i;
+
+        /* read byte */
+        for (i = 0; i < 8; i++) {       /* send write I2c addr */
+
+                /* set SCL to output 0; set SDA to input */
+                dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+                status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                              (u8 *)&dev->gpio_val);
+
+                /* set SCL to output 1; set SDA to input */
+                dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+                status = cx231xx_set_gpio_bit(dev, dev->gpio_dir,
+                                              (u8 *)&dev->gpio_val);
+
+                /* get SDA data bit */
+                gpio_logic_value = dev->gpio_val;
+                status = cx231xx_get_gpio_bit(dev, dev->gpio_dir,
+                                              (u8 *)&dev->gpio_val);
+                if ((dev->gpio_val & (1 << dev->board.tuner_sda_gpio)) != 0)
+                        value |= (1 << (8 - i - 1));
+
+                dev->gpio_val = gpio_logic_value;
+        }
+
+        /* set SCL to output 0,finish the read latest SCL signal.
+           !!!set SDA to input, never to modify SDA direction at
+           the same times */
+        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        /* store the value */
+        *buf = value & 0xff;
+
+        return status;
+}
+
+int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev)
+{
+        int status = 0;
+        u32 gpio_logic_value = 0;
+        int nCnt = 10;
+        int nInit = nCnt;
+
+        /* clock stretch; set SCL to input; set SDA to input;
+           get SCL value till SCL = 1 */
+        dev->gpio_dir &= ~(1 << dev->board.tuner_sda_gpio);
+        dev->gpio_dir &= ~(1 << dev->board.tuner_scl_gpio);
+
+        gpio_logic_value = dev->gpio_val;
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        do {
+                msleep(2);
+                status = cx231xx_get_gpio_bit(dev, dev->gpio_dir,
+                                              (u8 *)&dev->gpio_val);
+                nCnt--;
+        } while (((dev->gpio_val &
+                          (1 << dev->board.tuner_scl_gpio)) == 0) &&
+                         (nCnt > 0));
+
+        if (nCnt == 0)
+                cx231xx_info("No ACK after %d msec -GPIO I2C failed!",
+                             nInit * 10);
+
+        /* readAck
+           throuth clock stretch ,slave has given a SCL signal,
+           so the SDA data can be directly read.  */
+        status = cx231xx_get_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        if ((dev->gpio_val & 1 << dev->board.tuner_sda_gpio) == 0) {
+                dev->gpio_val = gpio_logic_value;
+                dev->gpio_val &= ~(1 << dev->board.tuner_sda_gpio);
+                status = 0;
+        } else {
+                dev->gpio_val = gpio_logic_value;
+                dev->gpio_val |= (1 << dev->board.tuner_sda_gpio);
+        }
+
+        /* read SDA end, set the SCL to output 0, after this operation,
+           SDA direction can be changed. */
+        dev->gpio_val = gpio_logic_value;
+        dev->gpio_dir |= (1 << dev->board.tuner_scl_gpio);
+        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        return status;
+}
+
+int cx231xx_gpio_i2c_write_ack(struct cx231xx *dev)
+{
+        int status = 0;
+
+        /* set SDA to ouput */
+        dev->gpio_dir |= 1 << dev->board.tuner_sda_gpio;
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        /* set SCL = 0 (output); set SDA = 0 (output) */
+        dev->gpio_val &= ~(1 << dev->board.tuner_sda_gpio);
+        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        /* set SCL = 1 (output); set SDA = 0 (output) */
+        dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        /* set SCL = 0 (output); set SDA = 0 (output) */
+        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        /* set SDA to input,and then the slave will read data from SDA. */
+        dev->gpio_dir &= ~(1 << dev->board.tuner_sda_gpio);
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        return status;
+}
+
+int cx231xx_gpio_i2c_write_nak(struct cx231xx *dev)
+{
+        int status = 0;
+
+        /* set scl to output ; set sda to input */
+        dev->gpio_dir |= 1 << dev->board.tuner_scl_gpio;
+        dev->gpio_dir &= ~(1 << dev->board.tuner_sda_gpio);
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        /* set scl to output 0; set sda to input */
+        dev->gpio_val &= ~(1 << dev->board.tuner_scl_gpio);
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        /* set scl to output 1; set sda to input */
+        dev->gpio_val |= 1 << dev->board.tuner_scl_gpio;
+        status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
+
+        return status;
+}
+
+/*****************************************************************************
+*                      G P I O I2C related functions                         *
+******************************************************************************/
+/* cx231xx_gpio_i2c_read
+ * Function to read data from gpio based I2C interface
+ */
+int cx231xx_gpio_i2c_read(struct cx231xx *dev, u8 dev_addr, u8 * buf, u8 len)
+{
+        int status = 0;
+        int i = 0;
+
+        /* get the lock */
+        mutex_lock(&dev->gpio_i2c_lock);
+
+        /* start */
+        status = cx231xx_gpio_i2c_start(dev);
+
+        /* write dev_addr */
+        status = cx231xx_gpio_i2c_write_byte(dev, (dev_addr << 1) + 1);
+
+        /* readAck */
+        status = cx231xx_gpio_i2c_read_ack(dev);
+
+        /* read data */
+        for (i = 0; i < len; i++) {
+                /* read data */
+                buf[i] = 0;
+                status = cx231xx_gpio_i2c_read_byte(dev, &buf[i]);
+
+                if ((i + 1) != len) {
+                        /* only do write ack if we more length */
+                        status = cx231xx_gpio_i2c_write_ack(dev);
+                }
+        }
+
+        /* write NAK - inform reads are complete */
+        status = cx231xx_gpio_i2c_write_nak(dev);
+
+        /* write end */
+        status = cx231xx_gpio_i2c_end(dev);
+
+        /* release the lock */
+        mutex_unlock(&dev->gpio_i2c_lock);
+
+        return status;
+}
+
+/* cx231xx_gpio_i2c_write
+ * Function to write data to gpio based I2C interface
+ */
+int cx231xx_gpio_i2c_write(struct cx231xx *dev, u8 dev_addr, u8 * buf, u8 len)
+{
+        int status = 0;
+        int i = 0;
+
+        /* get the lock */
+        mutex_lock(&dev->gpio_i2c_lock);
+
+        /* start */
+        status = cx231xx_gpio_i2c_start(dev);
+
+        /* write dev_addr */
+        status = cx231xx_gpio_i2c_write_byte(dev, dev_addr << 1);
+
+        /* read Ack */
+        status = cx231xx_gpio_i2c_read_ack(dev);
+
+        for (i = 0; i < len; i++) {
+                /* Write data */
+                status = cx231xx_gpio_i2c_write_byte(dev, buf[i]);
+
+                /* read Ack */
+                status = cx231xx_gpio_i2c_read_ack(dev);
+        }
+
+        /* write End */
+        status = cx231xx_gpio_i2c_end(dev);
+
+        /* release the lock */
+        mutex_unlock(&dev->gpio_i2c_lock);
+
+        return 0;
+}
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
new file mode 100644
index 000000000000..c8a32b1b5381
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -0,0 +1,914 @@
+/*
+   cx231xx-cards.c - driver for Conexant Cx23100/101/102
+                                USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+                                Based on em28xx driver
+
+   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.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/usb.h>
+#include <media/tuner.h>
+#include <media/tveeprom.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
+
+#include <media/cx25840.h>
+#include "xc5000.h"
+
+#include "cx231xx.h"
+
+static int tuner = -1;
+module_param(tuner, int, 0444);
+MODULE_PARM_DESC(tuner, "tuner type");
+
+static unsigned int disable_ir;
+module_param(disable_ir, int, 0444);
+MODULE_PARM_DESC(disable_ir, "disable infrared remote support");
+
+/* Bitmask marking allocated devices from 0 to CX231XX_MAXBOARDS */
+static unsigned long cx231xx_devused;
+
+/*
+ *  Reset sequences for analog/digital modes
+ */
+
+static struct cx231xx_reg_seq RDE250_XCV_TUNER[] = {
+        {0x03, 0x01, 10},
+        {0x03, 0x00, 30},
+        {0x03, 0x01, 10},
+        {-1, -1, -1},
+};
+
+/*
+ *  Board definitions
+ */
+struct cx231xx_board cx231xx_boards[] = {
+        [CX231XX_BOARD_UNKNOWN] = {
+                .name = "Unknown CX231xx video grabber",
+                .tuner_type = TUNER_ABSENT,
+                .input = {{
+                                .type = CX231XX_VMUX_TELEVISION,
+                                .vmux = CX231XX_VIN_3_1,
+                                .amux = CX231XX_AMUX_VIDEO,
+                                .gpio = 0,
+                        }, {
+                                .type = CX231XX_VMUX_COMPOSITE1,
+                                .vmux = CX231XX_VIN_2_1,
+                                .amux = CX231XX_AMUX_LINE_IN,
+                                .gpio = 0,
+                        }, {
+                                .type = CX231XX_VMUX_SVIDEO,
+                                .vmux = CX231XX_VIN_1_1 |
+                                        (CX231XX_VIN_1_2 << 8) |
+                                        CX25840_SVIDEO_ON,
+                                .amux = CX231XX_AMUX_LINE_IN,
+                                .gpio = 0,
+                        }
+                },
+        },
+        [CX231XX_BOARD_CNXT_RDE_250] = {
+                .name = "Conexant Hybrid TV - RDE250",
+                .tuner_type = TUNER_XC5000,
+                .tuner_addr = 0x61,
+                .tuner_gpio = RDE250_XCV_TUNER,
+                .tuner_sif_gpio = 0x05,
+                .tuner_scl_gpio = 0x1a,
+                .tuner_sda_gpio = 0x1b,
+                .decoder = CX231XX_AVDECODER,
+                .demod_xfer_mode = 0,
+                .ctl_pin_status_mask = 0xFFFFFFC4,
+                .agc_analog_digital_select_gpio = 0x0c,
+                .gpio_pin_status_mask = 0x4001000,
+                .tuner_i2c_master = 1,
+                .demod_i2c_master = 2,
+                .has_dvb = 1,
+                .demod_addr = 0x02,
+                .norm = V4L2_STD_PAL,
+
+                .input = {{
+                                .type = CX231XX_VMUX_TELEVISION,
+                                .vmux = CX231XX_VIN_3_1,
+                                .amux = CX231XX_AMUX_VIDEO,
+                                .gpio = 0,
+                        }, {
+                                .type = CX231XX_VMUX_COMPOSITE1,
+                                .vmux = CX231XX_VIN_2_1,
+                                .amux = CX231XX_AMUX_LINE_IN,
+                                .gpio = 0,
+                        }, {
+                                .type = CX231XX_VMUX_SVIDEO,
+                                .vmux = CX231XX_VIN_1_1 |
+                                        (CX231XX_VIN_1_2 << 8) |
+                                        CX25840_SVIDEO_ON,
+                                .amux = CX231XX_AMUX_LINE_IN,
+                                .gpio = 0,
+                        }
+                },
+        },
+
+        [CX231XX_BOARD_CNXT_RDU_250] = {
+                .name = "Conexant Hybrid TV - RDU250",
+                .tuner_type = TUNER_XC5000,
+                .tuner_addr = 0x61,
+                .tuner_gpio = RDE250_XCV_TUNER,
+                .tuner_sif_gpio = 0x05,
+                .tuner_scl_gpio = 0x1a,
+                .tuner_sda_gpio = 0x1b,
+                .decoder = CX231XX_AVDECODER,
+                .demod_xfer_mode = 0,
+                .ctl_pin_status_mask = 0xFFFFFFC4,
+                .agc_analog_digital_select_gpio = 0x0c,
+                .gpio_pin_status_mask = 0x4001000,
+                .tuner_i2c_master = 1,
+                .demod_i2c_master = 2,
+                .has_dvb = 1,
+                .demod_addr = 0x32,
+                .norm = V4L2_STD_NTSC,
+
+                .input = {{
+                                .type = CX231XX_VMUX_TELEVISION,
+                                .vmux = CX231XX_VIN_3_1,
+                                .amux = CX231XX_AMUX_VIDEO,
+                                .gpio = 0,
+                        }, {
+                                .type = CX231XX_VMUX_COMPOSITE1,
+                                .vmux = CX231XX_VIN_2_1,
+                                .amux = CX231XX_AMUX_LINE_IN,
+                                .gpio = 0,
+                        }, {
+                                .type = CX231XX_VMUX_SVIDEO,
+                                .vmux = CX231XX_VIN_1_1 |
+                                        (CX231XX_VIN_1_2 << 8) |
+                                        CX25840_SVIDEO_ON,
+                                .amux = CX231XX_AMUX_LINE_IN,
+                                .gpio = 0,
+                        }
+                },
+        },
+};
+const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
+
+/* table of devices that work with this driver */
+struct usb_device_id cx231xx_id_table[] = {
+        {USB_DEVICE(0x0572, 0x5A3C),
+         .driver_info = CX231XX_BOARD_UNKNOWN},
+        {USB_DEVICE(0x0572, 0x58A2),
+         .driver_info = CX231XX_BOARD_CNXT_RDE_250},
+        {USB_DEVICE(0x0572, 0x58A1),
+         .driver_info = CX231XX_BOARD_CNXT_RDU_250},
+        {},
+};
+
+MODULE_DEVICE_TABLE(usb, cx231xx_id_table);
+
+/* cx231xx_tuner_callback
+ * will be used to reset XC5000 tuner using GPIO pin
+ */
+
+int cx231xx_tuner_callback(void *ptr, int component, int command, int arg)
+{
+        int rc = 0;
+        struct cx231xx *dev = ptr;
+
+        if (dev->tuner_type == TUNER_XC5000) {
+                if (command == XC5000_TUNER_RESET) {
+                        cx231xx_info
+                                ("Tuner CB: RESET: cmd %d : tuner type %d \n",
+                                 command, dev->tuner_type);
+                        cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
+                                               1);
+                        msleep(10);
+                        cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
+                                               0);
+                        msleep(330);
+                        cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
+                                               1);
+                        msleep(10);
+                }
+        }
+        return rc;
+}
+EXPORT_SYMBOL_GPL(cx231xx_tuner_callback);
+
+static inline void cx231xx_set_model(struct cx231xx *dev)
+{
+        memcpy(&dev->board, &cx231xx_boards[dev->model], sizeof(dev->board));
+}
+
+/* Since cx231xx_pre_card_setup() requires a proper dev->model,
+ * this won't work for boards with generic PCI IDs
+ */
+void cx231xx_pre_card_setup(struct cx231xx *dev)
+{
+
+        cx231xx_set_model(dev);
+
+        cx231xx_info("Identified as %s (card=%d)\n",
+                     dev->board.name, dev->model);
+
+        /* set the direction for GPIO pins */
+        cx231xx_set_gpio_direction(dev, dev->board.tuner_gpio->bit, 1);
+        cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit, 1);
+        cx231xx_set_gpio_direction(dev, dev->board.tuner_sif_gpio, 1);
+
+        /* request some modules if any required */
+
+        /* reset the Tuner */
+        cx231xx_gpio_set(dev, dev->board.tuner_gpio);
+
+        /* set the mode to Analog mode initially */
+        cx231xx_set_mode(dev, CX231XX_ANALOG_MODE);
+
+        /* Unlock device */
+        /* cx231xx_set_mode(dev, CX231XX_SUSPEND); */
+
+}
+
+static void cx231xx_config_tuner(struct cx231xx *dev)
+{
+        struct tuner_setup tun_setup;
+        struct v4l2_frequency f;
+
+        if (dev->tuner_type == TUNER_ABSENT)
+                return;
+
+        tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
+        tun_setup.type = dev->tuner_type;
+        tun_setup.addr = dev->tuner_addr;
+        tun_setup.tuner_callback = cx231xx_tuner_callback;
+
+        tuner_call(dev, tuner, s_type_addr, &tun_setup);
+
+#if 0
+        if (tun_setup.type == TUNER_XC5000) {
+                static struct xc2028_ctrl ctrl = {
+                        .fname = XC5000_DEFAULT_FIRMWARE,
+                        .max_len = 64,
+                        .demod = 0;
+                };
+                struct v4l2_priv_tun_config cfg = {
+                        .tuner = dev->tuner_type,
+                        .priv = &ctrl,
+                };
+                tuner_call(dev, tuner, s_config, &cfg);
+        }
+#endif
+        /* configure tuner */
+        f.tuner = 0;
+        f.type = V4L2_TUNER_ANALOG_TV;
+        f.frequency = 9076;     /* just a magic number */
+        dev->ctl_freq = f.frequency;
+        call_all(dev, tuner, s_frequency, &f);
+
+}
+
+/* ----------------------------------------------------------------------- */
+void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir)
+{
+        if (disable_ir) {
+                ir->get_key = NULL;
+                return;
+        }
+
+        /* detect & configure */
+        switch (dev->model) {
+
+        case CX231XX_BOARD_CNXT_RDE_250:
+                break;
+        case CX231XX_BOARD_CNXT_RDU_250:
+                break;
+        default:
+                break;
+        }
+}
+
+void cx231xx_card_setup(struct cx231xx *dev)
+{
+
+        cx231xx_set_model(dev);
+
+        dev->tuner_type = cx231xx_boards[dev->model].tuner_type;
+        if (cx231xx_boards[dev->model].tuner_addr)
+                dev->tuner_addr = cx231xx_boards[dev->model].tuner_addr;
+
+        /* request some modules */
+        if (dev->board.decoder == CX231XX_AVDECODER) {
+                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                        &dev->i2c_bus[0].i2c_adap,
+                                        "cx25840", "cx25840", 0x88 >> 1);
+                if (dev->sd_cx25840 == NULL)
+                        cx231xx_info("cx25840 subdev registration failure\n");
+                cx25840_call(dev, core, load_fw);
+
+        }
+
+        if (dev->board.tuner_type != TUNER_ABSENT) {
+                dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
+                                "tuner", "tuner", 0xc2 >> 1);
+                if (dev->sd_tuner == NULL)
+                        cx231xx_info("tuner subdev registration failure\n");
+
+                cx231xx_config_tuner(dev);
+        }
+
+        cx231xx_config_tuner(dev);
+
+#if 0
+        /* TBD  IR will be added later */
+        cx231xx_ir_init(dev);
+#endif
+}
+
+/*
+ * cx231xx_config()
+ * inits registers with sane defaults
+ */
+int cx231xx_config(struct cx231xx *dev)
+{
+        /* TBD need to add cx231xx specific code */
+        dev->mute = 1;          /* maybe not the right place... */
+        dev->volume = 0x1f;
+
+        return 0;
+}
+
+/*
+ * cx231xx_config_i2c()
+ * configure i2c attached devices
+ */
+void cx231xx_config_i2c(struct cx231xx *dev)
+{
+        /* u32 input = INPUT(dev->video_input)->vmux; */
+
+        call_all(dev, video, s_stream, 1);
+}
+
+/*
+ * cx231xx_realease_resources()
+ * unregisters the v4l2,i2c and usb devices
+ * called when the device gets disconected or at module unload
+*/
+void cx231xx_release_resources(struct cx231xx *dev)
+{
+
+#if 0           /* TBD IR related  */
+        if (dev->ir)
+                cx231xx_ir_fini(dev);
+#endif
+
+        cx231xx_release_analog_resources(dev);
+
+        cx231xx_remove_from_devlist(dev);
+
+        cx231xx_dev_uninit(dev);
+
+        usb_put_dev(dev->udev);
+
+        /* Mark device as unused */
+        cx231xx_devused &= ~(1 << dev->devno);
+}
+
+/*
+ * cx231xx_init_dev()
+ * allocates and inits the device structs, registers i2c bus and v4l device
+ */
+static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev,
+                            int minor)
+{
+        struct cx231xx *dev = *devhandle;
+        int retval = -ENOMEM;
+        int errCode;
+        unsigned int maxh, maxw;
+
+        dev->udev = udev;
+        mutex_init(&dev->lock);
+        mutex_init(&dev->ctrl_urb_lock);
+        mutex_init(&dev->gpio_i2c_lock);
+
+        spin_lock_init(&dev->video_mode.slock);
+        spin_lock_init(&dev->vbi_mode.slock);
+        spin_lock_init(&dev->sliced_cc_mode.slock);
+
+        init_waitqueue_head(&dev->open);
+        init_waitqueue_head(&dev->wait_frame);
+        init_waitqueue_head(&dev->wait_stream);
+
+        dev->cx231xx_read_ctrl_reg = cx231xx_read_ctrl_reg;
+        dev->cx231xx_write_ctrl_reg = cx231xx_write_ctrl_reg;
+        dev->cx231xx_send_usb_command = cx231xx_send_usb_command;
+        dev->cx231xx_gpio_i2c_read = cx231xx_gpio_i2c_read;
+        dev->cx231xx_gpio_i2c_write = cx231xx_gpio_i2c_write;
+
+        /* Query cx231xx to find what pcb config it is related to */
+        initialize_cx231xx(dev);
+
+        /* Cx231xx pre card setup */
+        cx231xx_pre_card_setup(dev);
+
+        errCode = cx231xx_config(dev);
+        if (errCode) {
+                cx231xx_errdev("error configuring device\n");
+                return -ENOMEM;
+        }
+
+        /* set default norm */
+        dev->norm = dev->board.norm;
+
+        /* register i2c bus */
+        errCode = cx231xx_dev_init(dev);
+        if (errCode < 0) {
+                cx231xx_errdev("%s: cx231xx_i2c_register - errCode [%d]!\n",
+                               __func__, errCode);
+                return errCode;
+        }
+
+        /* Do board specific init */
+        cx231xx_card_setup(dev);
+
+        /* configure the device */
+        cx231xx_config_i2c(dev);
+
+        maxw = norm_maxw(dev);
+        maxh = norm_maxh(dev);
+
+        /* set default image size */
+        dev->width = maxw;
+        dev->height = maxh;
+        dev->interlaced = 0;
+        dev->hscale = 0;
+        dev->vscale = 0;
+        dev->video_input = 0;
+
+        errCode = cx231xx_config(dev);
+        if (errCode < 0) {
+                cx231xx_errdev("%s: cx231xx_config - errCode [%d]!\n",
+                               __func__, errCode);
+                return errCode;
+        }
+
+        /* init video dma queues */
+        INIT_LIST_HEAD(&dev->video_mode.vidq.active);
+        INIT_LIST_HEAD(&dev->video_mode.vidq.queued);
+
+        /* init vbi dma queues */
+        INIT_LIST_HEAD(&dev->vbi_mode.vidq.active);
+        INIT_LIST_HEAD(&dev->vbi_mode.vidq.queued);
+
+        /* Reset other chips required if they are tied up with GPIO pins */
+
+        cx231xx_add_into_devlist(dev);
+
+        retval = cx231xx_register_analog_devices(dev);
+        if (retval < 0) {
+                cx231xx_release_resources(dev);
+                goto fail_reg_devices;
+        }
+
+        cx231xx_init_extension(dev);
+
+        return 0;
+
+fail_reg_devices:
+        mutex_unlock(&dev->lock);
+        return retval;
+}
+
+#if defined(CONFIG_MODULES) && defined(MODULE)
+static void request_module_async(struct work_struct *work)
+{
+        struct cx231xx *dev = container_of(work,
+                                           struct cx231xx, request_module_wk);
+
+        if (dev->has_alsa_audio)
+                request_module("cx231xx-alsa");
+
+        if (dev->board.has_dvb)
+                request_module("cx231xx-dvb");
+
+}
+
+static void request_modules(struct cx231xx *dev)
+{
+        INIT_WORK(&dev->request_module_wk, request_module_async);
+        schedule_work(&dev->request_module_wk);
+}
+#else
+#define request_modules(dev)
+#endif /* CONFIG_MODULES */
+
+/*
+ * cx231xx_usb_probe()
+ * checks for supported devices
+ */
+static int cx231xx_usb_probe(struct usb_interface *interface,
+                             const struct usb_device_id *id)
+{
+        struct usb_device *udev;
+        struct usb_interface *uif;
+        struct cx231xx *dev = NULL;
+        int retval = -ENODEV;
+        int nr = 0, ifnum;
+        int i, isoc_pipe = 0;
+        char *speed;
+        char descr[255] = "";
+        struct usb_interface *lif = NULL;
+        int skip_interface = 0;
+        struct usb_interface_assoc_descriptor *assoc_desc;
+
+        udev = usb_get_dev(interface_to_usbdev(interface));
+        ifnum = interface->altsetting[0].desc.bInterfaceNumber;
+
+        if (!ifnum) {
+                /*
+                 * Interface number 0 - IR interface
+                 */
+                /* Check to see next free device and mark as used */
+                nr = find_first_zero_bit(&cx231xx_devused, CX231XX_MAXBOARDS);
+                cx231xx_devused |= 1 << nr;
+
+                if (nr >= CX231XX_MAXBOARDS) {
+                        cx231xx_err(DRIVER_NAME ": Supports only %i cx231xx boards.\n",
+                                     CX231XX_MAXBOARDS);
+                        cx231xx_devused &= ~(1 << nr);
+                        return -ENOMEM;
+                }
+
+                /* allocate memory for our device state and initialize it */
+                dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+                if (dev == NULL) {
+                        cx231xx_err(DRIVER_NAME ": out of memory!\n");
+                        cx231xx_devused &= ~(1 << nr);
+                        return -ENOMEM;
+                }
+
+                snprintf(dev->name, 29, "cx231xx #%d", nr);
+                dev->devno = nr;
+                dev->model = id->driver_info;
+                dev->video_mode.alt = -1;
+                dev->interface_count++;
+
+                /* reset gpio dir and value */
+                dev->gpio_dir = 0;
+                dev->gpio_val = 0;
+                dev->xc_fw_load_done = 0;
+                dev->has_alsa_audio = 1;
+                dev->power_mode = -1;
+
+                /* 0 - vbi ; 1 -sliced cc mode */
+                dev->vbi_or_sliced_cc_mode = 0;
+
+                /* get maximum no.of IAD interfaces */
+                assoc_desc = udev->actconfig->intf_assoc[0];
+                dev->max_iad_interface_count = assoc_desc->bInterfaceCount;
+
+                /* init CIR module TBD */
+
+                /* store the current interface */
+                lif = interface;
+
+                switch (udev->speed) {
+                case USB_SPEED_LOW:
+                        speed = "1.5";
+                        break;
+                case USB_SPEED_UNKNOWN:
+                case USB_SPEED_FULL:
+                        speed = "12";
+                        break;
+                case USB_SPEED_HIGH:
+                        speed = "480";
+                        break;
+                default:
+                        speed = "unknown";
+                }
+
+                if (udev->manufacturer)
+                        strlcpy(descr, udev->manufacturer, sizeof(descr));
+
+                if (udev->product) {
+                        if (*descr)
+                                strlcat(descr, " ", sizeof(descr));
+                        strlcat(descr, udev->product, sizeof(descr));
+                }
+                if (*descr)
+                        strlcat(descr, " ", sizeof(descr));
+
+                cx231xx_info("New device %s@ %s Mbps "
+                     "(%04x:%04x) with %d interfaces\n",
+                     descr,
+                     speed,
+                     le16_to_cpu(udev->descriptor.idVendor),
+                     le16_to_cpu(udev->descriptor.idProduct),
+                     dev->max_iad_interface_count);
+        } else {
+                /* Get dev structure first */
+                dev = usb_get_intfdata(udev->actconfig->interface[0]);
+                if (dev == NULL) {
+                        cx231xx_err(DRIVER_NAME ": out of first interface!\n");
+                        return -ENODEV;
+                }
+
+                /* store the interface 0 back */
+                lif = udev->actconfig->interface[0];
+
+                /* increment interface count */
+                dev->interface_count++;
+
+                /* get device number */
+                nr = dev->devno;
+
+                /*
+                 * set skip interface, for all interfaces but
+                 * interface 1 and the last one
+                 */
+                if ((ifnum != 1) && ((dev->interface_count - 1)
+                                     != dev->max_iad_interface_count))
+                        skip_interface = 1;
+
+                if (ifnum == 1) {
+                        assoc_desc = udev->actconfig->intf_assoc[0];
+                        if (assoc_desc->bFirstInterface != ifnum) {
+                                cx231xx_err(DRIVER_NAME ": Not found "
+                                            "matching IAD interface\n");
+                                return -ENODEV;
+                        }
+                }
+        }
+
+        if (skip_interface)
+                return -ENODEV;
+
+        cx231xx_info("registering interface %d\n", ifnum);
+
+        /* save our data pointer in this interface device */
+        usb_set_intfdata(lif, dev);
+
+        if ((dev->interface_count - 1) != dev->max_iad_interface_count)
+                return 0;
+
+        /*
+         * AV device initialization - only done at the last interface
+         */
+
+        /* Create v4l2 device */
+        retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
+        if (retval) {
+                cx231xx_errdev("v4l2_device_register failed\n");
+                cx231xx_devused &= ~(1 << nr);
+                kfree(dev);
+                return -EIO;
+        }
+
+        /* allocate device struct */
+        retval = cx231xx_init_dev(&dev, udev, nr);
+        if (retval) {
+                cx231xx_devused &= ~(1 << dev->devno);
+                v4l2_device_unregister(&dev->v4l2_dev);
+                kfree(dev);
+                return retval;
+        }
+
+        /* compute alternate max packet sizes for video */
+        uif = udev->actconfig->interface[dev->current_pcb_config.
+                       hs_config_info[0].interface_info.video_index + 1];
+
+        dev->video_mode.end_point_addr = le16_to_cpu(uif->altsetting[0].
+                        endpoint[isoc_pipe].desc.bEndpointAddress);
+
+        dev->video_mode.num_alt = uif->num_altsetting;
+        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+                     dev->video_mode.end_point_addr,
+                     dev->video_mode.num_alt);
+        dev->video_mode.alt_max_pkt_size =
+                kmalloc(32 * dev->video_mode.num_alt, GFP_KERNEL);
+
+        if (dev->video_mode.alt_max_pkt_size == NULL) {
+                cx231xx_errdev("out of memory!\n");
+                cx231xx_devused &= ~(1 << nr);
+                v4l2_device_unregister(&dev->v4l2_dev);
+                kfree(dev);
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < dev->video_mode.num_alt; i++) {
+                u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
+                                desc.wMaxPacketSize);
+                dev->video_mode.alt_max_pkt_size[i] =
+                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
+                cx231xx_info("Alternate setting %i, max size= %i\n", i,
+                             dev->video_mode.alt_max_pkt_size[i]);
+        }
+
+        /* compute alternate max packet sizes for vbi */
+        uif = udev->actconfig->interface[dev->current_pcb_config.
+                                       hs_config_info[0].interface_info.
+                                       vanc_index + 1];
+
+        dev->vbi_mode.end_point_addr =
+            le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
+                        bEndpointAddress);
+
+        dev->vbi_mode.num_alt = uif->num_altsetting;
+        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+                     dev->vbi_mode.end_point_addr,
+                     dev->vbi_mode.num_alt);
+        dev->vbi_mode.alt_max_pkt_size =
+            kmalloc(32 * dev->vbi_mode.num_alt, GFP_KERNEL);
+
+        if (dev->vbi_mode.alt_max_pkt_size == NULL) {
+                cx231xx_errdev("out of memory!\n");
+                cx231xx_devused &= ~(1 << nr);
+                v4l2_device_unregister(&dev->v4l2_dev);
+                kfree(dev);
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < dev->vbi_mode.num_alt; i++) {
+                u16 tmp =
+                    le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
+                                desc.wMaxPacketSize);
+                dev->vbi_mode.alt_max_pkt_size[i] =
+                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
+                cx231xx_info("Alternate setting %i, max size= %i\n", i,
+                             dev->vbi_mode.alt_max_pkt_size[i]);
+        }
+
+        /* compute alternate max packet sizes for sliced CC */
+        uif = udev->actconfig->interface[dev->current_pcb_config.
+                                       hs_config_info[0].interface_info.
+                                       hanc_index + 1];
+
+        dev->sliced_cc_mode.end_point_addr =
+            le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
+                        bEndpointAddress);
+
+        dev->sliced_cc_mode.num_alt = uif->num_altsetting;
+        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+                     dev->sliced_cc_mode.end_point_addr,
+                     dev->sliced_cc_mode.num_alt);
+        dev->sliced_cc_mode.alt_max_pkt_size =
+                kmalloc(32 * dev->sliced_cc_mode.num_alt, GFP_KERNEL);
+
+        if (dev->sliced_cc_mode.alt_max_pkt_size == NULL) {
+                cx231xx_errdev("out of memory!\n");
+                cx231xx_devused &= ~(1 << nr);
+                v4l2_device_unregister(&dev->v4l2_dev);
+                kfree(dev);
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) {
+                u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
+                                desc.wMaxPacketSize);
+                dev->sliced_cc_mode.alt_max_pkt_size[i] =
+                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
+                cx231xx_info("Alternate setting %i, max size= %i\n", i,
+                             dev->sliced_cc_mode.alt_max_pkt_size[i]);
+        }
+
+        if (dev->current_pcb_config.ts1_source != 0xff) {
+                /* compute alternate max packet sizes for TS1 */
+                uif = udev->actconfig->interface[dev->current_pcb_config.
+                                               hs_config_info[0].
+                                               interface_info.
+                                               ts1_index + 1];
+
+                dev->ts1_mode.end_point_addr =
+                    le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].
+                                desc.bEndpointAddress);
+
+                dev->ts1_mode.num_alt = uif->num_altsetting;
+                cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+                             dev->ts1_mode.end_point_addr,
+                             dev->ts1_mode.num_alt);
+                dev->ts1_mode.alt_max_pkt_size =
+                        kmalloc(32 * dev->ts1_mode.num_alt, GFP_KERNEL);
+
+                if (dev->ts1_mode.alt_max_pkt_size == NULL) {
+                        cx231xx_errdev("out of memory!\n");
+                        cx231xx_devused &= ~(1 << nr);
+                        v4l2_device_unregister(&dev->v4l2_dev);
+                        kfree(dev);
+                        return -ENOMEM;
+                }
+
+                for (i = 0; i < dev->ts1_mode.num_alt; i++) {
+                        u16 tmp = le16_to_cpu(uif->altsetting[i].
+                                                endpoint[isoc_pipe].desc.
+                                                wMaxPacketSize);
+                        dev->ts1_mode.alt_max_pkt_size[i] =
+                            (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
+                        cx231xx_info("Alternate setting %i, max size= %i\n", i,
+                                     dev->ts1_mode.alt_max_pkt_size[i]);
+                }
+        }
+
+        /* load other modules required */
+        request_modules(dev);
+
+        return 0;
+}
+
+/*
+ * cx231xx_usb_disconnect()
+ * called when the device gets diconencted
+ * video device will be unregistered on v4l2_close in case it is still open
+ */
+static void cx231xx_usb_disconnect(struct usb_interface *interface)
+{
+        struct cx231xx *dev;
+
+        dev = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
+
+        if (!dev)
+                return;
+
+        if (!dev->udev)
+                return;
+
+        /* delete v4l2 device */
+        v4l2_device_unregister(&dev->v4l2_dev);
+
+        /* wait until all current v4l2 io is finished then deallocate
+           resources */
+        mutex_lock(&dev->lock);
+
+        wake_up_interruptible_all(&dev->open);
+
+        if (dev->users) {
+                cx231xx_warn
+                    ("device /dev/video%d is open! Deregistration and memory "
+                     "deallocation are deferred on close.\n", dev->vdev->num);
+
+                dev->state |= DEV_MISCONFIGURED;
+                cx231xx_uninit_isoc(dev);
+                dev->state |= DEV_DISCONNECTED;
+                wake_up_interruptible(&dev->wait_frame);
+                wake_up_interruptible(&dev->wait_stream);
+        } else {
+                dev->state |= DEV_DISCONNECTED;
+                cx231xx_release_resources(dev);
+        }
+
+        cx231xx_close_extension(dev);
+
+        mutex_unlock(&dev->lock);
+
+        if (!dev->users) {
+                kfree(dev->video_mode.alt_max_pkt_size);
+                kfree(dev->vbi_mode.alt_max_pkt_size);
+                kfree(dev->sliced_cc_mode.alt_max_pkt_size);
+                kfree(dev->ts1_mode.alt_max_pkt_size);
+                kfree(dev);
+        }
+}
+
+static struct usb_driver cx231xx_usb_driver = {
+        .name = "cx231xx",
+        .probe = cx231xx_usb_probe,
+        .disconnect = cx231xx_usb_disconnect,
+        .id_table = cx231xx_id_table,
+};
+
+static int __init cx231xx_module_init(void)
+{
+        int result;
+
+        printk(KERN_INFO DRIVER_NAME " v4l2 driver loaded.\n");
+
+        /* register this driver with the USB subsystem */
+        result = usb_register(&cx231xx_usb_driver);
+        if (result)
+                cx231xx_err(DRIVER_NAME
+                            " usb_register failed. Error number %d.\n", result);
+
+        return result;
+}
+
+static void __exit cx231xx_module_exit(void)
+{
+        /* deregister this driver with the USB subsystem */
+        usb_deregister(&cx231xx_usb_driver);
+}
+
+module_init(cx231xx_module_init);
+module_exit(cx231xx_module_exit);
diff --git a/drivers/media/video/cx231xx/cx231xx-conf-reg.h b/drivers/media/video/cx231xx/cx231xx-conf-reg.h
new file mode 100644
index 000000000000..a6f398a175c5
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-conf-reg.h
@@ -0,0 +1,494 @@
+/*
+   cx231xx_conf-reg.h - driver for Conexant Cx23100/101/102 USB
+                        video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _POLARIS_REG_H_
+#define _POLARIS_REG_H_
+
+#define BOARD_CFG_STAT          0x0
+#define TS_MODE_REG             0x4
+#define TS1_CFG_REG             0x8
+#define TS1_LENGTH_REG          0xc
+#define TS2_CFG_REG             0x10
+#define TS2_LENGTH_REG          0x14
+#define EP_MODE_SET             0x18
+#define CIR_PWR_PTN1            0x1c
+#define CIR_PWR_PTN2            0x20
+#define CIR_PWR_PTN3            0x24
+#define CIR_PWR_MASK0           0x28
+#define CIR_PWR_MASK1           0x2c
+#define CIR_PWR_MASK2           0x30
+#define CIR_GAIN                0x34
+#define CIR_CAR_REG             0x38
+#define CIR_OT_CFG1             0x40
+#define CIR_OT_CFG2             0x44
+#define PWR_CTL_EN              0x74
+
+/* Polaris Endpoints capture mask for register EP_MODE_SET */
+#define ENABLE_EP1              0x01   /* Bit[0]=1 */
+#define ENABLE_EP2              0x02   /* Bit[1]=1 */
+#define ENABLE_EP3              0x04   /* Bit[2]=1 */
+#define ENABLE_EP4              0x08   /* Bit[3]=1 */
+#define ENABLE_EP5              0x10   /* Bit[4]=1 */
+#define ENABLE_EP6              0x20   /* Bit[5]=1 */
+
+/* Bit definition for register PWR_CTL_EN */
+#define PWR_MODE_MASK           0x17f
+#define PWR_AV_EN               0x08   /* bit3 */
+#define PWR_ISO_EN              0x40   /* bit6 */
+#define PWR_AV_MODE             0x30   /* bit4,5  */
+#define PWR_TUNER_EN            0x04   /* bit2 */
+#define PWR_DEMOD_EN            0x02   /* bit1 */
+#define I2C_DEMOD_EN            0x01   /* bit0 */
+#define PWR_RESETOUT_EN         0x100  /* bit8 */
+
+enum AV_MODE{
+       POLARIS_AVMODE_DEFAULT = 0,
+       POLARIS_AVMODE_DIGITAL = 0x10,
+       POLARIS_AVMODE_ANALOGT_TV = 0x20,
+       POLARIS_AVMODE_ENXTERNAL_AV = 0x30,
+
+};
+
+/* Colibri Registers */
+
+#define SINGLE_ENDED            0x0
+#define LOW_IF                  0x4
+#define EU_IF                   0x9
+#define US_IF                   0xa
+
+#define SUP_BLK_TUNE1           0x00
+#define SUP_BLK_TUNE2           0x01
+#define SUP_BLK_TUNE3           0x02
+#define SUP_BLK_XTAL            0x03
+#define SUP_BLK_PLL1            0x04
+#define SUP_BLK_PLL2            0x05
+#define SUP_BLK_PLL3            0x06
+#define SUP_BLK_REF             0x07
+#define SUP_BLK_PWRDN           0x08
+#define SUP_BLK_TESTPAD         0x09
+#define ADC_COM_INT5_STAB_REF   0x0a
+#define ADC_COM_QUANT           0x0b
+#define ADC_COM_BIAS1           0x0c
+#define ADC_COM_BIAS2           0x0d
+#define ADC_COM_BIAS3           0x0e
+#define TESTBUS_CTRL            0x12
+
+#define FLD_PWRDN_TUNING_BIAS   0x10
+#define FLD_PWRDN_ENABLE_PLL    0x08
+#define FLD_PWRDN_PD_BANDGAP    0x04
+#define FLD_PWRDN_PD_BIAS       0x02
+#define FLD_PWRDN_PD_TUNECK     0x01
+
+
+#define ADC_STATUS_CH1          0x20
+#define ADC_STATUS_CH2          0x40
+#define ADC_STATUS_CH3          0x60
+
+#define ADC_STATUS2_CH1         0x21
+#define ADC_STATUS2_CH2         0x41
+#define ADC_STATUS2_CH3         0x61
+
+#define ADC_CAL_ATEST_CH1       0x22
+#define ADC_CAL_ATEST_CH2       0x42
+#define ADC_CAL_ATEST_CH3       0x62
+
+#define ADC_PWRDN_CLAMP_CH1     0x23
+#define ADC_PWRDN_CLAMP_CH2     0x43
+#define ADC_PWRDN_CLAMP_CH3     0x63
+
+#define ADC_CTRL_DAC23_CH1      0x24
+#define ADC_CTRL_DAC23_CH2      0x44
+#define ADC_CTRL_DAC23_CH3      0x64
+
+#define ADC_CTRL_DAC1_CH1       0x25
+#define ADC_CTRL_DAC1_CH2       0x45
+#define ADC_CTRL_DAC1_CH3       0x65
+
+#define ADC_DCSERVO_DEM_CH1     0x26
+#define ADC_DCSERVO_DEM_CH2     0x46
+#define ADC_DCSERVO_DEM_CH3     0x66
+
+#define ADC_FB_FRCRST_CH1       0x27
+#define ADC_FB_FRCRST_CH2       0x47
+#define ADC_FB_FRCRST_CH3       0x67
+
+#define ADC_INPUT_CH1           0x28
+#define ADC_INPUT_CH2           0x48
+#define ADC_INPUT_CH3           0x68
+#define INPUT_SEL_MASK          0x30   /* [5:4] in_sel */
+
+#define ADC_NTF_PRECLMP_EN_CH1  0x29
+#define ADC_NTF_PRECLMP_EN_CH2  0x49
+#define ADC_NTF_PRECLMP_EN_CH3  0x69
+
+#define ADC_QGAIN_RES_TRM_CH1   0x2a
+#define ADC_QGAIN_RES_TRM_CH2   0x4a
+#define ADC_QGAIN_RES_TRM_CH3   0x6a
+
+#define ADC_SOC_PRECLMP_TERM_CH1    0x2b
+#define ADC_SOC_PRECLMP_TERM_CH2    0x4b
+#define ADC_SOC_PRECLMP_TERM_CH3    0x6b
+
+#define TESTBUS_CTRL_CH1        0x32
+#define TESTBUS_CTRL_CH2        0x52
+#define TESTBUS_CTRL_CH3        0x72
+
+/******************************************************************************
+                            * DIF registers *
+ ******************************************************************************/
+#define      DIRECT_IF_REVB_BASE  0x00300
+
+/*****************************************************************************/
+#define      DIF_PLL_FREQ_WORD        (DIRECT_IF_REVB_BASE + 0x00000000)
+/*****************************************************************************/
+#define      FLD_DIF_PLL_LOCK                           0x80000000
+/*  Reserved                                [30:29] */
+#define      FLD_DIF_PLL_FREE_RUN                       0x10000000
+#define      FLD_DIF_PLL_FREQ                           0x0fffffff
+
+/*****************************************************************************/
+#define      DIF_PLL_CTRL             (DIRECT_IF_REVB_BASE + 0x00000004)
+/*****************************************************************************/
+#define      FLD_DIF_KD_PD                              0xff000000
+/*  Reserved                             [23:20] */
+#define      FLD_DIF_KDS_PD                             0x000f0000
+#define      FLD_DIF_KI_PD                              0x0000ff00
+/*  Reserved                             [7:4] */
+#define      FLD_DIF_KIS_PD                             0x0000000f
+
+/*****************************************************************************/
+#define      DIF_PLL_CTRL1            (DIRECT_IF_REVB_BASE + 0x00000008)
+/*****************************************************************************/
+#define      FLD_DIF_KD_FD                              0xff000000
+/*  Reserved                             [23:20] */
+#define      FLD_DIF_KDS_FD                             0x000f0000
+#define      FLD_DIF_KI_FD                              0x0000ff00
+#define      FLD_DIF_SIG_PROP_SZ                        0x000000f0
+#define      FLD_DIF_KIS_FD                             0x0000000f
+
+/*****************************************************************************/
+#define      DIF_PLL_CTRL2            (DIRECT_IF_REVB_BASE + 0x0000000c)
+/*****************************************************************************/
+#define      FLD_DIF_PLL_AGC_REF                        0xfff00000
+#define      FLD_DIF_PLL_AGC_KI                         0x000f0000
+/*  Reserved                             [15] */
+#define      FLD_DIF_FREQ_LIMIT                         0x00007000
+#define      FLD_DIF_K_FD                               0x00000f00
+#define      FLD_DIF_DOWNSMPL_FD                        0x000000ff
+
+/*****************************************************************************/
+#define      DIF_PLL_CTRL3            (DIRECT_IF_REVB_BASE + 0x00000010)
+/*****************************************************************************/
+/*  Reserved                             [31:16] */
+#define      FLD_DIF_PLL_AGC_EN                         0x00008000
+/*  Reserved                             [14:12] */
+#define      FLD_DIF_PLL_MAN_GAIN                       0x00000fff
+
+/*****************************************************************************/
+#define      DIF_AGC_IF_REF           (DIRECT_IF_REVB_BASE + 0x00000014)
+/*****************************************************************************/
+#define      FLD_DIF_K_AGC_RF                           0xf0000000
+#define      FLD_DIF_K_AGC_IF                           0x0f000000
+#define      FLD_DIF_K_AGC_INT                          0x00f00000
+/*  Reserved                             [19:12] */
+#define      FLD_DIF_IF_REF                             0x00000fff
+
+/*****************************************************************************/
+#define      DIF_AGC_CTRL_IF          (DIRECT_IF_REVB_BASE + 0x00000018)
+/*****************************************************************************/
+#define      FLD_DIF_IF_MAX                             0xff000000
+#define      FLD_DIF_IF_MIN                             0x00ff0000
+#define      FLD_DIF_IF_AGC                             0x0000ffff
+
+/*****************************************************************************/
+#define      DIF_AGC_CTRL_INT         (DIRECT_IF_REVB_BASE + 0x0000001c)
+/*****************************************************************************/
+#define      FLD_DIF_INT_MAX                            0xff000000
+#define      FLD_DIF_INT_MIN                            0x00ff0000
+#define      FLD_DIF_INT_AGC                            0x0000ffff
+
+/*****************************************************************************/
+#define      DIF_AGC_CTRL_RF          (DIRECT_IF_REVB_BASE + 0x00000020)
+/*****************************************************************************/
+#define      FLD_DIF_RF_MAX                             0xff000000
+#define      FLD_DIF_RF_MIN                             0x00ff0000
+#define      FLD_DIF_RF_AGC                             0x0000ffff
+
+/*****************************************************************************/
+#define      DIF_AGC_IF_INT_CURRENT   (DIRECT_IF_REVB_BASE + 0x00000024)
+/*****************************************************************************/
+#define      FLD_DIF_IF_AGC_IN                          0xffff0000
+#define      FLD_DIF_INT_AGC_IN                         0x0000ffff
+
+/*****************************************************************************/
+#define      DIF_AGC_RF_CURRENT       (DIRECT_IF_REVB_BASE + 0x00000028)
+/*****************************************************************************/
+/*  Reserved                            [31:16] */
+#define      FLD_DIF_RF_AGC_IN                          0x0000ffff
+
+/*****************************************************************************/
+#define      DIF_VIDEO_AGC_CTRL       (DIRECT_IF_REVB_BASE + 0x0000002c)
+/*****************************************************************************/
+#define      FLD_DIF_AFD                                0xc0000000
+#define      FLD_DIF_K_VID_AGC                          0x30000000
+#define      FLD_DIF_LINE_LENGTH                        0x0fff0000
+#define      FLD_DIF_AGC_GAIN                           0x0000ffff
+
+/*****************************************************************************/
+#define      DIF_VID_AUD_OVERRIDE     (DIRECT_IF_REVB_BASE + 0x00000030)
+/*****************************************************************************/
+#define      FLD_DIF_AUDIO_AGC_OVERRIDE                 0x80000000
+/*  Reserved                             [30:30] */
+#define      FLD_DIF_AUDIO_MAN_GAIN                     0x3f000000
+/*  Reserved                             [23:17] */
+#define      FLD_DIF_VID_AGC_OVERRIDE                   0x00010000
+#define      FLD_DIF_VID_MAN_GAIN                       0x0000ffff
+
+/*****************************************************************************/
+#define      DIF_AV_SEP_CTRL          (DIRECT_IF_REVB_BASE + 0x00000034)
+/*****************************************************************************/
+#define      FLD_DIF_LPF_FREQ                           0xc0000000
+#define      FLD_DIF_AV_PHASE_INC                       0x3f000000
+#define      FLD_DIF_AUDIO_FREQ                         0x00ffffff
+
+/*****************************************************************************/
+#define      DIF_COMP_FLT_CTRL        (DIRECT_IF_REVB_BASE + 0x00000038)
+/*****************************************************************************/
+/*  Reserved                            [31:24] */
+#define      FLD_DIF_IIR23_R2                           0x00ff0000
+#define      FLD_DIF_IIR23_R1                           0x0000ff00
+#define      FLD_DIF_IIR1_R1                            0x000000ff
+
+/*****************************************************************************/
+#define      DIF_MISC_CTRL            (DIRECT_IF_REVB_BASE + 0x0000003c)
+/*****************************************************************************/
+#define      FLD_DIF_DIF_BYPASS                         0x80000000
+#define      FLD_DIF_FM_NYQ_GAIN                        0x40000000
+#define      FLD_DIF_RF_AGC_ENA                         0x20000000
+#define      FLD_DIF_INT_AGC_ENA                        0x10000000
+#define      FLD_DIF_IF_AGC_ENA                         0x08000000
+#define      FLD_DIF_FORCE_RF_IF_LOCK                   0x04000000
+#define      FLD_DIF_VIDEO_AGC_ENA                      0x02000000
+#define      FLD_DIF_RF_AGC_INV                         0x01000000
+#define      FLD_DIF_INT_AGC_INV                        0x00800000
+#define      FLD_DIF_IF_AGC_INV                         0x00400000
+#define      FLD_DIF_SPEC_INV                           0x00200000
+#define      FLD_DIF_AUD_FULL_BW                        0x00100000
+#define      FLD_DIF_AUD_SRC_SEL                        0x00080000
+/*  Reserved                             [18] */
+#define      FLD_DIF_IF_FREQ                            0x00030000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_TIP_OFFSET                         0x00003f00
+/*  Reserved                             [7:5] */
+#define      FLD_DIF_DITHER_ENA                         0x00000010
+/*  Reserved                             [3:1] */
+#define      FLD_DIF_RF_IF_LOCK                         0x00000001
+
+/*****************************************************************************/
+#define      DIF_SRC_PHASE_INC        (DIRECT_IF_REVB_BASE + 0x00000040)
+/*****************************************************************************/
+/*  Reserved                             [31:29] */
+#define      FLD_DIF_PHASE_INC                          0x1fffffff
+
+/*****************************************************************************/
+#define      DIF_SRC_GAIN_CONTROL     (DIRECT_IF_REVB_BASE + 0x00000044)
+/*****************************************************************************/
+/*  Reserved                             [31:16] */
+#define      FLD_DIF_SRC_KI                             0x0000ff00
+#define      FLD_DIF_SRC_KD                             0x000000ff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF01          (DIRECT_IF_REVB_BASE + 0x00000048)
+/*****************************************************************************/
+/*  Reserved                             [31:19] */
+#define      FLD_DIF_BPF_COEFF_0                        0x00070000
+/*  Reserved                             [15:4] */
+#define      FLD_DIF_BPF_COEFF_1                        0x0000000f
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF23          (DIRECT_IF_REVB_BASE + 0x0000004c)
+/*****************************************************************************/
+/*  Reserved                             [31:22] */
+#define      FLD_DIF_BPF_COEFF_2                        0x003f0000
+/*  Reserved                             [15:7] */
+#define      FLD_DIF_BPF_COEFF_3                        0x0000007f
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF45          (DIRECT_IF_REVB_BASE + 0x00000050)
+/*****************************************************************************/
+/*  Reserved                             [31:24] */
+#define      FLD_DIF_BPF_COEFF_4                        0x00ff0000
+/*  Reserved                             [15:8] */
+#define      FLD_DIF_BPF_COEFF_5                        0x000000ff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF67          (DIRECT_IF_REVB_BASE + 0x00000054)
+/*****************************************************************************/
+/*  Reserved                             [31:25] */
+#define      FLD_DIF_BPF_COEFF_6                        0x01ff0000
+/*  Reserved                             [15:9] */
+#define      FLD_DIF_BPF_COEFF_7                        0x000001ff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF89          (DIRECT_IF_REVB_BASE + 0x00000058)
+/*****************************************************************************/
+/*  Reserved                             [31:26] */
+#define      FLD_DIF_BPF_COEFF_8                        0x03ff0000
+/*  Reserved                             [15:10] */
+#define      FLD_DIF_BPF_COEFF_9                        0x000003ff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF1011        (DIRECT_IF_REVB_BASE + 0x0000005c)
+/*****************************************************************************/
+/*  Reserved                             [31:27] */
+#define      FLD_DIF_BPF_COEFF_10                       0x07ff0000
+/*  Reserved                             [15:11] */
+#define      FLD_DIF_BPF_COEFF_11                       0x000007ff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF1213        (DIRECT_IF_REVB_BASE + 0x00000060)
+/*****************************************************************************/
+/*  Reserved                             [31:27] */
+#define      FLD_DIF_BPF_COEFF_12                       0x07ff0000
+/*  Reserved                             [15:12] */
+#define      FLD_DIF_BPF_COEFF_13                       0x00000fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF1415        (DIRECT_IF_REVB_BASE + 0x00000064)
+/*****************************************************************************/
+/*  Reserved                             [31:28] */
+#define      FLD_DIF_BPF_COEFF_14                       0x0fff0000
+/*  Reserved                             [15:12] */
+#define      FLD_DIF_BPF_COEFF_15                       0x00000fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF1617        (DIRECT_IF_REVB_BASE + 0x00000068)
+/*****************************************************************************/
+/*  Reserved                             [31:29] */
+#define      FLD_DIF_BPF_COEFF_16                       0x1fff0000
+/*  Reserved                             [15:13] */
+#define      FLD_DIF_BPF_COEFF_17                       0x00001fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF1819        (DIRECT_IF_REVB_BASE + 0x0000006c)
+/*****************************************************************************/
+/*  Reserved                             [31:29] */
+#define      FLD_DIF_BPF_COEFF_18                       0x1fff0000
+/*  Reserved                             [15:13] */
+#define      FLD_DIF_BPF_COEFF_19                       0x00001fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF2021        (DIRECT_IF_REVB_BASE + 0x00000070)
+/*****************************************************************************/
+/*  Reserved                             [31:29] */
+#define      FLD_DIF_BPF_COEFF_20                       0x1fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_21                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF2223        (DIRECT_IF_REVB_BASE + 0x00000074)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_22                       0x3fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_23                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF2425        (DIRECT_IF_REVB_BASE + 0x00000078)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_24                       0x3fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_25                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF2627        (DIRECT_IF_REVB_BASE + 0x0000007c)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_26                       0x3fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_27                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF2829        (DIRECT_IF_REVB_BASE + 0x00000080)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_28                       0x3fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_29                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF3031        (DIRECT_IF_REVB_BASE + 0x00000084)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_30                       0x3fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_31                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF3233        (DIRECT_IF_REVB_BASE + 0x00000088)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_32                       0x3fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_33                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF3435        (DIRECT_IF_REVB_BASE + 0x0000008c)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_34                       0x3fff0000
+/*  Reserved                             [15:14] */
+#define      FLD_DIF_BPF_COEFF_35                       0x00003fff
+
+/*****************************************************************************/
+#define      DIF_BPF_COEFF36          (DIRECT_IF_REVB_BASE + 0x00000090)
+/*****************************************************************************/
+/*  Reserved                             [31:30] */
+#define      FLD_DIF_BPF_COEFF_36                       0x3fff0000
+/*  Reserved                             [15:0] */
+
+/*****************************************************************************/
+#define      DIF_RPT_VARIANCE         (DIRECT_IF_REVB_BASE + 0x00000094)
+/*****************************************************************************/
+/*  Reserved                             [31:20] */
+#define      FLD_DIF_RPT_VARIANCE                       0x000fffff
+
+/*****************************************************************************/
+#define      DIF_SOFT_RST_CTRL_REVB       (DIRECT_IF_REVB_BASE + 0x00000098)
+/*****************************************************************************/
+/*  Reserved                             [31:8] */
+#define      FLD_DIF_DIF_SOFT_RST                       0x00000080
+#define      FLD_DIF_DIF_REG_RST_MSK                    0x00000040
+#define      FLD_DIF_AGC_RST_MSK                        0x00000020
+#define      FLD_DIF_CMP_RST_MSK                        0x00000010
+#define      FLD_DIF_AVS_RST_MSK                        0x00000008
+#define      FLD_DIF_NYQ_RST_MSK                        0x00000004
+#define      FLD_DIF_DIF_SRC_RST_MSK                    0x00000002
+#define      FLD_DIF_PLL_RST_MSK                        0x00000001
+
+/*****************************************************************************/
+#define      DIF_PLL_FREQ_ERR         (DIRECT_IF_REVB_BASE + 0x0000009c)
+/*****************************************************************************/
+/*  Reserved                             [31:25] */
+#define      FLD_DIF_CTL_IP                             0x01ffffff
+
+#endif
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c
new file mode 100644
index 000000000000..0d333e679f70
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-core.c
@@ -0,0 +1,1200 @@
+/*
+   cx231xx-core.c - driver for Conexant Cx23100/101/102
+                                USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+                                Based on em28xx driver
+
+   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.
+ */
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/vmalloc.h>
+#include <media/v4l2-common.h>
+
+#include "cx231xx.h"
+#include "cx231xx-reg.h"
+
+/* #define ENABLE_DEBUG_ISOC_FRAMES */
+
+static unsigned int core_debug;
+module_param(core_debug, int, 0644);
+MODULE_PARM_DESC(core_debug, "enable debug messages [core]");
+
+#define cx231xx_coredbg(fmt, arg...) do {\
+        if (core_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __func__ , ##arg); } while (0)
+
+static unsigned int reg_debug;
+module_param(reg_debug, int, 0644);
+MODULE_PARM_DESC(reg_debug, "enable debug messages [URB reg]");
+
+#define cx231xx_regdbg(fmt, arg...) do {\
+        if (reg_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __func__ , ##arg); } while (0)
+
+static int alt = CX231XX_PINOUT;
+module_param(alt, int, 0644);
+MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
+
+#define cx231xx_isocdbg(fmt, arg...) do {\
+        if (core_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __func__ , ##arg); } while (0)
+
+/*****************************************************************
+*             Device control list functions                                      *
+******************************************************************/
+
+static LIST_HEAD(cx231xx_devlist);
+static DEFINE_MUTEX(cx231xx_devlist_mutex);
+
+struct cx231xx *cx231xx_get_device(int minor,
+                                   enum v4l2_buf_type *fh_type, int *has_radio)
+{
+        struct cx231xx *h, *dev = NULL;
+
+        *fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        *has_radio = 0;
+
+        mutex_lock(&cx231xx_devlist_mutex);
+        list_for_each_entry(h, &cx231xx_devlist, devlist) {
+                if (h->vdev->minor == minor)
+                        dev = h;
+                if (h->vbi_dev->minor == minor) {
+                        dev = h;
+                        *fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                }
+                if (h->radio_dev && h->radio_dev->minor == minor) {
+                        dev = h;
+                        *has_radio = 1;
+                }
+        }
+        mutex_unlock(&cx231xx_devlist_mutex);
+
+        return dev;
+}
+
+/*
+ * cx231xx_realease_resources()
+ * unregisters the v4l2,i2c and usb devices
+ * called when the device gets disconected or at module unload
+*/
+void cx231xx_remove_from_devlist(struct cx231xx *dev)
+{
+        mutex_lock(&cx231xx_devlist_mutex);
+        list_del(&dev->devlist);
+        mutex_unlock(&cx231xx_devlist_mutex);
+};
+
+void cx231xx_add_into_devlist(struct cx231xx *dev)
+{
+        mutex_lock(&cx231xx_devlist_mutex);
+        list_add_tail(&dev->devlist, &cx231xx_devlist);
+        mutex_unlock(&cx231xx_devlist_mutex);
+};
+
+static LIST_HEAD(cx231xx_extension_devlist);
+static DEFINE_MUTEX(cx231xx_extension_devlist_lock);
+
+int cx231xx_register_extension(struct cx231xx_ops *ops)
+{
+        struct cx231xx *dev = NULL;
+
+        mutex_lock(&cx231xx_devlist_mutex);
+        mutex_lock(&cx231xx_extension_devlist_lock);
+        list_add_tail(&ops->next, &cx231xx_extension_devlist);
+        list_for_each_entry(dev, &cx231xx_devlist, devlist) {
+                if (dev)
+                        ops->init(dev);
+        }
+        printk(KERN_INFO DRIVER_NAME ": %s initialized\n", ops->name);
+        mutex_unlock(&cx231xx_extension_devlist_lock);
+        mutex_unlock(&cx231xx_devlist_mutex);
+        return 0;
+}
+EXPORT_SYMBOL(cx231xx_register_extension);
+
+void cx231xx_unregister_extension(struct cx231xx_ops *ops)
+{
+        struct cx231xx *dev = NULL;
+
+        mutex_lock(&cx231xx_devlist_mutex);
+        list_for_each_entry(dev, &cx231xx_devlist, devlist) {
+                if (dev)
+                        ops->fini(dev);
+        }
+
+        mutex_lock(&cx231xx_extension_devlist_lock);
+        printk(KERN_INFO DRIVER_NAME ": %s removed\n", ops->name);
+        list_del(&ops->next);
+        mutex_unlock(&cx231xx_extension_devlist_lock);
+        mutex_unlock(&cx231xx_devlist_mutex);
+}
+EXPORT_SYMBOL(cx231xx_unregister_extension);
+
+void cx231xx_init_extension(struct cx231xx *dev)
+{
+        struct cx231xx_ops *ops = NULL;
+
+        mutex_lock(&cx231xx_extension_devlist_lock);
+        if (!list_empty(&cx231xx_extension_devlist)) {
+                list_for_each_entry(ops, &cx231xx_extension_devlist, next) {
+                        if (ops->init)
+                                ops->init(dev);
+                }
+        }
+        mutex_unlock(&cx231xx_extension_devlist_lock);
+}
+
+void cx231xx_close_extension(struct cx231xx *dev)
+{
+        struct cx231xx_ops *ops = NULL;
+
+        mutex_lock(&cx231xx_extension_devlist_lock);
+        if (!list_empty(&cx231xx_extension_devlist)) {
+                list_for_each_entry(ops, &cx231xx_extension_devlist, next) {
+                        if (ops->fini)
+                                ops->fini(dev);
+                }
+        }
+        mutex_unlock(&cx231xx_extension_devlist_lock);
+}
+
+/****************************************************************
+*               U S B related functions                         *
+*****************************************************************/
+int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus,
+                             struct cx231xx_i2c_xfer_data *req_data)
+{
+        int status = 0;
+        struct cx231xx *dev = i2c_bus->dev;
+        struct VENDOR_REQUEST_IN ven_req;
+
+        u8 saddr_len = 0;
+        u8 _i2c_period = 0;
+        u8 _i2c_nostop = 0;
+        u8 _i2c_reserve = 0;
+
+        /* Get the I2C period, nostop and reserve parameters */
+        _i2c_period = i2c_bus->i2c_period;
+        _i2c_nostop = i2c_bus->i2c_nostop;
+        _i2c_reserve = i2c_bus->i2c_reserve;
+
+        saddr_len = req_data->saddr_len;
+
+        /* Set wValue */
+        if (saddr_len == 1)     /* need check saddr_len == 0  */
+                ven_req.wValue =
+                    req_data->
+                    dev_addr << 9 | _i2c_period << 4 | saddr_len << 2 |
+                    _i2c_nostop << 1 | I2C_SYNC | _i2c_reserve << 6;
+        else
+                ven_req.wValue =
+                    req_data->
+                    dev_addr << 9 | _i2c_period << 4 | saddr_len << 2 |
+                    _i2c_nostop << 1 | I2C_SYNC | _i2c_reserve << 6;
+
+        /* set channel number */
+        if (req_data->direction & I2C_M_RD) {
+                /* channel number, for read,spec required channel_num +4 */
+                ven_req.bRequest = i2c_bus->nr + 4;
+        } else
+                ven_req.bRequest = i2c_bus->nr; /* channel number,  */
+
+        /* set index value */
+        switch (saddr_len) {
+        case 0:
+                ven_req.wIndex = 0;     /* need check */
+                break;
+        case 1:
+                ven_req.wIndex = (req_data->saddr_dat & 0xff);
+                break;
+        case 2:
+                ven_req.wIndex = req_data->saddr_dat;
+                break;
+        }
+
+        /* set wLength value */
+        ven_req.wLength = req_data->buf_size;
+
+        /* set bData value */
+        ven_req.bData = 0;
+
+        /* set the direction */
+        if (req_data->direction) {
+                ven_req.direction = USB_DIR_IN;
+                memset(req_data->p_buffer, 0x00, ven_req.wLength);
+        } else
+                ven_req.direction = USB_DIR_OUT;
+
+        /* set the buffer for read / write */
+        ven_req.pBuff = req_data->p_buffer;
+
+
+        /* call common vendor command request */
+        status = cx231xx_send_vendor_cmd(dev, &ven_req);
+        if (status < 0) {
+                cx231xx_info
+                    ("UsbInterface::sendCommand, failed with status -%d\n",
+                     status);
+        }
+
+        return status;
+}
+EXPORT_SYMBOL_GPL(cx231xx_send_usb_command);
+
+/*
+ * cx231xx_read_ctrl_reg()
+ * reads data from the usb device specifying bRequest and wValue
+ */
+int cx231xx_read_ctrl_reg(struct cx231xx *dev, u8 req, u16 reg,
+                          char *buf, int len)
+{
+        u8 val = 0;
+        int ret;
+        int pipe = usb_rcvctrlpipe(dev->udev, 0);
+
+        if (dev->state & DEV_DISCONNECTED)
+                return -ENODEV;
+
+        if (len > URB_MAX_CTRL_SIZE)
+                return -EINVAL;
+
+        switch (len) {
+        case 1:
+                val = ENABLE_ONE_BYTE;
+                break;
+        case 2:
+                val = ENABLE_TWE_BYTE;
+                break;
+        case 3:
+                val = ENABLE_THREE_BYTE;
+                break;
+        case 4:
+                val = ENABLE_FOUR_BYTE;
+                break;
+        default:
+                val = 0xFF;     /* invalid option */
+        }
+
+        if (val == 0xFF)
+                return -EINVAL;
+
+        if (reg_debug) {
+                cx231xx_isocdbg("(pipe 0x%08x): "
+                                "IN:  %02x %02x %02x %02x %02x %02x %02x %02x ",
+                                pipe,
+                                USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                                req, 0, val,
+                                reg & 0xff, reg >> 8, len & 0xff, len >> 8);
+        }
+
+        mutex_lock(&dev->ctrl_urb_lock);
+        ret = usb_control_msg(dev->udev, pipe, req,
+                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              val, reg, dev->urb_buf, len, HZ);
+        if (ret < 0) {
+                cx231xx_isocdbg(" failed!\n");
+                /* mutex_unlock(&dev->ctrl_urb_lock); */
+                return ret;
+        }
+
+        if (len)
+                memcpy(buf, dev->urb_buf, len);
+
+        mutex_unlock(&dev->ctrl_urb_lock);
+
+        if (reg_debug) {
+                int byte;
+
+                cx231xx_isocdbg("<<<");
+                for (byte = 0; byte < len; byte++)
+                        cx231xx_isocdbg(" %02x", (unsigned char)buf[byte]);
+                cx231xx_isocdbg("\n");
+        }
+
+        return ret;
+}
+
+int cx231xx_send_vendor_cmd(struct cx231xx *dev,
+                                struct VENDOR_REQUEST_IN *ven_req)
+{
+        int ret;
+        int pipe = 0;
+
+        if (dev->state & DEV_DISCONNECTED)
+                return -ENODEV;
+
+        if ((ven_req->wLength > URB_MAX_CTRL_SIZE))
+                return -EINVAL;
+
+        if (ven_req->direction)
+                pipe = usb_rcvctrlpipe(dev->udev, 0);
+        else
+                pipe = usb_sndctrlpipe(dev->udev, 0);
+
+        if (reg_debug) {
+                int byte;
+
+                cx231xx_isocdbg("(pipe 0x%08x): "
+                                "OUT: %02x %02x %02x %04x %04x %04x >>>",
+                                pipe,
+                                ven_req->
+                                direction | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                                ven_req->bRequest, 0, ven_req->wValue,
+                                ven_req->wIndex, ven_req->wLength);
+
+                for (byte = 0; byte < ven_req->wLength; byte++)
+                        cx231xx_isocdbg(" %02x",
+                                        (unsigned char)ven_req->pBuff[byte]);
+                cx231xx_isocdbg("\n");
+        }
+
+        mutex_lock(&dev->ctrl_urb_lock);
+        ret = usb_control_msg(dev->udev, pipe, ven_req->bRequest,
+                              ven_req->
+                              direction | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              ven_req->wValue, ven_req->wIndex, ven_req->pBuff,
+                              ven_req->wLength, HZ);
+        mutex_unlock(&dev->ctrl_urb_lock);
+
+        return ret;
+}
+
+/*
+ * cx231xx_write_ctrl_reg()
+ * sends data to the usb device, specifying bRequest
+ */
+int cx231xx_write_ctrl_reg(struct cx231xx *dev, u8 req, u16 reg, char *buf,
+                           int len)
+{
+        u8 val = 0;
+        int ret;
+        int pipe = usb_sndctrlpipe(dev->udev, 0);
+
+        if (dev->state & DEV_DISCONNECTED)
+                return -ENODEV;
+
+        if ((len < 1) || (len > URB_MAX_CTRL_SIZE))
+                return -EINVAL;
+
+        switch (len) {
+        case 1:
+                val = ENABLE_ONE_BYTE;
+                break;
+        case 2:
+                val = ENABLE_TWE_BYTE;
+                break;
+        case 3:
+                val = ENABLE_THREE_BYTE;
+                break;
+        case 4:
+                val = ENABLE_FOUR_BYTE;
+                break;
+        default:
+                val = 0xFF;     /* invalid option */
+        }
+
+        if (val == 0xFF)
+                return -EINVAL;
+
+        if (reg_debug) {
+                int byte;
+
+                cx231xx_isocdbg("(pipe 0x%08x): "
+                        "OUT: %02x %02x %02x %02x %02x %02x %02x %02x >>>",
+                        pipe,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                        req, 0, val, reg & 0xff,
+                        reg >> 8, len & 0xff, len >> 8);
+
+                for (byte = 0; byte < len; byte++)
+                        cx231xx_isocdbg(" %02x", (unsigned char)buf[byte]);
+                cx231xx_isocdbg("\n");
+        }
+
+        mutex_lock(&dev->ctrl_urb_lock);
+        memcpy(dev->urb_buf, buf, len);
+        ret = usb_control_msg(dev->udev, pipe, req,
+                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              val, reg, dev->urb_buf, len, HZ);
+        mutex_unlock(&dev->ctrl_urb_lock);
+
+        return ret;
+}
+
+/****************************************************************
+*           USB Alternate Setting functions                     *
+*****************************************************************/
+
+int cx231xx_set_video_alternate(struct cx231xx *dev)
+{
+        int errCode, prev_alt = dev->video_mode.alt;
+        unsigned int min_pkt_size = dev->width * 2 + 4;
+        u32 usb_interface_index = 0;
+
+        /* When image size is bigger than a certain value,
+           the frame size should be increased, otherwise, only
+           green screen will be received.
+         */
+        if (dev->width * 2 * dev->height > 720 * 240 * 2)
+                min_pkt_size *= 2;
+
+        if (dev->width > 360) {
+                /* resolutions: 720,704,640 */
+                dev->video_mode.alt = 3;
+        } else if (dev->width > 180) {
+                /* resolutions: 360,352,320,240 */
+                dev->video_mode.alt = 2;
+        } else if (dev->width > 0) {
+                /* resolutions: 180,176,160,128,88 */
+                dev->video_mode.alt = 1;
+        } else {
+                /* Change to alt0 BULK to release USB bandwidth */
+                dev->video_mode.alt = 0;
+        }
+
+        /* Get the correct video interface Index */
+        usb_interface_index =
+            dev->current_pcb_config.hs_config_info[0].interface_info.
+            video_index + 1;
+
+        if (dev->video_mode.alt != prev_alt) {
+                cx231xx_coredbg("minimum isoc packet size: %u (alt=%d)\n",
+                                min_pkt_size, dev->video_mode.alt);
+                dev->video_mode.max_pkt_size =
+                    dev->video_mode.alt_max_pkt_size[dev->video_mode.alt];
+                cx231xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n",
+                                dev->video_mode.alt,
+                                dev->video_mode.max_pkt_size);
+                cx231xx_info
+                    (" setting alt %d with wMaxPktSize=%u , Interface = %d\n",
+                     dev->video_mode.alt, dev->video_mode.max_pkt_size,
+                     usb_interface_index);
+                errCode =
+                    usb_set_interface(dev->udev, usb_interface_index,
+                                      dev->video_mode.alt);
+                if (errCode < 0) {
+                        cx231xx_errdev
+                            ("cannot change alt number to %d (error=%i)\n",
+                             dev->video_mode.alt, errCode);
+                        return errCode;
+                }
+        }
+        return 0;
+}
+
+int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt)
+{
+        int status = 0;
+        u32 usb_interface_index = 0;
+        u32 max_pkt_size = 0;
+
+        switch (index) {
+        case INDEX_TS1:
+                usb_interface_index =
+                    dev->current_pcb_config.hs_config_info[0].interface_info.
+                    ts1_index + 1;
+                dev->video_mode.alt = alt;
+                if (dev->ts1_mode.alt_max_pkt_size != NULL)
+                        max_pkt_size = dev->ts1_mode.max_pkt_size =
+                            dev->ts1_mode.alt_max_pkt_size[dev->ts1_mode.alt];
+                break;
+        case INDEX_TS2:
+                usb_interface_index =
+                    dev->current_pcb_config.hs_config_info[0].interface_info.
+                    ts2_index + 1;
+                break;
+        case INDEX_AUDIO:
+                usb_interface_index =
+                    dev->current_pcb_config.hs_config_info[0].interface_info.
+                    audio_index + 1;
+                dev->adev.alt = alt;
+                if (dev->adev.alt_max_pkt_size != NULL)
+                        max_pkt_size = dev->adev.max_pkt_size =
+                            dev->adev.alt_max_pkt_size[dev->adev.alt];
+                break;
+        case INDEX_VIDEO:
+                usb_interface_index =
+                    dev->current_pcb_config.hs_config_info[0].interface_info.
+                    video_index + 1;
+                dev->video_mode.alt = alt;
+                if (dev->video_mode.alt_max_pkt_size != NULL)
+                        max_pkt_size = dev->video_mode.max_pkt_size =
+                            dev->video_mode.alt_max_pkt_size[dev->video_mode.
+                                                             alt];
+                break;
+        case INDEX_VANC:
+                usb_interface_index =
+                    dev->current_pcb_config.hs_config_info[0].interface_info.
+                    vanc_index + 1;
+                dev->vbi_mode.alt = alt;
+                if (dev->vbi_mode.alt_max_pkt_size != NULL)
+                        max_pkt_size = dev->vbi_mode.max_pkt_size =
+                            dev->vbi_mode.alt_max_pkt_size[dev->vbi_mode.alt];
+                break;
+        case INDEX_HANC:
+                usb_interface_index =
+                    dev->current_pcb_config.hs_config_info[0].interface_info.
+                    hanc_index + 1;
+                dev->sliced_cc_mode.alt = alt;
+                if (dev->sliced_cc_mode.alt_max_pkt_size != NULL)
+                        max_pkt_size = dev->sliced_cc_mode.max_pkt_size =
+                            dev->sliced_cc_mode.alt_max_pkt_size[dev->
+                                                                 sliced_cc_mode.
+                                                                 alt];
+                break;
+        default:
+                break;
+        }
+
+        if (alt > 0 && max_pkt_size == 0) {
+                cx231xx_errdev
+                ("can't change interface %d alt no. to %d: Max. Pkt size = 0\n",
+                usb_interface_index, alt);
+                return -1;
+        }
+
+        cx231xx_info
+            (" setting alternate %d with wMaxPacketSize=%u , Interface = %d\n",
+             alt, max_pkt_size, usb_interface_index);
+
+        if (usb_interface_index > 0) {
+                status = usb_set_interface(dev->udev, usb_interface_index, alt);
+                if (status < 0) {
+                        cx231xx_errdev
+                        ("can't change interface %d alt no. to %d (err=%i)\n",
+                        usb_interface_index, alt, status);
+                        return status;
+                }
+        }
+
+        return status;
+}
+EXPORT_SYMBOL_GPL(cx231xx_set_alt_setting);
+
+int cx231xx_gpio_set(struct cx231xx *dev, struct cx231xx_reg_seq *gpio)
+{
+        int rc = 0;
+
+        if (!gpio)
+                return rc;
+
+        /* Send GPIO reset sequences specified at board entry */
+        while (gpio->sleep >= 0) {
+                rc = cx231xx_set_gpio_value(dev, gpio->bit, gpio->val);
+                if (rc < 0)
+                        return rc;
+
+                if (gpio->sleep > 0)
+                        msleep(gpio->sleep);
+
+                gpio++;
+        }
+        return rc;
+}
+
+int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)
+{
+        if (dev->mode == set_mode)
+                return 0;
+
+        if (set_mode == CX231XX_SUSPEND) {
+                /* Set the chip in power saving mode */
+                dev->mode = set_mode;
+        }
+
+        /* Resource is locked */
+        if (dev->mode != CX231XX_SUSPEND)
+                return -EINVAL;
+
+        dev->mode = set_mode;
+
+        if (dev->mode == CX231XX_DIGITAL_MODE)
+                ;/* Set Digital power mode */
+        else
+                ;/* Set Analog Power mode */
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cx231xx_set_mode);
+
+/*****************************************************************
+*                URB Streaming functions                         *
+******************************************************************/
+
+/*
+ * IRQ callback, called by URB callback
+ */
+static void cx231xx_irq_callback(struct urb *urb)
+{
+        struct cx231xx_dmaqueue *dma_q = urb->context;
+        struct cx231xx_video_mode *vmode =
+            container_of(dma_q, struct cx231xx_video_mode, vidq);
+        struct cx231xx *dev = container_of(vmode, struct cx231xx, video_mode);
+        int rc, i;
+
+        switch (urb->status) {
+        case 0:         /* success */
+        case -ETIMEDOUT:        /* NAK */
+                break;
+        case -ECONNRESET:       /* kill */
+        case -ENOENT:
+        case -ESHUTDOWN:
+                return;
+        default:                /* error */
+                cx231xx_isocdbg("urb completition error %d.\n", urb->status);
+                break;
+        }
+
+        /* Copy data from URB */
+        spin_lock(&dev->video_mode.slock);
+        rc = dev->video_mode.isoc_ctl.isoc_copy(dev, urb);
+        spin_unlock(&dev->video_mode.slock);
+
+        /* Reset urb buffers */
+        for (i = 0; i < urb->number_of_packets; i++) {
+                urb->iso_frame_desc[i].status = 0;
+                urb->iso_frame_desc[i].actual_length = 0;
+        }
+        urb->status = 0;
+
+        urb->status = usb_submit_urb(urb, GFP_ATOMIC);
+        if (urb->status) {
+                cx231xx_isocdbg("urb resubmit failed (error=%i)\n",
+                                urb->status);
+        }
+}
+
+/*
+ * Stop and Deallocate URBs
+ */
+void cx231xx_uninit_isoc(struct cx231xx *dev)
+{
+        struct urb *urb;
+        int i;
+
+        cx231xx_isocdbg("cx231xx: called cx231xx_uninit_isoc\n");
+
+        dev->video_mode.isoc_ctl.nfields = -1;
+        for (i = 0; i < dev->video_mode.isoc_ctl.num_bufs; i++) {
+                urb = dev->video_mode.isoc_ctl.urb[i];
+                if (urb) {
+                        if (!irqs_disabled())
+                                usb_kill_urb(urb);
+                        else
+                                usb_unlink_urb(urb);
+
+                        if (dev->video_mode.isoc_ctl.transfer_buffer[i]) {
+                                usb_buffer_free(dev->udev,
+                                                urb->transfer_buffer_length,
+                                                dev->video_mode.isoc_ctl.
+                                                transfer_buffer[i],
+                                                urb->transfer_dma);
+                        }
+                        usb_free_urb(urb);
+                        dev->video_mode.isoc_ctl.urb[i] = NULL;
+                }
+                dev->video_mode.isoc_ctl.transfer_buffer[i] = NULL;
+        }
+
+        kfree(dev->video_mode.isoc_ctl.urb);
+        kfree(dev->video_mode.isoc_ctl.transfer_buffer);
+
+        dev->video_mode.isoc_ctl.urb = NULL;
+        dev->video_mode.isoc_ctl.transfer_buffer = NULL;
+        dev->video_mode.isoc_ctl.num_bufs = 0;
+
+        cx231xx_capture_start(dev, 0, Raw_Video);
+}
+EXPORT_SYMBOL_GPL(cx231xx_uninit_isoc);
+
+/*
+ * Allocate URBs and start IRQ
+ */
+int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
+                      int num_bufs, int max_pkt_size,
+                      int (*isoc_copy) (struct cx231xx *dev, struct urb *urb))
+{
+        struct cx231xx_dmaqueue *dma_q = &dev->video_mode.vidq;
+        int i;
+        int sb_size, pipe;
+        struct urb *urb;
+        int j, k;
+        int rc;
+
+        cx231xx_isocdbg("cx231xx: called cx231xx_prepare_isoc\n");
+
+        dev->video_input = dev->video_input > 2 ? 2 : dev->video_input;
+
+        cx231xx_info("Setting Video mux to %d\n", dev->video_input);
+        video_mux(dev, dev->video_input);
+
+        /* De-allocates all pending stuff */
+        cx231xx_uninit_isoc(dev);
+
+        dev->video_mode.isoc_ctl.isoc_copy = isoc_copy;
+        dev->video_mode.isoc_ctl.num_bufs = num_bufs;
+        dma_q->pos = 0;
+        dma_q->is_partial_line = 0;
+        dma_q->last_sav = 0;
+        dma_q->current_field = -1;
+        dma_q->field1_done = 0;
+        dma_q->lines_per_field = dev->height / 2;
+        dma_q->bytes_left_in_line = dev->width << 1;
+        dma_q->lines_completed = 0;
+        for (i = 0; i < 8; i++)
+                dma_q->partial_buf[i] = 0;
+
+        dev->video_mode.isoc_ctl.urb =
+            kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
+        if (!dev->video_mode.isoc_ctl.urb) {
+                cx231xx_errdev("cannot alloc memory for usb buffers\n");
+                return -ENOMEM;
+        }
+
+        dev->video_mode.isoc_ctl.transfer_buffer =
+            kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
+        if (!dev->video_mode.isoc_ctl.transfer_buffer) {
+                cx231xx_errdev("cannot allocate memory for usbtransfer\n");
+                kfree(dev->video_mode.isoc_ctl.urb);
+                return -ENOMEM;
+        }
+
+        dev->video_mode.isoc_ctl.max_pkt_size = max_pkt_size;
+        dev->video_mode.isoc_ctl.buf = NULL;
+
+        sb_size = max_packets * dev->video_mode.isoc_ctl.max_pkt_size;
+
+        /* allocate urbs and transfer buffers */
+        for (i = 0; i < dev->video_mode.isoc_ctl.num_bufs; i++) {
+                urb = usb_alloc_urb(max_packets, GFP_KERNEL);
+                if (!urb) {
+                        cx231xx_err("cannot alloc isoc_ctl.urb %i\n", i);
+                        cx231xx_uninit_isoc(dev);
+                        return -ENOMEM;
+                }
+                dev->video_mode.isoc_ctl.urb[i] = urb;
+
+                dev->video_mode.isoc_ctl.transfer_buffer[i] =
+                    usb_buffer_alloc(dev->udev, sb_size, GFP_KERNEL,
+                                     &urb->transfer_dma);
+                if (!dev->video_mode.isoc_ctl.transfer_buffer[i]) {
+                        cx231xx_err("unable to allocate %i bytes for transfer"
+                                    " buffer %i%s\n",
+                                    sb_size, i,
+                                    in_interrupt() ? " while in int" : "");
+                        cx231xx_uninit_isoc(dev);
+                        return -ENOMEM;
+                }
+                memset(dev->video_mode.isoc_ctl.transfer_buffer[i], 0, sb_size);
+
+                pipe =
+                    usb_rcvisocpipe(dev->udev, dev->video_mode.end_point_addr);
+
+                usb_fill_int_urb(urb, dev->udev, pipe,
+                                 dev->video_mode.isoc_ctl.transfer_buffer[i],
+                                 sb_size, cx231xx_irq_callback, dma_q, 1);
+
+                urb->number_of_packets = max_packets;
+                urb->transfer_flags = URB_ISO_ASAP;
+
+                k = 0;
+                for (j = 0; j < max_packets; j++) {
+                        urb->iso_frame_desc[j].offset = k;
+                        urb->iso_frame_desc[j].length =
+                            dev->video_mode.isoc_ctl.max_pkt_size;
+                        k += dev->video_mode.isoc_ctl.max_pkt_size;
+                }
+        }
+
+        init_waitqueue_head(&dma_q->wq);
+
+        /* submit urbs and enables IRQ */
+        for (i = 0; i < dev->video_mode.isoc_ctl.num_bufs; i++) {
+                rc = usb_submit_urb(dev->video_mode.isoc_ctl.urb[i],
+                                    GFP_ATOMIC);
+                if (rc) {
+                        cx231xx_err("submit of urb %i failed (error=%i)\n", i,
+                                    rc);
+                        cx231xx_uninit_isoc(dev);
+                        return rc;
+                }
+        }
+
+        cx231xx_capture_start(dev, 1, Raw_Video);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cx231xx_init_isoc);
+
+/*****************************************************************
+*             Device Init/UnInit functions                       *
+******************************************************************/
+int cx231xx_dev_init(struct cx231xx *dev)
+{
+        int errCode = 0;
+
+        /* Initialize I2C bus */
+
+        /* External Master 1 Bus */
+        dev->i2c_bus[0].nr = 0;
+        dev->i2c_bus[0].dev = dev;
+        dev->i2c_bus[0].i2c_period = I2C_SPEED_1M;      /* 1MHz */
+        dev->i2c_bus[0].i2c_nostop = 0;
+        dev->i2c_bus[0].i2c_reserve = 0;
+
+        /* External Master 2 Bus */
+        dev->i2c_bus[1].nr = 1;
+        dev->i2c_bus[1].dev = dev;
+        dev->i2c_bus[1].i2c_period = I2C_SPEED_1M;      /* 1MHz */
+        dev->i2c_bus[1].i2c_nostop = 0;
+        dev->i2c_bus[1].i2c_reserve = 0;
+
+        /* Internal Master 3 Bus */
+        dev->i2c_bus[2].nr = 2;
+        dev->i2c_bus[2].dev = dev;
+        dev->i2c_bus[2].i2c_period = I2C_SPEED_400K;    /* 400kHz */
+        dev->i2c_bus[2].i2c_nostop = 0;
+        dev->i2c_bus[2].i2c_reserve = 0;
+
+        /* register I2C buses */
+        cx231xx_i2c_register(&dev->i2c_bus[0]);
+        cx231xx_i2c_register(&dev->i2c_bus[1]);
+        cx231xx_i2c_register(&dev->i2c_bus[2]);
+
+        /* init hardware */
+        /* Note : with out calling set power mode function,
+        afe can not be set up correctly */
+        errCode = cx231xx_set_power_mode(dev, POLARIS_AVMODE_ANALOGT_TV);
+        if (errCode < 0) {
+                cx231xx_errdev
+                    ("%s: Failed to set Power - errCode [%d]!\n",
+                     __func__, errCode);
+                return errCode;
+        }
+
+        /* initialize Colibri block */
+        errCode = cx231xx_afe_init_super_block(dev, 0x23c);
+        if (errCode < 0) {
+                cx231xx_errdev
+                    ("%s: cx231xx_afe init super block - errCode [%d]!\n",
+                     __func__, errCode);
+                return errCode;
+        }
+        errCode = cx231xx_afe_init_channels(dev);
+        if (errCode < 0) {
+                cx231xx_errdev
+                    ("%s: cx231xx_afe init channels - errCode [%d]!\n",
+                     __func__, errCode);
+                return errCode;
+        }
+
+        /* Set DIF in By pass mode */
+        errCode = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);
+        if (errCode < 0) {
+                cx231xx_errdev
+                    ("%s: cx231xx_dif set to By pass mode - errCode [%d]!\n",
+                     __func__, errCode);
+                return errCode;
+        }
+
+        /* I2S block related functions */
+        errCode = cx231xx_i2s_blk_initialize(dev);
+        if (errCode < 0) {
+                cx231xx_errdev
+                    ("%s: cx231xx_i2s block initialize - errCode [%d]!\n",
+                     __func__, errCode);
+                return errCode;
+        }
+
+        /* init control pins */
+        errCode = cx231xx_init_ctrl_pin_status(dev);
+        if (errCode < 0) {
+                cx231xx_errdev("%s: cx231xx_init ctrl pins - errCode [%d]!\n",
+                               __func__, errCode);
+                return errCode;
+        }
+
+        /* set AGC mode to Analog */
+        errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 1);
+        if (errCode < 0) {
+                cx231xx_errdev
+                    ("%s: cx231xx_AGC mode to Analog - errCode [%d]!\n",
+                     __func__, errCode);
+                return errCode;
+        }
+
+        /* set all alternate settings to zero initially */
+        cx231xx_set_alt_setting(dev, INDEX_VIDEO, 0);
+        cx231xx_set_alt_setting(dev, INDEX_VANC, 0);
+        cx231xx_set_alt_setting(dev, INDEX_HANC, 0);
+        if (dev->board.has_dvb)
+                cx231xx_set_alt_setting(dev, INDEX_TS1, 0);
+
+        /* set the I2C master port to 3 on channel 1 */
+        errCode = cx231xx_enable_i2c_for_tuner(dev, I2C_3);
+
+        return errCode;
+}
+EXPORT_SYMBOL_GPL(cx231xx_dev_init);
+
+void cx231xx_dev_uninit(struct cx231xx *dev)
+{
+        /* Un Initialize I2C bus */
+        cx231xx_i2c_unregister(&dev->i2c_bus[2]);
+        cx231xx_i2c_unregister(&dev->i2c_bus[1]);
+        cx231xx_i2c_unregister(&dev->i2c_bus[0]);
+}
+EXPORT_SYMBOL_GPL(cx231xx_dev_uninit);
+
+/*****************************************************************
+*              G P I O related functions                         *
+******************************************************************/
+int cx231xx_send_gpio_cmd(struct cx231xx *dev, u32 gpio_bit, u8 * gpio_val,
+                          u8 len, u8 request, u8 direction)
+{
+        int status = 0;
+        struct VENDOR_REQUEST_IN ven_req;
+
+        /* Set wValue */
+        ven_req.wValue = (u16) (gpio_bit >> 16 & 0xffff);
+
+        /* set request */
+        if (!request) {
+                if (direction)
+                        ven_req.bRequest = VRT_GET_GPIO;        /* 0x8 gpio */
+                else
+                        ven_req.bRequest = VRT_SET_GPIO;        /* 0x9 gpio */
+        } else {
+                if (direction)
+                        ven_req.bRequest = VRT_GET_GPIE;        /* 0xa gpie */
+                else
+                        ven_req.bRequest = VRT_SET_GPIE;        /* 0xb gpie */
+        }
+
+        /* set index value */
+        ven_req.wIndex = (u16) (gpio_bit & 0xffff);
+
+        /* set wLength value */
+        ven_req.wLength = len;
+
+        /* set bData value */
+        ven_req.bData = 0;
+
+        /* set the buffer for read / write */
+        ven_req.pBuff = gpio_val;
+
+        /* set the direction */
+        if (direction) {
+                ven_req.direction = USB_DIR_IN;
+                memset(ven_req.pBuff, 0x00, ven_req.wLength);
+        } else
+                ven_req.direction = USB_DIR_OUT;
+
+
+        /* call common vendor command request */
+        status = cx231xx_send_vendor_cmd(dev, &ven_req);
+        if (status < 0) {
+                cx231xx_info
+                    ("UsbInterface::sendCommand, failed with status -%d\n",
+                     status);
+        }
+
+        return status;
+}
+EXPORT_SYMBOL_GPL(cx231xx_send_gpio_cmd);
+
+/*****************************************************************
+ *    C O N T R O L - Register R E A D / W R I T E functions     *
+ *****************************************************************/
+int cx231xx_mode_register(struct cx231xx *dev, u16 address, u32 mode)
+{
+        u8 value[4] = { 0x0, 0x0, 0x0, 0x0 };
+        u32 tmp = 0;
+        int status = 0;
+
+        status =
+            cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, address, value, 4);
+        if (status < 0)
+                return status;
+
+        tmp = *((u32 *) value);
+        tmp |= mode;
+
+        value[0] = (u8) tmp;
+        value[1] = (u8) (tmp >> 8);
+        value[2] = (u8) (tmp >> 16);
+        value[3] = (u8) (tmp >> 24);
+
+        status =
+            cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, address, value, 4);
+
+        return status;
+}
+
+/*****************************************************************
+ *            I 2 C Internal C O N T R O L   functions           *
+ *****************************************************************/
+int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,
+                          u8 saddr_len, u32 *data, u8 data_len)
+{
+        int status = 0;
+        struct cx231xx_i2c_xfer_data req_data;
+        u8 value[4] = { 0, 0, 0, 0 };
+
+        if (saddr_len == 0)
+                saddr = 0;
+        else if (saddr_len == 0)
+                saddr &= 0xff;
+
+        /* prepare xfer_data struct */
+        req_data.dev_addr = dev_addr >> 1;
+        req_data.direction = I2C_M_RD;
+        req_data.saddr_len = saddr_len;
+        req_data.saddr_dat = saddr;
+        req_data.buf_size = data_len;
+        req_data.p_buffer = (u8 *) value;
+
+        /* usb send command */
+        status = dev->cx231xx_send_usb_command(&dev->i2c_bus[0], &req_data);
+
+        if (status >= 0) {
+                /* Copy the data read back to main buffer */
+                if (data_len == 1)
+                        *data = value[0];
+                else
+                        *data =
+                            value[0] | value[1] << 8 | value[2] << 16 | value[3]
+                            << 24;
+        }
+
+        return status;
+}
+
+int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,
+                           u8 saddr_len, u32 data, u8 data_len)
+{
+        int status = 0;
+        u8 value[4] = { 0, 0, 0, 0 };
+        struct cx231xx_i2c_xfer_data req_data;
+
+        value[0] = (u8) data;
+        value[1] = (u8) (data >> 8);
+        value[2] = (u8) (data >> 16);
+        value[3] = (u8) (data >> 24);
+
+        if (saddr_len == 0)
+                saddr = 0;
+        else if (saddr_len == 0)
+                saddr &= 0xff;
+
+        /* prepare xfer_data struct */
+        req_data.dev_addr = dev_addr >> 1;
+        req_data.direction = 0;
+        req_data.saddr_len = saddr_len;
+        req_data.saddr_dat = saddr;
+        req_data.buf_size = data_len;
+        req_data.p_buffer = value;
+
+        /* usb send command */
+        status = dev->cx231xx_send_usb_command(&dev->i2c_bus[0], &req_data);
+
+        return status;
+}
+
+int cx231xx_reg_mask_write(struct cx231xx *dev, u8 dev_addr, u8 size,
+                           u16 register_address, u8 bit_start, u8 bit_end,
+                           u32 value)
+{
+        int status = 0;
+        u32 tmp;
+        u32 mask = 0;
+        int i;
+
+        if (bit_start > (size - 1) || bit_end > (size - 1))
+                return -1;
+
+        if (size == 8) {
+                status =
+                    cx231xx_read_i2c_data(dev, dev_addr, register_address, 2,
+                                          &tmp, 1);
+        } else {
+                status =
+                    cx231xx_read_i2c_data(dev, dev_addr, register_address, 2,
+                                          &tmp, 4);
+        }
+
+        if (status < 0)
+                return status;
+
+        mask = 1 << bit_end;
+        for (i = bit_end; i > bit_start && i > 0; i--)
+                mask = mask + (1 << (i - 1));
+
+        value <<= bit_start;
+
+        if (size == 8) {
+                tmp &= ~mask;
+                tmp |= value;
+                tmp &= 0xff;
+                status =
+                    cx231xx_write_i2c_data(dev, dev_addr, register_address, 2,
+                                           tmp, 1);
+        } else {
+                tmp &= ~mask;
+                tmp |= value;
+                status =
+                    cx231xx_write_i2c_data(dev, dev_addr, register_address, 2,
+                                           tmp, 4);
+        }
+
+        return status;
+}
+
+int cx231xx_read_modify_write_i2c_dword(struct cx231xx *dev, u8 dev_addr,
+                                        u16 saddr, u32 mask, u32 value)
+{
+        u32 temp;
+        int status = 0;
+
+        status = cx231xx_read_i2c_data(dev, dev_addr, saddr, 2, &temp, 4);
+
+        if (status < 0)
+                return status;
+
+        temp &= ~mask;
+        temp |= value;
+
+        status = cx231xx_write_i2c_data(dev, dev_addr, saddr, 2, temp, 4);
+
+        return status;
+}
+
+u32 cx231xx_set_field(u32 field_mask, u32 data)
+{
+        u32 temp;
+
+        for (temp = field_mask; (temp & 1) == 0; temp >>= 1)
+                data <<= 1;
+
+        return data;
+}
diff --git a/drivers/media/video/cx231xx/cx231xx-dvb.c b/drivers/media/video/cx231xx/cx231xx-dvb.c
new file mode 100644
index 000000000000..c5082a4e8ced
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-dvb.c
@@ -0,0 +1,559 @@
+/*
+ DVB device driver for cx231xx
+
+ Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+                Based on em28xx driver
+
+ 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/usb.h>
+
+#include "cx231xx.h"
+#include <media/v4l2-common.h>
+#include <media/videobuf-vmalloc.h>
+
+#include "xc5000.h"
+#include "dvb_dummy_fe.h"
+
+MODULE_DESCRIPTION("driver for cx231xx based DVB cards");
+MODULE_AUTHOR("Srinivasa Deevi <srinivasa.deevi@conexant.com>");
+MODULE_LICENSE("GPL");
+
+static unsigned int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "enable debug messages [dvb]");
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+#define dprintk(level, fmt, arg...) do {                        \
+if (debug >= level)                                             \
+        printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg); \
+} while (0)
+
+#define CX231XX_DVB_NUM_BUFS 5
+#define CX231XX_DVB_MAX_PACKETSIZE 564
+#define CX231XX_DVB_MAX_PACKETS 64
+
+struct cx231xx_dvb {
+        struct dvb_frontend *frontend;
+
+        /* feed count management */
+        struct mutex lock;
+        int nfeeds;
+
+        /* general boilerplate stuff */
+        struct dvb_adapter adapter;
+        struct dvb_demux demux;
+        struct dmxdev dmxdev;
+        struct dmx_frontend fe_hw;
+        struct dmx_frontend fe_mem;
+        struct dvb_net net;
+};
+
+static inline void print_err_status(struct cx231xx *dev, int packet, int status)
+{
+        char *errmsg = "Unknown";
+
+        switch (status) {
+        case -ENOENT:
+                errmsg = "unlinked synchronuously";
+                break;
+        case -ECONNRESET:
+                errmsg = "unlinked asynchronuously";
+                break;
+        case -ENOSR:
+                errmsg = "Buffer error (overrun)";
+                break;
+        case -EPIPE:
+                errmsg = "Stalled (device not responding)";
+                break;
+        case -EOVERFLOW:
+                errmsg = "Babble (bad cable?)";
+                break;
+        case -EPROTO:
+                errmsg = "Bit-stuff error (bad cable?)";
+                break;
+        case -EILSEQ:
+                errmsg = "CRC/Timeout (could be anything)";
+                break;
+        case -ETIME:
+                errmsg = "Device does not respond";
+                break;
+        }
+        if (packet < 0) {
+                dprintk(1, "URB status %d [%s].\n", status, errmsg);
+        } else {
+                dprintk(1, "URB packet %d, status %d [%s].\n",
+                        packet, status, errmsg);
+        }
+}
+
+static inline int dvb_isoc_copy(struct cx231xx *dev, struct urb *urb)
+{
+        int i;
+
+        if (!dev)
+                return 0;
+
+        if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+                return 0;
+
+        if (urb->status < 0) {
+                print_err_status(dev, -1, urb->status);
+                if (urb->status == -ENOENT)
+                        return 0;
+        }
+
+        for (i = 0; i < urb->number_of_packets; i++) {
+                int status = urb->iso_frame_desc[i].status;
+
+                if (status < 0) {
+                        print_err_status(dev, i, status);
+                        if (urb->iso_frame_desc[i].status != -EPROTO)
+                                continue;
+                }
+
+                dvb_dmx_swfilter(&dev->dvb->demux, urb->transfer_buffer +
+                                 urb->iso_frame_desc[i].offset,
+                                 urb->iso_frame_desc[i].actual_length);
+        }
+
+        return 0;
+}
+
+static int start_streaming(struct cx231xx_dvb *dvb)
+{
+        int rc;
+        struct cx231xx *dev = dvb->adapter.priv;
+
+        usb_set_interface(dev->udev, 0, 1);
+        rc = cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
+        if (rc < 0)
+                return rc;
+
+        return cx231xx_init_isoc(dev, CX231XX_DVB_MAX_PACKETS,
+                                 CX231XX_DVB_NUM_BUFS,
+                                 CX231XX_DVB_MAX_PACKETSIZE, dvb_isoc_copy);
+}
+
+static int stop_streaming(struct cx231xx_dvb *dvb)
+{
+        struct cx231xx *dev = dvb->adapter.priv;
+
+        cx231xx_uninit_isoc(dev);
+
+        cx231xx_set_mode(dev, CX231XX_SUSPEND);
+
+        return 0;
+}
+
+static int start_feed(struct dvb_demux_feed *feed)
+{
+        struct dvb_demux *demux = feed->demux;
+        struct cx231xx_dvb *dvb = demux->priv;
+        int rc, ret;
+
+        if (!demux->dmx.frontend)
+                return -EINVAL;
+
+        mutex_lock(&dvb->lock);
+        dvb->nfeeds++;
+        rc = dvb->nfeeds;
+
+        if (dvb->nfeeds == 1) {
+                ret = start_streaming(dvb);
+                if (ret < 0)
+                        rc = ret;
+        }
+
+        mutex_unlock(&dvb->lock);
+        return rc;
+}
+
+static int stop_feed(struct dvb_demux_feed *feed)
+{
+        struct dvb_demux *demux = feed->demux;
+        struct cx231xx_dvb *dvb = demux->priv;
+        int err = 0;
+
+        mutex_lock(&dvb->lock);
+        dvb->nfeeds--;
+
+        if (0 == dvb->nfeeds)
+                err = stop_streaming(dvb);
+
+        mutex_unlock(&dvb->lock);
+        return err;
+}
+
+/* ------------------------------------------------------------------ */
+static int cx231xx_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire)
+{
+        struct cx231xx *dev = fe->dvb->priv;
+
+        if (acquire)
+                return cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
+        else
+                return cx231xx_set_mode(dev, CX231XX_SUSPEND);
+}
+
+/* ------------------------------------------------------------------ */
+
+static struct xc5000_config cnxt_rde250_tunerconfig = {
+        .i2c_address = 0x61,
+        .if_khz = 5380,
+};
+
+/* ------------------------------------------------------------------ */
+#if 0
+static int attach_xc5000(u8 addr, struct cx231xx *dev)
+{
+
+        struct dvb_frontend *fe;
+        struct xc5000_config cfg;
+
+        memset(&cfg, 0, sizeof(cfg));
+        cfg.i2c_adap = &dev->i2c_bus[1].i2c_adap;
+        cfg.i2c_addr = addr;
+
+        if (!dev->dvb->frontend) {
+                printk(KERN_ERR "%s/2: dvb frontend not attached. "
+                       "Can't attach xc5000\n", dev->name);
+                return -EINVAL;
+        }
+
+        fe = dvb_attach(xc5000_attach, dev->dvb->frontend, &cfg);
+        if (!fe) {
+                printk(KERN_ERR "%s/2: xc5000 attach failed\n", dev->name);
+                dvb_frontend_detach(dev->dvb->frontend);
+                dev->dvb->frontend = NULL;
+                return -EINVAL;
+        }
+
+        printk(KERN_INFO "%s/2: xc5000 attached\n", dev->name);
+
+        return 0;
+}
+#endif
+
+int cx231xx_set_analog_freq(struct cx231xx *dev, u32 freq)
+{
+        int status = 0;
+
+        if ((dev->dvb != NULL) && (dev->dvb->frontend != NULL)) {
+
+                struct dvb_tuner_ops *dops = &dev->dvb->frontend->ops.tuner_ops;
+
+                if (dops->set_analog_params != NULL) {
+                        struct analog_parameters params;
+
+                        params.frequency = freq;
+                        params.std = dev->norm;
+                        params.mode = 0;        /* 0- Air; 1 - cable */
+                        /*params.audmode = ;       */
+
+                        /* Set the analog parameters to set the frequency */
+                        cx231xx_info("Setting Frequency for XC5000\n");
+                        dops->set_analog_params(dev->dvb->frontend, &params);
+                }
+
+        }
+
+        return status;
+}
+
+int cx231xx_reset_analog_tuner(struct cx231xx *dev)
+{
+        int status = 0;
+
+        if ((dev->dvb != NULL) && (dev->dvb->frontend != NULL)) {
+
+                struct dvb_tuner_ops *dops = &dev->dvb->frontend->ops.tuner_ops;
+
+                if (dops->init != NULL && !dev->xc_fw_load_done) {
+
+                        cx231xx_info("Reloading firmware for XC5000\n");
+                        status = dops->init(dev->dvb->frontend);
+                        if (status == 0) {
+                                dev->xc_fw_load_done = 1;
+                                cx231xx_info
+                                    ("XC5000 firmware download completed\n");
+                        } else {
+                                dev->xc_fw_load_done = 0;
+                                cx231xx_info
+                                    ("XC5000 firmware download failed !!!\n");
+                        }
+                }
+
+        }
+
+        return status;
+}
+
+/* ------------------------------------------------------------------ */
+
+static int register_dvb(struct cx231xx_dvb *dvb,
+                        struct module *module,
+                        struct cx231xx *dev, struct device *device)
+{
+        int result;
+
+        mutex_init(&dvb->lock);
+
+        /* register adapter */
+        result = dvb_register_adapter(&dvb->adapter, dev->name, module, device,
+                                      adapter_nr);
+        if (result < 0) {
+                printk(KERN_WARNING
+                       "%s: dvb_register_adapter failed (errno = %d)\n",
+                       dev->name, result);
+                goto fail_adapter;
+        }
+
+        /* Ensure all frontends negotiate bus access */
+        dvb->frontend->ops.ts_bus_ctrl = cx231xx_dvb_bus_ctrl;
+
+        dvb->adapter.priv = dev;
+
+        /* register frontend */
+        result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
+        if (result < 0) {
+                printk(KERN_WARNING
+                       "%s: dvb_register_frontend failed (errno = %d)\n",
+                       dev->name, result);
+                goto fail_frontend;
+        }
+
+        /* register demux stuff */
+        dvb->demux.dmx.capabilities =
+            DMX_TS_FILTERING | DMX_SECTION_FILTERING |
+            DMX_MEMORY_BASED_FILTERING;
+        dvb->demux.priv = dvb;
+        dvb->demux.filternum = 256;
+        dvb->demux.feednum = 256;
+        dvb->demux.start_feed = start_feed;
+        dvb->demux.stop_feed = stop_feed;
+
+        result = dvb_dmx_init(&dvb->demux);
+        if (result < 0) {
+                printk(KERN_WARNING "%s: dvb_dmx_init failed (errno = %d)\n",
+                       dev->name, result);
+                goto fail_dmx;
+        }
+
+        dvb->dmxdev.filternum = 256;
+        dvb->dmxdev.demux = &dvb->demux.dmx;
+        dvb->dmxdev.capabilities = 0;
+        result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
+        if (result < 0) {
+                printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
+                       dev->name, result);
+                goto fail_dmxdev;
+        }
+
+        dvb->fe_hw.source = DMX_FRONTEND_0;
+        result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+        if (result < 0) {
+                printk(KERN_WARNING
+                       "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
+                       dev->name, result);
+                goto fail_fe_hw;
+        }
+
+        dvb->fe_mem.source = DMX_MEMORY_FE;
+        result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
+        if (result < 0) {
+                printk(KERN_WARNING
+                       "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
+                       dev->name, result);
+                goto fail_fe_mem;
+        }
+
+        result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+        if (result < 0) {
+                printk(KERN_WARNING
+                       "%s: connect_frontend failed (errno = %d)\n", dev->name,
+                       result);
+                goto fail_fe_conn;
+        }
+
+        /* register network adapter */
+        dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
+        return 0;
+
+fail_fe_conn:
+        dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);
+fail_fe_mem:
+        dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+fail_fe_hw:
+        dvb_dmxdev_release(&dvb->dmxdev);
+fail_dmxdev:
+        dvb_dmx_release(&dvb->demux);
+fail_dmx:
+        dvb_unregister_frontend(dvb->frontend);
+fail_frontend:
+        dvb_frontend_detach(dvb->frontend);
+        dvb_unregister_adapter(&dvb->adapter);
+fail_adapter:
+        return result;
+}
+
+static void unregister_dvb(struct cx231xx_dvb *dvb)
+{
+        dvb_net_release(&dvb->net);
+        dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);
+        dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_hw);
+        dvb_dmxdev_release(&dvb->dmxdev);
+        dvb_dmx_release(&dvb->demux);
+        dvb_unregister_frontend(dvb->frontend);
+        dvb_frontend_detach(dvb->frontend);
+        dvb_unregister_adapter(&dvb->adapter);
+}
+
+static int dvb_init(struct cx231xx *dev)
+{
+        int result = 0;
+        struct cx231xx_dvb *dvb;
+
+        if (!dev->board.has_dvb) {
+                /* This device does not support the extension */
+                return 0;
+        }
+
+        dvb = kzalloc(sizeof(struct cx231xx_dvb), GFP_KERNEL);
+
+        if (dvb == NULL) {
+                printk(KERN_INFO "cx231xx_dvb: memory allocation failed\n");
+                return -ENOMEM;
+        }
+        dev->dvb = dvb;
+        dev->cx231xx_set_analog_freq = cx231xx_set_analog_freq;
+        dev->cx231xx_reset_analog_tuner = cx231xx_reset_analog_tuner;
+
+        cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
+        /* init frontend */
+        switch (dev->model) {
+        case CX231XX_BOARD_CNXT_RDE_250:
+
+                /* dev->dvb->frontend = dvb_attach(s5h1411_attach,
+                   &dvico_s5h1411_config,
+                   &dev->i2c_bus[1].i2c_adap); */
+                dev->dvb->frontend = dvb_attach(dvb_dummy_fe_ofdm_attach);
+
+                if (dev->dvb->frontend == NULL) {
+                        printk(DRIVER_NAME
+                               ": Failed to attach dummy front end\n");
+                        result = -EINVAL;
+                        goto out_free;
+                }
+
+                /* define general-purpose callback pointer */
+                dvb->frontend->callback = cx231xx_tuner_callback;
+
+                if (dvb_attach(xc5000_attach, dev->dvb->frontend,
+                               &dev->i2c_bus[1].i2c_adap,
+                               &cnxt_rde250_tunerconfig) < 0) {
+                        result = -EINVAL;
+                        goto out_free;
+                }
+
+                break;
+        case CX231XX_BOARD_CNXT_RDU_250:
+
+                dev->dvb->frontend = dvb_attach(dvb_dummy_fe_ofdm_attach);
+
+                if (dev->dvb->frontend == NULL) {
+                        printk(DRIVER_NAME
+                               ": Failed to attach dummy front end\n");
+                        result = -EINVAL;
+                        goto out_free;
+                }
+
+                /* define general-purpose callback pointer */
+                dvb->frontend->callback = cx231xx_tuner_callback;
+
+                if (dvb_attach(xc5000_attach, dev->dvb->frontend,
+                               &dev->i2c_bus[1].i2c_adap,
+                               &cnxt_rde250_tunerconfig) < 0) {
+                        result = -EINVAL;
+                        goto out_free;
+                }
+                break;
+
+        default:
+                printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
+                       " isn't supported yet\n", dev->name);
+                break;
+        }
+        if (NULL == dvb->frontend) {
+                printk(KERN_ERR
+                       "%s/2: frontend initialization failed\n", dev->name);
+                result = -EINVAL;
+                goto out_free;
+        }
+
+        /* register everything */
+        result = register_dvb(dvb, THIS_MODULE, dev, &dev->udev->dev);
+
+        if (result < 0)
+                goto out_free;
+
+        cx231xx_set_mode(dev, CX231XX_SUSPEND);
+        printk(KERN_INFO "Successfully loaded cx231xx-dvb\n");
+        return 0;
+
+out_free:
+        cx231xx_set_mode(dev, CX231XX_SUSPEND);
+        kfree(dvb);
+        dev->dvb = NULL;
+        return result;
+}
+
+static int dvb_fini(struct cx231xx *dev)
+{
+        if (!dev->board.has_dvb) {
+                /* This device does not support the extension */
+                return 0;
+        }
+
+        if (dev->dvb) {
+                unregister_dvb(dev->dvb);
+                dev->dvb = NULL;
+        }
+
+        return 0;
+}
+
+static struct cx231xx_ops dvb_ops = {
+        .id = CX231XX_DVB,
+        .name = "Cx231xx dvb Extension",
+        .init = dvb_init,
+        .fini = dvb_fini,
+};
+
+static int __init cx231xx_dvb_register(void)
+{
+        return cx231xx_register_extension(&dvb_ops);
+}
+
+static void __exit cx231xx_dvb_unregister(void)
+{
+        cx231xx_unregister_extension(&dvb_ops);
+}
+
+module_init(cx231xx_dvb_register);
+module_exit(cx231xx_dvb_unregister);
diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c
new file mode 100644
index 000000000000..b4a03d813e00
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-i2c.c
@@ -0,0 +1,555 @@
+/*
+   cx231xx-i2c.c - driver for Conexant Cx23100/101/102 USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+                Based on em28xx driver
+                Based on Cx23885 driver
+
+   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.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/usb.h>
+#include <linux/i2c.h>
+#include <media/v4l2-common.h>
+#include <media/tuner.h>
+
+#include "cx231xx.h"
+
+/* ----------------------------------------------------------- */
+
+static unsigned int i2c_scan;
+module_param(i2c_scan, int, 0444);
+MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
+
+static unsigned int i2c_debug;
+module_param(i2c_debug, int, 0644);
+MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
+
+#define dprintk1(lvl, fmt, args...)                     \
+do {                                                    \
+        if (i2c_debug >= lvl) {                         \
+                printk(fmt, ##args);                    \
+                }                                       \
+} while (0)
+
+#define dprintk2(lvl, fmt, args...)                     \
+do {                                                    \
+        if (i2c_debug >= lvl) {                         \
+                printk(KERN_DEBUG "%s at %s: " fmt,     \
+                       dev->name, __func__ , ##args);   \
+      }                                                 \
+} while (0)
+
+/*
+ * cx231xx_i2c_send_bytes()
+ */
+int cx231xx_i2c_send_bytes(struct i2c_adapter *i2c_adap,
+                           const struct i2c_msg *msg)
+{
+        struct cx231xx_i2c *bus = i2c_adap->algo_data;
+        struct cx231xx *dev = bus->dev;
+        struct cx231xx_i2c_xfer_data req_data;
+        int status = 0;
+        u16 size = 0;
+        u8 loop = 0;
+        u8 saddr_len = 1;
+        u8 *buf_ptr = NULL;
+        u16 saddr = 0;
+        u8 need_gpio = 0;
+
+        if ((bus->nr == 1) && (msg->addr == 0x61)
+            && (dev->tuner_type == TUNER_XC5000)) {
+
+                size = msg->len;
+
+                if (size == 2) {        /* register write sub addr */
+                        /* Just writing sub address will cause problem
+                        * to XC5000. So ignore the request */
+                        return 0;
+                } else if (size == 4) { /* register write with sub addr */
+                        if (msg->len >= 2)
+                                saddr = msg->buf[0] << 8 | msg->buf[1];
+                        else if (msg->len == 1)
+                                saddr = msg->buf[0];
+
+                        switch (saddr) {
+                        case 0x0000:    /* start tuner calibration mode */
+                                need_gpio = 1;
+                                /* FW Loading is done */
+                                dev->xc_fw_load_done = 1;
+                                break;
+                        case 0x000D:    /* Set signal source */
+                        case 0x0001:    /* Set TV standard - Video */
+                        case 0x0002:    /* Set TV standard - Audio */
+                        case 0x0003:    /* Set RF Frequency */
+                                need_gpio = 1;
+                                break;
+                        default:
+                                if (dev->xc_fw_load_done)
+                                        need_gpio = 1;
+                                break;
+                        }
+
+                        if (need_gpio) {
+                                dprintk1(1,
+                                "GPIO WRITE: addr 0x%x, len %d, saddr 0x%x\n",
+                                msg->addr, msg->len, saddr);
+
+                                return dev->cx231xx_gpio_i2c_write(dev,
+                                                                   msg->addr,
+                                                                   msg->buf,
+                                                                   msg->len);
+                        }
+                }
+
+                /* special case for Xc5000 tuner case */
+                saddr_len = 1;
+
+                /* adjust the length to correct length */
+                size -= saddr_len;
+                buf_ptr = (u8 *) (msg->buf + 1);
+
+                do {
+                        /* prepare xfer_data struct */
+                        req_data.dev_addr = msg->addr;
+                        req_data.direction = msg->flags;
+                        req_data.saddr_len = saddr_len;
+                        req_data.saddr_dat = msg->buf[0];
+                        req_data.buf_size = size > 16 ? 16 : size;
+                        req_data.p_buffer = (u8 *) (buf_ptr + loop * 16);
+
+                        bus->i2c_nostop = (size > 16) ? 1 : 0;
+                        bus->i2c_reserve = (loop == 0) ? 0 : 1;
+
+                        /* usb send command */
+                        status = dev->cx231xx_send_usb_command(bus, &req_data);
+                        loop++;
+
+                        if (size >= 16)
+                                size -= 16;
+                        else
+                                size = 0;
+
+                } while (size > 0);
+
+                bus->i2c_nostop = 0;
+                bus->i2c_reserve = 0;
+
+        } else {                /* regular case */
+
+                /* prepare xfer_data struct */
+                req_data.dev_addr = msg->addr;
+                req_data.direction = msg->flags;
+                req_data.saddr_len = 0;
+                req_data.saddr_dat = 0;
+                req_data.buf_size = msg->len;
+                req_data.p_buffer = msg->buf;
+
+                /* usb send command */
+                status = dev->cx231xx_send_usb_command(bus, &req_data);
+        }
+
+        return status < 0 ? status : 0;
+}
+
+/*
+ * cx231xx_i2c_recv_bytes()
+ * read a byte from the i2c device
+ */
+static int cx231xx_i2c_recv_bytes(struct i2c_adapter *i2c_adap,
+                                  const struct i2c_msg *msg)
+{
+        struct cx231xx_i2c *bus = i2c_adap->algo_data;
+        struct cx231xx *dev = bus->dev;
+        struct cx231xx_i2c_xfer_data req_data;
+        int status = 0;
+        u16 saddr = 0;
+        u8 need_gpio = 0;
+
+        if ((bus->nr == 1) && (msg->addr == 0x61)
+            && dev->tuner_type == TUNER_XC5000) {
+
+                if (msg->len == 2)
+                        saddr = msg->buf[0] << 8 | msg->buf[1];
+                else if (msg->len == 1)
+                        saddr = msg->buf[0];
+
+                if (dev->xc_fw_load_done) {
+
+                        switch (saddr) {
+                        case 0x0009:    /* BUSY check */
+                                dprintk1(1,
+                                "GPIO R E A D: Special case BUSY check \n");
+                                /*Try read BUSY register, just set it to zero*/
+                                msg->buf[0] = 0;
+                                if (msg->len == 2)
+                                        msg->buf[1] = 0;
+                                return 0;
+                        case 0x0004:    /* read Lock status */
+                                need_gpio = 1;
+                                break;
+
+                        }
+
+                        if (need_gpio) {
+                                /* this is a special case to handle Xceive tuner
+                                clock stretch issue with gpio based I2C */
+
+                                dprintk1(1,
+                                "GPIO R E A D: addr 0x%x, len %d, saddr 0x%x\n",
+                                msg->addr, msg->len,
+                                msg->buf[0] << 8 | msg->buf[1]);
+
+                                status =
+                                    dev->cx231xx_gpio_i2c_write(dev, msg->addr,
+                                                                msg->buf,
+                                                                msg->len);
+                                status =
+                                    dev->cx231xx_gpio_i2c_read(dev, msg->addr,
+                                                               msg->buf,
+                                                               msg->len);
+                                return status;
+                        }
+                }
+
+                /* prepare xfer_data struct */
+                req_data.dev_addr = msg->addr;
+                req_data.direction = msg->flags;
+                req_data.saddr_len = msg->len;
+                req_data.saddr_dat = msg->buf[0] << 8 | msg->buf[1];
+                req_data.buf_size = msg->len;
+                req_data.p_buffer = msg->buf;
+
+                /* usb send command */
+                status = dev->cx231xx_send_usb_command(bus, &req_data);
+
+        } else {
+
+                /* prepare xfer_data struct */
+                req_data.dev_addr = msg->addr;
+                req_data.direction = msg->flags;
+                req_data.saddr_len = 0;
+                req_data.saddr_dat = 0;
+                req_data.buf_size = msg->len;
+                req_data.p_buffer = msg->buf;
+
+                /* usb send command */
+                status = dev->cx231xx_send_usb_command(bus, &req_data);
+        }
+
+        return status < 0 ? status : 0;
+}
+
+/*
+ * cx231xx_i2c_recv_bytes_with_saddr()
+ * read a byte from the i2c device
+ */
+static int cx231xx_i2c_recv_bytes_with_saddr(struct i2c_adapter *i2c_adap,
+                                             const struct i2c_msg *msg1,
+                                             const struct i2c_msg *msg2)
+{
+        struct cx231xx_i2c *bus = i2c_adap->algo_data;
+        struct cx231xx *dev = bus->dev;
+        struct cx231xx_i2c_xfer_data req_data;
+        int status = 0;
+        u16 saddr = 0;
+        u8 need_gpio = 0;
+
+        if (msg1->len == 2)
+                saddr = msg1->buf[0] << 8 | msg1->buf[1];
+        else if (msg1->len == 1)
+                saddr = msg1->buf[0];
+
+        if ((bus->nr == 1) && (msg2->addr == 0x61)
+            && dev->tuner_type == TUNER_XC5000) {
+
+                if ((msg2->len < 16)) {
+
+                        dprintk1(1,
+                        "i2c_read: addr 0x%x, len %d, saddr 0x%x, len %d\n",
+                        msg2->addr, msg2->len, saddr, msg1->len);
+
+                        switch (saddr) {
+                        case 0x0008:    /* read FW load status */
+                                need_gpio = 1;
+                                break;
+                        case 0x0004:    /* read Lock status */
+                                need_gpio = 1;
+                                break;
+                        }
+
+                        if (need_gpio) {
+                                status =
+                                    dev->cx231xx_gpio_i2c_write(dev, msg1->addr,
+                                                                msg1->buf,
+                                                                msg1->len);
+                                status =
+                                    dev->cx231xx_gpio_i2c_read(dev, msg2->addr,
+                                                               msg2->buf,
+                                                               msg2->len);
+                                return status;
+                        }
+                }
+        }
+
+        /* prepare xfer_data struct */
+        req_data.dev_addr = msg2->addr;
+        req_data.direction = msg2->flags;
+        req_data.saddr_len = msg1->len;
+        req_data.saddr_dat = saddr;
+        req_data.buf_size = msg2->len;
+        req_data.p_buffer = msg2->buf;
+
+        /* usb send command */
+        status = dev->cx231xx_send_usb_command(bus, &req_data);
+
+        return status < 0 ? status : 0;
+}
+
+/*
+ * cx231xx_i2c_check_for_device()
+ * check if there is a i2c_device at the supplied address
+ */
+static int cx231xx_i2c_check_for_device(struct i2c_adapter *i2c_adap,
+                                        const struct i2c_msg *msg)
+{
+        struct cx231xx_i2c *bus = i2c_adap->algo_data;
+        struct cx231xx *dev = bus->dev;
+        struct cx231xx_i2c_xfer_data req_data;
+        int status = 0;
+
+        /* prepare xfer_data struct */
+        req_data.dev_addr = msg->addr;
+        req_data.direction = msg->flags;
+        req_data.saddr_len = 0;
+        req_data.saddr_dat = 0;
+        req_data.buf_size = 0;
+        req_data.p_buffer = NULL;
+
+        /* usb send command */
+        status = dev->cx231xx_send_usb_command(bus, &req_data);
+
+        return status < 0 ? status : 0;
+}
+
+/*
+ * cx231xx_i2c_xfer()
+ * the main i2c transfer function
+ */
+static int cx231xx_i2c_xfer(struct i2c_adapter *i2c_adap,
+                            struct i2c_msg msgs[], int num)
+{
+        struct cx231xx_i2c *bus = i2c_adap->algo_data;
+        struct cx231xx *dev = bus->dev;
+        int addr, rc, i, byte;
+
+        if (num <= 0)
+                return 0;
+
+        for (i = 0; i < num; i++) {
+
+                addr = msgs[i].addr >> 1;
+
+                dprintk2(2, "%s %s addr=%x len=%d:",
+                         (msgs[i].flags & I2C_M_RD) ? "read" : "write",
+                         i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len);
+                if (!msgs[i].len) {
+                        /* no len: check only for device presence */
+                        rc = cx231xx_i2c_check_for_device(i2c_adap, &msgs[i]);
+                        if (rc < 0) {
+                                dprintk2(2, " no device\n");
+                                return rc;
+                        }
+
+                } else if (msgs[i].flags & I2C_M_RD) {
+                        /* read bytes */
+                        rc = cx231xx_i2c_recv_bytes(i2c_adap, &msgs[i]);
+                        if (i2c_debug >= 2) {
+                                for (byte = 0; byte < msgs[i].len; byte++)
+                                        printk(" %02x", msgs[i].buf[byte]);
+                        }
+                } else if (i + 1 < num && (msgs[i + 1].flags & I2C_M_RD) &&
+                           msgs[i].addr == msgs[i + 1].addr
+                           && (msgs[i].len <= 2) && (bus->nr < 2)) {
+                        /* read bytes */
+                        rc = cx231xx_i2c_recv_bytes_with_saddr(i2c_adap,
+                                                               &msgs[i],
+                                                               &msgs[i + 1]);
+                        if (i2c_debug >= 2) {
+                                for (byte = 0; byte < msgs[i].len; byte++)
+                                        printk(" %02x", msgs[i].buf[byte]);
+                        }
+                        i++;
+                } else {
+                        /* write bytes */
+                        if (i2c_debug >= 2) {
+                                for (byte = 0; byte < msgs[i].len; byte++)
+                                        printk(" %02x", msgs[i].buf[byte]);
+                        }
+                        rc = cx231xx_i2c_send_bytes(i2c_adap, &msgs[i]);
+                }
+                if (rc < 0)
+                        goto err;
+                if (i2c_debug >= 2)
+                        printk("\n");
+        }
+
+        return num;
+err:
+        dprintk2(2, " ERROR: %i\n", rc);
+        return rc;
+}
+
+/* ----------------------------------------------------------- */
+
+/*
+ * functionality()
+ */
+static u32 functionality(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
+}
+
+/*
+ * attach_inform()
+ * gets called when a device attaches to the i2c bus
+ * does some basic configuration
+ */
+static int attach_inform(struct i2c_client *client)
+{
+        struct cx231xx_i2c *bus = i2c_get_adapdata(client->adapter);
+        struct cx231xx *dev = bus->dev;
+
+        switch (client->addr << 1) {
+        case 0x8e:
+                {
+                        struct IR_i2c *ir = i2c_get_clientdata(client);
+                        dprintk1(1, "attach_inform: IR detected (%s).\n",
+                                 ir->phys);
+                        cx231xx_set_ir(dev, ir);
+                        break;
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static struct i2c_algorithm cx231xx_algo = {
+        .master_xfer = cx231xx_i2c_xfer,
+        .functionality = functionality,
+};
+
+static struct i2c_adapter cx231xx_adap_template = {
+        .owner = THIS_MODULE,
+        .name = "cx231xx",
+        .id = I2C_HW_B_CX231XX,
+        .algo = &cx231xx_algo,
+        .client_register = attach_inform,
+};
+
+static struct i2c_client cx231xx_client_template = {
+        .name = "cx231xx internal",
+};
+
+/* ----------------------------------------------------------- */
+
+/*
+ * i2c_devs
+ * incomplete list of known devices
+ */
+static char *i2c_devs[128] = {
+        [0x60 >> 1] = "colibri",
+        [0x88 >> 1] = "hammerhead",
+        [0x8e >> 1] = "CIR",
+        [0x32 >> 1] = "GeminiIII",
+        [0x02 >> 1] = "Aquarius",
+        [0xa0 >> 1] = "eeprom",
+        [0xc0 >> 1] = "tuner/XC3028",
+        [0xc2 >> 1] = "tuner/XC5000",
+};
+
+/*
+ * cx231xx_do_i2c_scan()
+ * check i2c address range for devices
+ */
+void cx231xx_do_i2c_scan(struct cx231xx *dev, struct i2c_client *c)
+{
+        unsigned char buf;
+        int i, rc;
+
+        cx231xx_info(": Checking for I2C devices ..\n");
+        for (i = 0; i < 128; i++) {
+                c->addr = i;
+                rc = i2c_master_recv(c, &buf, 0);
+                if (rc < 0)
+                        continue;
+                cx231xx_info("%s: i2c scan: found device @ 0x%x  [%s]\n",
+                             dev->name, i << 1,
+                             i2c_devs[i] ? i2c_devs[i] : "???");
+        }
+        cx231xx_info(": Completed Checking for I2C devices.\n");
+}
+
+/*
+ * cx231xx_i2c_register()
+ * register i2c bus
+ */
+int cx231xx_i2c_register(struct cx231xx_i2c *bus)
+{
+        struct cx231xx *dev = bus->dev;
+
+        BUG_ON(!dev->cx231xx_send_usb_command);
+
+        memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap));
+        memcpy(&bus->i2c_algo, &cx231xx_algo, sizeof(bus->i2c_algo));
+        memcpy(&bus->i2c_client, &cx231xx_client_template,
+               sizeof(bus->i2c_client));
+
+        bus->i2c_adap.dev.parent = &dev->udev->dev;
+
+        strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
+
+        bus->i2c_algo.data = bus;
+        bus->i2c_adap.algo_data = bus;
+        i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
+        i2c_add_adapter(&bus->i2c_adap);
+
+        bus->i2c_client.adapter = &bus->i2c_adap;
+
+        if (0 == bus->i2c_rc) {
+                if (i2c_scan)
+                        cx231xx_do_i2c_scan(dev, &bus->i2c_client);
+        } else
+                cx231xx_warn("%s: i2c bus %d register FAILED\n",
+                             dev->name, bus->nr);
+
+        return bus->i2c_rc;
+}
+
+/*
+ * cx231xx_i2c_unregister()
+ * unregister i2c_bus
+ */
+int cx231xx_i2c_unregister(struct cx231xx_i2c *bus)
+{
+        i2c_del_adapter(&bus->i2c_adap);
+        return 0;
+}
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c
new file mode 100644
index 000000000000..97e304c3c799
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-input.c
@@ -0,0 +1,246 @@
+/*
+  handle cx231xx IR remotes via linux kernel input layer.
+
+  Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+                Based on em28xx driver
+
+                < This is a place holder for IR now.>
+
+  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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/usb.h>
+
+#include "cx231xx.h"
+
+static unsigned int ir_debug;
+module_param(ir_debug, int, 0644);
+MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
+
+#define i2cdprintk(fmt, arg...) \
+        if (ir_debug) { \
+                printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg); \
+        }
+
+#define dprintk(fmt, arg...) \
+        if (ir_debug) { \
+                printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
+        }
+
+/**********************************************************
+ Polling structure used by cx231xx IR's
+ **********************************************************/
+
+struct cx231xx_ir_poll_result {
+        unsigned int toggle_bit:1;
+        unsigned int read_count:7;
+        u8 rc_address;
+        u8 rc_data[4];
+};
+
+struct cx231xx_IR {
+        struct cx231xx *dev;
+        struct input_dev *input;
+        struct ir_input_state ir;
+        char name[32];
+        char phys[32];
+
+        /* poll external decoder */
+        int polling;
+        struct work_struct work;
+        struct timer_list timer;
+        unsigned int last_toggle:1;
+        unsigned int last_readcount;
+        unsigned int repeat_interval;
+
+        int (*get_key) (struct cx231xx_IR *, struct cx231xx_ir_poll_result *);
+};
+
+/**********************************************************
+ Polling code for cx231xx
+ **********************************************************/
+
+static void cx231xx_ir_handle_key(struct cx231xx_IR *ir)
+{
+        int result;
+        int do_sendkey = 0;
+        struct cx231xx_ir_poll_result poll_result;
+
+        /* read the registers containing the IR status */
+        result = ir->get_key(ir, &poll_result);
+        if (result < 0) {
+                dprintk("ir->get_key() failed %d\n", result);
+                return;
+        }
+
+        dprintk("ir->get_key result tb=%02x rc=%02x lr=%02x data=%02x\n",
+                poll_result.toggle_bit, poll_result.read_count,
+                ir->last_readcount, poll_result.rc_data[0]);
+
+        if (ir->dev->chip_id == CHIP_ID_EM2874) {
+                /* The em2874 clears the readcount field every time the
+                   register is read.  The em2860/2880 datasheet says that it
+                   is supposed to clear the readcount, but it doesn't.  So with
+                   the em2874, we are looking for a non-zero read count as
+                   opposed to a readcount that is incrementing */
+                ir->last_readcount = 0;
+        }
+
+        if (poll_result.read_count == 0) {
+                /* The button has not been pressed since the last read */
+        } else if (ir->last_toggle != poll_result.toggle_bit) {
+                /* A button has been pressed */
+                dprintk("button has been pressed\n");
+                ir->last_toggle = poll_result.toggle_bit;
+                ir->repeat_interval = 0;
+                do_sendkey = 1;
+        } else if (poll_result.toggle_bit == ir->last_toggle &&
+                   poll_result.read_count > 0 &&
+                   poll_result.read_count != ir->last_readcount) {
+                /* The button is still being held down */
+                dprintk("button being held down\n");
+
+                /* Debouncer for first keypress */
+                if (ir->repeat_interval++ > 9) {
+                        /* Start repeating after 1 second */
+                        do_sendkey = 1;
+                }
+        }
+
+        if (do_sendkey) {
+                dprintk("sending keypress\n");
+                ir_input_keydown(ir->input, &ir->ir, poll_result.rc_data[0],
+                                 poll_result.rc_data[0]);
+                ir_input_nokey(ir->input, &ir->ir);
+        }
+
+        ir->last_readcount = poll_result.read_count;
+        return;
+}
+
+static void ir_timer(unsigned long data)
+{
+        struct cx231xx_IR *ir = (struct cx231xx_IR *)data;
+
+        schedule_work(&ir->work);
+}
+
+static void cx231xx_ir_work(struct work_struct *work)
+{
+        struct cx231xx_IR *ir = container_of(work, struct cx231xx_IR, work);
+
+        cx231xx_ir_handle_key(ir);
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
+}
+
+void cx231xx_ir_start(struct cx231xx_IR *ir)
+{
+        setup_timer(&ir->timer, ir_timer, (unsigned long)ir);
+        INIT_WORK(&ir->work, cx231xx_ir_work);
+        schedule_work(&ir->work);
+}
+
+static void cx231xx_ir_stop(struct cx231xx_IR *ir)
+{
+        del_timer_sync(&ir->timer);
+        flush_scheduled_work();
+}
+
+int cx231xx_ir_init(struct cx231xx *dev)
+{
+        struct cx231xx_IR *ir;
+        struct input_dev *input_dev;
+        u8 ir_config;
+        int err = -ENOMEM;
+
+        if (dev->board.ir_codes == NULL) {
+                /* No remote control support */
+                return 0;
+        }
+
+        ir = kzalloc(sizeof(*ir), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!ir || !input_dev)
+                goto err_out_free;
+
+        ir->input = input_dev;
+
+        /* Setup the proper handler based on the chip */
+        switch (dev->chip_id) {
+        default:
+                printk("Unrecognized cx231xx chip id: IR not supported\n");
+                goto err_out_free;
+        }
+
+        /* This is how often we ask the chip for IR information */
+        ir->polling = 100;      /* ms */
+
+        /* init input device */
+        snprintf(ir->name, sizeof(ir->name), "cx231xx IR (%s)", dev->name);
+
+        usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
+        strlcat(ir->phys, "/input0", sizeof(ir->phys));
+
+        ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER, dev->board.ir_codes);
+        input_dev->name = ir->name;
+        input_dev->phys = ir->phys;
+        input_dev->id.bustype = BUS_USB;
+        input_dev->id.version = 1;
+        input_dev->id.vendor = le16_to_cpu(dev->udev->descriptor.idVendor);
+        input_dev->id.product = le16_to_cpu(dev->udev->descriptor.idProduct);
+
+        input_dev->dev.parent = &dev->udev->dev;
+        /* record handles to ourself */
+        ir->dev = dev;
+        dev->ir = ir;
+
+        cx231xx_ir_start(ir);
+
+        /* all done */
+        err = input_register_device(ir->input);
+        if (err)
+                goto err_out_stop;
+
+        return 0;
+err_out_stop:
+        cx231xx_ir_stop(ir);
+        dev->ir = NULL;
+err_out_free:
+        input_free_device(input_dev);
+        kfree(ir);
+        return err;
+}
+
+int cx231xx_ir_fini(struct cx231xx *dev)
+{
+        struct cx231xx_IR *ir = dev->ir;
+
+        /* skip detach on non attached boards */
+        if (!ir)
+                return 0;
+
+        cx231xx_ir_stop(ir);
+        input_unregister_device(ir->input);
+        kfree(ir);
+
+        /* done */
+        dev->ir = NULL;
+        return 0;
+}
diff --git a/drivers/media/video/cx231xx/cx231xx-pcb-cfg.c b/drivers/media/video/cx231xx/cx231xx-pcb-cfg.c
new file mode 100644
index 000000000000..7473c33e823e
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-pcb-cfg.c
@@ -0,0 +1,795 @@
+/*
+   cx231xx-pcb-config.c - driver for Conexant
+                Cx23100/101/102 USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx231xx.h"
+#include "cx231xx-conf-reg.h"
+
+static unsigned int pcb_debug;
+module_param(pcb_debug, int, 0644);
+MODULE_PARM_DESC(pcb_debug, "enable pcb config debug messages [video]");
+
+/******************************************************************************/
+
+struct pcb_config cx231xx_Scenario[] = {
+        {
+         INDEX_SELFPOWER_DIGITAL_ONLY,  /* index */
+         USB_SELF_POWER,        /* power_type */
+         0,                     /* speed , not decide yet */
+         MOD_DIGITAL,           /* mode */
+         SOURCE_TS_BDA,         /* ts1_source, digital tv only */
+         NOT_SUPPORTED,         /* ts2_source  */
+         NOT_SUPPORTED,         /* analog source */
+
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index   */
+         0,                     /* external_index */
+
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            NOT_SUPPORTED,      /* AUDIO */
+            NOT_SUPPORTED,      /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           ,
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         /* full-speed config */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            NOT_SUPPORTED,      /* AUDIO */
+            NOT_SUPPORTED,      /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+
+        {
+         INDEX_SELFPOWER_DUAL_DIGITAL,  /* index */
+         USB_SELF_POWER,        /* power_type */
+         0,                     /* speed , not decide yet */
+         MOD_DIGITAL,           /* mode */
+         SOURCE_TS_BDA,         /* ts1_source, digital tv only */
+         0,                     /* ts2_source,need update from register */
+         NOT_SUPPORTED,         /* analog source */
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            2,                  /* TS2 index */
+            NOT_SUPPORTED,      /* AUDIO */
+            NOT_SUPPORTED,      /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         /* full-speed */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            2,                  /* TS2 index */
+            NOT_SUPPORTED,      /* AUDIO */
+            NOT_SUPPORTED,      /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+
+        {
+         INDEX_SELFPOWER_ANALOG_ONLY,   /* index */
+         USB_SELF_POWER,        /* power_type */
+         0,                     /* speed , not decide yet */
+         MOD_ANALOG | MOD_DIF | MOD_EXTERNAL,   /* mode ,analog tv only */
+         NOT_SUPPORTED,         /* ts1_source, NOT SUPPORT */
+         NOT_SUPPORTED,         /* ts2_source,NOT SUPPORT */
+         0,                     /* analog source, need update */
+
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            NOT_SUPPORTED,      /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            1,                  /* AUDIO */
+            2,                  /* VIDEO */
+            3,                  /* VANC */
+            4,                  /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         /* full-speed */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            NOT_SUPPORTED,      /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            1,                  /* AUDIO */
+            2,                  /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+
+        {
+         INDEX_SELFPOWER_DUAL,  /* index */
+         USB_SELF_POWER,        /* power_type */
+         0,                     /* speed , not decide yet */
+         /* mode ,analog tv and digital path */
+         MOD_ANALOG | MOD_DIF | MOD_DIGITAL | MOD_EXTERNAL,
+         0,                     /* ts1_source,will update in register */
+         NOT_SUPPORTED,         /* ts2_source,NOT SUPPORT */
+         0,                     /* analog source need update */
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            2,                  /* AUDIO */
+            3,                  /* VIDEO */
+            4,                  /* VANC */
+            5,                  /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         /* full-speed */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            2,                  /* AUDIO */
+            3,                  /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+
+        {
+         INDEX_SELFPOWER_TRIPLE,        /* index */
+         USB_SELF_POWER,        /* power_type */
+         0,                     /* speed , not decide yet */
+         /* mode ,analog tv and digital path */
+         MOD_ANALOG | MOD_DIF | MOD_DIGITAL | MOD_EXTERNAL,
+         0,                     /* ts1_source, update in register */
+         0,                     /* ts2_source,update in register */
+         0,                     /* analog source, need update */
+
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            2,                  /* TS2 index */
+            3,                  /* AUDIO */
+            4,                  /* VIDEO */
+            5,                  /* VANC */
+            6,                  /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         /* full-speed */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            2,                  /* TS2 index */
+            3,                  /* AUDIO */
+            4,                  /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+
+        {
+         INDEX_SELFPOWER_COMPRESSOR,    /* index */
+         USB_SELF_POWER,        /* power_type */
+         0,                     /* speed , not decide yet */
+         /* mode ,analog tv AND DIGITAL path */
+         MOD_ANALOG | MOD_DIF | MOD_DIGITAL | MOD_EXTERNAL,
+         NOT_SUPPORTED,         /* ts1_source, disable */
+         SOURCE_TS_BDA,         /* ts2_source */
+         0,                     /* analog source,need update */
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            NOT_SUPPORTED,      /* ts1 index */
+            1,                  /* TS2 index */
+            2,                  /* AUDIO */
+            3,                  /* VIDEO */
+            4,                  /* VANC */
+            5,                  /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         /* full-speed  */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            NOT_SUPPORTED,      /* ts1 index */
+            1,                  /* TS2 index */
+            2,                  /* AUDIO */
+            3,                  /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+
+        {
+         INDEX_BUSPOWER_DIGITAL_ONLY,   /* index */
+         USB_BUS_POWER,         /* power_type */
+         0,                     /* speed , not decide yet */
+         MOD_DIGITAL,           /* mode ,analog tv AND DIGITAL path */
+         SOURCE_TS_BDA,         /* ts1_source, disable */
+         NOT_SUPPORTED,         /* ts2_source */
+         NOT_SUPPORTED,         /* analog source */
+
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index  = 2 */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            NOT_SUPPORTED,      /* AUDIO */
+            NOT_SUPPORTED,      /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         /* full-speed */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index  = 2 */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            NOT_SUPPORTED,      /* AUDIO */
+            NOT_SUPPORTED,      /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+        {
+         INDEX_BUSPOWER_ANALOG_ONLY,    /* index */
+         USB_BUS_POWER,         /* power_type */
+         0,                     /* speed , not decide yet */
+         MOD_ANALOG,            /* mode ,analog tv AND DIGITAL path */
+         NOT_SUPPORTED,         /* ts1_source, disable */
+         NOT_SUPPORTED,         /* ts2_source */
+         SOURCE_ANALOG,         /* analog source--analog */
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            NOT_SUPPORTED,      /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            1,                  /* AUDIO */
+            2,                  /* VIDEO */
+            3,                  /* VANC */
+            4,                  /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         {                      /* full-speed */
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            NOT_SUPPORTED,      /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            1,                  /* AUDIO */
+            2,                  /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+        {
+         INDEX_BUSPOWER_DIF_ONLY,       /* index */
+         USB_BUS_POWER,         /* power_type */
+         0,                     /* speed , not decide yet */
+         /* mode ,analog tv AND DIGITAL path */
+         MOD_DIF | MOD_ANALOG | MOD_DIGITAL | MOD_EXTERNAL,
+         SOURCE_TS_BDA,         /* ts1_source, disable */
+         NOT_SUPPORTED,         /* ts2_source */
+         SOURCE_DIF | SOURCE_ANALOG | SOURCE_EXTERNAL,  /* analog source, dif */
+         0,                     /* digital_index  */
+         0,                     /* analog index */
+         0,                     /* dif_index */
+         0,                     /* external_index */
+         1,                     /* only one configuration */
+         {
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            2,                  /* AUDIO */
+            3,                  /* VIDEO */
+            4,                  /* VANC */
+            5,                  /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         ,
+         {                      /* full speed */
+          {
+           0,                   /* config index */
+           {
+            0,                  /* interrupt ep index */
+            1,                  /* ts1 index */
+            NOT_SUPPORTED,      /* TS2 index */
+            2,                  /* AUDIO */
+            3,                  /* VIDEO */
+            NOT_SUPPORTED,      /* VANC */
+            NOT_SUPPORTED,      /* HANC */
+            NOT_SUPPORTED       /* ir_index */
+            }
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          ,
+          {NOT_SUPPORTED, {NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED, NOT_SUPPORTED, NOT_SUPPORTED,
+                           NOT_SUPPORTED}
+           }
+          }
+         }
+        ,
+
+};
+
+/*****************************************************************/
+
+u32 initialize_cx231xx(struct cx231xx *dev)
+{
+        u32 config_info = 0;
+        struct pcb_config *p_pcb_info;
+        u8 usb_speed = 1;       /* from register,1--HS, 0--FS  */
+        u8 data[4] = { 0, 0, 0, 0 };
+        u32 ts1_source = 0;
+        u32 ts2_source = 0;
+        u32 analog_source = 0;
+        u8 _current_scenario_idx = 0xff;
+
+        ts1_source = SOURCE_TS_BDA;
+        ts2_source = SOURCE_TS_BDA;
+
+        /* read board config register to find out which
+        pcb config it is related to */
+        cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT, data, 4);
+
+        config_info = *((u32 *) data);
+        usb_speed = (u8) (config_info & 0x1);
+
+        /* Verify this device belongs to Bus power or Self power device */
+        if (config_info & BUS_POWER) {  /* bus-power */
+                switch (config_info & BUSPOWER_MASK) {
+                case TS1_PORT | BUS_POWER:
+                        cx231xx_Scenario[INDEX_BUSPOWER_DIGITAL_ONLY].speed =
+                            usb_speed;
+                        p_pcb_info =
+                            &cx231xx_Scenario[INDEX_BUSPOWER_DIGITAL_ONLY];
+                        _current_scenario_idx = INDEX_BUSPOWER_DIGITAL_ONLY;
+                        break;
+                case AVDEC_ENABLE | BUS_POWER:
+                        cx231xx_Scenario[INDEX_BUSPOWER_ANALOG_ONLY].speed =
+                            usb_speed;
+                        p_pcb_info =
+                            &cx231xx_Scenario[INDEX_BUSPOWER_ANALOG_ONLY];
+                        _current_scenario_idx = INDEX_BUSPOWER_ANALOG_ONLY;
+                        break;
+                case AVDEC_ENABLE | BUS_POWER | TS1_PORT:
+                        cx231xx_Scenario[INDEX_BUSPOWER_DIF_ONLY].speed =
+                            usb_speed;
+                        p_pcb_info = &cx231xx_Scenario[INDEX_BUSPOWER_DIF_ONLY];
+                        _current_scenario_idx = INDEX_BUSPOWER_DIF_ONLY;
+                        break;
+                default:
+                        cx231xx_info("bad config in buspower!!!!\n");
+                        cx231xx_info("config_info=%x\n",
+                                     (config_info & BUSPOWER_MASK));
+                        return 1;
+                }
+        } else {                /* self-power */
+
+                switch (config_info & SELFPOWER_MASK) {
+                case TS1_PORT | SELF_POWER:
+                        cx231xx_Scenario[INDEX_SELFPOWER_DIGITAL_ONLY].speed =
+                            usb_speed;
+                        p_pcb_info =
+                            &cx231xx_Scenario[INDEX_SELFPOWER_DIGITAL_ONLY];
+                        _current_scenario_idx = INDEX_SELFPOWER_DIGITAL_ONLY;
+                        break;
+                case TS1_TS2_PORT | SELF_POWER:
+                        cx231xx_Scenario[INDEX_SELFPOWER_DUAL_DIGITAL].speed =
+                            usb_speed;
+                        cx231xx_Scenario[INDEX_SELFPOWER_DUAL_DIGITAL].
+                            ts2_source = ts2_source;
+                        p_pcb_info =
+                            &cx231xx_Scenario[INDEX_SELFPOWER_DUAL_DIGITAL];
+                        _current_scenario_idx = INDEX_SELFPOWER_DUAL_DIGITAL;
+                        break;
+                case AVDEC_ENABLE | SELF_POWER:
+                        cx231xx_Scenario[INDEX_SELFPOWER_ANALOG_ONLY].speed =
+                            usb_speed;
+                        cx231xx_Scenario[INDEX_SELFPOWER_ANALOG_ONLY].
+                            analog_source = analog_source;
+                        p_pcb_info =
+                            &cx231xx_Scenario[INDEX_SELFPOWER_ANALOG_ONLY];
+                        _current_scenario_idx = INDEX_SELFPOWER_ANALOG_ONLY;
+                        break;
+                case AVDEC_ENABLE | TS1_PORT | SELF_POWER:
+                        cx231xx_Scenario[INDEX_SELFPOWER_DUAL].speed =
+                            usb_speed;
+                        cx231xx_Scenario[INDEX_SELFPOWER_DUAL].ts1_source =
+                            ts1_source;
+                        cx231xx_Scenario[INDEX_SELFPOWER_DUAL].analog_source =
+                            analog_source;
+                        p_pcb_info = &cx231xx_Scenario[INDEX_SELFPOWER_DUAL];
+                        _current_scenario_idx = INDEX_SELFPOWER_DUAL;
+                        break;
+                case AVDEC_ENABLE | TS1_TS2_PORT | SELF_POWER:
+                        cx231xx_Scenario[INDEX_SELFPOWER_TRIPLE].speed =
+                            usb_speed;
+                        cx231xx_Scenario[INDEX_SELFPOWER_TRIPLE].ts1_source =
+                            ts1_source;
+                        cx231xx_Scenario[INDEX_SELFPOWER_TRIPLE].ts2_source =
+                            ts2_source;
+                        cx231xx_Scenario[INDEX_SELFPOWER_TRIPLE].analog_source =
+                            analog_source;
+                        p_pcb_info = &cx231xx_Scenario[INDEX_SELFPOWER_TRIPLE];
+                        _current_scenario_idx = INDEX_SELFPOWER_TRIPLE;
+                        break;
+                case AVDEC_ENABLE | TS1VIP_TS2_PORT | SELF_POWER:
+                        cx231xx_Scenario[INDEX_SELFPOWER_COMPRESSOR].speed =
+                            usb_speed;
+                        cx231xx_Scenario[INDEX_SELFPOWER_COMPRESSOR].
+                            analog_source = analog_source;
+                        p_pcb_info =
+                            &cx231xx_Scenario[INDEX_SELFPOWER_COMPRESSOR];
+                        _current_scenario_idx = INDEX_SELFPOWER_COMPRESSOR;
+                        break;
+                default:
+                        cx231xx_info("bad senario!!!!!\n");
+                        cx231xx_info("config_info=%x\n",
+                                     (config_info & SELFPOWER_MASK));
+                        return 1;
+                }
+        }
+
+        dev->current_scenario_idx = _current_scenario_idx;
+
+        memcpy(&dev->current_pcb_config, p_pcb_info,
+                   sizeof(struct pcb_config));
+
+        if (pcb_debug) {
+                cx231xx_info("SC(0x00) register = 0x%x\n", config_info);
+                cx231xx_info("scenario %d\n",
+                            (dev->current_pcb_config.index) + 1);
+                cx231xx_info("type=%x\n", dev->current_pcb_config.type);
+                cx231xx_info("mode=%x\n", dev->current_pcb_config.mode);
+                cx231xx_info("speed=%x\n", dev->current_pcb_config.speed);
+                cx231xx_info("ts1_source=%x\n",
+                             dev->current_pcb_config.ts1_source);
+                cx231xx_info("ts2_source=%x\n",
+                             dev->current_pcb_config.ts2_source);
+                cx231xx_info("analog_source=%x\n",
+                             dev->current_pcb_config.analog_source);
+        }
+
+        return 0;
+}
diff --git a/drivers/media/video/cx231xx/cx231xx-pcb-cfg.h b/drivers/media/video/cx231xx/cx231xx-pcb-cfg.h
new file mode 100644
index 000000000000..f5e46e89f3ab
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-pcb-cfg.h
@@ -0,0 +1,231 @@
+/*
+   cx231xx-pcb-cfg.h - driver for Conexant
+                Cx23100/101/102 USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _PCB_CONFIG_H_
+#define _PCB_CONFIG_H_
+
+#include <linux/init.h>
+#include <linux/module.h>
+
+/***************************************************************************
+                                * Class Information *
+***************************************************************************/
+#define CLASS_DEFAULT       0xFF
+
+enum VENDOR_REQUEST_TYPE {
+        /* Set/Get I2C */
+        VRT_SET_I2C0 = 0x0,
+        VRT_SET_I2C1 = 0x1,
+        VRT_SET_I2C2 = 0x2,
+        VRT_GET_I2C0 = 0x4,
+        VRT_GET_I2C1 = 0x5,
+        VRT_GET_I2C2 = 0x6,
+
+        /* Set/Get GPIO */
+        VRT_SET_GPIO = 0x8,
+        VRT_GET_GPIO = 0x9,
+
+        /* Set/Get GPIE */
+        VRT_SET_GPIE = 0xA,
+        VRT_GET_GPIE = 0xB,
+
+        /* Set/Get Register Control/Status */
+        VRT_SET_REGISTER = 0xC,
+        VRT_GET_REGISTER = 0xD,
+
+        /* Get Extended Compat ID Descriptor */
+        VRT_GET_EXTCID_DESC = 0xFF,
+};
+
+enum BYTE_ENABLE_MASK {
+        ENABLE_ONE_BYTE = 0x1,
+        ENABLE_TWE_BYTE = 0x3,
+        ENABLE_THREE_BYTE = 0x7,
+        ENABLE_FOUR_BYTE = 0xF,
+};
+
+#define SPEED_MASK      0x1
+enum USB_SPEED{
+        FULL_SPEED = 0x0,       /* 0: full speed */
+        HIGH_SPEED = 0x1        /* 1: high speed */
+};
+
+enum _true_false{
+        FALSE = 0,
+        TRUE = 1
+};
+
+#define TS_MASK         0x6
+enum TS_PORT{
+        NO_TS_PORT = 0x0,       /* 2'b00: Neither port used. PCB not a Hybrid,
+                                   only offers Analog TV or Video */
+        TS1_PORT = 0x4,         /* 2'b10: TS1 Input (Hybrid mode :
+                                Digital or External Analog/Compressed source) */
+        TS1_TS2_PORT = 0x6,     /* 2'b11: TS1 & TS2 Inputs
+                                (Dual inputs from Digital and/or
+                                External Analog/Compressed sources) */
+        TS1_EXT_CLOCK = 0x6,    /* 2'b11: TS1 & TS2 as selector
+                                                to external clock */
+        TS1VIP_TS2_PORT = 0x2   /* 2'b01: TS1 used as 656/VIP Output,
+                                   TS2 Input (from Compressor) */
+};
+
+#define EAVP_MASK       0x8
+enum EAV_PRESENT{
+        NO_EXTERNAL_AV = 0x0,   /* 0: No External A/V inputs
+                                                (no need for i2s blcok),
+                                                Analog Tuner must be present */
+        EXTERNAL_AV = 0x8       /* 1: External A/V inputs
+                                                present (requires i2s blk) */
+};
+
+#define ATM_MASK        0x30
+enum AT_MODE{
+        DIF_TUNER = 0x30,       /* 2'b11: IF Tuner (requires use of DIF) */
+        BASEBAND_SOUND = 0x20,  /* 2'b10: Baseband Composite &
+                                                Sound-IF Signals present */
+        NO_TUNER = 0x10         /* 2'b0x: No Analog Tuner present */
+};
+
+#define PWR_SEL_MASK    0x40
+enum POWE_TYPE{
+        SELF_POWER = 0x0,       /* 0: self power */
+        BUS_POWER = 0x40        /* 1: bus power */
+};
+
+enum USB_POWE_TYPE{
+        USB_SELF_POWER = 0,
+        USB_BUS_POWER
+};
+
+#define BO_0_MASK       0x80
+enum AVDEC_STATUS{
+        AVDEC_DISABLE = 0x0,    /* 0: A/V Decoder Disabled */
+        AVDEC_ENABLE = 0x80     /* 1: A/V Decoder Enabled */
+};
+
+#define BO_1_MASK       0x100
+
+#define BUSPOWER_MASK   0xC4    /* for Polaris spec 0.8 */
+#define SELFPOWER_MASK  0x86
+
+/***************************************************************************/
+#define NOT_DECIDE_YET  0xFE
+#define NOT_SUPPORTED   0xFF
+
+/***************************************************************************
+                                * for mod field use *
+***************************************************************************/
+#define MOD_DIGITAL     0x1
+#define MOD_ANALOG      0x2
+#define MOD_DIF         0x4
+#define MOD_EXTERNAL    0x8
+#define CAP_ALL_MOD     0x0f
+
+/***************************************************************************
+                                * source define *
+***************************************************************************/
+#define SOURCE_DIGITAL          0x1
+#define SOURCE_ANALOG           0x2
+#define SOURCE_DIF              0x4
+#define SOURCE_EXTERNAL         0x8
+#define SOURCE_TS_BDA                   0x10
+#define SOURCE_TS_ENCODE                0x20
+#define SOURCE_TS_EXTERNAL      0x40
+
+/***************************************************************************
+                                * interface information define *
+***************************************************************************/
+struct INTERFACE_INFO {
+        u8 interrupt_index;
+        u8 ts1_index;
+        u8 ts2_index;
+        u8 audio_index;
+        u8 video_index;
+        u8 vanc_index;          /* VBI */
+        u8 hanc_index;          /* Sliced CC */
+        u8 ir_index;
+};
+
+enum INDEX_INTERFACE_INFO{
+        INDEX_INTERRUPT = 0x0,
+        INDEX_TS1,
+        INDEX_TS2,
+        INDEX_AUDIO,
+        INDEX_VIDEO,
+        INDEX_VANC,
+        INDEX_HANC,
+        INDEX_IR,
+};
+
+/***************************************************************************
+                                * configuration information define *
+***************************************************************************/
+struct CONFIG_INFO {
+        u8 config_index;
+        struct INTERFACE_INFO interface_info;
+};
+
+struct pcb_config {
+        u8 index;
+        u8 type;                /* bus power or self power,
+                                           self power--0, bus_power--1 */
+        u8 speed;               /* usb speed, 2.0--1, 1.1--0 */
+        u8 mode;                /* digital , anlog, dif or external A/V */
+        u32 ts1_source;         /* three source -- BDA,External,encode */
+        u32 ts2_source;
+        u32 analog_source;
+        u8 digital_index;       /* bus-power used */
+        u8 analog_index;        /* bus-power used */
+        u8 dif_index;           /* bus-power used */
+        u8 external_index;      /* bus-power used */
+        u8 config_num;          /* current config num, 0,1,2,
+                                                   for self-power, always 0 */
+        struct CONFIG_INFO hs_config_info[3];
+        struct CONFIG_INFO fs_config_info[3];
+};
+
+enum INDEX_PCB_CONFIG{
+        INDEX_SELFPOWER_DIGITAL_ONLY = 0x0,
+        INDEX_SELFPOWER_DUAL_DIGITAL,
+        INDEX_SELFPOWER_ANALOG_ONLY,
+        INDEX_SELFPOWER_DUAL,
+        INDEX_SELFPOWER_TRIPLE,
+        INDEX_SELFPOWER_COMPRESSOR,
+        INDEX_BUSPOWER_DIGITAL_ONLY,
+        INDEX_BUSPOWER_ANALOG_ONLY,
+        INDEX_BUSPOWER_DIF_ONLY,
+        INDEX_BUSPOWER_EXTERNAL_ONLY,
+        INDEX_BUSPOWER_EXTERNAL_ANALOG,
+        INDEX_BUSPOWER_EXTERNAL_DIF,
+        INDEX_BUSPOWER_EXTERNAL_DIGITAL,
+        INDEX_BUSPOWER_DIGITAL_ANALOG,
+        INDEX_BUSPOWER_DIGITAL_DIF,
+        INDEX_BUSPOWER_DIGITAL_ANALOG_EXTERNAL,
+        INDEX_BUSPOWER_DIGITAL_DIF_EXTERNAL,
+};
+
+/***************************************************************************/
+struct cx231xx;
+
+u32 initialize_cx231xx(struct cx231xx *p_dev);
+
+#endif
diff --git a/drivers/media/video/cx231xx/cx231xx-reg.h b/drivers/media/video/cx231xx/cx231xx-reg.h
new file mode 100644
index 000000000000..750c5d37d569
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-reg.h
@@ -0,0 +1,1564 @@
+/*
+   cx231xx-reg.h - driver for Conexant Cx23100/101/102
+               USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _CX231XX_REG_H
+#define _CX231XX_REG_H
+
+/*****************************************************************************
+                                * VBI codes *
+*****************************************************************************/
+
+#define SAV_ACTIVE_VIDEO_FIELD1         0x80
+#define EAV_ACTIVE_VIDEO_FIELD1         0x90
+
+#define SAV_ACTIVE_VIDEO_FIELD2         0xc0
+#define EAV_ACTIVE_VIDEO_FIELD2         0xd0
+
+#define SAV_VBLANK_FIELD1               0xa0
+#define EAV_VBLANK_FIELD1               0xb0
+
+#define SAV_VBLANK_FIELD2               0xe0
+#define EAV_VBLANK_FIELD2               0xf0
+
+#define SAV_VBI_FIELD1                  0x20
+#define EAV_VBI_FIELD1                  0x30
+
+#define SAV_VBI_FIELD2                  0x60
+#define EAV_VBI_FIELD2                  0x70
+
+/*****************************************************************************/
+/* Audio ADC Registers */
+#define CH_PWR_CTRL1                    0x0000000e
+#define CH_PWR_CTRL2                    0x0000000f
+/*****************************************************************************/
+
+#define      HOST_REG1                0x000
+#define      FLD_FORCE_CHIP_SEL       0x80
+#define      FLD_AUTO_INC_DIS         0x20
+#define      FLD_PREFETCH_EN          0x10
+/* Reserved [2:3] */
+#define      FLD_DIGITAL_PWR_DN       0x02
+#define      FLD_SLEEP                0x01
+
+/*****************************************************************************/
+#define      HOST_REG2                0x001
+
+/*****************************************************************************/
+#define      HOST_REG3                0x002
+
+/*****************************************************************************/
+/* added for polaris */
+#define      GPIO_PIN_CTL0            0x3
+#define      GPIO_PIN_CTL1            0x4
+#define      GPIO_PIN_CTL2            0x5
+#define      GPIO_PIN_CTL3            0x6
+#define      TS1_PIN_CTL0             0x7
+#define      TS1_PIN_CTL1             0x8
+/*****************************************************************************/
+
+#define      FLD_CLK_IN_EN            0x80
+#define      FLD_XTAL_CTRL            0x70
+#define      FLD_BB_CLK_MODE          0x0C
+#define      FLD_REF_DIV_PLL          0x02
+#define      FLD_REF_SEL_PLL1         0x01
+
+/*****************************************************************************/
+#define      CHIP_CTRL                0x100
+/* Reserved [27] */
+/* Reserved [31:21] */
+#define      FLD_CHIP_ACFG_DIS        0x00100000
+/* Reserved [19] */
+#define      FLD_DUAL_MODE_ADC2       0x00040000
+#define      FLD_SIF_EN               0x00020000
+#define      FLD_SOFT_RST             0x00010000
+#define      FLD_DEVICE_ID            0x0000ffff
+
+/*****************************************************************************/
+#define      AFE_CTRL                 0x104
+#define      AFE_CTRL_C2HH_SRC_CTRL   0x104
+#define      FLD_DIF_OUT_SEL          0xc0000000
+#define      FLD_AUX_PLL_CLK_ALT_SEL  0x3c000000
+#define      FLD_UV_ORDER_MODE        0x02000000
+#define      FLD_FUNC_MODE            0x01800000
+#define      FLD_ROT1_PHASE_CTL       0x007f8000
+#define      FLD_AUD_IN_SEL           0x00004000
+#define      FLD_LUMA_IN_SEL          0x00002000
+#define      FLD_CHROMA_IN_SEL        0x00001000
+/* reserve [11:10] */
+#define      FLD_INV_SPEC_DIS         0x00000200
+#define      FLD_VGA_SEL_CH3          0x00000100
+#define      FLD_VGA_SEL_CH2          0x00000080
+#define      FLD_VGA_SEL_CH1          0x00000040
+#define      FLD_DCR_BYP_CH1          0x00000020
+#define      FLD_DCR_BYP_CH2          0x00000010
+#define      FLD_DCR_BYP_CH3          0x00000008
+#define      FLD_EN_12DB_CH3          0x00000004
+#define      FLD_EN_12DB_CH2          0x00000002
+#define      FLD_EN_12DB_CH1          0x00000001
+
+/* redefine in Cx231xx */
+/*****************************************************************************/
+#define      DC_CTRL1                 0x108
+/* reserve [31:30] */
+#define      FLD_CLAMP_LVL_CH1        0x3fff8000
+#define      FLD_CLAMP_LVL_CH2        0x00007fff
+/*****************************************************************************/
+
+/*****************************************************************************/
+#define      DC_CTRL2                 0x10c
+/* reserve [31:28] */
+#define      FLD_CLAMP_LVL_CH3        0x00fffe00
+#define      FLD_CLAMP_WIND_LENTH     0x000001e0
+#define      FLD_C2HH_SAT_MIN         0x0000001e
+#define      FLD_FLT_BYP_SEL          0x00000001
+/*****************************************************************************/
+
+/*****************************************************************************/
+#define      DC_CTRL3                 0x110
+/* reserve [31:16] */
+#define      FLD_ERR_GAIN_CTL         0x00070000
+#define      FLD_LPF_MIN              0x0000ffff
+/*****************************************************************************/
+
+/*****************************************************************************/
+#define      DC_CTRL4                 0x114
+/* reserve [31:31] */
+#define      FLD_INTG_CH1             0x7fffffff
+/*****************************************************************************/
+
+/*****************************************************************************/
+#define      DC_CTRL5                 0x118
+/* reserve [31:31] */
+#define      FLD_INTG_CH2             0x7fffffff
+/*****************************************************************************/
+
+/*****************************************************************************/
+#define      DC_CTRL6                 0x11c
+/* reserve [31:31] */
+#define      FLD_INTG_CH3             0x7fffffff
+/*****************************************************************************/
+
+/*****************************************************************************/
+#define      PIN_CTRL                 0x120
+#define      FLD_OEF_AGC_RF           0x00000001
+#define      FLD_OEF_AGC_IFVGA        0x00000002
+#define      FLD_OEF_AGC_IF           0x00000004
+#define      FLD_REG_BO_PUD           0x80000000
+#define      FLD_IR_IRQ_STAT          0x40000000
+#define      FLD_AUD_IRQ_STAT         0x20000000
+#define      FLD_VID_IRQ_STAT         0x10000000
+/* Reserved [27:26] */
+#define      FLD_IRQ_N_OUT_EN         0x02000000
+#define      FLD_IRQ_N_POLAR          0x01000000
+/* Reserved [23:6] */
+#define      FLD_OE_AUX_PLL_CLK       0x00000020
+#define      FLD_OE_I2S_BCLK          0x00000010
+#define      FLD_OE_I2S_WCLK          0x00000008
+#define      FLD_OE_AGC_IF            0x00000004
+#define      FLD_OE_AGC_IFVGA         0x00000002
+#define      FLD_OE_AGC_RF            0x00000001
+
+/*****************************************************************************/
+#define      AUD_IO_CTRL              0x124
+/* Reserved [31:8] */
+#define      FLD_I2S_PORT_DIR         0x00000080
+#define      FLD_I2S_OUT_SRC          0x00000040
+#define      FLD_AUD_CHAN3_SRC        0x00000030
+#define      FLD_AUD_CHAN2_SRC        0x0000000c
+#define      FLD_AUD_CHAN1_SRC        0x00000003
+
+/*****************************************************************************/
+#define      AUD_LOCK1                0x128
+#define      FLD_AUD_LOCK_KI_SHIFT    0xc0000000
+#define      FLD_AUD_LOCK_KD_SHIFT    0x30000000
+/* Reserved [27:25] */
+#define      FLD_EN_AV_LOCK           0x01000000
+#define      FLD_VID_COUNT            0x00ffffff
+
+/*****************************************************************************/
+#define      AUD_LOCK2                0x12c
+#define      FLD_AUD_LOCK_KI_MULT     0xf0000000
+#define      FLD_AUD_LOCK_KD_MULT     0x0F000000
+/* Reserved [23:22] */
+#define      FLD_AUD_LOCK_FREQ_SHIFT  0x00300000
+#define      FLD_AUD_COUNT            0x000fffff
+
+/*****************************************************************************/
+#define      AFE_DIAG_CTRL1           0x134
+/* Reserved [31:16] */
+#define      FLD_CUV_DLY_LENGTH       0x0000ff00
+#define      FLD_YC_DLY_LENGTH        0x000000ff
+
+/*****************************************************************************/
+/* Poalris redefine */
+#define      AFE_DIAG_CTRL3           0x138
+/* Reserved [31:26] */
+#define      FLD_AUD_DUAL_FLAG_POL    0x02000000
+#define      FLD_VID_DUAL_FLAG_POL    0x01000000
+/* Reserved [23:23] */
+#define      FLD_COL_CLAMP_DIS_CH1    0x00400000
+#define      FLD_COL_CLAMP_DIS_CH2    0x00200000
+#define      FLD_COL_CLAMP_DIS_CH3    0x00100000
+
+#define      TEST_CTRL1               0x144
+/* Reserved [31:29] */
+#define      FLD_LBIST_EN             0x10000000
+/* Reserved [27:10] */
+#define      FLD_FI_BIST_INTR_R       0x0000200
+#define      FLD_FI_BIST_INTR_L       0x0000100
+#define      FLD_BIST_FAIL_AUD_PLL    0x0000080
+#define      FLD_BIST_INTR_AUD_PLL    0x0000040
+#define      FLD_BIST_FAIL_VID_PLL    0x0000020
+#define      FLD_BIST_INTR_VID_PLL    0x0000010
+/* Reserved [3:1] */
+#define      FLD_CIR_TEST_DIS         0x00000001
+
+/*****************************************************************************/
+#define      TEST_CTRL2               0x148
+#define      FLD_TSXCLK_POL_CTL       0x80000000
+#define      FLD_ISO_CTL_SEL          0x40000000
+#define      FLD_ISO_CTL_EN           0x20000000
+#define      FLD_BIST_DEBUGZ          0x10000000
+#define      FLD_AUD_BIST_TEST_H      0x0f000000
+/* Reserved [23:22] */
+#define      FLD_FLTRN_BIST_TEST_H    0x00020000
+#define      FLD_VID_BIST_TEST_H      0x00010000
+/* Reserved [19:17] */
+#define      FLD_BIST_TEST_H          0x00010000
+/* Reserved [15:13] */
+#define      FLD_TAB_EN               0x00001000
+/* Reserved [11:0] */
+
+/*****************************************************************************/
+#define      BIST_STAT                0x14c
+#define      FLD_AUD_BIST_FAIL_H      0xfff00000
+#define      FLD_FLTRN_BIST_FAIL_H    0x00180000
+#define      FLD_VID_BIST_FAIL_H      0x00070000
+#define      FLD_AUD_BIST_TST_DONE    0x0000fff0
+#define      FLD_FLTRN_BIST_TST_DONE  0x00000008
+#define      FLD_VID_BIST_TST_DONE    0x00000007
+
+/*****************************************************************************/
+/* DirectIF registers definition have been moved to DIF_reg.h                */
+/*****************************************************************************/
+#define      MODE_CTRL                0x400
+#define      FLD_AFD_PAL60_DIS        0x20000000
+#define      FLD_AFD_FORCE_SECAM      0x10000000
+#define      FLD_AFD_FORCE_PALNC      0x08000000
+#define      FLD_AFD_FORCE_PAL        0x04000000
+#define      FLD_AFD_PALM_SEL         0x03000000
+#define      FLD_CKILL_MODE           0x00300000
+#define      FLD_COMB_NOTCH_MODE      0x00c00000       /* bit[19:18] */
+#define      FLD_CLR_LOCK_STAT        0x00020000
+#define      FLD_FAST_LOCK_MD         0x00010000
+#define      FLD_WCEN                 0x00008000
+#define      FLD_CAGCEN               0x00004000
+#define      FLD_CKILLEN              0x00002000
+#define      FLD_AUTO_SC_LOCK         0x00001000
+#define      FLD_MAN_SC_FAST_LOCK     0x00000800
+#define      FLD_INPUT_MODE           0x00000600
+#define      FLD_AFD_ACQUIRE          0x00000100
+#define      FLD_AFD_NTSC_SEL         0x00000080
+#define      FLD_AFD_PAL_SEL          0x00000040
+#define      FLD_ACFG_DIS             0x00000020
+#define      FLD_SQ_PIXEL             0x00000010
+#define      FLD_VID_FMT_SEL          0x0000000f
+
+/*****************************************************************************/
+#define      OUT_CTRL1                0x404
+#define      FLD_POLAR                0x7f000000
+/* Reserved [23] */
+#define      FLD_RND_MODE             0x00600000
+#define      FLD_VIPCLAMP_EN          0x00100000
+#define      FLD_VIPBLANK_EN          0x00080000
+#define      FLD_VIP_OPT_AL           0x00040000
+#define      FLD_IDID0_SOURCE         0x00020000
+#define      FLD_DCMODE               0x00010000
+#define      FLD_CLK_GATING           0x0000c000
+#define      FLD_CLK_INVERT           0x00002000
+#define      FLD_HSFMT                0x00001000
+#define      FLD_VALIDFMT             0x00000800
+#define      FLD_ACTFMT               0x00000400
+#define      FLD_SWAPRAW              0x00000200
+#define      FLD_CLAMPRAW_EN          0x00000100
+#define      FLD_BLUE_FIELD_EN        0x00000080
+#define      FLD_BLUE_FIELD_ACT       0x00000040
+#define      FLD_TASKBIT_VAL          0x00000020
+#define      FLD_ANC_DATA_EN          0x00000010
+#define      FLD_VBIHACTRAW_EN        0x00000008
+#define      FLD_MODE10B              0x00000004
+#define      FLD_OUT_MODE             0x00000003
+
+/*****************************************************************************/
+#define      OUT_CTRL2                0x408
+#define      FLD_AUD_GRP              0xc0000000
+#define      FLD_SAMPLE_RATE          0x30000000
+#define      FLD_AUD_ANC_EN           0x08000000
+#define      FLD_EN_C                 0x04000000
+#define      FLD_EN_B                 0x02000000
+#define      FLD_EN_A                 0x01000000
+/* Reserved [23:20] */
+#define      FLD_IDID1_LSB            0x000c0000
+#define      FLD_IDID0_LSB            0x00030000
+#define      FLD_IDID1_MSB            0x0000ff00
+#define      FLD_IDID0_MSB            0x000000ff
+
+/*****************************************************************************/
+#define      GEN_STAT                 0x40c
+#define      FLD_VCR_DETECT           0x00800000
+#define      FLD_SPECIAL_PLAY_N       0x00400000
+#define      FLD_VPRES                0x00200000
+#define      FLD_AGC_LOCK             0x00100000
+#define      FLD_CSC_LOCK             0x00080000
+#define      FLD_VLOCK                0x00040000
+#define      FLD_SRC_LOCK             0x00020000
+#define      FLD_HLOCK                0x00010000
+#define      FLD_VSYNC_N              0x00008000
+#define      FLD_SRC_FIFO_UFLOW       0x00004000
+#define      FLD_SRC_FIFO_OFLOW       0x00002000
+#define      FLD_FIELD                0x00001000
+#define      FLD_AFD_FMT_STAT         0x00000f00
+#define      FLD_MV_TYPE2_PAIR        0x00000080
+#define      FLD_MV_T3CS              0x00000040
+#define      FLD_MV_CS                0x00000020
+#define      FLD_MV_PSP               0x00000010
+/* Reserved [3] */
+#define      FLD_MV_CDAT              0x00000003
+
+/*****************************************************************************/
+#define      INT_STAT_MASK            0x410
+#define      FLD_COMB_3D_FIFO_MSK     0x80000000
+#define      FLD_WSS_DAT_AVAIL_MSK    0x40000000
+#define      FLD_GS2_DAT_AVAIL_MSK    0x20000000
+#define      FLD_GS1_DAT_AVAIL_MSK    0x10000000
+#define      FLD_CC_DAT_AVAIL_MSK     0x08000000
+#define      FLD_VPRES_CHANGE_MSK     0x04000000
+#define      FLD_MV_CHANGE_MSK        0x02000000
+#define      FLD_END_VBI_EVEN_MSK     0x01000000
+#define      FLD_END_VBI_ODD_MSK      0x00800000
+#define      FLD_FMT_CHANGE_MSK       0x00400000
+#define      FLD_VSYNC_TRAIL_MSK      0x00200000
+#define      FLD_HLOCK_CHANGE_MSK     0x00100000
+#define      FLD_VLOCK_CHANGE_MSK     0x00080000
+#define      FLD_CSC_LOCK_CHANGE_MSK  0x00040000
+#define      FLD_SRC_FIFO_UFLOW_MSK   0x00020000
+#define      FLD_SRC_FIFO_OFLOW_MSK   0x00010000
+#define      FLD_COMB_3D_FIFO_STAT    0x00008000
+#define      FLD_WSS_DAT_AVAIL_STAT   0x00004000
+#define      FLD_GS2_DAT_AVAIL_STAT   0x00002000
+#define      FLD_GS1_DAT_AVAIL_STAT   0x00001000
+#define      FLD_CC_DAT_AVAIL_STAT    0x00000800
+#define      FLD_VPRES_CHANGE_STAT    0x00000400
+#define      FLD_MV_CHANGE_STAT       0x00000200
+#define      FLD_END_VBI_EVEN_STAT    0x00000100
+#define      FLD_END_VBI_ODD_STAT     0x00000080
+#define      FLD_FMT_CHANGE_STAT      0x00000040
+#define      FLD_VSYNC_TRAIL_STAT     0x00000020
+#define      FLD_HLOCK_CHANGE_STAT    0x00000010
+#define      FLD_VLOCK_CHANGE_STAT    0x00000008
+#define      FLD_CSC_LOCK_CHANGE_STAT 0x00000004
+#define      FLD_SRC_FIFO_UFLOW_STAT  0x00000002
+#define      FLD_SRC_FIFO_OFLOW_STAT  0x00000001
+
+/*****************************************************************************/
+#define      LUMA_CTRL                0x414
+#define      BRIGHTNESS_CTRL_BYTE     0x414
+#define      CONTRAST_CTRL_BYTE       0x415
+#define      LUMA_CTRL_BYTE_3         0x416
+#define      FLD_LUMA_CORE_SEL        0x00c00000
+#define      FLD_RANGE                0x00300000
+/* Reserved [19] */
+#define      FLD_PEAK_EN              0x00040000
+#define      FLD_PEAK_SEL             0x00030000
+#define      FLD_CNTRST               0x0000ff00
+#define      FLD_BRITE                0x000000ff
+
+/*****************************************************************************/
+#define      HSCALE_CTRL              0x418
+#define      FLD_HFILT                0x03000000
+#define      FLD_HSCALE               0x00ffffff
+
+/*****************************************************************************/
+#define      VSCALE_CTRL              0x41c
+#define      FLD_LINE_AVG_DIS         0x01000000
+/* Reserved [23:20] */
+#define      FLD_VS_INTRLACE          0x00080000
+#define      FLD_VFILT                0x00070000
+/* Reserved [15:13] */
+#define      FLD_VSCALE               0x00001fff
+
+/*****************************************************************************/
+#define      CHROMA_CTRL              0x420
+#define      USAT_CTRL_BYTE           0x420
+#define      VSAT_CTRL_BYTE           0x421
+#define      HUE_CTRL_BYTE            0x422
+#define      FLD_C_LPF_EN             0x20000000
+#define      FLD_CHR_DELAY            0x1c000000
+#define      FLD_C_CORE_SEL           0x03000000
+#define      FLD_HUE                  0x00ff0000
+#define      FLD_VSAT                 0x0000ff00
+#define      FLD_USAT                 0x000000ff
+
+/*****************************************************************************/
+#define      VBI_LINE_CTRL1           0x424
+#define      FLD_VBI_MD_LINE4         0xff000000
+#define      FLD_VBI_MD_LINE3         0x00ff0000
+#define      FLD_VBI_MD_LINE2         0x0000ff00
+#define      FLD_VBI_MD_LINE1         0x000000ff
+
+/*****************************************************************************/
+#define      VBI_LINE_CTRL2           0x428
+#define      FLD_VBI_MD_LINE8         0xff000000
+#define      FLD_VBI_MD_LINE7         0x00ff0000
+#define      FLD_VBI_MD_LINE6         0x0000ff00
+#define      FLD_VBI_MD_LINE5         0x000000ff
+
+/*****************************************************************************/
+#define      VBI_LINE_CTRL3           0x42c
+#define      FLD_VBI_MD_LINE12        0xff000000
+#define      FLD_VBI_MD_LINE11        0x00ff0000
+#define      FLD_VBI_MD_LINE10        0x0000ff00
+#define      FLD_VBI_MD_LINE9         0x000000ff
+
+/*****************************************************************************/
+#define      VBI_LINE_CTRL4           0x430
+#define      FLD_VBI_MD_LINE16        0xff000000
+#define      FLD_VBI_MD_LINE15        0x00ff0000
+#define      FLD_VBI_MD_LINE14        0x0000ff00
+#define      FLD_VBI_MD_LINE13        0x000000ff
+
+/*****************************************************************************/
+#define      VBI_LINE_CTRL5           0x434
+#define      FLD_VBI_MD_LINE17        0x000000ff
+
+/*****************************************************************************/
+#define      VBI_FC_CFG               0x438
+#define      FLD_FC_ALT2              0xff000000
+#define      FLD_FC_ALT1              0x00ff0000
+#define      FLD_FC_ALT2_TYPE         0x0000f000
+#define      FLD_FC_ALT1_TYPE         0x00000f00
+/* Reserved [7:1] */
+#define      FLD_FC_SEARCH_MODE       0x00000001
+
+/*****************************************************************************/
+#define      VBI_MISC_CFG1            0x43c
+#define      FLD_TTX_PKTADRU          0xfff00000
+#define      FLD_TTX_PKTADRL          0x000fff00
+/* Reserved [7:6] */
+#define      FLD_MOJI_PACK_DIS        0x00000020
+#define      FLD_VPS_DEC_DIS          0x00000010
+#define      FLD_CRI_MARG_SCALE       0x0000000c
+#define      FLD_EDGE_RESYNC_EN       0x00000002
+#define      FLD_ADAPT_SLICE_DIS      0x00000001
+
+/*****************************************************************************/
+#define      VBI_MISC_CFG2            0x440
+#define      FLD_HAMMING_TYPE         0x0f000000
+/* Reserved [23:20] */
+#define      FLD_WSS_FIFO_RST         0x00080000
+#define      FLD_GS2_FIFO_RST         0x00040000
+#define      FLD_GS1_FIFO_RST         0x00020000
+#define      FLD_CC_FIFO_RST          0x00010000
+/* Reserved [15:12] */
+#define      FLD_VBI3_SDID            0x00000f00
+#define      FLD_VBI2_SDID            0x000000f0
+#define      FLD_VBI1_SDID            0x0000000f
+
+/*****************************************************************************/
+#define      VBI_PAY1                 0x444
+#define      FLD_GS1_FIFO_DAT         0xFF000000
+#define      FLD_GS1_STAT             0x00FF0000
+#define      FLD_CC_FIFO_DAT          0x0000FF00
+#define      FLD_CC_STAT              0x000000FF
+
+/*****************************************************************************/
+#define      VBI_PAY2                 0x448
+#define      FLD_WSS_FIFO_DAT         0xff000000
+#define      FLD_WSS_STAT             0x00ff0000
+#define      FLD_GS2_FIFO_DAT         0x0000ff00
+#define      FLD_GS2_STAT             0x000000ff
+
+/*****************************************************************************/
+#define      VBI_CUST1_CFG1           0x44c
+/* Reserved [31] */
+#define      FLD_VBI1_CRIWIN          0x7f000000
+#define      FLD_VBI1_SLICE_DIST      0x00f00000
+#define      FLD_VBI1_BITINC          0x000fff00
+#define      FLD_VBI1_HDELAY          0x000000ff
+
+/*****************************************************************************/
+#define      VBI_CUST1_CFG2           0x450
+#define      FLD_VBI1_FC_LENGTH       0x1f000000
+#define      FLD_VBI1_FRAME_CODE      0x00ffffff
+
+/*****************************************************************************/
+#define      VBI_CUST1_CFG3           0x454
+#define      FLD_VBI1_HAM_EN          0x80000000
+#define      FLD_VBI1_FIFO_MODE       0x70000000
+#define      FLD_VBI1_FORMAT_TYPE     0x0f000000
+#define      FLD_VBI1_PAYLD_LENGTH    0x00ff0000
+#define      FLD_VBI1_CRI_LENGTH      0x0000f000
+#define      FLD_VBI1_CRI_MARGIN      0x00000f00
+#define      FLD_VBI1_CRI_TIME        0x000000ff
+
+/*****************************************************************************/
+#define      VBI_CUST2_CFG1           0x458
+/* Reserved [31] */
+#define      FLD_VBI2_CRIWIN          0x7f000000
+#define      FLD_VBI2_SLICE_DIST      0x00f00000
+#define      FLD_VBI2_BITINC          0x000fff00
+#define      FLD_VBI2_HDELAY          0x000000ff
+
+/*****************************************************************************/
+#define      VBI_CUST2_CFG2           0x45c
+#define      FLD_VBI2_FC_LENGTH       0x1f000000
+#define      FLD_VBI2_FRAME_CODE      0x00ffffff
+
+/*****************************************************************************/
+#define      VBI_CUST2_CFG3           0x460
+#define      FLD_VBI2_HAM_EN          0x80000000
+#define      FLD_VBI2_FIFO_MODE       0x70000000
+#define      FLD_VBI2_FORMAT_TYPE     0x0f000000
+#define      FLD_VBI2_PAYLD_LENGTH    0x00ff0000
+#define      FLD_VBI2_CRI_LENGTH      0x0000f000
+#define      FLD_VBI2_CRI_MARGIN      0x00000f00
+#define      FLD_VBI2_CRI_TIME        0x000000ff
+
+/*****************************************************************************/
+#define      VBI_CUST3_CFG1           0x464
+/* Reserved [31] */
+#define      FLD_VBI3_CRIWIN          0x7f000000
+#define      FLD_VBI3_SLICE_DIST      0x00f00000
+#define      FLD_VBI3_BITINC          0x000fff00
+#define      FLD_VBI3_HDELAY          0x000000ff
+
+/*****************************************************************************/
+#define      VBI_CUST3_CFG2           0x468
+#define      FLD_VBI3_FC_LENGTH       0x1f000000
+#define      FLD_VBI3_FRAME_CODE      0x00ffffff
+
+/*****************************************************************************/
+#define      VBI_CUST3_CFG3           0x46c
+#define      FLD_VBI3_HAM_EN          0x80000000
+#define      FLD_VBI3_FIFO_MODE       0x70000000
+#define      FLD_VBI3_FORMAT_TYPE     0x0f000000
+#define      FLD_VBI3_PAYLD_LENGTH    0x00ff0000
+#define      FLD_VBI3_CRI_LENGTH      0x0000f000
+#define      FLD_VBI3_CRI_MARGIN      0x00000f00
+#define      FLD_VBI3_CRI_TIME        0x000000ff
+
+/*****************************************************************************/
+#define      HORIZ_TIM_CTRL           0x470
+#define      FLD_BGDEL_CNT            0xff000000
+/* Reserved [23:22] */
+#define      FLD_HACTIVE_CNT          0x003ff000
+/* Reserved [11:10] */
+#define      FLD_HBLANK_CNT           0x000003ff
+
+/*****************************************************************************/
+#define      VERT_TIM_CTRL            0x474
+#define      FLD_V656BLANK_CNT        0xff000000
+/* Reserved [23:22] */
+#define      FLD_VACTIVE_CNT          0x003ff000
+/* Reserved [11:10] */
+#define      FLD_VBLANK_CNT           0x000003ff
+
+/*****************************************************************************/
+#define      SRC_COMB_CFG             0x478
+#define      FLD_CCOMB_2LN_CHECK      0x80000000
+#define      FLD_CCOMB_3LN_EN         0x40000000
+#define      FLD_CCOMB_2LN_EN         0x20000000
+#define      FLD_CCOMB_3D_EN          0x10000000
+/* Reserved [27] */
+#define      FLD_LCOMB_3LN_EN         0x04000000
+#define      FLD_LCOMB_2LN_EN         0x02000000
+#define      FLD_LCOMB_3D_EN          0x01000000
+#define      FLD_LUMA_LPF_SEL         0x00c00000
+#define      FLD_UV_LPF_SEL           0x00300000
+#define      FLD_BLEND_SLOPE          0x000f0000
+#define      FLD_CCOMB_REDUCE_EN      0x00008000
+/* Reserved [14:10] */
+#define      FLD_SRC_DECIM_RATIO      0x000003ff
+
+/*****************************************************************************/
+#define      CHROMA_VBIOFF_CFG        0x47c
+#define      FLD_VBI_VOFFSET          0x1f000000
+/* Reserved [23:20] */
+#define      FLD_SC_STEP              0x000fffff
+
+/*****************************************************************************/
+#define      FIELD_COUNT              0x480
+#define      FLD_FIELD_COUNT_FLD      0x000003ff
+
+/*****************************************************************************/
+#define      MISC_TIM_CTRL            0x484
+#define      FLD_DEBOUNCE_COUNT       0xc0000000
+#define      FLD_VT_LINE_CNT_HYST     0x30000000
+/* Reserved [27] */
+#define      FLD_AFD_STAT             0x07ff0000
+#define      FLD_VPRES_VERT_EN        0x00008000
+/* Reserved [14:12] */
+#define      FLD_HR32                 0x00000800
+#define      FLD_TDALGN               0x00000400
+#define      FLD_TDFIELD              0x00000200
+/* Reserved [8:6] */
+#define      FLD_TEMPDEC              0x0000003f
+
+/*****************************************************************************/
+#define      DFE_CTRL1                0x488
+#define      FLD_CLAMP_AUTO_EN        0x80000000
+#define      FLD_AGC_AUTO_EN          0x40000000
+#define      FLD_VGA_CRUSH_EN         0x20000000
+#define      FLD_VGA_AUTO_EN          0x10000000
+#define      FLD_VBI_GATE_EN          0x08000000
+#define      FLD_CLAMP_LEVEL          0x07000000
+/* Reserved [23:22] */
+#define      FLD_CLAMP_SKIP_CNT       0x00300000
+#define      FLD_AGC_GAIN             0x000fff00
+/* Reserved [7:6] */
+#define      FLD_VGA_GAIN             0x0000003f
+
+/*****************************************************************************/
+#define      DFE_CTRL2                0x48c
+#define      FLD_VGA_ACQUIRE_RANGE    0x00ff0000
+#define      FLD_VGA_TRACK_RANGE      0x0000ff00
+#define      FLD_VGA_SYNC             0x000000ff
+
+/*****************************************************************************/
+#define      DFE_CTRL3                0x490
+#define      FLD_BP_PERCENT           0xff000000
+#define      FLD_DFT_THRESHOLD        0x00ff0000
+/* Reserved [15:12] */
+#define      FLD_SYNC_WIDTH_SEL       0x00000600
+#define      FLD_BP_LOOP_GAIN         0x00000300
+#define      FLD_SYNC_LOOP_GAIN       0x000000c0
+/* Reserved [5:4] */
+#define      FLD_AGC_LOOP_GAIN        0x0000000c
+#define      FLD_DCC_LOOP_GAIN        0x00000003
+
+/*****************************************************************************/
+#define      PLL_CTRL                 0x494
+#define      FLD_PLL_KD               0xff000000
+#define      FLD_PLL_KI               0x00ff0000
+#define      FLD_PLL_MAX_OFFSET       0x0000ffff
+
+/*****************************************************************************/
+#define      HTL_CTRL                 0x498
+/* Reserved [31:24] */
+#define      FLD_AUTO_LOCK_SPD        0x00080000
+#define      FLD_MAN_FAST_LOCK        0x00040000
+#define      FLD_HTL_15K_EN           0x00020000
+#define      FLD_HTL_500K_EN          0x00010000
+#define      FLD_HTL_KD               0x0000ff00
+#define      FLD_HTL_KI               0x000000ff
+
+/*****************************************************************************/
+#define      COMB_CTRL                0x49c
+#define      FLD_COMB_PHASE_LIMIT     0xff000000
+#define      FLD_CCOMB_ERR_LIMIT      0x00ff0000
+#define      FLD_LUMA_THRESHOLD       0x0000ff00
+#define      FLD_LCOMB_ERR_LIMIT      0x000000ff
+
+/*****************************************************************************/
+#define      CRUSH_CTRL               0x4a0
+#define      FLD_WTW_EN               0x00400000
+#define      FLD_CRUSH_FREQ           0x00200000
+#define      FLD_MAJ_SEL_EN           0x00100000
+#define      FLD_MAJ_SEL              0x000c0000
+/* Reserved [17:15] */
+#define      FLD_SYNC_TIP_REDUCE      0x00007e00
+/* Reserved [8:6] */
+#define      FLD_SYNC_TIP_INC         0x0000003f
+
+/*****************************************************************************/
+#define      SOFT_RST_CTRL            0x4a4
+#define      FLD_VD_SOFT_RST          0x00008000
+/* Reserved [14:12] */
+#define      FLD_REG_RST_MSK          0x00000800
+#define      FLD_VOF_RST_MSK          0x00000400
+#define      FLD_MVDET_RST_MSK        0x00000200
+#define      FLD_VBI_RST_MSK          0x00000100
+#define      FLD_SCALE_RST_MSK        0x00000080
+#define      FLD_CHROMA_RST_MSK       0x00000040
+#define      FLD_LUMA_RST_MSK         0x00000020
+#define      FLD_VTG_RST_MSK          0x00000010
+#define      FLD_YCSEP_RST_MSK        0x00000008
+#define      FLD_SRC_RST_MSK          0x00000004
+#define      FLD_DFE_RST_MSK          0x00000002
+/* Reserved [0] */
+
+/*****************************************************************************/
+#define      MV_DT_CTRL1              0x4a8
+/* Reserved [31:29] */
+#define      FLD_PSP_STOP_LINE        0x1f000000
+/* Reserved [23:21] */
+#define      FLD_PSP_STRT_LINE        0x001f0000
+/* Reserved [15] */
+#define      FLD_PSP_LLIMW            0x00007f00
+/* Reserved [7] */
+#define      FLD_PSP_ULIMW            0x0000007f
+
+/*****************************************************************************/
+#define      MV_DT_CTRL2              0x4aC
+#define      FLD_CS_STOPWIN           0xff000000
+#define      FLD_CS_STRTWIN           0x00ff0000
+#define      FLD_CS_WIDTH             0x0000ff00
+#define      FLD_PSP_SPEC_VAL         0x000000ff
+
+/*****************************************************************************/
+#define      MV_DT_CTRL3              0x4B0
+#define      FLD_AUTO_RATE_DIS        0x80000000
+#define      FLD_HLOCK_DIS            0x40000000
+#define      FLD_SEL_FIELD_CNT        0x20000000
+#define      FLD_CS_TYPE2_SEL         0x10000000
+#define      FLD_CS_LINE_THRSH_SEL    0x08000000
+#define      FLD_CS_ATHRESH_SEL       0x04000000
+#define      FLD_PSP_SPEC_SEL         0x02000000
+#define      FLD_PSP_LINES_SEL        0x01000000
+#define      FLD_FIELD_CNT            0x00f00000
+#define      FLD_CS_TYPE2_CNT         0x000fc000
+#define      FLD_CS_LINE_CNT          0x00003f00
+#define      FLD_CS_ATHRESH_LEV       0x000000ff
+
+/*****************************************************************************/
+#define      CHIP_VERSION             0x4b4
+/* Cx231xx redefine  */
+#define      VERSION                  0x4b4
+#define      FLD_REV_ID               0x000000ff
+
+/*****************************************************************************/
+#define      MISC_DIAG_CTRL           0x4b8
+/* Reserved [31:24] */
+#define      FLD_SC_CONVERGE_THRESH   0x00ff0000
+#define      FLD_CCOMB_ERR_LIMIT_3D   0x0000ff00
+#define      FLD_LCOMB_ERR_LIMIT_3D   0x000000ff
+
+/*****************************************************************************/
+#define      VBI_PASS_CTRL            0x4bc
+#define      FLD_VBI_PASS_MD          0x00200000
+#define      FLD_VBI_SETUP_DIS        0x00100000
+#define      FLD_PASS_LINE_CTRL       0x000fffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      VCR_DET_CTRL             0x4c0
+#define      FLD_EN_FIELD_PHASE_DET   0x80000000
+#define      FLD_EN_HEAD_SW_DET       0x40000000
+#define      FLD_FIELD_PHASE_LENGTH   0x01ff0000
+/* Reserved [29:25] */
+#define      FLD_FIELD_PHASE_DELAY    0x0000ff00
+#define      FLD_FIELD_PHASE_LIMIT    0x000000f0
+#define      FLD_HEAD_SW_DET_LIMIT    0x0000000f
+
+/*****************************************************************************/
+#define      DL_CTL                   0x800
+#define      DL_CTL_ADDRESS_LOW       0x800    /* Byte 1 in DL_CTL */
+#define      DL_CTL_ADDRESS_HIGH      0x801    /* Byte 2 in DL_CTL */
+#define      DL_CTL_DATA              0x802    /* Byte 3 in DL_CTL */
+#define      DL_CTL_CONTROL           0x803    /* Byte 4 in DL_CTL */
+/* Reserved [31:5] */
+#define      FLD_START_8051           0x10000000
+#define      FLD_DL_ENABLE            0x08000000
+#define      FLD_DL_AUTO_INC          0x04000000
+#define      FLD_DL_MAP               0x03000000
+
+/*****************************************************************************/
+#define      STD_DET_STATUS           0x804
+#define      FLD_SPARE_STATUS1        0xff000000
+#define      FLD_SPARE_STATUS0        0x00ff0000
+#define      FLD_MOD_DET_STATUS1      0x0000ff00
+#define      FLD_MOD_DET_STATUS0      0x000000ff
+
+/*****************************************************************************/
+#define      AUD_BUILD_NUM            0x806
+#define      AUD_VER_NUM              0x807
+#define      STD_DET_CTL              0x808
+#define      STD_DET_CTL_AUD_CTL      0x808    /* Byte 1 in STD_DET_CTL */
+#define      STD_DET_CTL_PREF_MODE    0x809    /* Byte 2 in STD_DET_CTL */
+#define      FLD_SPARE_CTL0           0xff000000
+#define      FLD_DIS_DBX              0x00800000
+#define      FLD_DIS_BTSC             0x00400000
+#define      FLD_DIS_NICAM_A2         0x00200000
+#define      FLD_VIDEO_PRESENT        0x00100000
+#define      FLD_DW8051_VIDEO_FORMAT  0x000f0000
+#define      FLD_PREF_DEC_MODE        0x0000ff00
+#define      FLD_AUD_CONFIG           0x000000ff
+
+/*****************************************************************************/
+#define      DW8051_INT               0x80c
+#define      FLD_VIDEO_PRESENT_CHANGE 0x80000000
+#define      FLD_VIDEO_CHANGE         0x40000000
+#define      FLD_RDS_READY            0x20000000
+#define      FLD_AC97_INT             0x10000000
+#define      FLD_NICAM_BIT_ERROR_TOO_HIGH         0x08000000
+#define      FLD_NICAM_LOCK           0x04000000
+#define      FLD_NICAM_UNLOCK         0x02000000
+#define      FLD_DFT4_TH_CMP          0x01000000
+/* Reserved [23:22] */
+#define      FLD_LOCK_IND_INT         0x00200000
+#define      FLD_DFT3_TH_CMP          0x00100000
+#define      FLD_DFT2_TH_CMP          0x00080000
+#define      FLD_DFT1_TH_CMP          0x00040000
+#define      FLD_FM2_DFT_TH_CMP       0x00020000
+#define      FLD_FM1_DFT_TH_CMP       0x00010000
+#define      FLD_VIDEO_PRESENT_EN     0x00008000
+#define      FLD_VIDEO_CHANGE_EN      0x00004000
+#define      FLD_RDS_READY_EN         0x00002000
+#define      FLD_AC97_INT_EN          0x00001000
+#define      FLD_NICAM_BIT_ERROR_TOO_HIGH_EN      0x00000800
+#define      FLD_NICAM_LOCK_EN        0x00000400
+#define      FLD_NICAM_UNLOCK_EN      0x00000200
+#define      FLD_DFT4_TH_CMP_EN       0x00000100
+/* Reserved [7] */
+#define      FLD_DW8051_INT6_CTL1     0x00000040
+#define      FLD_DW8051_INT5_CTL1     0x00000020
+#define      FLD_DW8051_INT4_CTL1     0x00000010
+#define      FLD_DW8051_INT3_CTL1     0x00000008
+#define      FLD_DW8051_INT2_CTL1     0x00000004
+#define      FLD_DW8051_INT1_CTL1     0x00000002
+#define      FLD_DW8051_INT0_CTL1     0x00000001
+
+/*****************************************************************************/
+#define      GENERAL_CTL              0x810
+#define      FLD_RDS_INT              0x80000000
+#define      FLD_NBER_INT             0x40000000
+#define      FLD_NLL_INT              0x20000000
+#define      FLD_IFL_INT              0x10000000
+#define      FLD_FDL_INT              0x08000000
+#define      FLD_AFC_INT              0x04000000
+#define      FLD_AMC_INT              0x02000000
+#define      FLD_AC97_INT_CTL         0x01000000
+#define      FLD_RDS_INT_DIS          0x00800000
+#define      FLD_NBER_INT_DIS         0x00400000
+#define      FLD_NLL_INT_DIS          0x00200000
+#define      FLD_IFL_INT_DIS          0x00100000
+#define      FLD_FDL_INT_DIS          0x00080000
+#define      FLD_FC_INT_DIS           0x00040000
+#define      FLD_AMC_INT_DIS          0x00020000
+#define      FLD_AC97_INT_DIS         0x00010000
+#define      FLD_REV_NUM              0x0000ff00
+/* Reserved [7:5] */
+#define      FLD_DBX_SOFT_RESET_REG   0x00000010
+#define      FLD_AD_SOFT_RESET_REG    0x00000008
+#define      FLD_SRC_SOFT_RESET_REG   0x00000004
+#define      FLD_CDMOD_SOFT_RESET     0x00000002
+#define      FLD_8051_SOFT_RESET      0x00000001
+
+/*****************************************************************************/
+#define      AAGC_CTL                 0x814
+#define      FLD_AFE_12DB_EN          0x80000000
+#define      FLD_AAGC_DEFAULT_EN      0x40000000
+#define      FLD_AAGC_DEFAULT         0x3f000000
+/* Reserved [23] */
+#define      FLD_AAGC_GAIN            0x00600000
+#define      FLD_AAGC_TH              0x001f0000
+/* Reserved [15:14] */
+#define      FLD_AAGC_HYST2           0x00003f00
+/* Reserved [7:6] */
+#define      FLD_AAGC_HYST1           0x0000003f
+
+/*****************************************************************************/
+#define      IF_SRC_CTL               0x818
+#define      FLD_DBX_BYPASS           0x80000000
+/* Reserved [30:25] */
+#define      FLD_IF_SRC_MODE          0x01000000
+/* Reserved [23:18] */
+#define      FLD_IF_SRC_PHASE_INC     0x0001ffff
+
+/*****************************************************************************/
+#define      ANALOG_DEMOD_CTL         0x81c
+#define      FLD_ROT1_PHACC_PROG      0xffff0000
+/* Reserved [15] */
+#define      FLD_FM1_DELAY_FIX        0x00007000
+#define      FLD_PDF4_SHIFT           0x00000c00
+#define      FLD_PDF3_SHIFT           0x00000300
+#define      FLD_PDF2_SHIFT           0x000000c0
+#define      FLD_PDF1_SHIFT           0x00000030
+#define      FLD_FMBYPASS_MODE2       0x00000008
+#define      FLD_FMBYPASS_MODE1       0x00000004
+#define      FLD_NICAM_MODE           0x00000002
+#define      FLD_BTSC_FMRADIO_MODE    0x00000001
+
+/*****************************************************************************/
+#define      ROT_FREQ_CTL             0x820
+#define      FLD_ROT3_PHACC_PROG      0xffff0000
+#define      FLD_ROT2_PHACC_PROG      0x0000ffff
+
+/*****************************************************************************/
+#define      FM_CTL                   0x824
+#define      FLD_FM2_DC_FB_SHIFT      0xf0000000
+#define      FLD_FM2_DC_INT_SHIFT     0x0f000000
+#define      FLD_FM2_AFC_RESET        0x00800000
+#define      FLD_FM2_DC_PASS_IN       0x00400000
+#define      FLD_FM2_DAGC_SHIFT       0x00380000
+#define      FLD_FM2_CORDIC_SHIFT     0x00070000
+#define      FLD_FM1_DC_FB_SHIFT      0x0000f000
+#define      FLD_FM1_DC_INT_SHIFT     0x00000f00
+#define      FLD_FM1_AFC_RESET        0x00000080
+#define      FLD_FM1_DC_PASS_IN       0x00000040
+#define      FLD_FM1_DAGC_SHIFT       0x00000038
+#define      FLD_FM1_CORDIC_SHIFT     0x00000007
+
+/*****************************************************************************/
+#define      LPF_PDF_CTL              0x828
+/* Reserved [31:30] */
+#define      FLD_LPF32_SHIFT1         0x30000000
+#define      FLD_LPF32_SHIFT2         0x0c000000
+#define      FLD_LPF160_SHIFTA        0x03000000
+#define      FLD_LPF160_SHIFTB        0x00c00000
+#define      FLD_LPF160_SHIFTC        0x00300000
+#define      FLD_LPF32_COEF_SEL2      0x000c0000
+#define      FLD_LPF32_COEF_SEL1      0x00030000
+#define      FLD_LPF160_COEF_SELC     0x0000c000
+#define      FLD_LPF160_COEF_SELB     0x00003000
+#define      FLD_LPF160_COEF_SELA     0x00000c00
+#define      FLD_LPF160_IN_EN_REG     0x00000300
+#define      FLD_PDF4_PDF_SEL         0x000000c0
+#define      FLD_PDF3_PDF_SEL         0x00000030
+#define      FLD_PDF2_PDF_SEL         0x0000000c
+#define      FLD_PDF1_PDF_SEL         0x00000003
+
+/*****************************************************************************/
+#define      DFT1_CTL1                0x82c
+#define      FLD_DFT1_DWELL           0xffff0000
+#define      FLD_DFT1_FREQ            0x0000ffff
+
+/*****************************************************************************/
+#define      DFT1_CTL2                0x830
+#define      FLD_DFT1_THRESHOLD       0xffffff00
+#define      FLD_DFT1_CMP_CTL         0x00000080
+#define      FLD_DFT1_AVG             0x00000070
+/* Reserved [3:1] */
+#define      FLD_DFT1_START           0x00000001
+
+/*****************************************************************************/
+#define      DFT1_STATUS              0x834
+#define      FLD_DFT1_DONE            0x80000000
+#define      FLD_DFT1_TH_CMP_STAT     0x40000000
+#define      FLD_DFT1_RESULT          0x3fffffff
+
+/*****************************************************************************/
+#define      DFT2_CTL1                0x838
+#define      FLD_DFT2_DWELL           0xffff0000
+#define      FLD_DFT2_FREQ            0x0000ffff
+
+/*****************************************************************************/
+#define      DFT2_CTL2                0x83C
+#define      FLD_DFT2_THRESHOLD       0xffffff00
+#define      FLD_DFT2_CMP_CTL         0x00000080
+#define      FLD_DFT2_AVG             0x00000070
+/* Reserved [3:1] */
+#define      FLD_DFT2_START           0x00000001
+
+/*****************************************************************************/
+#define      DFT2_STATUS              0x840
+#define      FLD_DFT2_DONE            0x80000000
+#define      FLD_DFT2_TH_CMP_STAT     0x40000000
+#define      FLD_DFT2_RESULT          0x3fffffff
+
+/*****************************************************************************/
+#define      DFT3_CTL1                0x844
+#define      FLD_DFT3_DWELL           0xffff0000
+#define      FLD_DFT3_FREQ            0x0000ffff
+
+/*****************************************************************************/
+#define      DFT3_CTL2                0x848
+#define      FLD_DFT3_THRESHOLD       0xffffff00
+#define      FLD_DFT3_CMP_CTL         0x00000080
+#define      FLD_DFT3_AVG             0x00000070
+/* Reserved [3:1] */
+#define      FLD_DFT3_START           0x00000001
+
+/*****************************************************************************/
+#define      DFT3_STATUS              0x84c
+#define      FLD_DFT3_DONE            0x80000000
+#define      FLD_DFT3_TH_CMP_STAT     0x40000000
+#define      FLD_DFT3_RESULT          0x3fffffff
+
+/*****************************************************************************/
+#define      DFT4_CTL1                0x850
+#define      FLD_DFT4_DWELL           0xffff0000
+#define      FLD_DFT4_FREQ            0x0000ffff
+
+/*****************************************************************************/
+#define      DFT4_CTL2                0x854
+#define      FLD_DFT4_THRESHOLD       0xffffff00
+#define      FLD_DFT4_CMP_CTL         0x00000080
+#define      FLD_DFT4_AVG             0x00000070
+/* Reserved [3:1] */
+#define      FLD_DFT4_START           0x00000001
+
+/*****************************************************************************/
+#define      DFT4_STATUS              0x858
+#define      FLD_DFT4_DONE            0x80000000
+#define      FLD_DFT4_TH_CMP_STAT     0x40000000
+#define      FLD_DFT4_RESULT          0x3fffffff
+
+/*****************************************************************************/
+#define      AM_MTS_DET               0x85c
+#define      FLD_AM_MTS_MODE          0x80000000
+/* Reserved [30:26] */
+#define      FLD_AM_SUB               0x02000000
+#define      FLD_AM_GAIN_EN           0x01000000
+/* Reserved [23:16] */
+#define      FLD_AMMTS_GAIN_SCALE     0x0000e000
+#define      FLD_MTS_PDF_SHIFT        0x00001800
+#define      FLD_AM_REG_GAIN          0x00000700
+#define      FLD_AGC_REF              0x000000ff
+
+/*****************************************************************************/
+#define      ANALOG_MUX_CTL           0x860
+/* Reserved [31:29] */
+#define      FLD_MUX21_SEL            0x10000000
+#define      FLD_MUX20_SEL            0x08000000
+#define      FLD_MUX19_SEL            0x04000000
+#define      FLD_MUX18_SEL            0x02000000
+#define      FLD_MUX17_SEL            0x01000000
+#define      FLD_MUX16_SEL            0x00800000
+#define      FLD_MUX15_SEL            0x00400000
+#define      FLD_MUX14_SEL            0x00300000
+#define      FLD_MUX13_SEL            0x000C0000
+#define      FLD_MUX12_SEL            0x00020000
+#define      FLD_MUX11_SEL            0x00018000
+#define      FLD_MUX10_SEL            0x00004000
+#define      FLD_MUX9_SEL             0x00002000
+#define      FLD_MUX8_SEL             0x00001000
+#define      FLD_MUX7_SEL             0x00000800
+#define      FLD_MUX6_SEL             0x00000600
+#define      FLD_MUX5_SEL             0x00000100
+#define      FLD_MUX4_SEL             0x000000c0
+#define      FLD_MUX3_SEL             0x00000030
+#define      FLD_MUX2_SEL             0x0000000c
+#define      FLD_MUX1_SEL             0x00000003
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DPLL_CTRL1               0x864
+#define      DIG_PLL_CTL1             0x864
+
+#define      FLD_PLL_STATUS           0x07000000
+#define      FLD_BANDWIDTH_SELECT     0x00030000
+#define      FLD_PLL_SHIFT_REG        0x00007000
+#define      FLD_PHASE_SHIFT          0x000007ff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DPLL_CTRL2               0x868
+#define      DIG_PLL_CTL2             0x868
+#define      FLD_PLL_UNLOCK_THR       0xff000000
+#define      FLD_PLL_LOCK_THR         0x00ff0000
+/* Reserved [15:8] */
+#define      FLD_AM_PDF_SEL2          0x000000c0
+#define      FLD_AM_PDF_SEL1          0x00000030
+#define      FLD_DPLL_FSM_CTRL        0x0000000c
+/* Reserved [1] */
+#define      FLD_PLL_PILOT_DET        0x00000001
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DPLL_CTRL3               0x86c
+#define      DIG_PLL_CTL3             0x86c
+#define      FLD_DISABLE_LOOP         0x01000000
+#define      FLD_A1_DS1_SEL           0x000c0000
+#define      FLD_A1_DS2_SEL           0x00030000
+#define      FLD_A1_KI                0x0000ff00
+#define      FLD_A1_KD                0x000000ff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DPLL_CTRL4               0x870
+#define      DIG_PLL_CTL4             0x870
+#define      FLD_A2_DS1_SEL           0x000c0000
+#define      FLD_A2_DS2_SEL           0x00030000
+#define      FLD_A2_KI                0x0000ff00
+#define      FLD_A2_KD                0x000000ff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DPLL_CTRL5               0x874
+#define      DIG_PLL_CTL5             0x874
+#define      FLD_TRK_DS1_SEL          0x000c0000
+#define      FLD_TRK_DS2_SEL          0x00030000
+#define      FLD_TRK_KI               0x0000ff00
+#define      FLD_TRK_KD               0x000000ff
+
+/*****************************************************************************/
+#define      DEEMPH_GAIN_CTL          0x878
+#define      FLD_DEEMPH2_GAIN         0xFFFF0000
+#define      FLD_DEEMPH1_GAIN         0x0000FFFF
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DEEMPH_COEFF1            0x87c
+#define      DEEMPH_COEF1             0x87c
+#define      FLD_DEEMPH_B0            0xffff0000
+#define      FLD_DEEMPH_A0            0x0000ffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DEEMPH_COEFF2            0x880
+#define      DEEMPH_COEF2             0x880
+#define      FLD_DEEMPH_B1            0xFFFF0000
+#define      FLD_DEEMPH_A1            0x0000FFFF
+
+/*****************************************************************************/
+#define      DBX1_CTL1                0x884
+#define      FLD_DBX1_WBE_GAIN        0xffff0000
+#define      FLD_DBX1_IN_GAIN         0x0000ffff
+
+/*****************************************************************************/
+#define      DBX1_CTL2                0x888
+#define      FLD_DBX1_SE_BYPASS       0xffff0000
+#define      FLD_DBX1_SE_GAIN         0x0000ffff
+
+/*****************************************************************************/
+#define      DBX1_RMS_SE              0x88C
+#define      FLD_DBX1_RMS_WBE         0xffff0000
+#define      FLD_DBX1_RMS_SE_FLD      0x0000ffff
+
+/*****************************************************************************/
+#define      DBX2_CTL1                0x890
+#define      FLD_DBX2_WBE_GAIN        0xffff0000
+#define      FLD_DBX2_IN_GAIN         0x0000ffff
+
+/*****************************************************************************/
+#define      DBX2_CTL2                0x894
+#define      FLD_DBX2_SE_BYPASS       0xffff0000
+#define      FLD_DBX2_SE_GAIN         0x0000ffff
+
+/*****************************************************************************/
+#define      DBX2_RMS_SE              0x898
+#define      FLD_DBX2_RMS_WBE         0xffff0000
+#define      FLD_DBX2_RMS_SE_FLD      0x0000ffff
+
+/*****************************************************************************/
+#define      AM_FM_DIFF               0x89c
+/* Reserved [31] */
+#define      FLD_FM_DIFF_OUT          0x7fff0000
+/* Reserved [15] */
+#define      FLD_AM_DIFF_OUT          0x00007fff
+
+/*****************************************************************************/
+#define      NICAM_FAW                0x8a0
+#define      FLD_FAWDETWINEND         0xFc000000
+#define      FLD_FAWDETWINSTR         0x03ff0000
+/* Reserved [15:12] */
+#define      FLD_FAWDETTHRSHLD3       0x00000f00
+#define      FLD_FAWDETTHRSHLD2       0x000000f0
+#define      FLD_FAWDETTHRSHLD1       0x0000000f
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DEEMPH_GAIN              0x8a4
+#define      NICAM_DEEMPHGAIN         0x8a4
+/* Reserved [31:18] */
+#define      FLD_DEEMPHGAIN           0x0003ffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DEEMPH_NUMER1            0x8a8
+#define      NICAM_DEEMPHNUMER1       0x8a8
+/* Reserved [31:18] */
+#define      FLD_DEEMPHNUMER1         0x0003ffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DEEMPH_NUMER2            0x8ac
+#define      NICAM_DEEMPHNUMER2       0x8ac
+/* Reserved [31:18] */
+#define      FLD_DEEMPHNUMER2         0x0003ffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DEEMPH_DENOM1            0x8b0
+#define      NICAM_DEEMPHDENOM1       0x8b0
+/* Reserved [31:18] */
+#define      FLD_DEEMPHDENOM1         0x0003ffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      DEEMPH_DENOM2            0x8b4
+#define      NICAM_DEEMPHDENOM2       0x8b4
+/* Reserved [31:18] */
+#define      FLD_DEEMPHDENOM2         0x0003ffff
+
+/*****************************************************************************/
+#define      NICAM_ERRLOG_CTL1        0x8B8
+/* Reserved [31:28] */
+#define      FLD_ERRINTRPTTHSHLD1     0x0fff0000
+/* Reserved [15:12] */
+#define      FLD_ERRLOGPERIOD         0x00000fff
+
+/*****************************************************************************/
+#define      NICAM_ERRLOG_CTL2        0x8bc
+/* Reserved [31:28] */
+#define      FLD_ERRINTRPTTHSHLD3     0x0fff0000
+/* Reserved [15:12] */
+#define      FLD_ERRINTRPTTHSHLD2     0x00000fff
+
+/*****************************************************************************/
+#define      NICAM_ERRLOG_STS1        0x8c0
+/* Reserved [31:28] */
+#define      FLD_ERRLOG2              0x0fff0000
+/* Reserved [15:12] */
+#define      FLD_ERRLOG1              0x00000fff
+
+/*****************************************************************************/
+#define      NICAM_ERRLOG_STS2        0x8c4
+/* Reserved [31:12] */
+#define      FLD_ERRLOG3              0x00000fff
+
+/*****************************************************************************/
+#define      NICAM_STATUS             0x8c8
+/* Reserved [31:20] */
+#define      FLD_NICAM_CIB            0x000c0000
+#define      FLD_NICAM_LOCK_STAT      0x00020000
+#define      FLD_NICAM_MUTE           0x00010000
+#define      FLD_NICAMADDIT_DATA      0x0000ffe0
+#define      FLD_NICAMCNTRL           0x0000001f
+
+/*****************************************************************************/
+#define      DEMATRIX_CTL             0x8cc
+#define      FLD_AC97_IN_SHIFT        0xf0000000
+#define      FLD_I2S_IN_SHIFT         0x0f000000
+#define      FLD_DEMATRIX_SEL_CTL     0x00ff0000
+/* Reserved [15:11] */
+#define      FLD_DMTRX_BYPASS         0x00000400
+#define      FLD_DEMATRIX_MODE        0x00000300
+/* Reserved [7:6] */
+#define      FLD_PH_DBX_SEL           0x00000020
+#define      FLD_PH_CH_SEL            0x00000010
+#define      FLD_PHASE_FIX            0x0000000f
+
+/*****************************************************************************/
+#define      PATH1_CTL1               0x8d0
+/* Reserved [31:29] */
+#define      FLD_PATH1_MUTE_CTL       0x1f000000
+/* Reserved [23:22] */
+#define      FLD_PATH1_AVC_CG         0x00300000
+#define      FLD_PATH1_AVC_RT         0x000f0000
+#define      FLD_PATH1_AVC_AT         0x0000f000
+#define      FLD_PATH1_AVC_STEREO     0x00000800
+#define      FLD_PATH1_AVC_CR         0x00000700
+#define      FLD_PATH1_AVC_RMS_CON    0x000000f0
+#define      FLD_PATH1_SEL_CTL        0x0000000f
+
+/*****************************************************************************/
+#define      PATH1_VOL_CTL            0x8d4
+#define      FLD_PATH1_AVC_THRESHOLD  0x7fff0000
+#define      FLD_PATH1_BAL_LEFT       0x00008000
+#define      FLD_PATH1_BAL_LEVEL      0x00007f00
+#define      FLD_PATH1_VOLUME         0x000000ff
+
+/*****************************************************************************/
+#define      PATH1_EQ_CTL             0x8d8
+/* Reserved [31:30] */
+#define      FLD_PATH1_EQ_TREBLE_VOL  0x3f000000
+/* Reserved [23:22] */
+#define      FLD_PATH1_EQ_MID_VOL     0x003f0000
+/* Reserved [15:14] */
+#define      FLD_PATH1_EQ_BASS_VOL    0x00003f00
+/* Reserved [7:1] */
+#define      FLD_PATH1_EQ_BAND_SEL    0x00000001
+
+/*****************************************************************************/
+#define      PATH1_SC_CTL             0x8dc
+#define      FLD_PATH1_SC_THRESHOLD   0x7fff0000
+#define      FLD_PATH1_SC_RT          0x0000f000
+#define      FLD_PATH1_SC_AT          0x00000f00
+#define      FLD_PATH1_SC_STEREO      0x00000080
+#define      FLD_PATH1_SC_CR          0x00000070
+#define      FLD_PATH1_SC_RMS_CON     0x0000000f
+
+/*****************************************************************************/
+#define      PATH2_CTL1               0x8e0
+/* Reserved [31:26] */
+#define      FLD_PATH2_MUTE_CTL       0x03000000
+/* Reserved [23:22] */
+#define      FLD_PATH2_AVC_CG         0x00300000
+#define      FLD_PATH2_AVC_RT         0x000f0000
+#define      FLD_PATH2_AVC_AT         0x0000f000
+#define      FLD_PATH2_AVC_STEREO     0x00000800
+#define      FLD_PATH2_AVC_CR         0x00000700
+#define      FLD_PATH2_AVC_RMS_CON    0x000000f0
+#define      FLD_PATH2_SEL_CTL        0x0000000f
+
+/*****************************************************************************/
+#define      PATH2_VOL_CTL            0x8e4
+#define      FLD_PATH2_AVC_THRESHOLD  0xffff0000
+#define      FLD_PATH2_BAL_LEFT       0x00008000
+#define      FLD_PATH2_BAL_LEVEL      0x00007f00
+#define      FLD_PATH2_VOLUME         0x000000ff
+
+/*****************************************************************************/
+#define      PATH2_EQ_CTL             0x8e8
+/* Reserved [31:30] */
+#define      FLD_PATH2_EQ_TREBLE_VOL  0x3f000000
+/* Reserved [23:22] */
+#define      FLD_PATH2_EQ_MID_VOL     0x003f0000
+/* Reserved [15:14] */
+#define      FLD_PATH2_EQ_BASS_VOL    0x00003f00
+/* Reserved [7:1] */
+#define      FLD_PATH2_EQ_BAND_SEL    0x00000001
+
+/*****************************************************************************/
+#define      PATH2_SC_CTL             0x8eC
+#define      FLD_PATH2_SC_THRESHOLD   0xffff0000
+#define      FLD_PATH2_SC_RT          0x0000f000
+#define      FLD_PATH2_SC_AT          0x00000f00
+#define      FLD_PATH2_SC_STEREO      0x00000080
+#define      FLD_PATH2_SC_CR          0x00000070
+#define      FLD_PATH2_SC_RMS_CON     0x0000000f
+
+/*****************************************************************************/
+#define      SRC_CTL                  0x8f0
+#define      FLD_SRC_STATUS           0xffffff00
+#define      FLD_FIFO_LF_EN           0x000000fc
+#define      FLD_BYPASS_LI            0x00000002
+#define      FLD_BYPASS_PF            0x00000001
+
+/*****************************************************************************/
+#define      SRC_LF_COEF              0x8f4
+#define      FLD_LOOP_FILTER_COEF2    0xffff0000
+#define      FLD_LOOP_FILTER_COEF1    0x0000ffff
+
+/*****************************************************************************/
+#define      SRC1_CTL                 0x8f8
+/* Reserved [31:28] */
+#define      FLD_SRC1_FIFO_RD_TH      0x0f000000
+/* Reserved [23:18] */
+#define      FLD_SRC1_PHASE_INC       0x0003ffff
+
+/*****************************************************************************/
+#define      SRC2_CTL                 0x8fc
+/* Reserved [31:28] */
+#define      FLD_SRC2_FIFO_RD_TH      0x0f000000
+/* Reserved [23:18] */
+#define      FLD_SRC2_PHASE_INC       0x0003ffff
+
+/*****************************************************************************/
+#define      SRC3_CTL                 0x900
+/* Reserved [31:28] */
+#define      FLD_SRC3_FIFO_RD_TH      0x0f000000
+/* Reserved [23:18] */
+#define      FLD_SRC3_PHASE_INC       0x0003ffff
+
+/*****************************************************************************/
+#define      SRC4_CTL                 0x904
+/* Reserved [31:28] */
+#define      FLD_SRC4_FIFO_RD_TH      0x0f000000
+/* Reserved [23:18] */
+#define      FLD_SRC4_PHASE_INC       0x0003ffff
+
+/*****************************************************************************/
+#define      SRC5_CTL                 0x908
+/* Reserved [31:28] */
+#define      FLD_SRC5_FIFO_RD_TH      0x0f000000
+/* Reserved [23:18] */
+#define      FLD_SRC5_PHASE_INC       0x0003ffff
+
+/*****************************************************************************/
+#define      SRC6_CTL                 0x90c
+/* Reserved [31:28] */
+#define      FLD_SRC6_FIFO_RD_TH      0x0f000000
+/* Reserved [23:18] */
+#define      FLD_SRC6_PHASE_INC       0x0003ffff
+
+/*****************************************************************************/
+#define      BAND_OUT_SEL             0x910
+#define      FLD_SRC6_IN_SEL          0xc0000000
+#define      FLD_SRC6_CLK_SEL         0x30000000
+#define      FLD_SRC5_IN_SEL          0x0c000000
+#define      FLD_SRC5_CLK_SEL         0x03000000
+#define      FLD_SRC4_IN_SEL          0x00c00000
+#define      FLD_SRC4_CLK_SEL         0x00300000
+#define      FLD_SRC3_IN_SEL          0x000c0000
+#define      FLD_SRC3_CLK_SEL         0x00030000
+#define      FLD_BASEBAND_BYPASS_CTL  0x0000ff00
+#define      FLD_AC97_SRC_SEL         0x000000c0
+#define      FLD_I2S_SRC_SEL          0x00000030
+#define      FLD_PARALLEL2_SRC_SEL    0x0000000c
+#define      FLD_PARALLEL1_SRC_SEL    0x00000003
+
+/*****************************************************************************/
+#define      I2S_IN_CTL               0x914
+/* Reserved [31:11] */
+#define      FLD_I2S_UP2X_BW20K       0x00000400
+#define      FLD_I2S_UP2X_BYPASS      0x00000200
+#define      FLD_I2S_IN_MASTER_MODE   0x00000100
+#define      FLD_I2S_IN_SONY_MODE     0x00000080
+#define      FLD_I2S_IN_RIGHT_JUST    0x00000040
+#define      FLD_I2S_IN_WS_SEL        0x00000020
+#define      FLD_I2S_IN_BCN_DEL       0x0000001f
+
+/*****************************************************************************/
+#define      I2S_OUT_CTL              0x918
+/* Reserved [31:17] */
+#define      FLD_I2S_OUT_SOFT_RESET_EN  0x00010000
+/* Reserved [15:9] */
+#define      FLD_I2S_OUT_MASTER_MODE  0x00000100
+#define      FLD_I2S_OUT_SONY_MODE    0x00000080
+#define      FLD_I2S_OUT_RIGHT_JUST   0x00000040
+#define      FLD_I2S_OUT_WS_SEL       0x00000020
+#define      FLD_I2S_OUT_BCN_DEL      0x0000001f
+
+/*****************************************************************************/
+#define      AC97_CTL                 0x91c
+/* Reserved [31:26] */
+#define      FLD_AC97_UP2X_BW20K      0x02000000
+#define      FLD_AC97_UP2X_BYPASS     0x01000000
+/* Reserved [23:17] */
+#define      FLD_AC97_RST_ACL         0x00010000
+/* Reserved [15:9] */
+#define      FLD_AC97_WAKE_UP_SYNC    0x00000100
+/* Reserved [7:1] */
+#define      FLD_AC97_SHUTDOWN        0x00000001
+
+/* Cx231xx redefine */
+#define      QPSK_IAGC_CTL1             0x94c
+#define      QPSK_IAGC_CTL2             0x950
+#define      QPSK_FEPR_FREQ             0x954
+#define      QPSK_BTL_CTL1              0x958
+#define      QPSK_BTL_CTL2              0x95c
+#define      QPSK_CTL_CTL1              0x960
+#define      QPSK_CTL_CTL2              0x964
+#define      QPSK_MF_FAGC_CTL           0x968
+#define      QPSK_EQ_CTL                0x96c
+#define      QPSK_LOCK_CTL              0x970
+
+/*****************************************************************************/
+#define      FM1_DFT_CTL              0x9a8
+#define      FLD_FM1_DFT_THRESHOLD    0xffff0000
+/* Reserved [15:8] */
+#define      FLD_FM1_DFT_CMP_CTL      0x00000080
+#define      FLD_FM1_DFT_AVG          0x00000070
+/* Reserved [3:1] */
+#define      FLD_FM1_DFT_START        0x00000001
+
+/*****************************************************************************/
+#define      FM1_DFT_STATUS           0x9ac
+#define      FLD_FM1_DFT_DONE         0x80000000
+/* Reserved [30:19] */
+#define      FLD_FM_DFT_TH_CMP        0x00040000
+#define      FLD_FM1_DFT              0x0003ffff
+
+/*****************************************************************************/
+#define      FM2_DFT_CTL              0x9b0
+#define      FLD_FM2_DFT_THRESHOLD    0xffff0000
+/* Reserved [15:8] */
+#define      FLD_FM2_DFT_CMP_CTL      0x00000080
+#define      FLD_FM2_DFT_AVG          0x00000070
+/* Reserved [3:1] */
+#define      FLD_FM2_DFT_START        0x00000001
+
+/*****************************************************************************/
+#define      FM2_DFT_STATUS           0x9b4
+#define      FLD_FM2_DFT_DONE         0x80000000
+/* Reserved [30:19] */
+#define      FLD_FM2_DFT_TH_CMP_STAT  0x00040000
+#define      FLD_FM2_DFT              0x0003ffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      AAGC_STATUS_REG          0x9b8
+#define      AAGC_STATUS              0x9b8
+/* Reserved [31:27] */
+#define      FLD_FM2_DAGC_OUT         0x07000000
+/* Reserved [23:19] */
+#define      FLD_FM1_DAGC_OUT         0x00070000
+/* Reserved [15:6] */
+#define      FLD_AFE_VGA_OUT          0x0000003f
+
+/*****************************************************************************/
+#define      MTS_GAIN_STATUS          0x9bc
+/* Reserved [31:14] */
+#define      FLD_MTS_GAIN             0x00003fff
+
+#define      RDS_OUT                  0x9c0
+#define      FLD_RDS_Q                0xffff0000
+#define      FLD_RDS_I                0x0000ffff
+
+/*****************************************************************************/
+#define      AUTOCONFIG_REG           0x9c4
+/* Reserved [31:4] */
+#define      FLD_AUTOCONFIG_MODE      0x0000000f
+
+#define      FM_AFC                   0x9c8
+#define      FLD_FM2_AFC              0xffff0000
+#define      FLD_FM1_AFC              0x0000ffff
+
+/*****************************************************************************/
+/* Cx231xx redefine */
+#define      NEW_SPARE                0x9cc
+#define      NEW_SPARE_REG            0x9cc
+
+/*****************************************************************************/
+#define      DBX_ADJ                  0x9d0
+/* Reserved [31:28] */
+#define      FLD_DBX2_ADJ             0x0fff0000
+/* Reserved [15:12] */
+#define      FLD_DBX1_ADJ             0x00000fff
+
+#define      VID_FMT_AUTO              0
+#define      VID_FMT_NTSC_M            1
+#define      VID_FMT_NTSC_J            2
+#define      VID_FMT_NTSC_443          3
+#define      VID_FMT_PAL_BDGHI         4
+#define      VID_FMT_PAL_M             5
+#define      VID_FMT_PAL_N             6
+#define      VID_FMT_PAL_NC            7
+#define      VID_FMT_PAL_60            8
+#define      VID_FMT_SECAM             12
+#define      VID_FMT_SECAM_60          13
+
+#define      INPUT_MODE_CVBS_0         0       /* INPUT_MODE_VALUE(0) */
+#define      INPUT_MODE_YC_1           1       /* INPUT_MODE_VALUE(1) */
+#define      INPUT_MODE_YC2_2          2       /* INPUT_MODE_VALUE(2) */
+#define      INPUT_MODE_YUV_3          3       /* INPUT_MODE_VALUE(3) */
+
+#define      LUMA_LPF_LOW_BANDPASS     0       /* 0.6Mhz LPF BW */
+#define      LUMA_LPF_MEDIUM_BANDPASS  1       /* 1.0Mhz LPF BW */
+#define      LUMA_LPF_HIGH_BANDPASS    2       /* 1.5Mhz LPF BW */
+
+#define      UV_LPF_LOW_BANDPASS       0       /* 0.6Mhz LPF BW */
+#define      UV_LPF_MEDIUM_BANDPASS    1       /* 1.0Mhz LPF BW */
+#define      UV_LPF_HIGH_BANDPASS      2       /* 1.5Mhz LPF BW */
+
+#define      TWO_TAP_FILT              0
+#define      THREE_TAP_FILT            1
+#define      FOUR_TAP_FILT             2
+#define      FIVE_TAP_FILT             3
+
+#define      AUD_CHAN_SRC_PARALLEL     0
+#define      AUD_CHAN_SRC_I2S_INPUT    1
+#define      AUD_CHAN_SRC_FLATIRON     2
+#define      AUD_CHAN_SRC_PARALLEL3    3
+
+#define      OUT_MODE_601              0
+#define      OUT_MODE_656              1
+#define      OUT_MODE_VIP11            2
+#define      OUT_MODE_VIP20            3
+
+#define      PHASE_INC_49MHZ          0x0df22
+#define      PHASE_INC_56MHZ          0x0fa5b
+#define      PHASE_INC_28MHZ          0x010000
+
+#endif
diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.c b/drivers/media/video/cx231xx/cx231xx-vbi.c
new file mode 100644
index 000000000000..94180526909c
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-vbi.c
@@ -0,0 +1,701 @@
+/*
+   cx231xx_vbi.c - driver for Conexant Cx23100/101/102 USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+        Based on cx88 driver
+
+   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.
+ */
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/bitmap.h>
+#include <linux/usb.h>
+#include <linux/i2c.h>
+#include <linux/version.h>
+#include <linux/mm.h>
+#include <linux/mutex.h>
+
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/msp3400.h>
+#include <media/tuner.h>
+
+#include "cx231xx.h"
+#include "cx231xx-vbi.h"
+
+static inline void print_err_status(struct cx231xx *dev, int packet, int status)
+{
+        char *errmsg = "Unknown";
+
+        switch (status) {
+        case -ENOENT:
+                errmsg = "unlinked synchronuously";
+                break;
+        case -ECONNRESET:
+                errmsg = "unlinked asynchronuously";
+                break;
+        case -ENOSR:
+                errmsg = "Buffer error (overrun)";
+                break;
+        case -EPIPE:
+                errmsg = "Stalled (device not responding)";
+                break;
+        case -EOVERFLOW:
+                errmsg = "Babble (bad cable?)";
+                break;
+        case -EPROTO:
+                errmsg = "Bit-stuff error (bad cable?)";
+                break;
+        case -EILSEQ:
+                errmsg = "CRC/Timeout (could be anything)";
+                break;
+        case -ETIME:
+                errmsg = "Device does not respond";
+                break;
+        }
+        if (packet < 0) {
+                cx231xx_err(DRIVER_NAME "URB status %d [%s].\n", status,
+                            errmsg);
+        } else {
+                cx231xx_err(DRIVER_NAME "URB packet %d, status %d [%s].\n",
+                            packet, status, errmsg);
+        }
+}
+
+/*
+ * Controls the isoc copy of each urb packet
+ */
+static inline int cx231xx_isoc_vbi_copy(struct cx231xx *dev, struct urb *urb)
+{
+        struct cx231xx_buffer *buf;
+        struct cx231xx_dmaqueue *dma_q = urb->context;
+        int rc = 1;
+        unsigned char *p_buffer;
+        u32 bytes_parsed = 0, buffer_size = 0;
+        u8 sav_eav = 0;
+
+        if (!dev)
+                return 0;
+
+        if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+                return 0;
+
+        if (urb->status < 0) {
+                print_err_status(dev, -1, urb->status);
+                if (urb->status == -ENOENT)
+                        return 0;
+        }
+
+        buf = dev->vbi_mode.isoc_ctl.buf;
+
+        /* get buffer pointer and length */
+        p_buffer = urb->transfer_buffer;
+        buffer_size = urb->actual_length;
+
+        if (buffer_size > 0) {
+                bytes_parsed = 0;
+
+                if (dma_q->is_partial_line) {
+                        /* Handle the case where we were working on a partial
+                           line */
+                        sav_eav = dma_q->last_sav;
+                } else {
+                        /* Check for a SAV/EAV overlapping the
+                           buffer boundary */
+
+                        sav_eav = cx231xx_find_boundary_SAV_EAV(p_buffer,
+                                                          dma_q->partial_buf,
+                                                          &bytes_parsed);
+                }
+
+                sav_eav &= 0xF0;
+                /* Get the first line if we have some portion of an SAV/EAV from
+                   the last buffer or a partial line */
+                if (sav_eav) {
+                        bytes_parsed += cx231xx_get_vbi_line(dev, dma_q,
+                                sav_eav,                       /* SAV/EAV */
+                                p_buffer + bytes_parsed,       /* p_buffer */
+                                buffer_size - bytes_parsed);   /* buffer size */
+                }
+
+                /* Now parse data that is completely in this buffer */
+                dma_q->is_partial_line = 0;
+
+                while (bytes_parsed < buffer_size) {
+                        u32 bytes_used = 0;
+
+                        sav_eav = cx231xx_find_next_SAV_EAV(
+                                p_buffer + bytes_parsed,        /* p_buffer */
+                                buffer_size - bytes_parsed, /* buffer size */
+                                &bytes_used);   /* bytes used to get SAV/EAV */
+
+                        bytes_parsed += bytes_used;
+
+                        sav_eav &= 0xF0;
+                        if (sav_eav && (bytes_parsed < buffer_size)) {
+                                bytes_parsed += cx231xx_get_vbi_line(dev,
+                                        dma_q, sav_eav, /* SAV/EAV */
+                                        p_buffer+bytes_parsed, /* p_buffer */
+                                        buffer_size-bytes_parsed);/*buf size*/
+                        }
+                }
+
+                /* Save the last four bytes of the buffer so we can
+                check the buffer boundary condition next time */
+                memcpy(dma_q->partial_buf, p_buffer + buffer_size - 4, 4);
+                bytes_parsed = 0;
+        }
+
+        return rc;
+}
+
+/* ------------------------------------------------------------------
+        Vbi buf operations
+   ------------------------------------------------------------------*/
+
+static int
+vbi_buffer_setup(struct videobuf_queue *vq, unsigned int *count,
+                 unsigned int *size)
+{
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx *dev = fh->dev;
+        u32 height = 0;
+
+        height = ((dev->norm & V4L2_STD_625_50) ?
+                  PAL_VBI_LINES : NTSC_VBI_LINES);
+
+        *size = (dev->width * height * 2);
+        if (0 == *count)
+                *count = CX231XX_DEF_VBI_BUF;
+
+        if (*count < CX231XX_MIN_BUF)
+                *count = CX231XX_MIN_BUF;
+
+        return 0;
+}
+
+/* This is called *without* dev->slock held; please keep it that way */
+static void free_buffer(struct videobuf_queue *vq, struct cx231xx_buffer *buf)
+{
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx *dev = fh->dev;
+        unsigned long flags = 0;
+        if (in_interrupt())
+                BUG();
+
+        /* We used to wait for the buffer to finish here, but this didn't work
+           because, as we were keeping the state as VIDEOBUF_QUEUED,
+           videobuf_queue_cancel marked it as finished for us.
+           (Also, it could wedge forever if the hardware was misconfigured.)
+
+           This should be safe; by the time we get here, the buffer isn't
+           queued anymore. If we ever start marking the buffers as
+           VIDEOBUF_ACTIVE, it won't be, though.
+         */
+        spin_lock_irqsave(&dev->vbi_mode.slock, flags);
+        if (dev->vbi_mode.isoc_ctl.buf == buf)
+                dev->vbi_mode.isoc_ctl.buf = NULL;
+        spin_unlock_irqrestore(&dev->vbi_mode.slock, flags);
+
+        videobuf_vmalloc_free(&buf->vb);
+        buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
+
+static int
+vbi_buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
+                   enum v4l2_field field)
+{
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx_buffer *buf =
+            container_of(vb, struct cx231xx_buffer, vb);
+        struct cx231xx *dev = fh->dev;
+        int rc = 0, urb_init = 0;
+        u32 height = 0;
+
+        height = ((dev->norm & V4L2_STD_625_50) ?
+                  PAL_VBI_LINES : NTSC_VBI_LINES);
+        buf->vb.size = ((dev->width << 1) * height);
+
+        if (0 != buf->vb.baddr && buf->vb.bsize < buf->vb.size)
+                return -EINVAL;
+
+        buf->vb.width = dev->width;
+        buf->vb.height = height;
+        buf->vb.field = field;
+        buf->vb.field = V4L2_FIELD_SEQ_TB;
+
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
+                rc = videobuf_iolock(vq, &buf->vb, NULL);
+                if (rc < 0)
+                        goto fail;
+        }
+
+        if (!dev->vbi_mode.isoc_ctl.num_bufs)
+                urb_init = 1;
+
+        if (urb_init) {
+                rc = cx231xx_init_vbi_isoc(dev, CX231XX_NUM_VBI_PACKETS,
+                                           CX231XX_NUM_VBI_BUFS,
+                                           dev->vbi_mode.alt_max_pkt_size[0],
+                                           cx231xx_isoc_vbi_copy);
+                if (rc < 0)
+                        goto fail;
+        }
+
+        buf->vb.state = VIDEOBUF_PREPARED;
+        return 0;
+
+fail:
+        free_buffer(vq, buf);
+        return rc;
+}
+
+static void
+vbi_buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+        struct cx231xx_buffer *buf =
+            container_of(vb, struct cx231xx_buffer, vb);
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx *dev = fh->dev;
+        struct cx231xx_dmaqueue *vidq = &dev->vbi_mode.vidq;
+
+        buf->vb.state = VIDEOBUF_QUEUED;
+        list_add_tail(&buf->vb.queue, &vidq->active);
+
+}
+
+static void vbi_buffer_release(struct videobuf_queue *vq,
+                               struct videobuf_buffer *vb)
+{
+        struct cx231xx_buffer *buf =
+            container_of(vb, struct cx231xx_buffer, vb);
+
+
+        free_buffer(vq, buf);
+}
+
+struct videobuf_queue_ops cx231xx_vbi_qops = {
+        .buf_setup   = vbi_buffer_setup,
+        .buf_prepare = vbi_buffer_prepare,
+        .buf_queue   = vbi_buffer_queue,
+        .buf_release = vbi_buffer_release,
+};
+
+/* ------------------------------------------------------------------
+        URB control
+   ------------------------------------------------------------------*/
+
+/*
+ * IRQ callback, called by URB callback
+ */
+static void cx231xx_irq_vbi_callback(struct urb *urb)
+{
+        struct cx231xx_dmaqueue *dma_q = urb->context;
+        struct cx231xx_video_mode *vmode =
+            container_of(dma_q, struct cx231xx_video_mode, vidq);
+        struct cx231xx *dev = container_of(vmode, struct cx231xx, vbi_mode);
+        int rc;
+
+        switch (urb->status) {
+        case 0:         /* success */
+        case -ETIMEDOUT:        /* NAK */
+                break;
+        case -ECONNRESET:       /* kill */
+        case -ENOENT:
+        case -ESHUTDOWN:
+                return;
+        default:                /* error */
+                cx231xx_err(DRIVER_NAME "urb completition error %d.\n",
+                            urb->status);
+                break;
+        }
+
+        /* Copy data from URB */
+        spin_lock(&dev->vbi_mode.slock);
+        rc = dev->vbi_mode.isoc_ctl.isoc_copy(dev, urb);
+        spin_unlock(&dev->vbi_mode.slock);
+
+        /* Reset status */
+        urb->status = 0;
+
+        urb->status = usb_submit_urb(urb, GFP_ATOMIC);
+        if (urb->status) {
+                cx231xx_err(DRIVER_NAME "urb resubmit failed (error=%i)\n",
+                            urb->status);
+        }
+}
+
+/*
+ * Stop and Deallocate URBs
+ */
+void cx231xx_uninit_vbi_isoc(struct cx231xx *dev)
+{
+        struct urb *urb;
+        int i;
+
+        cx231xx_info(DRIVER_NAME "cx231xx: called cx231xx_uninit_vbi_isoc\n");
+
+        dev->vbi_mode.isoc_ctl.nfields = -1;
+        for (i = 0; i < dev->vbi_mode.isoc_ctl.num_bufs; i++) {
+                urb = dev->vbi_mode.isoc_ctl.urb[i];
+                if (urb) {
+                        if (!irqs_disabled())
+                                usb_kill_urb(urb);
+                        else
+                                usb_unlink_urb(urb);
+
+                        if (dev->vbi_mode.isoc_ctl.transfer_buffer[i]) {
+
+                                kfree(dev->vbi_mode.isoc_ctl.
+                                      transfer_buffer[i]);
+                                dev->vbi_mode.isoc_ctl.transfer_buffer[i] =
+                                    NULL;
+                        }
+                        usb_free_urb(urb);
+                        dev->vbi_mode.isoc_ctl.urb[i] = NULL;
+                }
+                dev->vbi_mode.isoc_ctl.transfer_buffer[i] = NULL;
+        }
+
+        kfree(dev->vbi_mode.isoc_ctl.urb);
+        kfree(dev->vbi_mode.isoc_ctl.transfer_buffer);
+
+        dev->vbi_mode.isoc_ctl.urb = NULL;
+        dev->vbi_mode.isoc_ctl.transfer_buffer = NULL;
+        dev->vbi_mode.isoc_ctl.num_bufs = 0;
+
+        cx231xx_capture_start(dev, 0, Vbi);
+}
+EXPORT_SYMBOL_GPL(cx231xx_uninit_vbi_isoc);
+
+/*
+ * Allocate URBs and start IRQ
+ */
+int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
+                          int num_bufs, int max_pkt_size,
+                          int (*isoc_copy) (struct cx231xx *dev,
+                                            struct urb *urb))
+{
+        struct cx231xx_dmaqueue *dma_q = &dev->vbi_mode.vidq;
+        int i;
+        int sb_size, pipe;
+        struct urb *urb;
+        int rc;
+
+        cx231xx_info(DRIVER_NAME "cx231xx: called cx231xx_prepare_isoc\n");
+
+        /* De-allocates all pending stuff */
+        cx231xx_uninit_vbi_isoc(dev);
+
+        /* clear if any halt */
+        usb_clear_halt(dev->udev,
+                       usb_rcvbulkpipe(dev->udev,
+                                       dev->vbi_mode.end_point_addr));
+
+        dev->vbi_mode.isoc_ctl.isoc_copy = isoc_copy;
+        dev->vbi_mode.isoc_ctl.num_bufs = num_bufs;
+        dma_q->pos = 0;
+        dma_q->is_partial_line = 0;
+        dma_q->last_sav = 0;
+        dma_q->current_field = -1;
+        dma_q->bytes_left_in_line = dev->width << 1;
+        dma_q->lines_per_field = ((dev->norm & V4L2_STD_625_50) ?
+                                  PAL_VBI_LINES : NTSC_VBI_LINES);
+        dma_q->lines_completed = 0;
+        for (i = 0; i < 8; i++)
+                dma_q->partial_buf[i] = 0;
+
+        dev->vbi_mode.isoc_ctl.urb = kzalloc(sizeof(void *) * num_bufs,
+                                             GFP_KERNEL);
+        if (!dev->vbi_mode.isoc_ctl.urb) {
+                cx231xx_errdev("cannot alloc memory for usb buffers\n");
+                return -ENOMEM;
+        }
+
+        dev->vbi_mode.isoc_ctl.transfer_buffer =
+            kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
+        if (!dev->vbi_mode.isoc_ctl.transfer_buffer) {
+                cx231xx_errdev("cannot allocate memory for usbtransfer\n");
+                kfree(dev->vbi_mode.isoc_ctl.urb);
+                return -ENOMEM;
+        }
+
+        dev->vbi_mode.isoc_ctl.max_pkt_size = max_pkt_size;
+        dev->vbi_mode.isoc_ctl.buf = NULL;
+
+        sb_size = max_packets * dev->vbi_mode.isoc_ctl.max_pkt_size;
+
+        /* allocate urbs and transfer buffers */
+        for (i = 0; i < dev->vbi_mode.isoc_ctl.num_bufs; i++) {
+
+                urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!urb) {
+                        cx231xx_err(DRIVER_NAME
+                                    ": cannot alloc isoc_ctl.urb %i\n", i);
+                        cx231xx_uninit_vbi_isoc(dev);
+                        return -ENOMEM;
+                }
+                dev->vbi_mode.isoc_ctl.urb[i] = urb;
+                urb->transfer_flags = 0;
+
+                dev->vbi_mode.isoc_ctl.transfer_buffer[i] =
+                    kzalloc(sb_size, GFP_KERNEL);
+                if (!dev->vbi_mode.isoc_ctl.transfer_buffer[i]) {
+                        cx231xx_err(DRIVER_NAME
+                                    ": unable to allocate %i bytes for transfer"
+                                    " buffer %i%s\n", sb_size, i,
+                                    in_interrupt() ? " while in int" : "");
+                        cx231xx_uninit_vbi_isoc(dev);
+                        return -ENOMEM;
+                }
+
+                pipe = usb_rcvbulkpipe(dev->udev, dev->vbi_mode.end_point_addr);
+                usb_fill_bulk_urb(urb, dev->udev, pipe,
+                                  dev->vbi_mode.isoc_ctl.transfer_buffer[i],
+                                  sb_size, cx231xx_irq_vbi_callback, dma_q);
+        }
+
+        init_waitqueue_head(&dma_q->wq);
+
+        /* submit urbs and enables IRQ */
+        for (i = 0; i < dev->vbi_mode.isoc_ctl.num_bufs; i++) {
+                rc = usb_submit_urb(dev->vbi_mode.isoc_ctl.urb[i], GFP_ATOMIC);
+                if (rc) {
+                        cx231xx_err(DRIVER_NAME
+                                    ": submit of urb %i failed (error=%i)\n", i,
+                                    rc);
+                        cx231xx_uninit_vbi_isoc(dev);
+                        return rc;
+                }
+        }
+
+        cx231xx_capture_start(dev, 1, Vbi);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cx231xx_init_vbi_isoc);
+
+u32 cx231xx_get_vbi_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                         u8 sav_eav, u8 *p_buffer, u32 buffer_size)
+{
+        u32 bytes_copied = 0;
+        int current_field = -1;
+
+        switch (sav_eav) {
+
+        case SAV_VBI_FIELD1:
+                current_field = 1;
+                break;
+
+        case SAV_VBI_FIELD2:
+                current_field = 2;
+                break;
+        default:
+                break;
+        }
+
+        if (current_field < 0)
+                return bytes_copied;
+
+        dma_q->last_sav = sav_eav;
+
+        bytes_copied =
+            cx231xx_copy_vbi_line(dev, dma_q, p_buffer, buffer_size,
+                                  current_field);
+
+        return bytes_copied;
+}
+
+/*
+ * Announces that a buffer were filled and request the next
+ */
+static inline void vbi_buffer_filled(struct cx231xx *dev,
+                                     struct cx231xx_dmaqueue *dma_q,
+                                     struct cx231xx_buffer *buf)
+{
+        /* Advice that buffer was filled */
+        /* cx231xx_info(DRIVER_NAME "[%p/%d] wakeup\n", buf, buf->vb.i); */
+
+        buf->vb.state = VIDEOBUF_DONE;
+        buf->vb.field_count++;
+        do_gettimeofday(&buf->vb.ts);
+
+        dev->vbi_mode.isoc_ctl.buf = NULL;
+
+        list_del(&buf->vb.queue);
+        wake_up(&buf->vb.done);
+}
+
+u32 cx231xx_copy_vbi_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                          u8 *p_line, u32 length, int field_number)
+{
+        u32 bytes_to_copy;
+        struct cx231xx_buffer *buf;
+        u32 _line_size = dev->width * 2;
+
+        if (dma_q->current_field != field_number)
+                cx231xx_reset_vbi_buffer(dev, dma_q);
+
+        /* get the buffer pointer */
+        buf = dev->vbi_mode.isoc_ctl.buf;
+
+        /* Remember the field number for next time */
+        dma_q->current_field = field_number;
+
+        bytes_to_copy = dma_q->bytes_left_in_line;
+        if (bytes_to_copy > length)
+                bytes_to_copy = length;
+
+        if (dma_q->lines_completed >= dma_q->lines_per_field) {
+                dma_q->bytes_left_in_line -= bytes_to_copy;
+                dma_q->is_partial_line =
+                    (dma_q->bytes_left_in_line == 0) ? 0 : 1;
+                return 0;
+        }
+
+        dma_q->is_partial_line = 1;
+
+        /* If we don't have a buffer, just return the number of bytes we would
+           have copied if we had a buffer. */
+        if (!buf) {
+                dma_q->bytes_left_in_line -= bytes_to_copy;
+                dma_q->is_partial_line =
+                    (dma_q->bytes_left_in_line == 0) ? 0 : 1;
+                return bytes_to_copy;
+        }
+
+        /* copy the data to video buffer */
+        cx231xx_do_vbi_copy(dev, dma_q, p_line, bytes_to_copy);
+
+        dma_q->pos += bytes_to_copy;
+        dma_q->bytes_left_in_line -= bytes_to_copy;
+
+        if (dma_q->bytes_left_in_line == 0) {
+
+                dma_q->bytes_left_in_line = _line_size;
+                dma_q->lines_completed++;
+                dma_q->is_partial_line = 0;
+
+                if (cx231xx_is_vbi_buffer_done(dev, dma_q) && buf) {
+
+                        vbi_buffer_filled(dev, dma_q, buf);
+
+                        dma_q->pos = 0;
+                        buf = NULL;
+                        dma_q->lines_completed = 0;
+                }
+        }
+
+        return bytes_to_copy;
+}
+
+/*
+ * video-buf generic routine to get the next available buffer
+ */
+static inline void get_next_vbi_buf(struct cx231xx_dmaqueue *dma_q,
+                                    struct cx231xx_buffer **buf)
+{
+        struct cx231xx_video_mode *vmode =
+            container_of(dma_q, struct cx231xx_video_mode, vidq);
+        struct cx231xx *dev = container_of(vmode, struct cx231xx, vbi_mode);
+        char *outp;
+
+        if (list_empty(&dma_q->active)) {
+                cx231xx_err(DRIVER_NAME ": No active queue to serve\n");
+                dev->vbi_mode.isoc_ctl.buf = NULL;
+                *buf = NULL;
+                return;
+        }
+
+        /* Get the next buffer */
+        *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue);
+
+        /* Cleans up buffer - Usefull for testing for frame/URB loss */
+        outp = videobuf_to_vmalloc(&(*buf)->vb);
+        memset(outp, 0, (*buf)->vb.size);
+
+        dev->vbi_mode.isoc_ctl.buf = *buf;
+
+        return;
+}
+
+void cx231xx_reset_vbi_buffer(struct cx231xx *dev,
+                              struct cx231xx_dmaqueue *dma_q)
+{
+        struct cx231xx_buffer *buf;
+
+        buf = dev->vbi_mode.isoc_ctl.buf;
+
+        if (buf == NULL) {
+                /* first try to get the buffer */
+                get_next_vbi_buf(dma_q, &buf);
+
+                dma_q->pos = 0;
+                dma_q->current_field = -1;
+        }
+
+        dma_q->bytes_left_in_line = dev->width << 1;
+        dma_q->lines_completed = 0;
+}
+
+int cx231xx_do_vbi_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                        u8 *p_buffer, u32 bytes_to_copy)
+{
+        u8 *p_out_buffer = NULL;
+        u32 current_line_bytes_copied = 0;
+        struct cx231xx_buffer *buf;
+        u32 _line_size = dev->width << 1;
+        void *startwrite;
+        int offset, lencopy;
+
+        buf = dev->vbi_mode.isoc_ctl.buf;
+
+        if (buf == NULL)
+                return -EINVAL;
+
+        p_out_buffer = videobuf_to_vmalloc(&buf->vb);
+
+        if (dma_q->bytes_left_in_line != _line_size) {
+                current_line_bytes_copied =
+                    _line_size - dma_q->bytes_left_in_line;
+        }
+
+        offset = (dma_q->lines_completed * _line_size) +
+                 current_line_bytes_copied;
+
+        /* prepare destination address */
+        startwrite = p_out_buffer + offset;
+
+        lencopy = dma_q->bytes_left_in_line > bytes_to_copy ?
+                  bytes_to_copy : dma_q->bytes_left_in_line;
+
+        memcpy(startwrite, p_buffer, lencopy);
+
+        return 0;
+}
+
+u8 cx231xx_is_vbi_buffer_done(struct cx231xx *dev,
+                              struct cx231xx_dmaqueue *dma_q)
+{
+        u32 height = 0;
+
+        height = ((dev->norm & V4L2_STD_625_50) ?
+                  PAL_VBI_LINES : NTSC_VBI_LINES);
+        return (dma_q->lines_completed == height) ? 1 : 0;
+}
diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.h b/drivers/media/video/cx231xx/cx231xx-vbi.h
new file mode 100644
index 000000000000..89c7fe80b261
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-vbi.h
@@ -0,0 +1,65 @@
+/*
+   cx231xx_vbi.h - driver for Conexant Cx23100/101/102 USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+                Based on cx88 driver
+
+   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 _CX231XX_VBI_H
+#define _CX231XX_VBI_H
+
+extern struct videobuf_queue_ops cx231xx_vbi_qops;
+
+#define   NTSC_VBI_START_LINE 10        /* line 10 - 21 */
+#define   NTSC_VBI_END_LINE   21
+#define   NTSC_VBI_LINES          (NTSC_VBI_END_LINE-NTSC_VBI_START_LINE+1)
+
+#define   PAL_VBI_START_LINE  6
+#define   PAL_VBI_END_LINE    23
+#define   PAL_VBI_LINES       (PAL_VBI_END_LINE-PAL_VBI_START_LINE+1)
+
+#define   VBI_STRIDE            1440
+#define   VBI_SAMPLES_PER_LINE  1440
+
+#define   CX231XX_NUM_VBI_PACKETS       4
+#define   CX231XX_NUM_VBI_BUFS          5
+
+/* stream functions */
+int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
+                          int num_bufs, int max_pkt_size,
+                          int (*isoc_copy) (struct cx231xx *dev,
+                                            struct urb *urb));
+
+void cx231xx_uninit_vbi_isoc(struct cx231xx *dev);
+
+/* vbi data copy functions */
+u32 cx231xx_get_vbi_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                         u8 sav_eav, u8 *p_buffer, u32 buffer_size);
+
+u32 cx231xx_copy_vbi_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                          u8 *p_line, u32 length, int field_number);
+
+void cx231xx_reset_vbi_buffer(struct cx231xx *dev,
+                              struct cx231xx_dmaqueue *dma_q);
+
+int cx231xx_do_vbi_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                        u8 *p_buffer, u32 bytes_to_copy);
+
+u8 cx231xx_is_vbi_buffer_done(struct cx231xx *dev,
+                              struct cx231xx_dmaqueue *dma_q);
+
+#endif
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
new file mode 100644
index 000000000000..a23ae73fe634
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -0,0 +1,2434 @@
+/*
+   cx231xx-video.c - driver for Conexant Cx23100/101/102
+                     USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+        Based on em28xx driver
+        Based on cx23885 driver
+        Based on cx88 driver
+
+   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.
+ */
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/bitmap.h>
+#include <linux/usb.h>
+#include <linux/i2c.h>
+#include <linux/version.h>
+#include <linux/mm.h>
+#include <linux/mutex.h>
+
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/msp3400.h>
+#include <media/tuner.h>
+
+#include "dvb_frontend.h"
+
+#include "cx231xx.h"
+#include "cx231xx-vbi.h"
+
+#define CX231XX_VERSION_CODE            KERNEL_VERSION(0, 0, 1)
+
+#define DRIVER_AUTHOR   "Srinivasa Deevi <srinivasa.deevi@conexant.com>"
+#define DRIVER_DESC     "Conexant cx231xx based USB video device driver"
+
+#define cx231xx_videodbg(fmt, arg...) do {\
+        if (video_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __func__ , ##arg); } while (0)
+
+static unsigned int isoc_debug;
+module_param(isoc_debug, int, 0644);
+MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]");
+
+#define cx231xx_isocdbg(fmt, arg...) \
+do {\
+        if (isoc_debug) { \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __func__ , ##arg); \
+        } \
+  } while (0)
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+static unsigned int card[]     = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET };
+static unsigned int video_nr[] = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET };
+static unsigned int vbi_nr[]   = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET };
+static unsigned int radio_nr[] = {[0 ... (CX231XX_MAXBOARDS - 1)] = UNSET };
+
+module_param_array(card, int, NULL, 0444);
+module_param_array(video_nr, int, NULL, 0444);
+module_param_array(vbi_nr, int, NULL, 0444);
+module_param_array(radio_nr, int, NULL, 0444);
+
+MODULE_PARM_DESC(card, "card type");
+MODULE_PARM_DESC(video_nr, "video device numbers");
+MODULE_PARM_DESC(vbi_nr, "vbi device numbers");
+MODULE_PARM_DESC(radio_nr, "radio device numbers");
+
+static unsigned int video_debug;
+module_param(video_debug, int, 0644);
+MODULE_PARM_DESC(video_debug, "enable debug messages [video]");
+
+/* supported video standards */
+static struct cx231xx_fmt format[] = {
+        {
+         .name = "16bpp YUY2, 4:2:2, packed",
+         .fourcc = V4L2_PIX_FMT_YUYV,
+         .depth = 16,
+         .reg = 0,
+         },
+};
+
+/* supported controls */
+/* Common to all boards */
+
+/* ------------------------------------------------------------------- */
+
+static const struct v4l2_queryctrl no_ctl = {
+        .name = "42",
+        .flags = V4L2_CTRL_FLAG_DISABLED,
+};
+
+static struct cx231xx_ctrl cx231xx_ctls[] = {
+        /* --- video --- */
+        {
+                .v = {
+                        .id = V4L2_CID_BRIGHTNESS,
+                        .name = "Brightness",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 1,
+                        .default_value = 0x7f,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                },
+                .off = 128,
+                .reg = LUMA_CTRL,
+                .mask = 0x00ff,
+                .shift = 0,
+        }, {
+                .v = {
+                        .id = V4L2_CID_CONTRAST,
+                        .name = "Contrast",
+                        .minimum = 0,
+                        .maximum = 0xff,
+                        .step = 1,
+                        .default_value = 0x3f,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                },
+                .off = 0,
+                .reg = LUMA_CTRL,
+                .mask = 0xff00,
+                .shift = 8,
+        }, {
+                .v = {
+                        .id = V4L2_CID_HUE,
+                        .name = "Hue",
+                        .minimum = 0,
+                        .maximum = 0xff,
+                        .step = 1,
+                        .default_value = 0x7f,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                },
+                .off = 128,
+                .reg = CHROMA_CTRL,
+                .mask = 0xff0000,
+                .shift = 16,
+        }, {
+        /* strictly, this only describes only U saturation.
+        * V saturation is handled specially through code.
+        */
+                .v = {
+                        .id = V4L2_CID_SATURATION,
+                        .name = "Saturation",
+                        .minimum = 0,
+                        .maximum = 0xff,
+                        .step = 1,
+                        .default_value = 0x7f,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                },
+                .off = 0,
+                .reg = CHROMA_CTRL,
+                .mask = 0x00ff,
+                .shift = 0,
+        }, {
+                /* --- audio --- */
+                .v = {
+                        .id = V4L2_CID_AUDIO_MUTE,
+                        .name = "Mute",
+                        .minimum = 0,
+                        .maximum = 1,
+                        .default_value = 1,
+                        .type = V4L2_CTRL_TYPE_BOOLEAN,
+                },
+                .reg = PATH1_CTL1,
+                .mask = (0x1f << 24),
+                .shift = 24,
+        }, {
+                .v = {
+                        .id = V4L2_CID_AUDIO_VOLUME,
+                        .name = "Volume",
+                        .minimum = 0,
+                        .maximum = 0x3f,
+                        .step = 1,
+                        .default_value = 0x3f,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                },
+                .reg = PATH1_VOL_CTL,
+                .mask = 0xff,
+                .shift = 0,
+        }
+};
+static const int CX231XX_CTLS = ARRAY_SIZE(cx231xx_ctls);
+
+static const u32 cx231xx_user_ctrls[] = {
+        V4L2_CID_USER_CLASS,
+        V4L2_CID_BRIGHTNESS,
+        V4L2_CID_CONTRAST,
+        V4L2_CID_SATURATION,
+        V4L2_CID_HUE,
+        V4L2_CID_AUDIO_VOLUME,
+#if 0
+        V4L2_CID_AUDIO_BALANCE,
+#endif
+        V4L2_CID_AUDIO_MUTE,
+        0
+};
+
+static const u32 *ctrl_classes[] = {
+        cx231xx_user_ctrls,
+        NULL
+};
+
+/* ------------------------------------------------------------------
+        Video buffer and parser functions
+   ------------------------------------------------------------------*/
+
+/*
+ * Announces that a buffer were filled and request the next
+ */
+static inline void buffer_filled(struct cx231xx *dev,
+                                 struct cx231xx_dmaqueue *dma_q,
+                                 struct cx231xx_buffer *buf)
+{
+        /* Advice that buffer was filled */
+        cx231xx_isocdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
+        buf->vb.state = VIDEOBUF_DONE;
+        buf->vb.field_count++;
+        do_gettimeofday(&buf->vb.ts);
+
+        dev->video_mode.isoc_ctl.buf = NULL;
+
+        list_del(&buf->vb.queue);
+        wake_up(&buf->vb.done);
+}
+
+static inline void print_err_status(struct cx231xx *dev, int packet, int status)
+{
+        char *errmsg = "Unknown";
+
+        switch (status) {
+        case -ENOENT:
+                errmsg = "unlinked synchronuously";
+                break;
+        case -ECONNRESET:
+                errmsg = "unlinked asynchronuously";
+                break;
+        case -ENOSR:
+                errmsg = "Buffer error (overrun)";
+                break;
+        case -EPIPE:
+                errmsg = "Stalled (device not responding)";
+                break;
+        case -EOVERFLOW:
+                errmsg = "Babble (bad cable?)";
+                break;
+        case -EPROTO:
+                errmsg = "Bit-stuff error (bad cable?)";
+                break;
+        case -EILSEQ:
+                errmsg = "CRC/Timeout (could be anything)";
+                break;
+        case -ETIME:
+                errmsg = "Device does not respond";
+                break;
+        }
+        if (packet < 0) {
+                cx231xx_isocdbg("URB status %d [%s].\n", status, errmsg);
+        } else {
+                cx231xx_isocdbg("URB packet %d, status %d [%s].\n",
+                                packet, status, errmsg);
+        }
+}
+
+/*
+ * video-buf generic routine to get the next available buffer
+ */
+static inline void get_next_buf(struct cx231xx_dmaqueue *dma_q,
+                                struct cx231xx_buffer **buf)
+{
+        struct cx231xx_video_mode *vmode =
+            container_of(dma_q, struct cx231xx_video_mode, vidq);
+        struct cx231xx *dev = container_of(vmode, struct cx231xx, video_mode);
+
+        char *outp;
+
+        if (list_empty(&dma_q->active)) {
+                cx231xx_isocdbg("No active queue to serve\n");
+                dev->video_mode.isoc_ctl.buf = NULL;
+                *buf = NULL;
+                return;
+        }
+
+        /* Get the next buffer */
+        *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue);
+
+        /* Cleans up buffer - Usefull for testing for frame/URB loss */
+        outp = videobuf_to_vmalloc(&(*buf)->vb);
+        memset(outp, 0, (*buf)->vb.size);
+
+        dev->video_mode.isoc_ctl.buf = *buf;
+
+        return;
+}
+
+/*
+ * Controls the isoc copy of each urb packet
+ */
+static inline int cx231xx_isoc_copy(struct cx231xx *dev, struct urb *urb)
+{
+        struct cx231xx_buffer *buf;
+        struct cx231xx_dmaqueue *dma_q = urb->context;
+        unsigned char *outp = NULL;
+        int i, rc = 1;
+        unsigned char *p_buffer;
+        u32 bytes_parsed = 0, buffer_size = 0;
+        u8 sav_eav = 0;
+
+        if (!dev)
+                return 0;
+
+        if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+                return 0;
+
+        if (urb->status < 0) {
+                print_err_status(dev, -1, urb->status);
+                if (urb->status == -ENOENT)
+                        return 0;
+        }
+
+        buf = dev->video_mode.isoc_ctl.buf;
+        if (buf != NULL)
+                outp = videobuf_to_vmalloc(&buf->vb);
+
+        for (i = 0; i < urb->number_of_packets; i++) {
+                int status = urb->iso_frame_desc[i].status;
+
+                if (status < 0) {
+                        print_err_status(dev, i, status);
+                        if (urb->iso_frame_desc[i].status != -EPROTO)
+                                continue;
+                }
+
+                if (urb->iso_frame_desc[i].actual_length <= 0) {
+                        /* cx231xx_isocdbg("packet %d is empty",i); - spammy */
+                        continue;
+                }
+                if (urb->iso_frame_desc[i].actual_length >
+                    dev->video_mode.max_pkt_size) {
+                        cx231xx_isocdbg("packet bigger than packet size");
+                        continue;
+                }
+
+                /*  get buffer pointer and length */
+                p_buffer = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
+                buffer_size = urb->iso_frame_desc[i].actual_length;
+                bytes_parsed = 0;
+
+                if (dma_q->is_partial_line) {
+                        /* Handle the case of a partial line */
+                        sav_eav = dma_q->last_sav;
+                } else {
+                        /* Check for a SAV/EAV overlapping
+                                the buffer boundary */
+                        sav_eav =
+                            cx231xx_find_boundary_SAV_EAV(p_buffer,
+                                                          dma_q->partial_buf,
+                                                          &bytes_parsed);
+                }
+
+                sav_eav &= 0xF0;
+                /* Get the first line if we have some portion of an SAV/EAV from
+                   the last buffer or a partial line  */
+                if (sav_eav) {
+                        bytes_parsed += cx231xx_get_video_line(dev, dma_q,
+                                sav_eav,        /* SAV/EAV */
+                                p_buffer + bytes_parsed,        /* p_buffer */
+                                buffer_size - bytes_parsed);/* buf size */
+                }
+
+                /* Now parse data that is completely in this buffer */
+                /* dma_q->is_partial_line = 0;  */
+
+                while (bytes_parsed < buffer_size) {
+                        u32 bytes_used = 0;
+
+                        sav_eav = cx231xx_find_next_SAV_EAV(
+                                p_buffer + bytes_parsed,        /* p_buffer */
+                                buffer_size - bytes_parsed,     /* buf size */
+                                &bytes_used);/* bytes used to get SAV/EAV */
+
+                        bytes_parsed += bytes_used;
+
+                        sav_eav &= 0xF0;
+                        if (sav_eav && (bytes_parsed < buffer_size)) {
+                                bytes_parsed += cx231xx_get_video_line(dev,
+                                        dma_q, sav_eav, /* SAV/EAV */
+                                        p_buffer + bytes_parsed,/* p_buffer */
+                                        buffer_size - bytes_parsed);/*buf size*/
+                        }
+                }
+
+                /* Save the last four bytes of the buffer so we can check the
+                   buffer boundary condition next time */
+                memcpy(dma_q->partial_buf, p_buffer + buffer_size - 4, 4);
+                bytes_parsed = 0;
+
+        }
+        return rc;
+}
+
+u8 cx231xx_find_boundary_SAV_EAV(u8 *p_buffer, u8 *partial_buf,
+                                 u32 *p_bytes_used)
+{
+        u32 bytes_used;
+        u8 boundary_bytes[8];
+        u8 sav_eav = 0;
+
+        *p_bytes_used = 0;
+
+        /* Create an array of the last 4 bytes of the last buffer and the first
+           4 bytes of the current buffer. */
+
+        memcpy(boundary_bytes, partial_buf, 4);
+        memcpy(boundary_bytes + 4, p_buffer, 4);
+
+        /* Check for the SAV/EAV in the boundary buffer */
+        sav_eav = cx231xx_find_next_SAV_EAV((u8 *)&boundary_bytes, 8,
+                                            &bytes_used);
+
+        if (sav_eav) {
+                /* found a boundary SAV/EAV.  Updates the bytes used to reflect
+                   only those used in the new buffer */
+                *p_bytes_used = bytes_used - 4;
+        }
+
+        return sav_eav;
+}
+
+u8 cx231xx_find_next_SAV_EAV(u8 *p_buffer, u32 buffer_size, u32 *p_bytes_used)
+{
+        u32 i;
+        u8 sav_eav = 0;
+
+        /*
+         * Don't search if the buffer size is less than 4.  It causes a page
+         * fault since buffer_size - 4 evaluates to a large number in that
+         * case.
+         */
+        if (buffer_size < 4) {
+                *p_bytes_used = buffer_size;
+                return 0;
+        }
+
+        for (i = 0; i < (buffer_size - 3); i++) {
+
+                if ((p_buffer[i] == 0xFF) &&
+                    (p_buffer[i + 1] == 0x00) && (p_buffer[i + 2] == 0x00)) {
+
+                        *p_bytes_used = i + 4;
+                        sav_eav = p_buffer[i + 3];
+                        return sav_eav;
+                }
+        }
+
+        *p_bytes_used = buffer_size;
+        return 0;
+}
+
+u32 cx231xx_get_video_line(struct cx231xx *dev,
+                           struct cx231xx_dmaqueue *dma_q, u8 sav_eav,
+                           u8 *p_buffer, u32 buffer_size)
+{
+        u32 bytes_copied = 0;
+        int current_field = -1;
+
+        switch (sav_eav) {
+        case SAV_ACTIVE_VIDEO_FIELD1:
+                /* looking for skipped line which occurred in PAL 720x480 mode.
+                   In this case, there will be no active data contained
+                   between the SAV and EAV */
+                if ((buffer_size > 3) && (p_buffer[0] == 0xFF) &&
+                    (p_buffer[1] == 0x00) && (p_buffer[2] == 0x00) &&
+                    ((p_buffer[3] == EAV_ACTIVE_VIDEO_FIELD1) ||
+                     (p_buffer[3] == EAV_ACTIVE_VIDEO_FIELD2) ||
+                     (p_buffer[3] == EAV_VBLANK_FIELD1) ||
+                     (p_buffer[3] == EAV_VBLANK_FIELD2)))
+                        return bytes_copied;
+                current_field = 1;
+                break;
+
+        case SAV_ACTIVE_VIDEO_FIELD2:
+                /* looking for skipped line which occurred in PAL 720x480 mode.
+                   In this case, there will be no active data contained between
+                   the SAV and EAV */
+                if ((buffer_size > 3) && (p_buffer[0] == 0xFF) &&
+                    (p_buffer[1] == 0x00) && (p_buffer[2] == 0x00) &&
+                    ((p_buffer[3] == EAV_ACTIVE_VIDEO_FIELD1) ||
+                     (p_buffer[3] == EAV_ACTIVE_VIDEO_FIELD2) ||
+                     (p_buffer[3] == EAV_VBLANK_FIELD1)       ||
+                     (p_buffer[3] == EAV_VBLANK_FIELD2)))
+                        return bytes_copied;
+                current_field = 2;
+                break;
+        }
+
+        dma_q->last_sav = sav_eav;
+
+        bytes_copied = cx231xx_copy_video_line(dev, dma_q, p_buffer,
+                                               buffer_size, current_field);
+
+        return bytes_copied;
+}
+
+u32 cx231xx_copy_video_line(struct cx231xx *dev,
+                            struct cx231xx_dmaqueue *dma_q, u8 *p_line,
+                            u32 length, int field_number)
+{
+        u32 bytes_to_copy;
+        struct cx231xx_buffer *buf;
+        u32 _line_size = dev->width * 2;
+
+        if (dma_q->current_field != field_number)
+                cx231xx_reset_video_buffer(dev, dma_q);
+
+        /* get the buffer pointer */
+        buf = dev->video_mode.isoc_ctl.buf;
+
+        /* Remember the field number for next time */
+        dma_q->current_field = field_number;
+
+        bytes_to_copy = dma_q->bytes_left_in_line;
+        if (bytes_to_copy > length)
+                bytes_to_copy = length;
+
+        if (dma_q->lines_completed >= dma_q->lines_per_field) {
+                dma_q->bytes_left_in_line -= bytes_to_copy;
+                dma_q->is_partial_line = (dma_q->bytes_left_in_line == 0) ?
+                                          0 : 1;
+                return 0;
+        }
+
+        dma_q->is_partial_line = 1;
+
+        /* If we don't have a buffer, just return the number of bytes we would
+           have copied if we had a buffer. */
+        if (!buf) {
+                dma_q->bytes_left_in_line -= bytes_to_copy;
+                dma_q->is_partial_line = (dma_q->bytes_left_in_line == 0)
+                                         ? 0 : 1;
+                return bytes_to_copy;
+        }
+
+        /* copy the data to video buffer */
+        cx231xx_do_copy(dev, dma_q, p_line, bytes_to_copy);
+
+        dma_q->pos += bytes_to_copy;
+        dma_q->bytes_left_in_line -= bytes_to_copy;
+
+        if (dma_q->bytes_left_in_line == 0) {
+                dma_q->bytes_left_in_line = _line_size;
+                dma_q->lines_completed++;
+                dma_q->is_partial_line = 0;
+
+                if (cx231xx_is_buffer_done(dev, dma_q) && buf) {
+                        buffer_filled(dev, dma_q, buf);
+
+                        dma_q->pos = 0;
+                        buf = NULL;
+                        dma_q->lines_completed = 0;
+                }
+        }
+
+        return bytes_to_copy;
+}
+
+void cx231xx_reset_video_buffer(struct cx231xx *dev,
+                                struct cx231xx_dmaqueue *dma_q)
+{
+        struct cx231xx_buffer *buf;
+
+        /* handle the switch from field 1 to field 2 */
+        if (dma_q->current_field == 1) {
+                if (dma_q->lines_completed >= dma_q->lines_per_field)
+                        dma_q->field1_done = 1;
+                else
+                        dma_q->field1_done = 0;
+        }
+
+        buf = dev->video_mode.isoc_ctl.buf;
+
+        if (buf == NULL) {
+                u8 *outp = NULL;
+                /* first try to get the buffer */
+                get_next_buf(dma_q, &buf);
+
+                if (buf)
+                        outp = videobuf_to_vmalloc(&buf->vb);
+
+                dma_q->pos = 0;
+                dma_q->field1_done = 0;
+                dma_q->current_field = -1;
+        }
+
+        /* reset the counters */
+        dma_q->bytes_left_in_line = dev->width << 1;
+        dma_q->lines_completed = 0;
+}
+
+int cx231xx_do_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                    u8 *p_buffer, u32 bytes_to_copy)
+{
+        u8 *p_out_buffer = NULL;
+        u32 current_line_bytes_copied = 0;
+        struct cx231xx_buffer *buf;
+        u32 _line_size = dev->width << 1;
+        void *startwrite;
+        int offset, lencopy;
+
+        buf = dev->video_mode.isoc_ctl.buf;
+
+        if (buf == NULL)
+                return -1;
+
+        p_out_buffer = videobuf_to_vmalloc(&buf->vb);
+
+        current_line_bytes_copied = _line_size - dma_q->bytes_left_in_line;
+
+        /* Offset field 2 one line from the top of the buffer */
+        offset = (dma_q->current_field == 1) ? 0 : _line_size;
+
+        /* Offset for field 2 */
+        startwrite = p_out_buffer + offset;
+
+        /* lines already completed in the current field */
+        startwrite += (dma_q->lines_completed * _line_size * 2);
+
+        /* bytes already completed in the current line */
+        startwrite += current_line_bytes_copied;
+
+        lencopy = dma_q->bytes_left_in_line > bytes_to_copy ?
+                  bytes_to_copy : dma_q->bytes_left_in_line;
+
+        if ((u8 *)(startwrite + lencopy) > (u8 *)(p_out_buffer + buf->vb.size))
+                return 0;
+
+        /* The below copies the UYVY data straight into video buffer */
+        cx231xx_swab((u16 *) p_buffer, (u16 *) startwrite, (u16) lencopy);
+
+        return 0;
+}
+
+void cx231xx_swab(u16 *from, u16 *to, u16 len)
+{
+        u16 i;
+
+        if (len <= 0)
+                return;
+
+        for (i = 0; i < len / 2; i++)
+                to[i] = (from[i] << 8) | (from[i] >> 8);
+}
+
+u8 cx231xx_is_buffer_done(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q)
+{
+        u8 buffer_complete = 0;
+
+        /* Dual field stream */
+        buffer_complete = ((dma_q->current_field == 2) &&
+                           (dma_q->lines_completed >= dma_q->lines_per_field) &&
+                            dma_q->field1_done);
+
+        return buffer_complete;
+}
+
+/* ------------------------------------------------------------------
+        Videobuf operations
+   ------------------------------------------------------------------*/
+
+static int
+buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
+{
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx *dev = fh->dev;
+        struct v4l2_frequency f;
+
+        *size = (fh->dev->width * fh->dev->height * dev->format->depth + 7)>>3;
+        if (0 == *count)
+                *count = CX231XX_DEF_BUF;
+
+        if (*count < CX231XX_MIN_BUF)
+                *count = CX231XX_MIN_BUF;
+
+        /* Ask tuner to go to analog mode */
+        memset(&f, 0, sizeof(f));
+        f.frequency = dev->ctl_freq;
+        f.type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+
+        call_all(dev, tuner, s_frequency, &f);
+
+        return 0;
+}
+
+/* This is called *without* dev->slock held; please keep it that way */
+static void free_buffer(struct videobuf_queue *vq, struct cx231xx_buffer *buf)
+{
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx *dev = fh->dev;
+        unsigned long flags = 0;
+
+        if (in_interrupt())
+                BUG();
+
+        /* We used to wait for the buffer to finish here, but this didn't work
+           because, as we were keeping the state as VIDEOBUF_QUEUED,
+           videobuf_queue_cancel marked it as finished for us.
+           (Also, it could wedge forever if the hardware was misconfigured.)
+
+           This should be safe; by the time we get here, the buffer isn't
+           queued anymore. If we ever start marking the buffers as
+           VIDEOBUF_ACTIVE, it won't be, though.
+         */
+        spin_lock_irqsave(&dev->video_mode.slock, flags);
+        if (dev->video_mode.isoc_ctl.buf == buf)
+                dev->video_mode.isoc_ctl.buf = NULL;
+        spin_unlock_irqrestore(&dev->video_mode.slock, flags);
+
+        videobuf_vmalloc_free(&buf->vb);
+        buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
+
+static int
+buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
+               enum v4l2_field field)
+{
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx_buffer *buf =
+            container_of(vb, struct cx231xx_buffer, vb);
+        struct cx231xx *dev = fh->dev;
+        int rc = 0, urb_init = 0;
+
+        /* The only currently supported format is 16 bits/pixel */
+        buf->vb.size = (fh->dev->width * fh->dev->height * dev->format->depth
+                        + 7) >> 3;
+        if (0 != buf->vb.baddr && buf->vb.bsize < buf->vb.size)
+                return -EINVAL;
+
+        buf->vb.width = dev->width;
+        buf->vb.height = dev->height;
+        buf->vb.field = field;
+
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
+                rc = videobuf_iolock(vq, &buf->vb, NULL);
+                if (rc < 0)
+                        goto fail;
+        }
+
+        if (!dev->video_mode.isoc_ctl.num_bufs)
+                urb_init = 1;
+
+        if (urb_init) {
+                rc = cx231xx_init_isoc(dev, CX231XX_NUM_PACKETS,
+                                       CX231XX_NUM_BUFS,
+                                       dev->video_mode.max_pkt_size,
+                                       cx231xx_isoc_copy);
+                if (rc < 0)
+                        goto fail;
+        }
+
+        buf->vb.state = VIDEOBUF_PREPARED;
+        return 0;
+
+fail:
+        free_buffer(vq, buf);
+        return rc;
+}
+
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+        struct cx231xx_buffer *buf =
+            container_of(vb, struct cx231xx_buffer, vb);
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx *dev = fh->dev;
+        struct cx231xx_dmaqueue *vidq = &dev->video_mode.vidq;
+
+        buf->vb.state = VIDEOBUF_QUEUED;
+        list_add_tail(&buf->vb.queue, &vidq->active);
+
+}
+
+static void buffer_release(struct videobuf_queue *vq,
+                           struct videobuf_buffer *vb)
+{
+        struct cx231xx_buffer *buf =
+            container_of(vb, struct cx231xx_buffer, vb);
+        struct cx231xx_fh *fh = vq->priv_data;
+        struct cx231xx *dev = (struct cx231xx *)fh->dev;
+
+        cx231xx_isocdbg("cx231xx: called buffer_release\n");
+
+        free_buffer(vq, buf);
+}
+
+static struct videobuf_queue_ops cx231xx_video_qops = {
+        .buf_setup = buffer_setup,
+        .buf_prepare = buffer_prepare,
+        .buf_queue = buffer_queue,
+        .buf_release = buffer_release,
+};
+
+/*********************  v4l2 interface  **************************************/
+
+void video_mux(struct cx231xx *dev, int index)
+{
+        dev->video_input = index;
+        dev->ctl_ainput = INPUT(index)->amux;
+
+        cx231xx_set_video_input_mux(dev, index);
+
+        cx25840_call(dev, video, s_routing, INPUT(index)->vmux, 0, 0);
+
+        cx231xx_set_audio_input(dev, dev->ctl_ainput);
+
+        cx231xx_info("video_mux : %d\n", index);
+
+        /* do mode control overrides if required */
+        cx231xx_do_mode_ctrl_overrides(dev);
+}
+
+/* Usage lock check functions */
+static int res_get(struct cx231xx_fh *fh)
+{
+        struct cx231xx *dev = fh->dev;
+        int rc = 0;
+
+        /* This instance already has stream_on */
+        if (fh->stream_on)
+                return rc;
+
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                if (dev->stream_on)
+                        return -EBUSY;
+                dev->stream_on = 1;
+        } else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+                if (dev->vbi_stream_on)
+                        return -EBUSY;
+                dev->vbi_stream_on = 1;
+        } else
+                return -EINVAL;
+
+        fh->stream_on = 1;
+
+        return rc;
+}
+
+static int res_check(struct cx231xx_fh *fh)
+{
+        return fh->stream_on;
+}
+
+static void res_free(struct cx231xx_fh *fh)
+{
+        struct cx231xx *dev = fh->dev;
+
+        fh->stream_on = 0;
+
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                dev->stream_on = 0;
+        if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE)
+                dev->vbi_stream_on = 0;
+}
+
+static int check_dev(struct cx231xx *dev)
+{
+        if (dev->state & DEV_DISCONNECTED) {
+                cx231xx_errdev("v4l2 ioctl: device not present\n");
+                return -ENODEV;
+        }
+
+        if (dev->state & DEV_MISCONFIGURED) {
+                cx231xx_errdev("v4l2 ioctl: device is misconfigured; "
+                               "close and open it again\n");
+                return -EIO;
+        }
+        return 0;
+}
+
+void get_scale(struct cx231xx *dev,
+               unsigned int width, unsigned int height,
+               unsigned int *hscale, unsigned int *vscale)
+{
+        unsigned int maxw = norm_maxw(dev);
+        unsigned int maxh = norm_maxh(dev);
+
+        *hscale = (((unsigned long)maxw) << 12) / width - 4096L;
+        if (*hscale >= 0x4000)
+                *hscale = 0x3fff;
+
+        *vscale = (((unsigned long)maxh) << 12) / height - 4096L;
+        if (*vscale >= 0x4000)
+                *vscale = 0x3fff;
+
+        dev->hscale = *hscale;
+        dev->vscale = *vscale;
+
+}
+
+/* ------------------------------------------------------------------
+        IOCTL vidioc handling
+   ------------------------------------------------------------------*/
+
+static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+                                struct v4l2_format *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        mutex_lock(&dev->lock);
+
+        f->fmt.pix.width = dev->width;
+        f->fmt.pix.height = dev->height;
+        f->fmt.pix.pixelformat = dev->format->fourcc;;
+        f->fmt.pix.bytesperline = (dev->width * dev->format->depth + 7) >> 3;;
+        f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * dev->height;
+        f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+
+        f->fmt.pix.field = V4L2_FIELD_INTERLACED;
+
+        mutex_unlock(&dev->lock);
+
+        return 0;
+}
+
+static struct cx231xx_fmt *format_by_fourcc(unsigned int fourcc)
+{
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(format); i++)
+                if (format[i].fourcc == fourcc)
+                        return &format[i];
+
+        return NULL;
+}
+
+static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+                                  struct v4l2_format *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int width = f->fmt.pix.width;
+        int height = f->fmt.pix.height;
+        unsigned int maxw = norm_maxw(dev);
+        unsigned int maxh = norm_maxh(dev);
+        unsigned int hscale, vscale;
+        struct cx231xx_fmt *fmt;
+
+        fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+        if (!fmt) {
+                cx231xx_videodbg("Fourcc format (%08x) invalid.\n",
+                                 f->fmt.pix.pixelformat);
+                return -EINVAL;
+        }
+
+        /* width must even because of the YUYV format
+           height must be even because of interlacing */
+        height &= 0xfffe;
+        width &= 0xfffe;
+
+        if (unlikely(height < 32))
+                height = 32;
+        if (unlikely(height > maxh))
+                height = maxh;
+        if (unlikely(width < 48))
+                width = 48;
+        if (unlikely(width > maxw))
+                width = maxw;
+
+        get_scale(dev, width, height, &hscale, &vscale);
+
+        width = (((unsigned long)maxw) << 12) / (hscale + 4096L);
+        height = (((unsigned long)maxh) << 12) / (vscale + 4096L);
+
+        f->fmt.pix.width = width;
+        f->fmt.pix.height = height;
+        f->fmt.pix.pixelformat = fmt->fourcc;
+        f->fmt.pix.bytesperline = (dev->width * fmt->depth + 7) >> 3;
+        f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * height;
+        f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+        f->fmt.pix.field = V4L2_FIELD_INTERLACED;
+
+        return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                                struct v4l2_format *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+        struct cx231xx_fmt *fmt;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+
+        vidioc_try_fmt_vid_cap(file, priv, f);
+
+        fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+        if (!fmt) {
+                rc = -EINVAL;
+                goto out;
+        }
+
+        if (videobuf_queue_is_busy(&fh->vb_vidq)) {
+                cx231xx_errdev("%s queue busy\n", __func__);
+                rc = -EBUSY;
+                goto out;
+        }
+
+        if (dev->stream_on && !fh->stream_on) {
+                cx231xx_errdev("%s device in use by another fh\n", __func__);
+                rc = -EBUSY;
+                goto out;
+        }
+
+        /* set new image size */
+        dev->width = f->fmt.pix.width;
+        dev->height = f->fmt.pix.height;
+        dev->format = fmt;
+        get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
+
+        call_all(dev, video, s_fmt, f);
+
+        /* Set the correct alternate setting for this resolution */
+        cx231xx_resolution_set(dev);
+
+out:
+        mutex_unlock(&dev->lock);
+        return rc;
+}
+
+static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id * id)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        *id = dev->norm;
+        return 0;
+}
+
+static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        struct v4l2_format f;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        cx231xx_info("vidioc_s_std : 0x%x\n", (unsigned int)*norm);
+
+        mutex_lock(&dev->lock);
+        dev->norm = *norm;
+
+        /* Adjusts width/height, if needed */
+        f.fmt.pix.width = dev->width;
+        f.fmt.pix.height = dev->height;
+        vidioc_try_fmt_vid_cap(file, priv, &f);
+
+        /* set new image size */
+        dev->width = f.fmt.pix.width;
+        dev->height = f.fmt.pix.height;
+        get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
+
+        call_all(dev, core, s_std, dev->norm);
+
+        mutex_unlock(&dev->lock);
+
+        cx231xx_resolution_set(dev);
+
+        /* do mode control overrides */
+        cx231xx_do_mode_ctrl_overrides(dev);
+
+        return 0;
+}
+
+static const char *iname[] = {
+        [CX231XX_VMUX_COMPOSITE1] = "Composite1",
+        [CX231XX_VMUX_SVIDEO]     = "S-Video",
+        [CX231XX_VMUX_TELEVISION] = "Television",
+        [CX231XX_VMUX_CABLE]      = "Cable TV",
+        [CX231XX_VMUX_DVB]        = "DVB",
+        [CX231XX_VMUX_DEBUG]      = "for debug only",
+};
+
+static int vidioc_enum_input(struct file *file, void *priv,
+                             struct v4l2_input *i)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        unsigned int n;
+
+        n = i->index;
+        if (n >= MAX_CX231XX_INPUT)
+                return -EINVAL;
+        if (0 == INPUT(n)->type)
+                return -EINVAL;
+
+        i->index = n;
+        i->type = V4L2_INPUT_TYPE_CAMERA;
+
+        strcpy(i->name, iname[INPUT(n)->type]);
+
+        if ((CX231XX_VMUX_TELEVISION == INPUT(n)->type) ||
+            (CX231XX_VMUX_CABLE == INPUT(n)->type))
+                i->type = V4L2_INPUT_TYPE_TUNER;
+
+        i->std = dev->vdev->tvnorms;
+
+        return 0;
+}
+
+static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        *i = dev->video_input;
+
+        return 0;
+}
+
+static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        if (i >= MAX_CX231XX_INPUT)
+                return -EINVAL;
+        if (0 == INPUT(i)->type)
+                return -EINVAL;
+
+        mutex_lock(&dev->lock);
+
+        video_mux(dev, i);
+
+        mutex_unlock(&dev->lock);
+        return 0;
+}
+
+static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        switch (a->index) {
+        case CX231XX_AMUX_VIDEO:
+                strcpy(a->name, "Television");
+                break;
+        case CX231XX_AMUX_LINE_IN:
+                strcpy(a->name, "Line In");
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        a->index = dev->ctl_ainput;
+        a->capability = V4L2_AUDCAP_STEREO;
+
+        return 0;
+}
+
+static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int status = 0;
+
+        /* Doesn't allow manual routing */
+        if (a->index != dev->ctl_ainput)
+                return -EINVAL;
+
+        dev->ctl_ainput = INPUT(a->index)->amux;
+        status = cx231xx_set_audio_input(dev, dev->ctl_ainput);
+
+        return status;
+}
+
+static int vidioc_queryctrl(struct file *file, void *priv,
+                            struct v4l2_queryctrl *qc)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int id = qc->id;
+        int i;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        qc->id = v4l2_ctrl_next(ctrl_classes, qc->id);
+        if (unlikely(qc->id == 0))
+                return -EINVAL;
+
+        memset(qc, 0, sizeof(*qc));
+
+        qc->id = id;
+
+        if (qc->id < V4L2_CID_BASE || qc->id >= V4L2_CID_LASTP1)
+                return -EINVAL;
+
+        for (i = 0; i < CX231XX_CTLS; i++)
+                if (cx231xx_ctls[i].v.id == qc->id)
+                        break;
+
+        if (i == CX231XX_CTLS) {
+                *qc = no_ctl;
+                return 0;
+        }
+        *qc = cx231xx_ctls[i].v;
+
+        mutex_lock(&dev->lock);
+        call_all(dev, core, queryctrl, qc);
+        mutex_unlock(&dev->lock);
+
+        if (qc->type)
+                return 0;
+        else
+                return -EINVAL;
+}
+
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                         struct v4l2_control *ctrl)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+        call_all(dev, core, g_ctrl, ctrl);
+        mutex_unlock(&dev->lock);
+        return rc;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                         struct v4l2_control *ctrl)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+        call_all(dev, core, s_ctrl, ctrl);
+        mutex_unlock(&dev->lock);
+        return rc;
+}
+
+static int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        if (0 != t->index)
+                return -EINVAL;
+
+        strcpy(t->name, "Tuner");
+
+        t->type = V4L2_TUNER_ANALOG_TV;
+        t->capability = V4L2_TUNER_CAP_NORM;
+        t->rangehigh = 0xffffffffUL;
+        t->signal = 0xffff;     /* LOCKED */
+
+        return 0;
+}
+
+static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        if (0 != t->index)
+                return -EINVAL;
+#if 0
+        mutex_lock(&dev->lock);
+        call_all(dev, tuner, s_tuner, t);
+        mutex_unlock(&dev->lock);
+#endif
+        return 0;
+}
+
+static int vidioc_g_frequency(struct file *file, void *priv,
+                              struct v4l2_frequency *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        mutex_lock(&dev->lock);
+        f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+        f->frequency = dev->ctl_freq;
+
+        call_all(dev, tuner, g_frequency, f);
+
+        mutex_unlock(&dev->lock);
+
+        return 0;
+}
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+                              struct v4l2_frequency *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        if (0 != f->tuner)
+                return -EINVAL;
+
+        if (unlikely(0 == fh->radio && f->type != V4L2_TUNER_ANALOG_TV))
+                return -EINVAL;
+        if (unlikely(1 == fh->radio && f->type != V4L2_TUNER_RADIO))
+                return -EINVAL;
+
+        /* set pre channel change settings in DIF first */
+        rc = cx231xx_tuner_pre_channel_change(dev);
+
+        mutex_lock(&dev->lock);
+
+        dev->ctl_freq = f->frequency;
+
+        if (dev->tuner_type == TUNER_XC5000) {
+                if (dev->cx231xx_set_analog_freq != NULL)
+                        dev->cx231xx_set_analog_freq(dev, f->frequency);
+        } else
+                call_all(dev, tuner, s_frequency, f);
+
+        mutex_unlock(&dev->lock);
+
+        /* set post channel change settings in DIF first */
+        rc = cx231xx_tuner_post_channel_change(dev);
+
+        cx231xx_info("Set New FREQUENCY to %d\n", f->frequency);
+
+        return rc;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+
+/*
+  -R, --list-registers=type=<host/i2cdrv/i2caddr>,
+                                chip=<chip>[,min=<addr>,max=<addr>]
+                     dump registers from <min> to <max> [VIDIOC_DBG_G_REGISTER]
+  -r, --set-register=type=<host/i2cdrv/i2caddr>,
+                                chip=<chip>,reg=<addr>,val=<val>
+                     set the register [VIDIOC_DBG_S_REGISTER]
+
+  if type == host, then <chip> is the hosts chip ID (default 0)
+  if type == i2cdrv (default), then <chip> is the I2C driver name or ID
+  if type == i2caddr, then <chip> is the 7-bit I2C address
+*/
+
+static int vidioc_g_register(struct file *file, void *priv,
+                             struct v4l2_dbg_register *reg)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int ret = 0;
+        u8 value[4] = { 0, 0, 0, 0 };
+        u32 data = 0;
+
+        switch (reg->match.type) {
+        case V4L2_CHIP_MATCH_HOST:
+                switch (reg->match.addr) {
+                case 0: /* Cx231xx - internal registers */
+                        ret = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER,
+                                                  (u16)reg->reg, value, 4);
+                        reg->val = value[0] | value[1] << 8 |
+                                   value[2] << 16 | value[3] << 24;
+                        break;
+                case 1: /* AFE - read byte */
+                        ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
+                                                  (u16)reg->reg, 2, &data, 1);
+                        reg->val = le32_to_cpu(data & 0xff);
+                        break;
+                case 14: /* AFE - read dword */
+                        ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
+                                                  (u16)reg->reg, 2, &data, 4);
+                        reg->val = le32_to_cpu(data);
+                        break;
+                case 2: /* Video Block - read byte */
+                        ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
+                                                  (u16)reg->reg, 2, &data, 1);
+                        reg->val = le32_to_cpu(data & 0xff);
+                        break;
+                case 24: /* Video Block - read dword */
+                        ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
+                                                  (u16)reg->reg, 2, &data, 4);
+                        reg->val = le32_to_cpu(data);
+                        break;
+                case 3: /* I2S block - read byte */
+                        ret = cx231xx_read_i2c_data(dev,
+                                                    I2S_BLK_DEVICE_ADDRESS,
+                                                    (u16)reg->reg, 1,
+                                                    &data, 1);
+                        reg->val = le32_to_cpu(data & 0xff);
+                        break;
+                case 34: /* I2S Block - read dword */
+                        ret =
+                            cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
+                                                  (u16)reg->reg, 1, &data, 4);
+                        reg->val = le32_to_cpu(data);
+                        break;
+                }
+                return ret < 0 ? ret : 0;
+
+        case V4L2_CHIP_MATCH_I2C_DRIVER:
+                call_all(dev, core, g_register, reg);
+                return 0;
+        case V4L2_CHIP_MATCH_I2C_ADDR:
+                /* Not supported yet */
+                return -EINVAL;
+        default:
+                if (!v4l2_chip_match_host(&reg->match))
+                        return -EINVAL;
+        }
+
+        mutex_lock(&dev->lock);
+        call_all(dev, core, g_register, reg);
+        mutex_unlock(&dev->lock);
+
+        return ret;
+}
+
+static int vidioc_s_register(struct file *file, void *priv,
+                             struct v4l2_dbg_register *reg)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int ret = 0;
+        __le64 buf;
+        u32 value;
+        u8 data[4] = { 0, 0, 0, 0 };
+
+        buf = cpu_to_le64(reg->val);
+
+        switch (reg->match.type) {
+        case V4L2_CHIP_MATCH_HOST:
+                {
+                        value = (u32) buf & 0xffffffff;
+
+                        switch (reg->match.addr) {
+                        case 0: /* cx231xx internal registers */
+                                data[0] = (u8) value;
+                                data[1] = (u8) (value >> 8);
+                                data[2] = (u8) (value >> 16);
+                                data[3] = (u8) (value >> 24);
+                                ret = cx231xx_write_ctrl_reg(dev,
+                                                           VRT_SET_REGISTER,
+                                                           (u16)reg->reg, data,
+                                                           4);
+                                break;
+                        case 1: /* AFE - read byte */
+                                ret = cx231xx_write_i2c_data(dev,
+                                                        AFE_DEVICE_ADDRESS,
+                                                        (u16)reg->reg, 2,
+                                                        value, 1);
+                                break;
+                        case 14: /* AFE - read dword */
+                                ret = cx231xx_write_i2c_data(dev,
+                                                        AFE_DEVICE_ADDRESS,
+                                                        (u16)reg->reg, 2,
+                                                        value, 4);
+                                break;
+                        case 2: /* Video Block - read byte */
+                                ret =
+                                    cx231xx_write_i2c_data(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        (u16)reg->reg, 2,
+                                                        value, 1);
+                                break;
+                        case 24: /* Video Block - read dword */
+                                ret =
+                                    cx231xx_write_i2c_data(dev,
+                                                        VID_BLK_I2C_ADDRESS,
+                                                        (u16)reg->reg, 2,
+                                                        value, 4);
+                                break;
+                        case 3: /* I2S block - read byte */
+                                ret =
+                                    cx231xx_write_i2c_data(dev,
+                                                        I2S_BLK_DEVICE_ADDRESS,
+                                                        (u16)reg->reg, 1,
+                                                        value, 1);
+                                break;
+                        case 34: /* I2S block - read dword */
+                                ret =
+                                    cx231xx_write_i2c_data(dev,
+                                                        I2S_BLK_DEVICE_ADDRESS,
+                                                        (u16)reg->reg, 1,
+                                                        value, 4);
+                                break;
+                        }
+                }
+                return ret < 0 ? ret : 0;
+
+        default:
+                break;
+        }
+
+        mutex_lock(&dev->lock);
+        call_all(dev, core, s_register, reg);
+        mutex_unlock(&dev->lock);
+
+        return ret;
+}
+#endif
+
+static int vidioc_cropcap(struct file *file, void *priv,
+                          struct v4l2_cropcap *cc)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        cc->bounds.left = 0;
+        cc->bounds.top = 0;
+        cc->bounds.width = dev->width;
+        cc->bounds.height = dev->height;
+        cc->defrect = cc->bounds;
+        cc->pixelaspect.numerator = 54; /* 4:3 FIXME: remove magic numbers */
+        cc->pixelaspect.denominator = 59;
+
+        return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv,
+                           enum v4l2_buf_type type)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+        rc = res_get(fh);
+
+        if (likely(rc >= 0))
+                rc = videobuf_streamon(&fh->vb_vidq);
+
+        call_all(dev, video, s_stream, 1);
+
+        mutex_unlock(&dev->lock);
+
+        return rc;
+}
+
+static int vidioc_streamoff(struct file *file, void *priv,
+                            enum v4l2_buf_type type)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
+            (fh->type != V4L2_BUF_TYPE_VBI_CAPTURE))
+                return -EINVAL;
+        if (type != fh->type)
+                return -EINVAL;
+
+        mutex_lock(&dev->lock);
+
+        cx25840_call(dev, video, s_stream, 0);
+
+        videobuf_streamoff(&fh->vb_vidq);
+        res_free(fh);
+
+        mutex_unlock(&dev->lock);
+
+        return 0;
+}
+
+static int vidioc_querycap(struct file *file, void *priv,
+                           struct v4l2_capability *cap)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        strlcpy(cap->driver, "cx231xx", sizeof(cap->driver));
+        strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));
+        usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
+
+        cap->version = CX231XX_VERSION_CODE;
+
+        cap->capabilities = V4L2_CAP_VBI_CAPTURE |
+#if 0
+                V4L2_CAP_SLICED_VBI_CAPTURE |
+#endif
+                V4L2_CAP_VIDEO_CAPTURE  |
+                V4L2_CAP_AUDIO          |
+                V4L2_CAP_READWRITE      |
+                V4L2_CAP_STREAMING;
+
+        if (dev->tuner_type != TUNER_ABSENT)
+                cap->capabilities |= V4L2_CAP_TUNER;
+
+        return 0;
+}
+
+static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
+                                   struct v4l2_fmtdesc *f)
+{
+        if (unlikely(f->index >= ARRAY_SIZE(format)))
+                return -EINVAL;
+
+        strlcpy(f->description, format[f->index].name, sizeof(f->description));
+        f->pixelformat = format[f->index].fourcc;
+
+        return 0;
+}
+
+/* Sliced VBI ioctls */
+static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,
+                                       struct v4l2_format *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+
+        f->fmt.sliced.service_set = 0;
+
+        call_all(dev, video, g_fmt, f);
+
+        if (f->fmt.sliced.service_set == 0)
+                rc = -EINVAL;
+
+        mutex_unlock(&dev->lock);
+        return rc;
+}
+
+static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
+                                         struct v4l2_format *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+        call_all(dev, video, g_fmt, f);
+        mutex_unlock(&dev->lock);
+
+        if (f->fmt.sliced.service_set == 0)
+                return -EINVAL;
+
+        return 0;
+}
+
+/* RAW VBI ioctls */
+
+static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
+                                struct v4l2_format *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        f->fmt.vbi.sampling_rate = (dev->norm & V4L2_STD_625_50) ?
+            35468950 : 28636363;
+        f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
+        f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
+        f->fmt.vbi.offset = 64 * 4;
+        f->fmt.vbi.start[0] = (dev->norm & V4L2_STD_625_50) ?
+            PAL_VBI_START_LINE : NTSC_VBI_START_LINE;
+        f->fmt.vbi.count[0] = (dev->norm & V4L2_STD_625_50) ?
+            PAL_VBI_LINES : NTSC_VBI_LINES;
+        f->fmt.vbi.start[1] = (dev->norm & V4L2_STD_625_50) ?
+            PAL_VBI_START_LINE + 312 : NTSC_VBI_START_LINE + 263;
+        f->fmt.vbi.count[1] = f->fmt.vbi.count[0];
+
+        return 0;
+
+}
+
+static int vidioc_try_fmt_vbi_cap(struct file *file, void *priv,
+                                  struct v4l2_format *f)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+
+        if (dev->vbi_stream_on && !fh->stream_on) {
+                cx231xx_errdev("%s device in use by another fh\n", __func__);
+                return -EBUSY;
+        }
+
+        f->type = V4L2_BUF_TYPE_VBI_CAPTURE;
+        f->fmt.vbi.sampling_rate = (dev->norm & V4L2_STD_625_50) ?
+            35468950 : 28636363;
+        f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
+        f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
+        f->fmt.vbi.offset = 244;
+        f->fmt.vbi.flags = 0;
+        f->fmt.vbi.start[0] = (dev->norm & V4L2_STD_625_50) ?
+            PAL_VBI_START_LINE : NTSC_VBI_START_LINE;
+        f->fmt.vbi.count[0] = (dev->norm & V4L2_STD_625_50) ?
+            PAL_VBI_LINES : NTSC_VBI_LINES;
+        f->fmt.vbi.start[1] = (dev->norm & V4L2_STD_625_50) ?
+            PAL_VBI_START_LINE + 312 : NTSC_VBI_START_LINE + 263;
+        f->fmt.vbi.count[1] = f->fmt.vbi.count[0];
+
+        return 0;
+
+}
+
+static int vidioc_reqbufs(struct file *file, void *priv,
+                          struct v4l2_requestbuffers *rb)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        return videobuf_reqbufs(&fh->vb_vidq, rb);
+}
+
+static int vidioc_querybuf(struct file *file, void *priv, struct v4l2_buffer *b)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        return videobuf_querybuf(&fh->vb_vidq, b);
+}
+
+static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        return videobuf_qbuf(&fh->vb_vidq, b);
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
+{
+        struct cx231xx_fh *fh = priv;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        return videobuf_dqbuf(&fh->vb_vidq, b, file->f_flags & O_NONBLOCK);
+}
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
+{
+        struct cx231xx_fh *fh = priv;
+
+        return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8);
+}
+#endif
+
+/* ----------------------------------------------------------- */
+/* RADIO ESPECIFIC IOCTLS                                      */
+/* ----------------------------------------------------------- */
+
+static int radio_querycap(struct file *file, void *priv,
+                          struct v4l2_capability *cap)
+{
+        struct cx231xx *dev = ((struct cx231xx_fh *)priv)->dev;
+
+        strlcpy(cap->driver, "cx231xx", sizeof(cap->driver));
+        strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));
+        usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
+
+        cap->version = CX231XX_VERSION_CODE;
+        cap->capabilities = V4L2_CAP_TUNER;
+        return 0;
+}
+
+static int radio_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
+{
+        struct cx231xx *dev = ((struct cx231xx_fh *)priv)->dev;
+
+        if (unlikely(t->index > 0))
+                return -EINVAL;
+
+        strcpy(t->name, "Radio");
+        t->type = V4L2_TUNER_RADIO;
+
+        mutex_lock(&dev->lock);
+        call_all(dev, tuner, s_tuner, t);
+        mutex_unlock(&dev->lock);
+
+        return 0;
+}
+
+static int radio_enum_input(struct file *file, void *priv, struct v4l2_input *i)
+{
+        if (i->index != 0)
+                return -EINVAL;
+        strcpy(i->name, "Radio");
+        i->type = V4L2_INPUT_TYPE_TUNER;
+
+        return 0;
+}
+
+static int radio_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
+{
+        if (unlikely(a->index))
+                return -EINVAL;
+
+        strcpy(a->name, "Radio");
+        return 0;
+}
+
+static int radio_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
+{
+        struct cx231xx *dev = ((struct cx231xx_fh *)priv)->dev;
+
+        if (0 != t->index)
+                return -EINVAL;
+
+        mutex_lock(&dev->lock);
+        call_all(dev, tuner, s_tuner, t);
+        mutex_unlock(&dev->lock);
+
+        return 0;
+}
+
+static int radio_s_audio(struct file *file, void *fh, struct v4l2_audio *a)
+{
+        return 0;
+}
+
+static int radio_s_input(struct file *file, void *fh, unsigned int i)
+{
+        return 0;
+}
+
+static int radio_queryctrl(struct file *file, void *priv,
+                           struct v4l2_queryctrl *c)
+{
+        int i;
+
+        if (c->id < V4L2_CID_BASE || c->id >= V4L2_CID_LASTP1)
+                return -EINVAL;
+        if (c->id == V4L2_CID_AUDIO_MUTE) {
+                for (i = 0; i < CX231XX_CTLS; i++)
+                        if (cx231xx_ctls[i].v.id == c->id)
+                                break;
+                *c = cx231xx_ctls[i].v;
+        } else
+                *c = no_ctl;
+        return 0;
+}
+
+/*
+ * cx231xx_v4l2_open()
+ * inits the device and starts isoc transfer
+ */
+static int cx231xx_v4l2_open(struct file *filp)
+{
+        int minor = video_devdata(filp)->minor;
+        int errCode = 0, radio = 0;
+        struct cx231xx *dev = NULL;
+        struct cx231xx_fh *fh;
+        enum v4l2_buf_type fh_type = 0;
+
+        dev = cx231xx_get_device(minor, &fh_type, &radio);
+        if (NULL == dev)
+                return -ENODEV;
+
+        mutex_lock(&dev->lock);
+
+        cx231xx_videodbg("open minor=%d type=%s users=%d\n",
+                         minor, v4l2_type_names[fh_type], dev->users);
+
+#if 0
+        errCode = cx231xx_set_mode(dev, CX231XX_ANALOG_MODE);
+        if (errCode < 0) {
+                cx231xx_errdev
+                    ("Device locked on digital mode. Can't open analog\n");
+                mutex_unlock(&dev->lock);
+                return -EBUSY;
+        }
+#endif
+
+        fh = kzalloc(sizeof(struct cx231xx_fh), GFP_KERNEL);
+        if (!fh) {
+                cx231xx_errdev("cx231xx-video.c: Out of memory?!\n");
+                mutex_unlock(&dev->lock);
+                return -ENOMEM;
+        }
+        fh->dev = dev;
+        fh->radio = radio;
+        fh->type = fh_type;
+        filp->private_data = fh;
+
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) {
+                dev->width = norm_maxw(dev);
+                dev->height = norm_maxh(dev);
+                dev->hscale = 0;
+                dev->vscale = 0;
+
+                /* Power up in Analog TV mode */
+                cx231xx_set_power_mode(dev, POLARIS_AVMODE_ANALOGT_TV);
+
+#if 0
+                cx231xx_set_mode(dev, CX231XX_ANALOG_MODE);
+#endif
+                cx231xx_resolution_set(dev);
+
+                /* set video alternate setting */
+                cx231xx_set_video_alternate(dev);
+
+                /* Needed, since GPIO might have disabled power of
+                   some i2c device */
+                cx231xx_config_i2c(dev);
+
+                /* device needs to be initialized before isoc transfer */
+                dev->video_input = dev->video_input > 2 ? 2 : dev->video_input;
+                video_mux(dev, dev->video_input);
+
+        }
+        if (fh->radio) {
+                cx231xx_videodbg("video_open: setting radio device\n");
+
+                /* cx231xx_start_radio(dev); */
+
+                call_all(dev, tuner, s_radio);
+        }
+
+        dev->users++;
+
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_video_qops,
+                                            NULL, &dev->video_mode.slock,
+                                            fh->type, V4L2_FIELD_INTERLACED,
+                                            sizeof(struct cx231xx_buffer), fh);
+        if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+                /* Set the required alternate setting  VBI interface works in
+                   Bulk mode only */
+                cx231xx_set_alt_setting(dev, INDEX_VANC, 0);
+
+                videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_vbi_qops,
+                                            NULL, &dev->vbi_mode.slock,
+                                            fh->type, V4L2_FIELD_SEQ_TB,
+                                            sizeof(struct cx231xx_buffer), fh);
+        }
+
+        mutex_unlock(&dev->lock);
+
+        return errCode;
+}
+
+/*
+ * cx231xx_realease_resources()
+ * unregisters the v4l2,i2c and usb devices
+ * called when the device gets disconected or at module unload
+*/
+void cx231xx_release_analog_resources(struct cx231xx *dev)
+{
+
+        /*FIXME: I2C IR should be disconnected */
+
+        if (dev->radio_dev) {
+                if (-1 != dev->radio_dev->minor)
+                        video_unregister_device(dev->radio_dev);
+                else
+                        video_device_release(dev->radio_dev);
+                dev->radio_dev = NULL;
+        }
+        if (dev->vbi_dev) {
+                cx231xx_info("V4L2 device /dev/vbi%d deregistered\n",
+                             dev->vbi_dev->num);
+                if (-1 != dev->vbi_dev->minor)
+                        video_unregister_device(dev->vbi_dev);
+                else
+                        video_device_release(dev->vbi_dev);
+                dev->vbi_dev = NULL;
+        }
+        if (dev->vdev) {
+                cx231xx_info("V4L2 device /dev/video%d deregistered\n",
+                             dev->vdev->num);
+                if (-1 != dev->vdev->minor)
+                        video_unregister_device(dev->vdev);
+                else
+                        video_device_release(dev->vdev);
+                dev->vdev = NULL;
+        }
+}
+
+/*
+ * cx231xx_v4l2_close()
+ * stops streaming and deallocates all resources allocated by the v4l2
+ * calls and ioctls
+ */
+static int cx231xx_v4l2_close(struct file *filp)
+{
+        struct cx231xx_fh *fh = filp->private_data;
+        struct cx231xx *dev = fh->dev;
+
+        cx231xx_videodbg("users=%d\n", dev->users);
+
+        mutex_lock(&dev->lock);
+
+        if (res_check(fh))
+                res_free(fh);
+
+        if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+                videobuf_stop(&fh->vb_vidq);
+                videobuf_mmap_free(&fh->vb_vidq);
+
+                /* the device is already disconnect,
+                   free the remaining resources */
+                if (dev->state & DEV_DISCONNECTED) {
+                        cx231xx_release_resources(dev);
+                        mutex_unlock(&dev->lock);
+                        kfree(dev);
+                        return 0;
+                }
+
+                /* do this before setting alternate! */
+                cx231xx_uninit_vbi_isoc(dev);
+
+                /* set alternate 0 */
+                if (!dev->vbi_or_sliced_cc_mode)
+                        cx231xx_set_alt_setting(dev, INDEX_VANC, 0);
+                else
+                        cx231xx_set_alt_setting(dev, INDEX_HANC, 0);
+
+                kfree(fh);
+                dev->users--;
+                wake_up_interruptible_nr(&dev->open, 1);
+                mutex_unlock(&dev->lock);
+                return 0;
+        }
+
+        if (dev->users == 1) {
+                videobuf_stop(&fh->vb_vidq);
+                videobuf_mmap_free(&fh->vb_vidq);
+
+                /* the device is already disconnect,
+                   free the remaining resources */
+                if (dev->state & DEV_DISCONNECTED) {
+                        cx231xx_release_resources(dev);
+                        mutex_unlock(&dev->lock);
+                        kfree(dev);
+                        return 0;
+                }
+
+                /* Save some power by putting tuner to sleep */
+                call_all(dev, tuner, s_standby);
+
+                /* do this before setting alternate! */
+                cx231xx_uninit_isoc(dev);
+                cx231xx_set_mode(dev, CX231XX_SUSPEND);
+
+                /* set alternate 0 */
+                cx231xx_set_alt_setting(dev, INDEX_VIDEO, 0);
+        }
+        kfree(fh);
+        dev->users--;
+        wake_up_interruptible_nr(&dev->open, 1);
+        mutex_unlock(&dev->lock);
+        return 0;
+}
+
+/*
+ * cx231xx_v4l2_read()
+ * will allocate buffers when called for the first time
+ */
+static ssize_t
+cx231xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
+                  loff_t *pos)
+{
+        struct cx231xx_fh *fh = filp->private_data;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        if ((fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
+            (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE)) {
+                mutex_lock(&dev->lock);
+                rc = res_get(fh);
+                mutex_unlock(&dev->lock);
+
+                if (unlikely(rc < 0))
+                        return rc;
+
+                return videobuf_read_stream(&fh->vb_vidq, buf, count, pos, 0,
+                                            filp->f_flags & O_NONBLOCK);
+        }
+        return 0;
+}
+
+/*
+ * cx231xx_v4l2_poll()
+ * will allocate buffers when called for the first time
+ */
+static unsigned int cx231xx_v4l2_poll(struct file *filp, poll_table * wait)
+{
+        struct cx231xx_fh *fh = filp->private_data;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+        rc = res_get(fh);
+        mutex_unlock(&dev->lock);
+
+        if (unlikely(rc < 0))
+                return POLLERR;
+
+        if ((V4L2_BUF_TYPE_VIDEO_CAPTURE == fh->type) ||
+            (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type))
+                return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
+        else
+                return POLLERR;
+}
+
+/*
+ * cx231xx_v4l2_mmap()
+ */
+static int cx231xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        struct cx231xx_fh *fh = filp->private_data;
+        struct cx231xx *dev = fh->dev;
+        int rc;
+
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+
+        mutex_lock(&dev->lock);
+        rc = res_get(fh);
+        mutex_unlock(&dev->lock);
+
+        if (unlikely(rc < 0))
+                return rc;
+
+        rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
+
+        cx231xx_videodbg("vma start=0x%08lx, size=%ld, ret=%d\n",
+                         (unsigned long)vma->vm_start,
+                         (unsigned long)vma->vm_end -
+                         (unsigned long)vma->vm_start, rc);
+
+        return rc;
+}
+
+static const struct v4l2_file_operations cx231xx_v4l_fops = {
+        .owner   = THIS_MODULE,
+        .open    = cx231xx_v4l2_open,
+        .release = cx231xx_v4l2_close,
+        .read    = cx231xx_v4l2_read,
+        .poll    = cx231xx_v4l2_poll,
+        .mmap    = cx231xx_v4l2_mmap,
+        .ioctl   = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+        .vidioc_querycap               = vidioc_querycap,
+        .vidioc_enum_fmt_vid_cap       = vidioc_enum_fmt_vid_cap,
+        .vidioc_g_fmt_vid_cap          = vidioc_g_fmt_vid_cap,
+        .vidioc_try_fmt_vid_cap        = vidioc_try_fmt_vid_cap,
+        .vidioc_s_fmt_vid_cap          = vidioc_s_fmt_vid_cap,
+        .vidioc_g_fmt_vbi_cap          = vidioc_g_fmt_vbi_cap,
+        .vidioc_try_fmt_vbi_cap        = vidioc_try_fmt_vbi_cap,
+        .vidioc_s_fmt_vbi_cap          = vidioc_try_fmt_vbi_cap,
+        .vidioc_g_audio                =  vidioc_g_audio,
+        .vidioc_s_audio                = vidioc_s_audio,
+        .vidioc_cropcap                = vidioc_cropcap,
+        .vidioc_g_fmt_sliced_vbi_cap   = vidioc_g_fmt_sliced_vbi_cap,
+        .vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap,
+        .vidioc_reqbufs                = vidioc_reqbufs,
+        .vidioc_querybuf               = vidioc_querybuf,
+        .vidioc_qbuf                   = vidioc_qbuf,
+        .vidioc_dqbuf                  = vidioc_dqbuf,
+        .vidioc_s_std                  = vidioc_s_std,
+        .vidioc_g_std                  = vidioc_g_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_ctrl                 = vidioc_g_ctrl,
+        .vidioc_s_ctrl                 = vidioc_s_ctrl,
+        .vidioc_streamon               = vidioc_streamon,
+        .vidioc_streamoff              = vidioc_streamoff,
+        .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
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        .vidiocgmbuf                   = vidiocgmbuf,
+#endif
+};
+
+static struct video_device cx231xx_vbi_template;
+
+static const struct video_device cx231xx_video_template = {
+        .fops         = &cx231xx_v4l_fops,
+        .release      = video_device_release,
+        .ioctl_ops    = &video_ioctl_ops,
+        .minor        = -1,
+        .tvnorms      = V4L2_STD_ALL,
+        .current_norm = V4L2_STD_PAL,
+};
+
+static const struct v4l2_file_operations radio_fops = {
+        .owner   = THIS_MODULE,
+        .open   = cx231xx_v4l2_open,
+        .release = cx231xx_v4l2_close,
+        .ioctl   = video_ioctl2,
+};
+
+static const struct v4l2_ioctl_ops radio_ioctl_ops = {
+        .vidioc_querycap    = radio_querycap,
+        .vidioc_g_tuner     = radio_g_tuner,
+        .vidioc_enum_input  = radio_enum_input,
+        .vidioc_g_audio     = radio_g_audio,
+        .vidioc_s_tuner     = radio_s_tuner,
+        .vidioc_s_audio     = radio_s_audio,
+        .vidioc_s_input     = radio_s_input,
+        .vidioc_queryctrl   = radio_queryctrl,
+        .vidioc_g_ctrl      = vidioc_g_ctrl,
+        .vidioc_s_ctrl      = vidioc_s_ctrl,
+        .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
+};
+
+static struct video_device cx231xx_radio_template = {
+        .name      = "cx231xx-radio",
+        .fops      = &radio_fops,
+        .ioctl_ops = &radio_ioctl_ops,
+        .minor     = -1,
+};
+
+/******************************** usb interface ******************************/
+
+static struct video_device *cx231xx_vdev_init(struct cx231xx *dev,
+                const struct video_device
+                *template, const char *type_name)
+{
+        struct video_device *vfd;
+
+        vfd = video_device_alloc();
+        if (NULL == vfd)
+                return NULL;
+
+        *vfd = *template;
+        vfd->minor = -1;
+        vfd->v4l2_dev = &dev->v4l2_dev;
+        vfd->release = video_device_release;
+        vfd->debug = video_debug;
+
+        snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
+
+        return vfd;
+}
+
+int cx231xx_register_analog_devices(struct cx231xx *dev)
+{
+        int ret;
+
+        cx231xx_info("%s: v4l2 driver version %d.%d.%d\n",
+                     dev->name,
+                     (CX231XX_VERSION_CODE >> 16) & 0xff,
+                     (CX231XX_VERSION_CODE >> 8) & 0xff,
+                     CX231XX_VERSION_CODE & 0xff);
+
+        /* set default norm */
+        /*dev->norm = cx231xx_video_template.current_norm; */
+        dev->width = norm_maxw(dev);
+        dev->height = norm_maxh(dev);
+        dev->interlaced = 0;
+        dev->hscale = 0;
+        dev->vscale = 0;
+
+        /* Analog specific initialization */
+        dev->format = &format[0];
+        /* video_mux(dev, dev->video_input); */
+
+        /* Audio defaults */
+        dev->mute = 1;
+        dev->volume = 0x1f;
+
+        /* enable vbi capturing */
+        /* write code here...  */
+
+        /* allocate and fill video video_device struct */
+        dev->vdev = cx231xx_vdev_init(dev, &cx231xx_video_template, "video");
+        if (!dev->vdev) {
+                cx231xx_errdev("cannot allocate video_device.\n");
+                return -ENODEV;
+        }
+
+        /* register v4l2 video video_device */
+        ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
+                                    video_nr[dev->devno]);
+        if (ret) {
+                cx231xx_errdev("unable to register video device (error=%i).\n",
+                               ret);
+                return ret;
+        }
+
+        cx231xx_info("%s/0: registered device video%d [v4l2]\n",
+                     dev->name, dev->vdev->num);
+
+        /* Initialize VBI template */
+        memcpy(&cx231xx_vbi_template, &cx231xx_video_template,
+               sizeof(cx231xx_vbi_template));
+        strcpy(cx231xx_vbi_template.name, "cx231xx-vbi");
+
+        /* Allocate and fill vbi video_device struct */
+        dev->vbi_dev = cx231xx_vdev_init(dev, &cx231xx_vbi_template, "vbi");
+
+        /* register v4l2 vbi video_device */
+        ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
+                                    vbi_nr[dev->devno]);
+        if (ret < 0) {
+                cx231xx_errdev("unable to register vbi device\n");
+                return ret;
+        }
+
+        cx231xx_info("%s/0: registered device vbi%d\n",
+                     dev->name, dev->vbi_dev->num);
+
+        if (cx231xx_boards[dev->model].radio.type == CX231XX_RADIO) {
+                dev->radio_dev = cx231xx_vdev_init(dev, &cx231xx_radio_template,
+                                                   "radio");
+                if (!dev->radio_dev) {
+                        cx231xx_errdev("cannot allocate video_device.\n");
+                        return -ENODEV;
+                }
+                ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
+                                            radio_nr[dev->devno]);
+                if (ret < 0) {
+                        cx231xx_errdev("can't register radio device\n");
+                        return ret;
+                }
+                cx231xx_info("Registered radio device as /dev/radio%d\n",
+                             dev->radio_dev->num);
+        }
+
+        cx231xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
+                     dev->vdev->num, dev->vbi_dev->num);
+
+        return 0;
+}
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
new file mode 100644
index 000000000000..aa4a23ef491a
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -0,0 +1,779 @@
+/*
+   cx231xx.h - driver for Conexant Cx23100/101/102 USB video capture devices
+
+   Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+        Based on em28xx driver
+
+   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 _CX231XX_H
+#define _CX231XX_H
+
+#include <linux/videodev2.h>
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+#include <linux/mutex.h>
+
+
+#include <media/videobuf-vmalloc.h>
+#include <media/v4l2-device.h>
+#include <media/ir-kbd-i2c.h>
+#if defined(CONFIG_VIDEO_CX231XX_DVB) || \
+        defined(CONFIG_VIDEO_CX231XX_DVB_MODULE)
+#include <media/videobuf-dvb.h>
+#endif
+
+#include "cx231xx-reg.h"
+#include "cx231xx-pcb-cfg.h"
+#include "cx231xx-conf-reg.h"
+
+#define DRIVER_NAME                     "cx231xx"
+#define PWR_SLEEP_INTERVAL              5
+
+/* I2C addresses for control block in Cx231xx */
+#define     AFE_DEVICE_ADDRESS          0x60
+#define     I2S_BLK_DEVICE_ADDRESS      0x98
+#define     VID_BLK_I2C_ADDRESS         0x88
+#define     DIF_USE_BASEBAND            0xFFFFFFFF
+
+/* Boards supported by driver */
+#define CX231XX_BOARD_UNKNOWN               0
+#define CX231XX_BOARD_CNXT_RDE_250      1
+#define CX231XX_BOARD_CNXT_RDU_250      2
+
+/* Limits minimum and default number of buffers */
+#define CX231XX_MIN_BUF                 4
+#define CX231XX_DEF_BUF                 12
+#define CX231XX_DEF_VBI_BUF             6
+
+#define VBI_LINE_COUNT                  17
+#define VBI_LINE_LENGTH                 1440
+
+/*Limits the max URB message size */
+#define URB_MAX_CTRL_SIZE               80
+
+/* Params for validated field */
+#define CX231XX_BOARD_NOT_VALIDATED     1
+#define CX231XX_BOARD_VALIDATED         0
+
+/* maximum number of cx231xx boards */
+#define CX231XX_MAXBOARDS               8
+
+/* maximum number of frames that can be queued */
+#define CX231XX_NUM_FRAMES              5
+
+/* number of buffers for isoc transfers */
+#define CX231XX_NUM_BUFS                8
+
+/* number of packets for each buffer
+   windows requests only 40 packets .. so we better do the same
+   this is what I found out for all alternate numbers there!
+ */
+#define CX231XX_NUM_PACKETS             40
+
+/* default alternate; 0 means choose the best */
+#define CX231XX_PINOUT                  0
+
+#define CX231XX_INTERLACED_DEFAULT      1
+
+/* time to wait when stopping the isoc transfer */
+#define CX231XX_URB_TIMEOUT             \
+                msecs_to_jiffies(CX231XX_NUM_BUFS * CX231XX_NUM_PACKETS)
+
+enum cx231xx_mode {
+        CX231XX_SUSPEND,
+        CX231XX_ANALOG_MODE,
+        CX231XX_DIGITAL_MODE,
+};
+
+enum cx231xx_std_mode {
+        CX231XX_TV_AIR = 0,
+        CX231XX_TV_CABLE
+};
+
+enum cx231xx_stream_state {
+        STREAM_OFF,
+        STREAM_INTERRUPT,
+        STREAM_ON,
+};
+
+struct cx231xx;
+
+struct cx231xx_usb_isoc_ctl {
+        /* max packet size of isoc transaction */
+        int max_pkt_size;
+
+        /* number of allocated urbs */
+        int num_bufs;
+
+        /* urb for isoc transfers */
+        struct urb **urb;
+
+        /* transfer buffers for isoc transfer */
+        char **transfer_buffer;
+
+        /* Last buffer command and region */
+        u8 cmd;
+        int pos, size, pktsize;
+
+        /* Last field: ODD or EVEN? */
+        int field;
+
+        /* Stores incomplete commands */
+        u32 tmp_buf;
+        int tmp_buf_len;
+
+        /* Stores already requested buffers */
+        struct cx231xx_buffer *buf;
+
+        /* Stores the number of received fields */
+        int nfields;
+
+        /* isoc urb callback */
+        int (*isoc_copy) (struct cx231xx *dev, struct urb *urb);
+};
+
+struct cx231xx_fmt {
+        char *name;
+        u32 fourcc;             /* v4l2 format id */
+        int depth;
+        int reg;
+};
+
+/* buffer for one video frame */
+struct cx231xx_buffer {
+        /* common v4l buffer stuff -- must be first */
+        struct videobuf_buffer vb;
+
+        struct list_head frame;
+        int top_field;
+        int receiving;
+};
+
+struct cx231xx_dmaqueue {
+        struct list_head active;
+        struct list_head queued;
+
+        wait_queue_head_t wq;
+
+        /* Counters to control buffer fill */
+        int pos;
+        u8 is_partial_line;
+        u8 partial_buf[8];
+        u8 last_sav;
+        int current_field;
+        u32 bytes_left_in_line;
+        u32 lines_completed;
+        u8 field1_done;
+        u32 lines_per_field;
+};
+
+/* inputs */
+
+#define MAX_CX231XX_INPUT               4
+
+enum cx231xx_itype {
+        CX231XX_VMUX_COMPOSITE1 = 1,
+        CX231XX_VMUX_SVIDEO,
+        CX231XX_VMUX_TELEVISION,
+        CX231XX_VMUX_CABLE,
+        CX231XX_RADIO,
+        CX231XX_VMUX_DVB,
+        CX231XX_VMUX_DEBUG
+};
+
+enum cx231xx_v_input {
+        CX231XX_VIN_1_1 = 0x1,
+        CX231XX_VIN_2_1,
+        CX231XX_VIN_3_1,
+        CX231XX_VIN_4_1,
+        CX231XX_VIN_1_2 = 0x01,
+        CX231XX_VIN_2_2,
+        CX231XX_VIN_3_2,
+        CX231XX_VIN_1_3 = 0x1,
+        CX231XX_VIN_2_3,
+        CX231XX_VIN_3_3,
+};
+
+/* cx231xx has two audio inputs: tuner and line in */
+enum cx231xx_amux {
+        /* This is the only entry for cx231xx tuner input */
+        CX231XX_AMUX_VIDEO,     /* cx231xx tuner */
+        CX231XX_AMUX_LINE_IN,   /* Line In */
+};
+
+struct cx231xx_reg_seq {
+        unsigned char bit;
+        unsigned char val;
+        int sleep;
+};
+
+struct cx231xx_input {
+        enum cx231xx_itype type;
+        unsigned int vmux;
+        enum cx231xx_amux amux;
+        struct cx231xx_reg_seq *gpio;
+};
+
+#define INPUT(nr) (&cx231xx_boards[dev->model].input[nr])
+
+enum cx231xx_decoder {
+        CX231XX_NODECODER,
+        CX231XX_AVDECODER
+};
+
+enum CX231XX_I2C_MASTER_PORT {
+        I2C_0 = 0,
+        I2C_1 = 1,
+        I2C_2 = 2,
+        I2C_3 = 3
+};
+
+struct cx231xx_board {
+        char *name;
+        int vchannels;
+        int tuner_type;
+        int tuner_addr;
+        v4l2_std_id norm;       /* tv norm */
+
+        /* demod related */
+        int demod_addr;
+        u8 demod_xfer_mode;     /* 0 - Serial; 1 - parallel */
+
+        /* GPIO Pins */
+        struct cx231xx_reg_seq *dvb_gpio;
+        struct cx231xx_reg_seq *suspend_gpio;
+        struct cx231xx_reg_seq *tuner_gpio;
+        u8 tuner_sif_gpio;
+        u8 tuner_scl_gpio;
+        u8 tuner_sda_gpio;
+
+        /* PIN ctrl */
+        u32 ctl_pin_status_mask;
+        u8 agc_analog_digital_select_gpio;
+        u32 gpio_pin_status_mask;
+
+        /* i2c masters */
+        u8 tuner_i2c_master;
+        u8 demod_i2c_master;
+
+        unsigned int max_range_640_480:1;
+        unsigned int has_dvb:1;
+        unsigned int valid:1;
+
+        unsigned char xclk, i2c_speed;
+
+        enum cx231xx_decoder decoder;
+
+        struct cx231xx_input input[MAX_CX231XX_INPUT];
+        struct cx231xx_input radio;
+        IR_KEYTAB_TYPE *ir_codes;
+};
+
+/* device states */
+enum cx231xx_dev_state {
+        DEV_INITIALIZED = 0x01,
+        DEV_DISCONNECTED = 0x02,
+        DEV_MISCONFIGURED = 0x04,
+};
+
+enum AFE_MODE {
+        AFE_MODE_LOW_IF,
+        AFE_MODE_BASEBAND,
+        AFE_MODE_EU_HI_IF,
+        AFE_MODE_US_HI_IF,
+        AFE_MODE_JAPAN_HI_IF
+};
+
+enum AUDIO_INPUT {
+        AUDIO_INPUT_MUTE,
+        AUDIO_INPUT_LINE,
+        AUDIO_INPUT_TUNER_TV,
+        AUDIO_INPUT_SPDIF,
+        AUDIO_INPUT_TUNER_FM
+};
+
+#define CX231XX_AUDIO_BUFS              5
+#define CX231XX_NUM_AUDIO_PACKETS       64
+#define CX231XX_CAPTURE_STREAM_EN       1
+#define CX231XX_STOP_AUDIO              0
+#define CX231XX_START_AUDIO             1
+
+/* cx231xx extensions */
+#define CX231XX_AUDIO                   0x10
+#define CX231XX_DVB                     0x20
+
+struct cx231xx_audio {
+        char name[50];
+        char *transfer_buffer[CX231XX_AUDIO_BUFS];
+        struct urb *urb[CX231XX_AUDIO_BUFS];
+        struct usb_device *udev;
+        unsigned int capture_transfer_done;
+        struct snd_pcm_substream *capture_pcm_substream;
+
+        unsigned int hwptr_done_capture;
+        struct snd_card *sndcard;
+
+        int users, shutdown;
+        enum cx231xx_stream_state capture_stream;
+        spinlock_t slock;
+
+        int alt;                /* alternate */
+        int max_pkt_size;       /* max packet size of isoc transaction */
+        int num_alt;            /* Number of alternative settings */
+        unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
+        u16 end_point_addr;
+};
+
+struct cx231xx;
+
+struct cx231xx_fh {
+        struct cx231xx *dev;
+        unsigned int stream_on:1;       /* Locks streams */
+        int radio;
+
+        struct videobuf_queue vb_vidq;
+
+        enum v4l2_buf_type type;
+};
+
+/*****************************************************************/
+/* set/get i2c */
+/* 00--1Mb/s, 01-400kb/s, 10--100kb/s, 11--5Mb/s */
+#define I2C_SPEED_1M            0x0
+#define I2C_SPEED_400K          0x1
+#define I2C_SPEED_100K          0x2
+#define I2C_SPEED_5M            0x3
+
+/* 0-- STOP transaction */
+#define I2C_STOP                0x0
+/* 1-- do not transmit STOP at end of transaction */
+#define I2C_NOSTOP              0x1
+/* 1--alllow slave to insert clock wait states */
+#define I2C_SYNC                0x1
+
+struct cx231xx_i2c {
+        struct cx231xx *dev;
+
+        int nr;
+
+        /* i2c i/o */
+        struct i2c_adapter i2c_adap;
+        struct i2c_algo_bit_data i2c_algo;
+        struct i2c_client i2c_client;
+        u32 i2c_rc;
+
+        /* different settings for each bus */
+        u8 i2c_period;
+        u8 i2c_nostop;
+        u8 i2c_reserve;
+};
+
+struct cx231xx_i2c_xfer_data {
+        u8 dev_addr;
+        u8 direction;           /* 1 - IN, 0 - OUT */
+        u8 saddr_len;           /* sub address len */
+        u16 saddr_dat;          /* sub addr data */
+        u8 buf_size;            /* buffer size */
+        u8 *p_buffer;           /* pointer to the buffer */
+};
+
+struct VENDOR_REQUEST_IN {
+        u8 bRequest;
+        u16 wValue;
+        u16 wIndex;
+        u16 wLength;
+        u8 direction;
+        u8 bData;
+        u8 *pBuff;
+};
+
+struct cx231xx_ctrl {
+        struct v4l2_queryctrl v;
+        u32 off;
+        u32 reg;
+        u32 mask;
+        u32 shift;
+};
+
+enum TRANSFER_TYPE {
+        Raw_Video = 0,
+        Audio,
+        Vbi,                    /* VANC */
+        Sliced_cc,              /* HANC */
+        TS1_serial_mode,
+        TS2,
+        TS1_parallel_mode
+} ;
+
+struct cx231xx_video_mode {
+        /* Isoc control struct */
+        struct cx231xx_dmaqueue vidq;
+        struct cx231xx_usb_isoc_ctl isoc_ctl;
+        spinlock_t slock;
+
+        /* usb transfer */
+        int alt;                /* alternate */
+        int max_pkt_size;       /* max packet size of isoc transaction */
+        int num_alt;            /* Number of alternative settings */
+        unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
+        u16 end_point_addr;
+};
+
+/* main device struct */
+struct cx231xx {
+        /* generic device properties */
+        char name[30];          /* name (including minor) of the device */
+        int model;              /* index in the device_data struct */
+        int devno;              /* marks the number of this device */
+
+        struct cx231xx_board board;
+
+        unsigned int stream_on:1;       /* Locks streams */
+        unsigned int vbi_stream_on:1;   /* Locks streams for VBI */
+        unsigned int has_audio_class:1;
+        unsigned int has_alsa_audio:1;
+
+        struct cx231xx_fmt *format;
+
+        struct v4l2_device v4l2_dev;
+        struct v4l2_subdev *sd_cx25840;
+        struct v4l2_subdev *sd_tuner;
+
+        struct cx231xx_IR *ir;
+
+        struct list_head devlist;
+
+        int tuner_type;         /* type of the tuner */
+        int tuner_addr;         /* tuner address */
+
+        /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
+        struct cx231xx_i2c i2c_bus[3];
+        unsigned int xc_fw_load_done:1;
+        struct mutex gpio_i2c_lock;
+
+        /* video for linux */
+        int users;              /* user count for exclusive use */
+        struct video_device *vdev;      /* video for linux device struct */
+        v4l2_std_id norm;       /* selected tv norm */
+        int ctl_freq;           /* selected frequency */
+        unsigned int ctl_ainput;        /* selected audio input */
+        int mute;
+        int volume;
+
+        /* frame properties */
+        int width;              /* current frame width */
+        int height;             /* current frame height */
+        unsigned hscale;        /* horizontal scale factor (see datasheet) */
+        unsigned vscale;        /* vertical scale factor (see datasheet) */
+        int interlaced;         /* 1=interlace fileds, 0=just top fileds */
+
+        struct cx231xx_audio adev;
+
+        /* states */
+        enum cx231xx_dev_state state;
+
+        struct work_struct request_module_wk;
+
+        /* locks */
+        struct mutex lock;
+        struct mutex ctrl_urb_lock;     /* protects urb_buf */
+        struct list_head inqueue, outqueue;
+        wait_queue_head_t open, wait_frame, wait_stream;
+        struct video_device *vbi_dev;
+        struct video_device *radio_dev;
+
+        unsigned char eedata[256];
+
+        struct cx231xx_video_mode video_mode;
+        struct cx231xx_video_mode vbi_mode;
+        struct cx231xx_video_mode sliced_cc_mode;
+        struct cx231xx_video_mode ts1_mode;
+
+        struct usb_device *udev;        /* the usb device */
+        char urb_buf[URB_MAX_CTRL_SIZE];        /* urb control msg buffer */
+
+        /* helper funcs that call usb_control_msg */
+        int (*cx231xx_read_ctrl_reg) (struct cx231xx *dev, u8 req, u16 reg,
+                                      char *buf, int len);
+        int (*cx231xx_write_ctrl_reg) (struct cx231xx *dev, u8 req, u16 reg,
+                                       char *buf, int len);
+        int (*cx231xx_send_usb_command) (struct cx231xx_i2c *i2c_bus,
+                                struct cx231xx_i2c_xfer_data *req_data);
+        int (*cx231xx_gpio_i2c_read) (struct cx231xx *dev, u8 dev_addr,
+                                      u8 *buf, u8 len);
+        int (*cx231xx_gpio_i2c_write) (struct cx231xx *dev, u8 dev_addr,
+                                       u8 *buf, u8 len);
+
+        int (*cx231xx_set_analog_freq) (struct cx231xx *dev, u32 freq);
+        int (*cx231xx_reset_analog_tuner) (struct cx231xx *dev);
+
+        enum cx231xx_mode mode;
+
+        struct cx231xx_dvb *dvb;
+
+        /* Cx231xx supported PCB config's */
+        struct pcb_config current_pcb_config;
+        u8 current_scenario_idx;
+        u8 interface_count;
+        u8 max_iad_interface_count;
+
+        /* GPIO related register direction and values */
+        u32 gpio_dir;
+        u32 gpio_val;
+
+        /* Power Modes */
+        int power_mode;
+
+        /* afe parameters */
+        enum AFE_MODE afe_mode;
+        u32 afe_ref_count;
+
+        /* video related parameters */
+        u32 video_input;
+        u32 active_mode;
+        u8 vbi_or_sliced_cc_mode;       /* 0 - vbi ; 1 - sliced cc mode */
+        enum cx231xx_std_mode std_mode; /* 0 - Air; 1 - cable */
+
+};
+
+#define cx25840_call(cx231xx, o, f, args...) \
+        v4l2_subdev_call(cx231xx->sd_cx25840, o, f, ##args)
+#define tuner_call(cx231xx, o, f, args...) \
+        v4l2_subdev_call(cx231xx->sd_tuner, o, f, ##args)
+#define call_all(dev, o, f, args...) \
+        v4l2_device_call_until_err(&dev->v4l2_dev, 0, o, f, ##args)
+
+struct cx231xx_ops {
+        struct list_head next;
+        char *name;
+        int id;
+        int (*init) (struct cx231xx *);
+        int (*fini) (struct cx231xx *);
+};
+
+/* call back functions in dvb module */
+int cx231xx_set_analog_freq(struct cx231xx *dev, u32 freq);
+int cx231xx_reset_analog_tuner(struct cx231xx *dev);
+
+/* Provided by cx231xx-i2c.c */
+void cx231xx_do_i2c_scan(struct cx231xx *dev, struct i2c_client *c);
+int cx231xx_i2c_register(struct cx231xx_i2c *bus);
+int cx231xx_i2c_unregister(struct cx231xx_i2c *bus);
+
+/* Internal block control functions */
+int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr,
+                          u16 saddr, u8 saddr_len, u32 *data, u8 data_len);
+int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr,
+                           u16 saddr, u8 saddr_len, u32 data, u8 data_len);
+int cx231xx_reg_mask_write(struct cx231xx *dev, u8 dev_addr, u8 size,
+                           u16 register_address, u8 bit_start, u8 bit_end,
+                           u32 value);
+int cx231xx_read_modify_write_i2c_dword(struct cx231xx *dev, u8 dev_addr,
+                                        u16 saddr, u32 mask, u32 value);
+u32 cx231xx_set_field(u32 field_mask, u32 data);
+
+/* afe related functions */
+int cx231xx_afe_init_super_block(struct cx231xx *dev, u32 ref_count);
+int cx231xx_afe_init_channels(struct cx231xx *dev);
+int cx231xx_afe_setup_AFE_for_baseband(struct cx231xx *dev);
+int cx231xx_afe_set_input_mux(struct cx231xx *dev, u32 input_mux);
+int cx231xx_afe_set_mode(struct cx231xx *dev, enum AFE_MODE mode);
+int cx231xx_afe_update_power_control(struct cx231xx *dev,
+                                        enum AV_MODE avmode);
+int cx231xx_afe_adjust_ref_count(struct cx231xx *dev, u32 video_input);
+
+/* i2s block related functions */
+int cx231xx_i2s_blk_initialize(struct cx231xx *dev);
+int cx231xx_i2s_blk_update_power_control(struct cx231xx *dev,
+                                        enum AV_MODE avmode);
+int cx231xx_i2s_blk_set_audio_input(struct cx231xx *dev, u8 audio_input);
+
+/* DIF related functions */
+int cx231xx_dif_configure_C2HH_for_low_IF(struct cx231xx *dev, u32 mode,
+                                          u32 function_mode, u32 standard);
+int cx231xx_dif_set_standard(struct cx231xx *dev, u32 standard);
+int cx231xx_tuner_pre_channel_change(struct cx231xx *dev);
+int cx231xx_tuner_post_channel_change(struct cx231xx *dev);
+
+/* video parser functions */
+u8 cx231xx_find_next_SAV_EAV(u8 *p_buffer, u32 buffer_size,
+                             u32 *p_bytes_used);
+u8 cx231xx_find_boundary_SAV_EAV(u8 *p_buffer, u8 *partial_buf,
+                                 u32 *p_bytes_used);
+int cx231xx_do_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                    u8 *p_buffer, u32 bytes_to_copy);
+void cx231xx_reset_video_buffer(struct cx231xx *dev,
+                                struct cx231xx_dmaqueue *dma_q);
+u8 cx231xx_is_buffer_done(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q);
+u32 cx231xx_copy_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                            u8 *p_line, u32 length, int field_number);
+u32 cx231xx_get_video_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
+                           u8 sav_eav, u8 *p_buffer, u32 buffer_size);
+void cx231xx_swab(u16 *from, u16 *to, u16 len);
+
+/* Provided by cx231xx-core.c */
+
+u32 cx231xx_request_buffers(struct cx231xx *dev, u32 count);
+void cx231xx_queue_unusedframes(struct cx231xx *dev);
+void cx231xx_release_buffers(struct cx231xx *dev);
+
+/* read from control pipe */
+int cx231xx_read_ctrl_reg(struct cx231xx *dev, u8 req, u16 reg,
+                          char *buf, int len);
+
+/* write to control pipe */
+int cx231xx_write_ctrl_reg(struct cx231xx *dev, u8 req, u16 reg,
+                           char *buf, int len);
+int cx231xx_mode_register(struct cx231xx *dev, u16 address, u32 mode);
+
+int cx231xx_send_vendor_cmd(struct cx231xx *dev,
+                                struct VENDOR_REQUEST_IN *ven_req);
+int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus,
+                                struct cx231xx_i2c_xfer_data *req_data);
+
+/* Gpio related functions */
+int cx231xx_send_gpio_cmd(struct cx231xx *dev, u32 gpio_bit, u8 *gpio_val,
+                          u8 len, u8 request, u8 direction);
+int cx231xx_set_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 *gpio_val);
+int cx231xx_get_gpio_bit(struct cx231xx *dev, u32 gpio_bit, u8 *gpio_val);
+int cx231xx_set_gpio_value(struct cx231xx *dev, int pin_number, int pin_value);
+int cx231xx_set_gpio_direction(struct cx231xx *dev, int pin_number,
+                               int pin_value);
+
+int cx231xx_gpio_i2c_start(struct cx231xx *dev);
+int cx231xx_gpio_i2c_end(struct cx231xx *dev);
+int cx231xx_gpio_i2c_write_byte(struct cx231xx *dev, u8 data);
+int cx231xx_gpio_i2c_read_byte(struct cx231xx *dev, u8 *buf);
+int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev);
+int cx231xx_gpio_i2c_write_ack(struct cx231xx *dev);
+int cx231xx_gpio_i2c_write_nak(struct cx231xx *dev);
+
+int cx231xx_gpio_i2c_read(struct cx231xx *dev, u8 dev_addr, u8 *buf, u8 len);
+int cx231xx_gpio_i2c_write(struct cx231xx *dev, u8 dev_addr, u8 *buf, u8 len);
+
+/* audio related functions */
+int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
+                                    enum AUDIO_INPUT audio_input);
+
+int cx231xx_capture_start(struct cx231xx *dev, int start, u8 media_type);
+int cx231xx_resolution_set(struct cx231xx *dev);
+int cx231xx_set_video_alternate(struct cx231xx *dev);
+int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt);
+int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
+                      int num_bufs, int max_pkt_size,
+                      int (*isoc_copy) (struct cx231xx *dev,
+                                        struct urb *urb));
+void cx231xx_uninit_isoc(struct cx231xx *dev);
+int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode);
+int cx231xx_gpio_set(struct cx231xx *dev, struct cx231xx_reg_seq *gpio);
+
+/* Device list functions */
+void cx231xx_release_resources(struct cx231xx *dev);
+void cx231xx_release_analog_resources(struct cx231xx *dev);
+int cx231xx_register_analog_devices(struct cx231xx *dev);
+void cx231xx_remove_from_devlist(struct cx231xx *dev);
+void cx231xx_add_into_devlist(struct cx231xx *dev);
+struct cx231xx *cx231xx_get_device(int minor,
+                                   enum v4l2_buf_type *fh_type, int *has_radio);
+void cx231xx_init_extension(struct cx231xx *dev);
+void cx231xx_close_extension(struct cx231xx *dev);
+
+/* hardware init functions */
+int cx231xx_dev_init(struct cx231xx *dev);
+void cx231xx_dev_uninit(struct cx231xx *dev);
+void cx231xx_config_i2c(struct cx231xx *dev);
+int cx231xx_config(struct cx231xx *dev);
+
+/* Stream control functions */
+int cx231xx_start_stream(struct cx231xx *dev, u32 ep_mask);
+int cx231xx_stop_stream(struct cx231xx *dev, u32 ep_mask);
+
+int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type);
+
+/* Power control functions */
+int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode);
+int cx231xx_power_suspend(struct cx231xx *dev);
+
+/* chip specific control functions */
+int cx231xx_init_ctrl_pin_status(struct cx231xx *dev);
+int cx231xx_set_agc_analog_digital_mux_select(struct cx231xx *dev,
+                                              u8 analog_or_digital);
+int cx231xx_enable_i2c_for_tuner(struct cx231xx *dev, u8 I2CIndex);
+
+/* video audio decoder related functions */
+void video_mux(struct cx231xx *dev, int index);
+int cx231xx_set_video_input_mux(struct cx231xx *dev, u8 input);
+int cx231xx_set_decoder_video_input(struct cx231xx *dev, u8 pin_type, u8 input);
+int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev);
+int cx231xx_set_audio_input(struct cx231xx *dev, u8 input);
+void get_scale(struct cx231xx *dev,
+               unsigned int width, unsigned int height,
+               unsigned int *hscale, unsigned int *vscale);
+
+/* Provided by cx231xx-video.c */
+int cx231xx_register_extension(struct cx231xx_ops *dev);
+void cx231xx_unregister_extension(struct cx231xx_ops *dev);
+void cx231xx_init_extension(struct cx231xx *dev);
+void cx231xx_close_extension(struct cx231xx *dev);
+
+/* Provided by cx231xx-cards.c */
+extern void cx231xx_pre_card_setup(struct cx231xx *dev);
+extern void cx231xx_card_setup(struct cx231xx *dev);
+extern struct cx231xx_board cx231xx_boards[];
+extern struct usb_device_id cx231xx_id_table[];
+extern const unsigned int cx231xx_bcount;
+void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir);
+int cx231xx_tuner_callback(void *ptr, int component, int command, int arg);
+
+/* Provided by cx231xx-input.c */
+int cx231xx_ir_init(struct cx231xx *dev);
+int cx231xx_ir_fini(struct cx231xx *dev);
+
+/* printk macros */
+
+#define cx231xx_err(fmt, arg...) do {\
+        printk(KERN_ERR fmt , ##arg); } while (0)
+
+#define cx231xx_errdev(fmt, arg...) do {\
+        printk(KERN_ERR "%s: "fmt,\
+                        dev->name , ##arg); } while (0)
+
+#define cx231xx_info(fmt, arg...) do {\
+        printk(KERN_INFO "%s: "fmt,\
+                        dev->name , ##arg); } while (0)
+#define cx231xx_warn(fmt, arg...) do {\
+        printk(KERN_WARNING "%s: "fmt,\
+                        dev->name , ##arg); } while (0)
+
+static inline unsigned int norm_maxw(struct cx231xx *dev)
+{
+        if (dev->board.max_range_640_480)
+                return 640;
+        else
+                return 720;
+}
+
+static inline unsigned int norm_maxh(struct cx231xx *dev)
+{
+        if (dev->board.max_range_640_480)
+                return 480;
+        else
+                return (dev->norm & V4L2_STD_625_50) ? 576 : 480;
+}
+#endif
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 5e4b7e790d94..a3c0565be1a9 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -739,9 +739,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
-                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->i2c_bus[2].i2c_adap,
+                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", "cx25840", 0x88 >> 1);
-                v4l2_subdev_call(dev->sd_cx25840, core, init, 0);
+                v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
                 break;
         }
 
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index dc7fff22cfdd..beda42925ce7 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -875,7 +875,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         cx23885_i2c_register(&dev->i2c_bus[1]);
         cx23885_i2c_register(&dev->i2c_bus[2]);
         cx23885_card_setup(dev);
-        call_all(dev, core, s_standby, 0);
+        call_all(dev, tuner, s_standby);
         cx23885_ir_init(dev);
 
         if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index d43c74396767..f48454ab3900 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -673,7 +673,7 @@ static int dvb_register(struct cx23885_tsport *port)
         fe0->dvb.frontend->callback = cx23885_tuner_callback;
 
         /* Put the analog decoder in standby to keep it quiet */
-        call_all(dev, core, s_standby, 0);
+        call_all(dev, tuner, s_standby);
 
         if (fe0->dvb.frontend->ops.analog_ops.standby)
                 fe0->dvb.frontend->ops.analog_ops.standby(fe0->dvb.frontend);
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index f0ac62c5dc83..68068c6d0987 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -299,7 +299,7 @@ static int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 
         dev->tvnorm = norm;
 
-        call_all(dev, tuner, s_std, norm);
+        call_all(dev, core, s_std, norm);
 
         return 0;
 }
@@ -393,9 +393,6 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
 
 static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
 {
-        struct v4l2_routing route;
-        memset(&route, 0, sizeof(route));
-
         dprintk(1, "%s() video_mux: %d [vmux=%d, gpio=0x%x,0x%x,0x%x,0x%x]\n",
                 __func__,
                 input, INPUT(input)->vmux,
@@ -403,10 +400,9 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
                 INPUT(input)->gpio2, INPUT(input)->gpio3);
         dev->input = input;
 
-        route.input = INPUT(input)->vmux;
-
         /* Tell the internal A/V decoder */
-        v4l2_subdev_call(dev->sd_cx25840, video, s_routing, &route);
+        v4l2_subdev_call(dev->sd_cx25840, video, s_routing,
+                        INPUT(input)->vmux, 0, 0);
 
         return 0;
 }
@@ -1523,10 +1519,12 @@ int cx23885_video_register(struct cx23885_dev *dev)
                 struct v4l2_subdev *sd = NULL;
 
                 if (dev->tuner_addr)
-                        sd = v4l2_i2c_new_subdev(&dev->i2c_bus[1].i2c_adap,
+                        sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", dev->tuner_addr);
                 else
-                        sd = v4l2_i2c_new_probed_subdev(&dev->i2c_bus[1].i2c_adap,
+                        sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", v4l2_i2c_tuner_addrs(ADDRS_TV));
                 if (sd) {
                         struct tuner_setup tun_setup;
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 02d980a29962..85642831ea8e 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -37,7 +37,7 @@
 #include <linux/version.h>
 #include <linux/mutex.h>
 
-#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 1)
+#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 2)
 
 #define UNSET (-1U)
 
diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c
index 93d74bee292a..2f846f5e0f9f 100644
--- a/drivers/media/video/cx25840/cx25840-audio.c
+++ b/drivers/media/video/cx25840/cx25840-audio.c
@@ -32,7 +32,7 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
 
         /* common for all inputs and rates */
         /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x10 */
-        if (!state->is_cx23885)
+        if (!state->is_cx23885 && !state->is_cx231xx)
                 cx25840_write(client, 0x127, 0x50);
 
         if (state->aud_input != CX25840_AUDIO_SERIAL) {
@@ -43,11 +43,14 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                                  * so avoid destroying registers. */
                                 break;
                         }
-                        /* VID_PLL and AUX_PLL */
-                        cx25840_write4(client, 0x108, 0x1006040f);
 
-                        /* AUX_PLL_FRAC */
-                        cx25840_write4(client, 0x110, 0x01bb39ee);
+                        if (!state->is_cx231xx) {
+                                /* VID_PLL and AUX_PLL */
+                                cx25840_write4(client, 0x108, 0x1006040f);
+
+                                /* AUX_PLL_FRAC */
+                                cx25840_write4(client, 0x110, 0x01bb39ee);
+                        }
 
                         if (state->is_cx25836)
                                 break;
@@ -64,11 +67,14 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                                  * so avoid destroying registers. */
                                 break;
                         }
-                        /* VID_PLL and AUX_PLL */
-                        cx25840_write4(client, 0x108, 0x1009040f);
 
-                        /* AUX_PLL_FRAC */
-                        cx25840_write4(client, 0x110, 0x00ec6bd6);
+                        if (!state->is_cx231xx) {
+                                /* VID_PLL and AUX_PLL */
+                                cx25840_write4(client, 0x108, 0x1009040f);
+
+                                /* AUX_PLL_FRAC */
+                                cx25840_write4(client, 0x110, 0x00ec6bd6);
+                        }
 
                         if (state->is_cx25836)
                                 break;
@@ -85,11 +91,14 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                                  * so avoid destroying registers. */
                                 break;
                         }
-                        /* VID_PLL and AUX_PLL */
-                        cx25840_write4(client, 0x108, 0x100a040f);
 
-                        /* AUX_PLL_FRAC */
-                        cx25840_write4(client, 0x110, 0x0098d6e5);
+                        if (!state->is_cx231xx) {
+                                /* VID_PLL and AUX_PLL */
+                                cx25840_write4(client, 0x108, 0x100a040f);
+
+                                /* AUX_PLL_FRAC */
+                                cx25840_write4(client, 0x110, 0x0098d6e5);
+                        }
 
                         if (state->is_cx25836)
                                 break;
@@ -108,11 +117,14 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                                  * so avoid destroying registers. */
                                 break;
                         }
-                        /* VID_PLL and AUX_PLL */
-                        cx25840_write4(client, 0x108, 0x1e08040f);
 
-                        /* AUX_PLL_FRAC */
-                        cx25840_write4(client, 0x110, 0x012a0869);
+                        if (!state->is_cx231xx) {
+                                /* VID_PLL and AUX_PLL */
+                                cx25840_write4(client, 0x108, 0x1e08040f);
+
+                                /* AUX_PLL_FRAC */
+                                cx25840_write4(client, 0x110, 0x012a0869);
+                        }
 
                         if (state->is_cx25836)
                                 break;
@@ -136,11 +148,14 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                                 break;
                         }
 
-                        /* VID_PLL and AUX_PLL */
-                        cx25840_write4(client, 0x108, 0x1809040f);
 
-                        /* AUX_PLL_FRAC */
-                        cx25840_write4(client, 0x110, 0x00ec6bd6);
+                        if (!state->is_cx231xx) {
+                                /* VID_PLL and AUX_PLL */
+                                cx25840_write4(client, 0x108, 0x1809040f);
+
+                                /* AUX_PLL_FRAC */
+                                cx25840_write4(client, 0x110, 0x00ec6bd6);
+                        }
 
                         if (state->is_cx25836)
                                 break;
@@ -155,7 +170,7 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                         break;
 
                 case 48000:
-                        if (!state->is_cx23885) {
+                        if (!state->is_cx23885 && !state->is_cx231xx) {
                                 /* VID_PLL and AUX_PLL */
                                 cx25840_write4(client, 0x108, 0x180a040f);
 
@@ -166,7 +181,7 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
                         if (state->is_cx25836)
                                 break;
 
-                        if (!state->is_cx23885) {
+                        if (!state->is_cx23885 && !state->is_cx231xx) {
                                 /* src1_ctl */
                                 cx25840_write4(client, 0x8f8, 0x08018000);
 
@@ -227,10 +242,9 @@ void cx25840_audio_set_path(struct i2c_client *client)
         /* deassert soft reset */
         cx25840_and_or(client, 0x810, ~0x1, 0x00);
 
-        if (state->is_cx23885) {
-                /* Ensure the controller is running when we exit */
+        /* Ensure the controller is running when we exit */
+        if (state->is_cx23885 || state->is_cx231xx)
                 cx25840_and_or(client, 0x803, ~0x10, 0x10);
-        }
 }
 
 static int get_volume(struct i2c_client *client)
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 737ee4ea8830..0be51b65f098 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -345,6 +345,77 @@ static void cx23885_initialize(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static void cx231xx_initialize(struct i2c_client *client)
+{
+        DEFINE_WAIT(wait);
+        struct cx25840_state *state = to_state(i2c_get_clientdata(client));
+        struct workqueue_struct *q;
+
+        /* Internal Reset */
+        cx25840_and_or(client, 0x102, ~0x01, 0x01);
+        cx25840_and_or(client, 0x102, ~0x01, 0x00);
+
+        /* Stop microcontroller */
+        cx25840_and_or(client, 0x803, ~0x10, 0x00);
+
+        /* DIF in reset? */
+        cx25840_write(client, 0x398, 0);
+
+        /* Trust the default xtal, no division */
+        /* This changes for the cx23888 products */
+        cx25840_write(client, 0x2, 0x76);
+
+        /* Bring down the regulator for AUX clk */
+        cx25840_write(client, 0x1, 0x40);
+
+        /* Disable DIF bypass */
+        cx25840_write4(client, 0x33c, 0x00000001);
+
+        /* DIF Src phase inc */
+        cx25840_write4(client, 0x340, 0x0df7df83);
+
+        /* Luma */
+        cx25840_write4(client, 0x414, 0x00107d12);
+
+        /* Chroma */
+        cx25840_write4(client, 0x420, 0x3d008282);
+
+        /* ADC2 input select */
+        cx25840_write(client, 0x102, 0x10);
+
+        /* VIN1 & VIN5 */
+        cx25840_write(client, 0x103, 0x11);
+
+        /* Enable format auto detect */
+        cx25840_write(client, 0x400, 0);
+        /* Fast subchroma lock */
+        /* White crush, Chroma AGC & Chroma Killer enabled */
+        cx25840_write(client, 0x401, 0xe8);
+
+        /* Do the firmware load in a work handler to prevent.
+           Otherwise the kernel is blocked waiting for the
+           bit-banging i2c interface to finish uploading the
+           firmware. */
+        INIT_WORK(&state->fw_work, cx25840_work_handler);
+        init_waitqueue_head(&state->fw_wait);
+        q = create_singlethread_workqueue("cx25840_fw");
+        prepare_to_wait(&state->fw_wait, &wait, TASK_UNINTERRUPTIBLE);
+        queue_work(q, &state->fw_work);
+        schedule();
+        finish_wait(&state->fw_wait, &wait);
+        destroy_workqueue(q);
+
+        cx25840_std_setup(client);
+
+        /* (re)set input */
+        set_input(client, state->vid_input, state->aud_input);
+
+        /* start microcontroller */
+        cx25840_and_or(client, 0x803, ~0x10, 0x10);
+}
+
+/* ----------------------------------------------------------------------- */
+
 void cx25840_std_setup(struct i2c_client *client)
 {
         struct cx25840_state *state = to_state(i2c_get_clientdata(client));
@@ -414,39 +485,41 @@ void cx25840_std_setup(struct i2c_client *client)
         }
 
         /* DEBUG: Displays configured PLL frequency */
-        pll_int = cx25840_read(client, 0x108);
-        pll_frac = cx25840_read4(client, 0x10c) & 0x1ffffff;
-        pll_post = cx25840_read(client, 0x109);
-        v4l_dbg(1, cx25840_debug, client,
-                                "PLL regs = int: %u, frac: %u, post: %u\n",
-                                pll_int, pll_frac, pll_post);
-
-        if (pll_post) {
-                int fin, fsc;
-                int pll = (28636363L * ((((u64)pll_int) << 25L) + pll_frac)) >> 25L;
-
-                pll /= pll_post;
-                v4l_dbg(1, cx25840_debug, client, "PLL = %d.%06d MHz\n",
-                                pll / 1000000, pll % 1000000);
-                v4l_dbg(1, cx25840_debug, client, "PLL/8 = %d.%06d MHz\n",
-                                pll / 8000000, (pll / 8) % 1000000);
-
-                fin = ((u64)src_decimation * pll) >> 12;
-                v4l_dbg(1, cx25840_debug, client,
-                                "ADC Sampling freq = %d.%06d MHz\n",
-                                fin / 1000000, fin % 1000000);
-
-                fsc = (((u64)sc) * pll) >> 24L;
+        if (!state->is_cx231xx) {
+                pll_int = cx25840_read(client, 0x108);
+                pll_frac = cx25840_read4(client, 0x10c) & 0x1ffffff;
+                pll_post = cx25840_read(client, 0x109);
                 v4l_dbg(1, cx25840_debug, client,
-                                "Chroma sub-carrier freq = %d.%06d MHz\n",
-                                fsc / 1000000, fsc % 1000000);
-
-                v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "
-                        "vblank %i, vactive %i, vblank656 %i, src_dec %i, "
-                        "burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x, "
-                        "sc 0x%06x\n",
-                        hblank, hactive, vblank, vactive, vblank656,
-                        src_decimation, burst, luma_lpf, uv_lpf, comb, sc);
+                        "PLL regs = int: %u, frac: %u, post: %u\n",
+                        pll_int, pll_frac, pll_post);
+
+                if (pll_post) {
+                        int fin, fsc;
+                        int pll = (28636363L * ((((u64)pll_int) << 25L) + pll_frac)) >> 25L;
+
+                        pll /= pll_post;
+                        v4l_dbg(1, cx25840_debug, client, "PLL = %d.%06d MHz\n",
+                                        pll / 1000000, pll % 1000000);
+                        v4l_dbg(1, cx25840_debug, client, "PLL/8 = %d.%06d MHz\n",
+                                        pll / 8000000, (pll / 8) % 1000000);
+
+                        fin = ((u64)src_decimation * pll) >> 12;
+                        v4l_dbg(1, cx25840_debug, client,
+                                        "ADC Sampling freq = %d.%06d MHz\n",
+                                        fin / 1000000, fin % 1000000);
+
+                        fsc = (((u64)sc) * pll) >> 24L;
+                        v4l_dbg(1, cx25840_debug, client,
+                                        "Chroma sub-carrier freq = %d.%06d MHz\n",
+                                        fsc / 1000000, fsc % 1000000);
+
+                        v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "
+                                "vblank %i, vactive %i, vblank656 %i, src_dec %i, "
+                                "burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x, "
+                                "sc 0x%06x\n",
+                                hblank, hactive, vblank, vactive, vblank656,
+                                src_decimation, burst, luma_lpf, uv_lpf, comb, sc);
+                }
         }
 
         /* Sets horizontal blanking delay and active lines */
@@ -596,7 +669,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
          * configuration in reg (for the cx23885) so we have no
          * need to attempt to flip bits for earlier av decoders.
          */
-        if (!state->is_cx23885) {
+        if (!state->is_cx23885 && !state->is_cx231xx) {
                 switch (aud_input) {
                 case CX25840_AUDIO_SERIAL:
                         /* do nothing, use serial audio input */
@@ -619,7 +692,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
         /* Set INPUT_MODE to Composite (0) or S-Video (1) */
         cx25840_and_or(client, 0x401, ~0x6, is_composite ? 0 : 0x02);
 
-        if (!state->is_cx23885) {
+        if (!state->is_cx23885 && !state->is_cx231xx) {
                 /* Set CH_SEL_ADC2 to 1 if input comes from CH3 */
                 cx25840_and_or(client, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0);
                 /* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2&CH3 */
@@ -659,6 +732,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
                  */
                 cx25840_write(client, 0x918, 0xa0);
                 cx25840_write(client, 0x919, 0x01);
+        } else if (state->is_cx231xx) {
+                /* Audio channel 1 src : Parallel 1 */
+                cx25840_write(client, 0x124, 0x03);
+
+                /* I2S_IN_CTL: I2S_IN_SONY_MODE, LEFT SAMPLE on WS=1 */
+                cx25840_write(client, 0x914, 0xa0);
+
+                /* I2S_OUT_CTL:
+                 * I2S_IN_SONY_MODE, LEFT SAMPLE on WS=1
+                 * I2S_OUT_MASTER_MODE = Master
+                 */
+                cx25840_write(client, 0x918, 0xa0);
+                cx25840_write(client, 0x919, 0x01);
         }
 
         return 0;
@@ -1096,7 +1182,7 @@ static void log_audio_status(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
-/* This init operation must be called to load the driver's firmware.
+/* This load_fw operation must be called to load the driver's firmware.
    Without this the audio standard detection will fail and you will
    only get mono.
 
@@ -1106,18 +1192,20 @@ static void log_audio_status(struct i2c_client *client)
    postponing it is that loading this firmware takes a long time (seconds)
    due to the slow i2c bus speed. So it will speed up the boot process if
    you can avoid loading the fw as long as the video device isn't used.  */
-static int cx25840_init(struct v4l2_subdev *sd, u32 val)
+static int cx25840_load_fw(struct v4l2_subdev *sd)
 {
         struct cx25840_state *state = to_state(sd);
         struct i2c_client *client = v4l2_get_subdevdata(sd);
 
         if (!state->is_initialized) {
-                /* initialize on first use */
+                /* initialize and load firmware */
                 state->is_initialized = 1;
                 if (state->is_cx25836)
                         cx25836_initialize(client);
                 else if (state->is_cx23885)
                         cx23885_initialize(client);
+                else if (state->is_cx231xx)
+                        cx231xx_initialize(client);
                 else
                         cx25840_initialize(client);
         }
@@ -1159,7 +1247,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
         v4l_dbg(1, cx25840_debug, client, "%s output\n",
                         enable ? "enable" : "disable");
         if (enable) {
-                if (state->is_cx23885) {
+                if (state->is_cx23885 || state->is_cx231xx) {
                         u8 v = (cx25840_read(client, 0x421) | 0x0b);
                         cx25840_write(client, 0x421, v);
                 } else {
@@ -1169,7 +1257,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
                                         state->is_cx25836 ? 0x04 : 0x07);
                 }
         } else {
-                if (state->is_cx23885) {
+                if (state->is_cx23885 || state->is_cx231xx) {
                         u8 v = cx25840_read(client, 0x421) & ~(0x0b);
                         cx25840_write(client, 0x421, v);
                 } else {
@@ -1234,22 +1322,24 @@ static int cx25840_s_radio(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int cx25840_s_video_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int cx25840_s_video_routing(struct v4l2_subdev *sd,
+                                   u32 input, u32 output, u32 config)
 {
         struct cx25840_state *state = to_state(sd);
         struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-        return set_input(client, route->input, state->aud_input);
+        return set_input(client, input, state->aud_input);
 }
 
-static int cx25840_s_audio_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int cx25840_s_audio_routing(struct v4l2_subdev *sd,
+                                   u32 input, u32 output, u32 config)
 {
         struct cx25840_state *state = to_state(sd);
         struct i2c_client *client = v4l2_get_subdevdata(sd);
 
         if (state->is_cx25836)
                 return -EINVAL;
-        return set_input(client, state->vid_input, route->input);
+        return set_input(client, state->vid_input, input);
 }
 
 static int cx25840_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *freq)
@@ -1350,6 +1440,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val)
                 cx25836_initialize(client);
         else if (state->is_cx23885)
                 cx23885_initialize(client);
+        else if (state->is_cx231xx)
+                cx231xx_initialize(client);
         else
                 cx25840_initialize(client);
         return 0;
@@ -1382,8 +1474,9 @@ static const struct v4l2_subdev_core_ops cx25840_core_ops = {
         .g_ctrl = cx25840_g_ctrl,
         .s_ctrl = cx25840_s_ctrl,
         .queryctrl = cx25840_queryctrl,
+        .s_std = cx25840_s_std,
         .reset = cx25840_reset,
-        .init = cx25840_init,
+        .load_fw = cx25840_load_fw,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .g_register = cx25840_g_register,
         .s_register = cx25840_s_register,
@@ -1392,7 +1485,6 @@ static const struct v4l2_subdev_core_ops cx25840_core_ops = {
 
 static const struct v4l2_subdev_tuner_ops cx25840_tuner_ops = {
         .s_frequency = cx25840_s_frequency,
-        .s_std = cx25840_s_std,
         .s_radio = cx25840_s_radio,
         .g_tuner = cx25840_g_tuner,
         .s_tuner = cx25840_s_tuner,
@@ -1449,6 +1541,8 @@ static int cx25840_probe(struct i2c_client *client,
                 id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
         } else if (device_id == 0x1313) {
                 id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
+        } else if ((device_id & 0xfff0) == 0x5A30) {
+                id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf);
         }
         else {
                 v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n");
@@ -1471,6 +1565,7 @@ static int cx25840_probe(struct i2c_client *client,
         state->c = client;
         state->is_cx25836 = ((device_id & 0xff00) == 0x8300);
         state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313);
+        state->is_cx231xx = (device_id == 0x5a3e);
         state->vid_input = CX25840_COMPOSITE7;
         state->aud_input = CX25840_AUDIO8;
         state->audclk_freq = 48000;
diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h
index 9ad0eb86ecfd..814b56536994 100644
--- a/drivers/media/video/cx25840/cx25840-core.h
+++ b/drivers/media/video/cx25840/cx25840-core.h
@@ -50,6 +50,7 @@ struct cx25840_state {
         u32 rev;
         int is_cx25836;
         int is_cx23885;
+        int is_cx231xx;
         int is_initialized;
         wait_queue_head_t fw_wait;    /* wake up when the fw load is finished */
         struct work_struct fw_work;   /* work entry for fw load */
diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 0b2dceb74108..0df53b0d75d9 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -25,6 +25,7 @@
 
 #define FWFILE "v4l-cx25840.fw"
 #define FWFILE_CX23885 "v4l-cx23885-avcore-01.fw"
+#define FWFILE_CX231XX "v4l-cx231xx-avcore-01.fw"
 
 /*
  * Mike Isely <isely@pobox.com> - The FWSEND parameter controls the
@@ -96,9 +97,17 @@ int cx25840_loadfw(struct i2c_client *client)
         u8 buffer[FWSEND];
         const u8 *ptr;
         int size, retval;
+        int MAX_BUF_SIZE = FWSEND;
 
         if (state->is_cx23885)
                 firmware = FWFILE_CX23885;
+        else if (state->is_cx231xx)
+                firmware = FWFILE_CX231XX;
+
+        if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
+                v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
+                MAX_BUF_SIZE = 16;  /* cx231xx cannot accept more than 16 bytes at a time */
+        }
 
         if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
                 v4l_err(client, "unable to open firmware %s\n", firmware);
@@ -113,7 +122,7 @@ int cx25840_loadfw(struct i2c_client *client)
         size = fw->size;
         ptr = fw->data;
         while (size > 0) {
-                int len = min(FWSEND - 2, size);
+                int len = min(MAX_BUF_SIZE - 2, size);
 
                 memcpy(buffer + 2, ptr, len);
 
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 0363971a23a8..6bbbfc66bb4b 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -3049,7 +3049,7 @@ static void cx88_card_setup(struct cx88_core *core)
                             ctl.fname);
                 call_all(core, tuner, s_config, &xc2028_cfg);
         }
-        call_all(core, core, s_standby, 0);
+        call_all(core, tuner, s_standby);
 }
 
 /* ------------------------------------------------------------------ */
@@ -3221,16 +3221,19 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
                    The radio_type is sometimes missing, or set to UNSET but
                    later code configures a tea5767.
                  */
-                v4l2_i2c_new_probed_subdev(&core->i2c_adap, "tuner", "tuner",
+                v4l2_i2c_new_probed_subdev(&core->v4l2_dev, &core->i2c_adap,
+                                "tuner", "tuner",
                                 v4l2_i2c_tuner_addrs(ADDRS_RADIO));
                 if (has_demod)
-                        v4l2_i2c_new_probed_subdev(&core->i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                        v4l2_i2c_new_probed_subdev(&core->v4l2_dev,
+                                &core->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                 if (core->board.tuner_addr == ADDR_UNSET) {
-                        v4l2_i2c_new_probed_subdev(&core->i2c_adap, "tuner",
-                                "tuner", has_demod ? tv_addrs + 4 : tv_addrs);
+                        v4l2_i2c_new_probed_subdev(&core->v4l2_dev,
+                                &core->i2c_adap, "tuner", "tuner",
+                                has_demod ? tv_addrs + 4 : tv_addrs);
                 } else {
-                        v4l2_i2c_new_subdev(&core->i2c_adap,
+                        v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
                                 "tuner", "tuner", core->board.tuner_addr);
                 }
         }
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index f2fb9f30bfc1..0e149b22bd19 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -991,7 +991,7 @@ int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm)
         set_tvaudio(core);
 
         // tell i2c chips
-        call_all(core, tuner, s_std, norm);
+        call_all(core, core, s_std, norm);
 
         // done
         return 0;
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 4ff4d9fe0355..9389cf290c1b 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -1168,7 +1168,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 fe1->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
 
         /* Put the analog decoder in standby to keep it quiet */
-        call_all(core, core, s_standby, 0);
+        call_all(core, tuner, s_standby);
 
         /* register everything */
         return videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 434237af5184..ec0425d9043a 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -428,10 +428,8 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
                    routes for different inputs. HVR-1300 surely does */
                 if (core->board.audio_chip &&
                     core->board.audio_chip == V4L2_IDENT_WM8775) {
-                        struct v4l2_routing route;
-
-                        route.input = INPUT(input).audioroute;
-                        call_all(core, audio, s_routing, &route);
+                        call_all(core, audio, s_routing,
+                                        INPUT(input).audioroute, 0, 0);
                 }
                 /* cx2388's C-ADC is connected to the tuner only.
                    When used with S-Video, that ADC is busy dealing with
@@ -823,10 +821,8 @@ static int video_open(struct file *file)
                 if (core->board.radio.audioroute) {
                         if(core->board.audio_chip &&
                                 core->board.audio_chip == V4L2_IDENT_WM8775) {
-                                struct v4l2_routing route;
-
-                                route.input = core->board.radio.audioroute;
-                                call_all(core, audio, s_routing, &route);
+                                call_all(core, audio, s_routing,
+                                        core->board.radio.audioroute, 0, 0);
                         }
                         /* "I2S ADC mode" */
                         core->tvaudio = WW_I2SADC;
@@ -931,7 +927,7 @@ static int video_release(struct file *file)
         kfree(fh);
 
         if(atomic_dec_and_test(&dev->core->users))
-                call_all(dev->core, core, s_standby, 0);
+                call_all(dev->core, tuner, s_standby);
 
         return 0;
 }
@@ -1882,18 +1878,15 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         /* load and configure helper modules */
 
         if (core->board.audio_chip == V4L2_IDENT_WM8775)
-                v4l2_i2c_new_subdev(&core->i2c_adap,
+                v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
                                 "wm8775", "wm8775", 0x36 >> 1);
 
         if (core->board.audio_chip == V4L2_IDENT_TVAUDIO) {
                 /* This probes for a tda9874 as is used on some
                    Pixelview Ultra boards. */
-                static const unsigned short i2c_addr[] = {
-                        0xb0 >> 1, I2C_CLIENT_END
-                };
-
-                v4l2_i2c_new_probed_subdev(&core->i2c_adap,
-                                "tvaudio", "tvaudio", i2c_addr);
+                v4l2_i2c_new_probed_subdev_addr(&core->v4l2_dev,
+                                &core->i2c_adap,
+                                "tvaudio", "tvaudio", 0xb0 >> 1);
         }
 
         switch (core->boardnr) {
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 9a43fdf20fae..7724d168fc04 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -41,7 +41,7 @@
 
 #include <linux/version.h>
 #include <linux/mutex.h>
-#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)
+#define CX88_VERSION_CODE KERNEL_VERSION(0,0,7)
 
 #define UNSET (-1U)
 
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 0f48c0ff5ac3..7c70738479dd 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -31,6 +31,8 @@
 #include <media/msp3400.h>
 #include <media/saa7115.h>
 #include <media/tvp5150.h>
+#include <media/tvaudio.h>
+#include <media/i2c-addr.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
@@ -1240,6 +1242,7 @@ struct em28xx_board em28xx_boards[] = {
         [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = {
                 .name         = "Compro VideoMate ForYou/Stereo",
                 .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tvaudio_addr = 0xb0,
                 .tda9887_conf = TDA9887_PRESENT,
                 .decoder      = EM28XX_TVP5150,
                 .adecoder     = EM28XX_TVAUDIO,
@@ -1444,6 +1447,24 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
         {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 };
 
+/* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */
+static unsigned short saa711x_addrs[] = {
+        0x4a >> 1, 0x48 >> 1,   /* SAA7111, SAA7111A and SAA7113 */
+        0x42 >> 1, 0x40 >> 1,   /* SAA7114, SAA7115 and SAA7118 */
+        I2C_CLIENT_END };
+
+static unsigned short tvp5150_addrs[] = {
+        0xb8 >> 1,
+        0xba >> 1,
+        I2C_CLIENT_END
+};
+
+static unsigned short msp3400_addrs[] = {
+        0x80 >> 1,
+        0x88 >> 1,
+        I2C_CLIENT_END
+};
+
 int em28xx_tuner_callback(void *ptr, int component, int command, int arg)
 {
         int rc = 0;
@@ -1672,31 +1693,55 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
         }
 }
 
-static void em28xx_config_tuner(struct em28xx *dev)
+static void em28xx_tuner_setup(struct em28xx *dev)
 {
-        struct v4l2_priv_tun_config  xc2028_cfg;
         struct tuner_setup           tun_setup;
         struct v4l2_frequency        f;
 
         if (dev->tuner_type == TUNER_ABSENT)
                 return;
 
+        memset(&tun_setup, 0, sizeof(tun_setup));
+
         tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
-        tun_setup.type = dev->tuner_type;
-        tun_setup.addr = dev->tuner_addr;
         tun_setup.tuner_callback = em28xx_tuner_callback;
 
-        em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
+        if (dev->board.radio.type) {
+                tun_setup.type = dev->board.radio.type;
+                tun_setup.addr = dev->board.radio_addr;
+
+                v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_type_addr, &tun_setup);
+        }
+
+        if ((dev->tuner_type != TUNER_ABSENT) && (dev->tuner_type)) {
+                tun_setup.type   = dev->tuner_type;
+                tun_setup.addr   = dev->tuner_addr;
+
+                v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_type_addr, &tun_setup);
+        }
+
+        if (dev->tda9887_conf) {
+                struct v4l2_priv_tun_config tda9887_cfg;
+
+                tda9887_cfg.tuner = TUNER_TDA9887;
+                tda9887_cfg.priv = &dev->tda9887_conf;
+
+                v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_config, &tda9887_cfg);
+        }
 
         if (dev->tuner_type == TUNER_XC2028) {
+                struct v4l2_priv_tun_config  xc2028_cfg;
                 struct xc2028_ctrl           ctl;
 
+                memset(&xc2028_cfg, 0, sizeof(xc2028_cfg));
+                memset(&ctl, 0, sizeof(ctl));
+
                 em28xx_setup_xc3028(dev, &ctl);
 
                 xc2028_cfg.tuner = TUNER_XC2028;
                 xc2028_cfg.priv  = &ctl;
 
-                em28xx_i2c_call_clients(dev, TUNER_SET_CONFIG, &xc2028_cfg);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_config, &xc2028_cfg);
         }
 
         /* configure tuner */
@@ -1704,7 +1749,7 @@ static void em28xx_config_tuner(struct em28xx *dev)
         f.type = V4L2_TUNER_ANALOG_TV;
         f.frequency = 9076;     /* just a magic number */
         dev->ctl_freq = f.frequency;
-        em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, &f);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, &f);
 }
 
 static int em28xx_hint_board(struct em28xx *dev)
@@ -1911,22 +1956,52 @@ void em28xx_card_setup(struct em28xx *dev)
         if (tuner >= 0)
                 dev->tuner_type = tuner;
 
-#ifdef CONFIG_MODULES
         /* request some modules */
         if (dev->board.has_msp34xx)
-                request_module("msp3400");
+                v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "msp3400", "msp3400", msp3400_addrs);
+
         if (dev->board.decoder == EM28XX_SAA711X)
-                request_module("saa7115");
+                v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "saa7115", "saa7115_auto", saa711x_addrs);
+
         if (dev->board.decoder == EM28XX_TVP5150)
-                request_module("tvp5150");
-        if (dev->board.tuner_type != TUNER_ABSENT)
-                request_module("tuner");
-        if (dev->board.adecoder == EM28XX_TVAUDIO)
-                request_module("tvaudio");
-#endif
+                v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "tvp5150", "tvp5150", tvp5150_addrs);
 
-        em28xx_config_tuner(dev);
+        if (dev->board.adecoder == EM28XX_TVAUDIO)
+                v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                        "tvaudio", "tvaudio", dev->board.tvaudio_addr);
+
+        if (dev->board.tuner_type != TUNER_ABSENT) {
+                int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);
+
+                if (dev->board.radio.type)
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "tuner", "tuner", dev->board.radio_addr);
+
+                if (has_demod)
+                        v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                if (dev->tuner_addr == 0) {
+                        enum v4l2_i2c_tuner_type type =
+                                has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
+                        struct v4l2_subdev *sd;
+
+                        sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(type));
+
+                        if (sd)
+                                dev->tuner_addr = v4l2_i2c_subdev_addr(sd);
+                } else {
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
+                                "tuner", "tuner", dev->tuner_addr);
+                }
+        }
 
+        em28xx_tuner_setup(dev);
         em28xx_ir_init(dev);
 }
 
@@ -1975,6 +2050,9 @@ void em28xx_release_resources(struct em28xx *dev)
         em28xx_remove_from_devlist(dev);
 
         em28xx_i2c_unregister(dev);
+
+        v4l2_device_unregister(&dev->v4l2_dev);
+
         usb_put_dev(dev->udev);
 
         /* Mark device as unused */
@@ -1986,6 +2064,7 @@ void em28xx_release_resources(struct em28xx *dev)
  * allocates and inits the device structs, registers i2c bus and v4l device
  */
 static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
+                           struct usb_interface *interface,
                            int minor)
 {
         struct em28xx *dev = *devhandle;
@@ -2019,9 +2098,16 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                 }
         }
 
+        retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
+        if (retval < 0) {
+                em28xx_errdev("Call to v4l2_device_register() failed!\n");
+                return retval;
+        }
+
         /* register i2c bus */
         errCode = em28xx_i2c_register(dev);
         if (errCode < 0) {
+                v4l2_device_unregister(&dev->v4l2_dev);
                 em28xx_errdev("%s: em28xx_i2c_register - errCode [%d]!\n",
                         __func__, errCode);
                 return errCode;
@@ -2033,6 +2119,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         /* Configure audio */
         errCode = em28xx_audio_setup(dev);
         if (errCode < 0) {
+                v4l2_device_unregister(&dev->v4l2_dev);
                 em28xx_errdev("%s: Error while setting audio - errCode [%d]!\n",
                         __func__, errCode);
         }
@@ -2077,7 +2164,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         em28xx_init_extension(dev);
 
         /* Save some power by putting tuner to sleep */
-        em28xx_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_standby);
 
         return 0;
 
@@ -2096,7 +2183,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         struct usb_device *udev;
         struct usb_interface *uif;
         struct em28xx *dev = NULL;
-        int retval = -ENODEV;
+        int retval;
         int i, nr, ifnum, isoc_pipe;
         char *speed;
         char descr[255] = "";
@@ -2118,7 +2205,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                         interface->altsetting[0].desc.bInterfaceClass);
 
                 em28xx_devused &= ~(1<<nr);
-                return -ENODEV;
+                retval = -ENODEV;
+                goto err;
         }
 
         endpoint = &interface->cur_altsetting->endpoint[0].desc;
@@ -2151,7 +2239,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                                 "interface not used by the driver\n");
 
                         em28xx_devused &= ~(1<<nr);
-                        return -ENODEV;
+                        retval = -ENODEV;
+                        goto err;
                 }
         }
 
@@ -2194,7 +2283,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
                                 EM28XX_MAXBOARDS);
                 em28xx_devused &= ~(1<<nr);
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto err;
         }
 
         /* allocate memory for our device state and initialize it */
@@ -2202,7 +2292,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         if (dev == NULL) {
                 em28xx_err(DRIVER_NAME ": out of memory!\n");
                 em28xx_devused &= ~(1<<nr);
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto err;
         }
 
         snprintf(dev->name, 29, "em28xx #%d", nr);
@@ -2229,7 +2320,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 em28xx_errdev("out of memory!\n");
                 em28xx_devused &= ~(1<<nr);
                 kfree(dev);
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto err;
         }
 
         for (i = 0; i < dev->num_alt ; i++) {
@@ -2244,12 +2336,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         /* allocate device struct */
         mutex_init(&dev->lock);
         mutex_lock(&dev->lock);
-        retval = em28xx_init_dev(&dev, udev, nr);
+        retval = em28xx_init_dev(&dev, udev, interface, nr);
         if (retval) {
                 em28xx_devused &= ~(1<<dev->devno);
                 kfree(dev);
-
-                return retval;
+                goto err;
         }
 
         /* save our data pointer in this interface device */
@@ -2263,6 +2354,9 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         mutex_unlock(&dev->lock);
 
         return 0;
+
+err:
+        return retval;
 }
 
 /*
@@ -2288,6 +2382,8 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
 
         wake_up_interruptible_all(&dev->open);
 
+        v4l2_device_disconnect(&dev->v4l2_dev);
+
         if (dev->users) {
                 em28xx_warn
                     ("device /dev/video%d is open! Deregistration and memory "
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 8f1999ca4803..192b76cdd5d7 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -1018,14 +1018,10 @@ EXPORT_SYMBOL_GPL(em28xx_init_isoc);
  */
 void em28xx_wake_i2c(struct em28xx *dev)
 {
-        struct v4l2_routing route;
-        int zero = 0;
-
-        route.input = INPUT(dev->ctl_input)->vmux;
-        route.output = 0;
-        em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, &zero);
-        em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
-        em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, core,  reset, 0);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing,
+                        INPUT(dev->ctl_input)->vmux, 0, 0);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);
 }
 
 /*
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 02c12fe6361b..f0bf1d960c75 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -459,70 +459,15 @@ static u32 functionality(struct i2c_adapter *adap)
 static int attach_inform(struct i2c_client *client)
 {
         struct em28xx *dev = client->adapter->algo_data;
+        struct IR_i2c *ir = i2c_get_clientdata(client);
 
         switch (client->addr << 1) {
-        case 0x86:
-        case 0x84:
-        case 0x96:
-        case 0x94:
-        {
-                struct v4l2_priv_tun_config tda9887_cfg;
-
-                struct tuner_setup tun_setup;
-
-                tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
-                tun_setup.type = TUNER_TDA9887;
-                tun_setup.addr = client->addr;
-
-                em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR,
-                        &tun_setup);
-
-                tda9887_cfg.tuner = TUNER_TDA9887;
-                tda9887_cfg.priv = &dev->tda9887_conf;
-                em28xx_i2c_call_clients(dev, TUNER_SET_CONFIG,
-                                        &tda9887_cfg);
-                break;
-        }
-        case 0x42:
-                dprintk1(1, "attach_inform: saa7114 detected.\n");
-                break;
-        case 0x4a:
-                dprintk1(1, "attach_inform: saa7113 detected.\n");
-                break;
-        case 0xa0:
-                dprintk1(1, "attach_inform: eeprom detected.\n");
-                break;
         case 0x60:
         case 0x8e:
-        {
-                struct IR_i2c *ir = i2c_get_clientdata(client);
-                dprintk1(1, "attach_inform: IR detected (%s).\n",
-                        ir->phys);
+                dprintk1(1, "attach_inform: IR detected (%s).\n", ir->phys);
                 em28xx_set_ir(dev, ir);
                 break;
         }
-        case 0x80:
-        case 0x88:
-                dprintk1(1, "attach_inform: msp34xx detected.\n");
-                break;
-        case 0xb8:
-        case 0xba:
-                dprintk1(1, "attach_inform: tvp5150 detected.\n");
-                break;
-
-        case 0xb0:
-                dprintk1(1, "attach_inform: tda9874 detected\n");
-                break;
-
-        default:
-                if (!dev->tuner_addr)
-                        dev->tuner_addr = client->addr;
-
-                dprintk1(1, "attach inform: detected I2C address %x\n",
-                                client->addr << 1);
-                dprintk1(1, "driver id %d\n", client->driver->id);
-
-        }
 
         return 0;
 }
@@ -534,7 +479,6 @@ static struct i2c_algorithm em28xx_algo = {
 
 static struct i2c_adapter em28xx_adap_template = {
         .owner = THIS_MODULE,
-        .class = I2C_CLASS_TV_ANALOG,
         .name = "em28xx",
         .id = I2C_HW_B_EM28XX,
         .algo = &em28xx_algo,
@@ -595,16 +539,6 @@ void em28xx_do_i2c_scan(struct em28xx *dev)
 }
 
 /*
- * em28xx_i2c_call_clients()
- * send commands to all attached i2c devices
- */
-void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg)
-{
-        BUG_ON(NULL == dev->i2c_adap.algo_data);
-        i2c_clients_command(&dev->i2c_adap, cmd, arg);
-}
-
-/*
  * em28xx_i2c_register()
  * register i2c bus
  */
@@ -618,6 +552,7 @@ int em28xx_i2c_register(struct em28xx *dev)
         dev->i2c_adap.dev.parent = &dev->udev->dev;
         strcpy(dev->i2c_adap.name, dev->name);
         dev->i2c_adap.algo_data = dev;
+        i2c_set_adapdata(&dev->i2c_adap, &dev->v4l2_dev);
 
         retval = i2c_add_adapter(&dev->i2c_adap);
         if (retval < 0) {
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 575472f1e702..882796e84dbc 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -49,7 +49,7 @@
                       "Sascha Sommer <saschasommer@freenet.de>"
 
 #define DRIVER_DESC         "Empia em28xx based USB video device driver"
-#define EM28XX_VERSION_CODE  KERNEL_VERSION(0, 1, 1)
+#define EM28XX_VERSION_CODE  KERNEL_VERSION(0, 1, 2)
 
 #define em28xx_videodbg(fmt, arg...) do {\
         if (video_debug) \
@@ -400,7 +400,7 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
         f.frequency = dev->ctl_freq;
         f.type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
 
-        em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, &f);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, &f);
 
         return 0;
 }
@@ -515,10 +515,6 @@ static struct videobuf_queue_ops em28xx_video_qops = {
 
 static void video_mux(struct em28xx *dev, int index)
 {
-        struct v4l2_routing route;
-
-        route.input = INPUT(index)->vmux;
-        route.output = 0;
         dev->ctl_input = index;
         dev->ctl_ainput = INPUT(index)->amux;
         dev->ctl_aoutput = INPUT(index)->aout;
@@ -526,25 +522,22 @@ static void video_mux(struct em28xx *dev, int index)
         if (!dev->ctl_aoutput)
                 dev->ctl_aoutput = EM28XX_AOUT_MASTER;
 
-        em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing,
+                        INPUT(index)->vmux, 0, 0);
 
         if (dev->board.has_msp34xx) {
                 if (dev->i2s_speed) {
-                        em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ,
-                                &dev->i2s_speed);
+                        v4l2_device_call_all(&dev->v4l2_dev, 0, audio,
+                                s_i2s_clock_freq, dev->i2s_speed);
                 }
-                route.input = dev->ctl_ainput;
-                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
                 /* Note: this is msp3400 specific */
-                em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING,
-                        &route);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing,
+                         dev->ctl_ainput, MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
         }
 
         if (dev->board.adecoder != EM28XX_NOADECODER) {
-                route.input = dev->ctl_ainput;
-                route.output = dev->ctl_aoutput;
-                em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING,
-                        &route);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing,
+                        dev->ctl_ainput, dev->ctl_aoutput, 0);
         }
 
         em28xx_audio_analog_set(dev);
@@ -829,7 +822,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
         get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
 
         em28xx_resolution_set(dev);
-        em28xx_i2c_call_clients(dev, VIDIOC_S_STD, &dev->norm);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm);
 
         mutex_unlock(&dev->lock);
         return 0;
@@ -995,8 +988,9 @@ static int vidioc_queryctrl(struct file *file, void *priv,
                         }
                 }
         }
+
         mutex_lock(&dev->lock);
-        em28xx_i2c_call_clients(dev, VIDIOC_QUERYCTRL, qc);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, core, queryctrl, qc);
         mutex_unlock(&dev->lock);
 
         if (qc->type)
@@ -1020,11 +1014,11 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
         mutex_lock(&dev->lock);
 
         if (dev->board.has_msp34xx)
-                em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_ctrl, ctrl);
         else {
                 rc = em28xx_get_ctrl(dev, ctrl);
                 if (rc < 0) {
-                        em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
+                        v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_ctrl, ctrl);
                         rc = 0;
                 }
         }
@@ -1048,7 +1042,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         mutex_lock(&dev->lock);
 
         if (dev->board.has_msp34xx)
-                em28xx_i2c_call_clients(dev, VIDIOC_S_CTRL, ctrl);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_ctrl, ctrl);
         else {
                 rc = 1;
                 for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
@@ -1067,7 +1061,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
 
         /* Control not found - try to send it to the attached devices */
         if (rc == 1) {
-                em28xx_i2c_call_clients(dev, VIDIOC_S_CTRL, ctrl);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_ctrl, ctrl);
                 rc = 0;
         }
 
@@ -1092,10 +1086,9 @@ static int vidioc_g_tuner(struct file *file, void *priv,
         strcpy(t->name, "Tuner");
 
         mutex_lock(&dev->lock);
-
-        em28xx_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
-
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_tuner, t);
         mutex_unlock(&dev->lock);
+
         return 0;
 }
 
@@ -1114,10 +1107,9 @@ static int vidioc_s_tuner(struct file *file, void *priv,
                 return -EINVAL;
 
         mutex_lock(&dev->lock);
-
-        em28xx_i2c_call_clients(dev, VIDIOC_S_TUNER, t);
-
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_tuner, t);
         mutex_unlock(&dev->lock);
+
         return 0;
 }
 
@@ -1157,7 +1149,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
         mutex_lock(&dev->lock);
 
         dev->ctl_freq = f->frequency;
-        em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, f);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, f);
 
         mutex_unlock(&dev->lock);
 
@@ -1186,7 +1178,7 @@ static int vidioc_g_chip_ident(struct file *file, void *priv,
         chip->ident = V4L2_IDENT_NONE;
         chip->revision = 0;
 
-        em28xx_i2c_call_clients(dev, VIDIOC_DBG_G_CHIP_IDENT, chip);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_chip_ident, chip);
 
         return 0;
 }
@@ -1211,7 +1203,7 @@ static int vidioc_g_register(struct file *file, void *priv,
                 reg->size = 1;
                 return 0;
         case V4L2_CHIP_MATCH_I2C_DRIVER:
-                em28xx_i2c_call_clients(dev, VIDIOC_DBG_G_REGISTER, reg);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg);
                 return 0;
         case V4L2_CHIP_MATCH_I2C_ADDR:
                 /* Not supported yet */
@@ -1263,7 +1255,7 @@ static int vidioc_s_register(struct file *file, void *priv,
 
                 return rc;
         case V4L2_CHIP_MATCH_I2C_DRIVER:
-                em28xx_i2c_call_clients(dev, VIDIOC_DBG_S_REGISTER, reg);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg);
                 return 0;
         case V4L2_CHIP_MATCH_I2C_ADDR:
                 /* Not supported yet */
@@ -1406,13 +1398,13 @@ static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,
         mutex_lock(&dev->lock);
 
         f->fmt.sliced.service_set = 0;
-
-        em28xx_i2c_call_clients(dev, VIDIOC_G_FMT, f);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f);
 
         if (f->fmt.sliced.service_set == 0)
                 rc = -EINVAL;
 
         mutex_unlock(&dev->lock);
+
         return rc;
 }
 
@@ -1428,7 +1420,7 @@ static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
                 return rc;
 
         mutex_lock(&dev->lock);
-        em28xx_i2c_call_clients(dev, VIDIOC_G_FMT, f);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f);
         mutex_unlock(&dev->lock);
 
         if (f->fmt.sliced.service_set == 0)
@@ -1532,7 +1524,7 @@ static int radio_g_tuner(struct file *file, void *priv,
         t->type = V4L2_TUNER_RADIO;
 
         mutex_lock(&dev->lock);
-        em28xx_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_tuner, t);
         mutex_unlock(&dev->lock);
 
         return 0;
@@ -1567,7 +1559,7 @@ static int radio_s_tuner(struct file *file, void *priv,
                 return -EINVAL;
 
         mutex_lock(&dev->lock);
-        em28xx_i2c_call_clients(dev, VIDIOC_S_TUNER, t);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_tuner, t);
         mutex_unlock(&dev->lock);
 
         return 0;
@@ -1655,7 +1647,7 @@ static int em28xx_v4l2_open(struct file *filp)
         }
         if (fh->radio) {
                 em28xx_videodbg("video_open: setting radio device\n");
-                em28xx_i2c_call_clients(dev, AUDC_SET_RADIO, NULL);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_radio);
         }
 
         dev->users++;
@@ -1738,7 +1730,7 @@ static int em28xx_v4l2_close(struct file *filp)
                 }
 
                 /* Save some power by putting tuner to sleep */
-                em28xx_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL);
+                v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_standby);
 
                 /* do this before setting alternate! */
                 em28xx_uninit_isoc(dev);
@@ -1959,11 +1951,12 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
         vfd = video_device_alloc();
         if (NULL == vfd)
                 return NULL;
-        *vfd = *template;
-        vfd->minor   = -1;
-        vfd->parent = &dev->udev->dev;
-        vfd->release = video_device_release;
-        vfd->debug = video_debug;
+
+        *vfd            = *template;
+        vfd->minor      = -1;
+        vfd->v4l2_dev   = &dev->v4l2_dev;
+        vfd->release    = video_device_release;
+        vfd->debug      = video_debug;
 
         snprintf(vfd->name, sizeof(vfd->name), "%s %s",
                  dev->name, type_name);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index a33a58da016e..4c4e58004f54 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -27,6 +27,7 @@
 
 #include <linux/videodev2.h>
 #include <media/videobuf-vmalloc.h>
+#include <media/v4l2-device.h>
 
 #include <linux/i2c.h>
 #include <linux/mutex.h>
@@ -385,6 +386,8 @@ struct em28xx_board {
         unsigned int valid:1;
 
         unsigned char xclk, i2c_speed;
+        unsigned char radio_addr;
+        unsigned short tvaudio_addr;
 
         enum em28xx_decoder decoder;
         enum em28xx_adecoder adecoder;
@@ -460,6 +463,7 @@ struct em28xx {
         int devno;              /* marks the number of this device */
         enum em28xx_chip_id chip_id;
 
+        struct v4l2_device v4l2_dev;
         struct em28xx_board board;
 
         unsigned int stream_on:1;       /* Locks streams */
@@ -577,11 +581,9 @@ struct em28xx_ops {
 };
 
 /* Provided by em28xx-i2c.c */
-
-void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg);
 void em28xx_do_i2c_scan(struct em28xx *dev);
-int em28xx_i2c_register(struct em28xx *dev);
-int em28xx_i2c_unregister(struct em28xx *dev);
+int  em28xx_i2c_register(struct em28xx *dev);
+int  em28xx_i2c_unregister(struct em28xx *dev);
 
 /* Provided by em28xx-core.c */
 
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index a75c1ca2db41..a2741d7dccfe 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1132,6 +1132,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
         if (input->index != 0)
                 return -EINVAL;
         input->type = V4L2_INPUT_TYPE_CAMERA;
+        input->status = gspca_dev->cam.input_flags;
         strncpy(input->name, gspca_dev->sd_desc->name,
                 sizeof input->name);
         return 0;
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index e4d4cf6ce05a..58e8ff02136a 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -56,6 +56,7 @@ struct cam {
                                  * - cannot be > MAX_NURBS
                                  * - when 0 and bulk_size != 0 means
                                  *   1 URB and submit done by subdriver */
+        u32 input_flags;        /* value for ENUM_INPUT status flags */
 };
 
 struct gspca_dev;
diff --git a/drivers/media/video/gspca/m5602/Makefile b/drivers/media/video/gspca/m5602/Makefile
index 226ab4fc9d60..9fa3644f4869 100644
--- a/drivers/media/video/gspca/m5602/Makefile
+++ b/drivers/media/video/gspca/m5602/Makefile
@@ -7,5 +7,4 @@ gspca_m5602-objs := m5602_core.o \
                     m5602_s5k83a.o \
                     m5602_s5k4aa.o
 
-EXTRA_CFLAGS += -Idrivers/media/video/gspca
-
+EXTRA_CFLAGS += -Idrivers/media/video/gspca
\ No newline at end of file
diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h
index a3f3b7a0c7e7..8f1cea6fd3bf 100644
--- a/drivers/media/video/gspca/m5602/m5602_bridge.h
+++ b/drivers/media/video/gspca/m5602/m5602_bridge.h
@@ -112,14 +112,14 @@ static const unsigned char sensor_urb_skeleton[] = {
 struct sd {
         struct gspca_dev gspca_dev;
 
-        /* The name of the m5602 camera */
-        char *name;
-
         /* A pointer to the currently connected sensor */
-        struct m5602_sensor *sensor;
+        const struct m5602_sensor *sensor;
 
         struct sd_desc *desc;
 
+        /* Sensor private data */
+        void *sensor_priv;
+
         /* The current frame's id, used to detect frame boundaries */
         u8 frame_id;
 
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index b35e4838a6e5..1aac2985fee6 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -51,7 +51,7 @@ int m5602_read_bridge(struct sd *sd, u8 address, u8 *i2c_data)
                address, *i2c_data);
 
         /* usb_control_msg(...) returns the number of bytes sent upon success,
-        mask that and return zero upon success instead*/
+        mask that and return zero instead*/
         return (err < 0) ? err : 0;
 }
 
@@ -76,7 +76,7 @@ int m5602_write_bridge(struct sd *sd, u8 address, u8 i2c_data)
                                 4, M5602_URB_MSG_TIMEOUT);
 
         /* usb_control_msg(...) returns the number of bytes sent upon success,
-           mask that and return zero upon success instead */
+           mask that and return zero instead */
         return (err < 0) ? err : 0;
 }
 
@@ -92,29 +92,29 @@ int m5602_read_sensor(struct sd *sd, const u8 address,
                 err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
         } while ((*i2c_data & I2C_BUSY) && !err);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
                                  sd->sensor->i2c_slave_id);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
         if (err < 0)
-                goto out;
+                return err;
 
         if (sd->sensor->i2c_regW == 1) {
                 err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, len);
                 if (err < 0)
-                        goto out;
+                        return err;
 
                 err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
                 if (err < 0)
-                        goto out;
+                        return err;
         } else {
                 err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
                 if (err < 0)
-                        goto out;
+                        return err;
         }
 
         for (i = 0; (i < len) && !err; i++) {
@@ -123,7 +123,6 @@ int m5602_read_sensor(struct sd *sd, const u8 address,
                 PDEBUG(D_CONF, "Reading sensor register "
                                "0x%x containing 0x%x ", address, *i2c_data);
         }
-out:
         return err;
 }
 
@@ -310,7 +309,11 @@ static void m5602_urb_complete(struct gspca_dev *gspca_dev,
 
 static void m5602_stop_transfer(struct gspca_dev *gspca_dev)
 {
-        /* Is there are a command to stop a data transfer? */
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        /* Run the sensor specific end transfer sequence */
+        if (sd->sensor->stop)
+                sd->sensor->stop(sd);
 }
 
 /* sub-driver description, the ctrl and nctrl is filled at probe time */
@@ -359,6 +362,17 @@ static int m5602_probe(struct usb_interface *intf,
                                THIS_MODULE);
 }
 
+void m5602_disconnect(struct usb_interface *intf)
+{
+        struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        if (sd->sensor->disconnect)
+                sd->sensor->disconnect(sd);
+
+        gspca_disconnect(intf);
+}
+
 static struct usb_driver sd_driver = {
         .name = MODULE_NAME,
         .id_table = m5602_table,
@@ -367,7 +381,7 @@ static struct usb_driver sd_driver = {
         .suspend = gspca_suspend,
         .resume = gspca_resume,
 #endif
-        .disconnect = gspca_disconnect
+        .disconnect = m5602_disconnect
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
index c0e71c331454..7d3f9e348ef4 100644
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.c
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
@@ -18,6 +18,61 @@
 
 #include "m5602_mt9m111.h"
 
+static struct v4l2_pix_format mt9m111_modes[] = {
+        {
+                640,
+                480,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage = 640 * 480,
+                .bytesperline = 640,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0
+        }
+};
+
+const static struct ctrl mt9m111_ctrls[] = {
+        {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = mt9m111_set_vflip,
+                .get = mt9m111_get_vflip
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = mt9m111_set_hflip,
+                .get = mt9m111_get_hflip
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0,
+                        .maximum        = (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2,
+                        .step           = 1,
+                        .default_value  = DEFAULT_GAIN,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = mt9m111_set_gain,
+                .get = mt9m111_get_gain
+        }
+};
+
+
 static void mt9m111_dump_registers(struct sd *sd);
 
 int mt9m111_probe(struct sd *sd)
@@ -62,10 +117,10 @@ int mt9m111_probe(struct sd *sd)
         return -ENODEV;
 
 sensor_found:
-        sd->gspca_dev.cam.cam_mode = mt9m111.modes;
-        sd->gspca_dev.cam.nmodes = mt9m111.nmodes;
-        sd->desc->ctrls = mt9m111.ctrls;
-        sd->desc->nctrls = mt9m111.nctrls;
+        sd->gspca_dev.cam.cam_mode = mt9m111_modes;
+        sd->gspca_dev.cam.nmodes = ARRAY_SIZE(mt9m111_modes);
+        sd->desc->ctrls = mt9m111_ctrls;
+        sd->desc->nctrls = ARRAY_SIZE(mt9m111_ctrls);
         return 0;
 }
 
@@ -125,16 +180,15 @@ int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
         /* Set the correct page map */
         err = m5602_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = (data[0] & 0xfe) | val;
         err = m5602_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
                                    data, 2);
-out:
         return err;
 }
 
@@ -163,16 +217,15 @@ int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
         /* Set the correct page map */
         err = m5602_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = (data[0] & 0xfd) | ((val << 1) & 0x02);
         err = m5602_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
                                         data, 2);
-out:
         return err;
 }
 
@@ -204,7 +257,7 @@ int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)
         /* Set the correct page map */
         err = m5602_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         if (val >= INITIAL_MAX_GAIN * 2 * 2 * 2)
                 return -EINVAL;
@@ -229,7 +282,7 @@ int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)
 
         err = m5602_write_sensor(sd, MT9M111_SC_GLOBAL_GAIN,
                                    data, 2);
-out:
+
         return err;
 }
 
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
index e795ab7a36c9..00c6db02bdb7 100644
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
@@ -94,7 +94,7 @@ int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
 int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
 int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val);
 
-static struct m5602_sensor mt9m111 = {
+const static struct m5602_sensor mt9m111 = {
         .name = "MT9M111",
 
         .i2c_slave_id = 0xba,
@@ -102,64 +102,7 @@ static struct m5602_sensor mt9m111 = {
 
         .probe = mt9m111_probe,
         .init = mt9m111_init,
-        .power_down = mt9m111_power_down,
-
-        .nctrls = 3,
-        .ctrls = {
-        {
-                {
-                        .id             = V4L2_CID_VFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "vertical flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = mt9m111_set_vflip,
-                .get = mt9m111_get_vflip
-        }, {
-                {
-                        .id             = V4L2_CID_HFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "horizontal flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = mt9m111_set_hflip,
-                .get = mt9m111_get_hflip
-        }, {
-                {
-                        .id             = V4L2_CID_GAIN,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "gain",
-                        .minimum        = 0,
-                        .maximum        = (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2,
-                        .step           = 1,
-                        .default_value  = DEFAULT_GAIN,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = mt9m111_set_gain,
-                .get = mt9m111_get_gain
-        }
-        },
-
-        .nmodes = 1,
-        .modes = {
-        {
-                M5602_DEFAULT_FRAME_WIDTH,
-                M5602_DEFAULT_FRAME_HEIGHT,
-                V4L2_PIX_FMT_SBGGR8,
-                V4L2_FIELD_NONE,
-                .sizeimage =
-                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
-                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1
-        }
-        }
+        .power_down = mt9m111_power_down
 };
 
 static const unsigned char preinit_mt9m111[][4] =
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c
index c908a8d6970a..fc4548fd441d 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.c
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -65,14 +65,177 @@ static
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aurora m9700")
                 }
         },
-        { }
+        {}
+};
+
+const static struct ctrl ov9650_ctrls[] = {
+#define EXPOSURE_IDX 0
+        {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "exposure",
+                        .minimum        = 0x00,
+                        .maximum        = 0x1ff,
+                        .step           = 0x4,
+                        .default_value  = EXPOSURE_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_exposure,
+                .get = ov9650_get_exposure
+        },
+#define GAIN_IDX 1
+        {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0x00,
+                        .maximum        = 0x3ff,
+                        .step           = 0x1,
+                        .default_value  = GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_gain,
+                .get = ov9650_get_gain
+        },
+#define RED_BALANCE_IDX 2
+        {
+                {
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "red balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = RED_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_red_balance,
+                .get = ov9650_get_red_balance
+        },
+#define BLUE_BALANCE_IDX 3
+        {
+                {
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "blue balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = BLUE_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_blue_balance,
+                .get = ov9650_get_blue_balance
+        },
+#define HFLIP_IDX 4
+        {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_hflip,
+                .get = ov9650_get_hflip
+        },
+#define VFLIP_IDX 5
+        {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_vflip,
+                .get = ov9650_get_vflip
+        },
+#define AUTO_WHITE_BALANCE_IDX 6
+        {
+                {
+                        .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "auto white balance",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 1
+                },
+                .set = ov9650_set_auto_white_balance,
+                .get = ov9650_get_auto_white_balance
+        },
+#define AUTO_GAIN_CTRL_IDX 7
+        {
+                {
+                        .id             = V4L2_CID_AUTOGAIN,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "auto gain control",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 1
+                },
+                .set = ov9650_set_auto_gain,
+                .get = ov9650_get_auto_gain
+        }
+};
+
+static struct v4l2_pix_format ov9650_modes[] = {
+        {
+                176,
+                144,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        176 * 144,
+                .bytesperline = 176,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 9
+        }, {
+                320,
+                240,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        320 * 240,
+                .bytesperline = 320,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 8
+        }, {
+                352,
+                288,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        352 * 288,
+                .bytesperline = 352,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 9
+        }, {
+                640,
+                480,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        640 * 480,
+                .bytesperline = 640,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 9
+        }
 };
 
 static void ov9650_dump_registers(struct sd *sd);
 
 int ov9650_probe(struct sd *sd)
 {
+        int err = 0;
         u8 prod_id = 0, ver_id = 0, i;
+        s32 *sensor_settings;
 
         if (force_sensor) {
                 if (force_sensor == OV9650_SENSOR) {
@@ -86,16 +249,20 @@ int ov9650_probe(struct sd *sd)
 
         info("Probing for an ov9650 sensor");
 
-        /* Run the pre-init to actually probe the unit */
-        for (i = 0; i < ARRAY_SIZE(preinit_ov9650); i++) {
+        /* Run the pre-init before probing the sensor */
+        for (i = 0; i < ARRAY_SIZE(preinit_ov9650) && !err; i++) {
                 u8 data = preinit_ov9650[i][2];
                 if (preinit_ov9650[i][0] == SENSOR)
-                        m5602_write_sensor(sd,
-                                            preinit_ov9650[i][1], &data, 1);
+                        err = m5602_write_sensor(sd,
+                                preinit_ov9650[i][1], &data, 1);
                 else
-                        m5602_write_bridge(sd, preinit_ov9650[i][1], data);
+                        err = m5602_write_bridge(sd,
+                                preinit_ov9650[i][1], data);
         }
 
+        if (err < 0)
+                return err;
+
         if (m5602_read_sensor(sd, OV9650_PID, &prod_id, 1))
                 return -ENODEV;
 
@@ -106,14 +273,28 @@ int ov9650_probe(struct sd *sd)
                 info("Detected an ov9650 sensor");
                 goto sensor_found;
         }
-
         return -ENODEV;
 
 sensor_found:
-        sd->gspca_dev.cam.cam_mode = ov9650.modes;
-        sd->gspca_dev.cam.nmodes = ov9650.nmodes;
-        sd->desc->ctrls = ov9650.ctrls;
-        sd->desc->nctrls = ov9650.nctrls;
+        sensor_settings = kmalloc(
+                ARRAY_SIZE(ov9650_ctrls) * sizeof(s32), GFP_KERNEL);
+        if (!sensor_settings)
+                return -ENOMEM;
+
+        sd->gspca_dev.cam.cam_mode = ov9650_modes;
+        sd->gspca_dev.cam.nmodes = ARRAY_SIZE(ov9650_modes);
+        sd->desc->ctrls = ov9650_ctrls;
+        sd->desc->nctrls = ARRAY_SIZE(ov9650_ctrls);
+
+        for (i = 0; i < ARRAY_SIZE(ov9650_ctrls); i++)
+                sensor_settings[i] = ov9650_ctrls[i].qctrl.default_value;
+        sd->sensor_priv = sensor_settings;
+
+        if (dmi_check_system(ov9650_flip_dmi_table) && !err) {
+                info("vflip quirk active");
+                sensor_settings[VFLIP_IDX] = 1;
+        }
+
         return 0;
 }
 
@@ -121,6 +302,7 @@ int ov9650_init(struct sd *sd)
 {
         int i, err = 0;
         u8 data;
+        s32 *sensor_settings = sd->sensor_priv;
 
         if (dump_sensor)
                 ov9650_dump_registers(sd);
@@ -134,70 +316,157 @@ int ov9650_init(struct sd *sd)
                         err = m5602_write_bridge(sd, init_ov9650[i][1], data);
         }
 
-        if (dmi_check_system(ov9650_flip_dmi_table) && !err) {
-                info("vflip quirk active");
-                data = 0x30;
-                err = m5602_write_sensor(sd, OV9650_MVFP, &data, 1);
-        }
+        err = ov9650_set_exposure(&sd->gspca_dev, sensor_settings[EXPOSURE_IDX]);
+        if (err < 0)
+                return err;
+
+        err = ov9650_set_gain(&sd->gspca_dev, sensor_settings[GAIN_IDX]);
+        if (err < 0)
+                return err;
+
+        err = ov9650_set_red_balance(&sd->gspca_dev, sensor_settings[RED_BALANCE_IDX]);
+        if (err < 0)
+                return err;
+
+        err = ov9650_set_blue_balance(&sd->gspca_dev, sensor_settings[BLUE_BALANCE_IDX]);
+        if (err < 0)
+                return err;
+
+        err = ov9650_set_hflip(&sd->gspca_dev, sensor_settings[HFLIP_IDX]);
+        if (err < 0)
+                return err;
+
+        err = ov9650_set_vflip(&sd->gspca_dev, sensor_settings[VFLIP_IDX]);
+        if (err < 0)
+                return err;
+
+        err = ov9650_set_auto_white_balance(&sd->gspca_dev, sensor_settings[AUTO_WHITE_BALANCE_IDX]);
+        if (err < 0)
+                return err;
+
+        err = ov9650_set_auto_gain(&sd->gspca_dev, sensor_settings[AUTO_GAIN_CTRL_IDX]);
         return err;
 }
 
 int ov9650_start(struct sd *sd)
 {
+        u8 data;
         int i, err = 0;
         struct cam *cam = &sd->gspca_dev.cam;
+        s32 *sensor_settings = sd->sensor_priv;
+
+        int width = cam->cam_mode[sd->gspca_dev.curr_mode].width;
+        int height = cam->cam_mode[sd->gspca_dev.curr_mode].height;
+        int ver_offs = cam->cam_mode[sd->gspca_dev.curr_mode].priv;
+        int hor_offs = OV9650_LEFT_OFFSET;
+
+        if (sensor_settings[VFLIP_IDX])
+                ver_offs--;
 
+        if (width <= 320)
+                hor_offs /= 2;
+
+        /* Synthesize the vsync/hsync setup */
         for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) {
-                u8 data = res_init_ov9650[i][1];
-                err = m5602_write_bridge(sd, res_init_ov9650[i][0], data);
+                if (res_init_ov9650[i][0] == BRIDGE)
+                        err = m5602_write_bridge(sd, res_init_ov9650[i][1],
+                                res_init_ov9650[i][2]);
+                else if (res_init_ov9650[i][0] == SENSOR) {
+                        u8 data = res_init_ov9650[i][2];
+                        err = m5602_write_sensor(sd,
+                                res_init_ov9650[i][1], &data, 1);
+                }
         }
         if (err < 0)
                 return err;
 
-        switch (cam->cam_mode[sd->gspca_dev.curr_mode].width)
-        {
+        err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA,
+                                 ((ver_offs >> 8) & 0xff));
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, (ver_offs & 0xff));
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, 0);
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, (height >> 8) & 0xff);
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, (height & 0xff));
+        if (err < 0)
+                return err;
+
+        for (i = 0; i < 2 && !err; i++)
+                err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, 0);
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_HSYNC_PARA,
+                                 (hor_offs >> 8) & 0xff);
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_HSYNC_PARA, hor_offs & 0xff);
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_HSYNC_PARA,
+                                 ((width + hor_offs) >> 8) & 0xff);
+        if (err < 0)
+                return err;
+
+        err = m5602_write_bridge(sd, M5602_XB_HSYNC_PARA,
+                                 ((width + hor_offs) & 0xff));
+        if (err < 0)
+                return err;
+
+        switch (width) {
         case 640:
                 PDEBUG(D_V4L2, "Configuring camera for VGA mode");
 
-                for (i = 0; i < ARRAY_SIZE(VGA_ov9650) && !err; i++) {
-                        u8 data = VGA_ov9650[i][2];
-                        if (VGA_ov9650[i][0] == SENSOR)
-                                err = m5602_write_sensor(sd,
-                                        VGA_ov9650[i][1], &data, 1);
-                        else
-                                err = m5602_write_bridge(sd, VGA_ov9650[i][1], data);
-                }
+                data = OV9650_VGA_SELECT | OV9650_RGB_SELECT |
+                       OV9650_RAW_RGB_SELECT;
+                err = m5602_write_sensor(sd, OV9650_COM7, &data, 1);
                 break;
 
         case 352:
                 PDEBUG(D_V4L2, "Configuring camera for CIF mode");
 
-                for (i = 0; i < ARRAY_SIZE(CIF_ov9650) && !err; i++) {
-                        u8 data = CIF_ov9650[i][2];
-                        if (CIF_ov9650[i][0] == SENSOR)
-                                err = m5602_write_sensor(sd,
-                                        CIF_ov9650[i][1], &data, 1);
-                        else
-                                err = m5602_write_bridge(sd, CIF_ov9650[i][1], data);
-                }
+                data = OV9650_CIF_SELECT | OV9650_RGB_SELECT |
+                                OV9650_RAW_RGB_SELECT;
+                err = m5602_write_sensor(sd, OV9650_COM7, &data, 1);
                 break;
 
         case 320:
                 PDEBUG(D_V4L2, "Configuring camera for QVGA mode");
 
-                for (i = 0; i < ARRAY_SIZE(QVGA_ov9650) && !err; i++) {
-                        u8 data = QVGA_ov9650[i][2];
-                        if (QVGA_ov9650[i][0] == SENSOR)
-                                err = m5602_write_sensor(sd,
-                                        QVGA_ov9650[i][1], &data, 1);
-                        else
-                                err = m5602_write_bridge(sd, QVGA_ov9650[i][1], data);
-                }
+                data = OV9650_QVGA_SELECT | OV9650_RGB_SELECT |
+                                OV9650_RAW_RGB_SELECT;
+                err = m5602_write_sensor(sd, OV9650_COM7, &data, 1);
+                break;
+
+        case 176:
+                PDEBUG(D_V4L2, "Configuring camera for QCIF mode");
+
+                data = OV9650_QCIF_SELECT | OV9650_RGB_SELECT |
+                        OV9650_RAW_RGB_SELECT;
+                err = m5602_write_sensor(sd, OV9650_COM7, &data, 1);
                 break;
         }
         return err;
 }
 
+int ov9650_stop(struct sd *sd)
+{
+        u8 data = OV9650_SOFT_SLEEP | OV9650_OUTPUT_DRIVE_2X;
+        return m5602_write_sensor(sd, OV9650_COM2, &data, 1);
+}
+
 int ov9650_power_down(struct sd *sd)
 {
         int i, err = 0;
@@ -214,76 +483,63 @@ int ov9650_power_down(struct sd *sd)
         return err;
 }
 
-int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+void ov9650_disconnect(struct sd *sd)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        u8 i2c_data;
-        int err;
-
-        err = m5602_read_sensor(sd, OV9650_COM1, &i2c_data, 1);
-        if (err < 0)
-                goto out;
-        *val = i2c_data & 0x03;
+        ov9650_stop(sd);
+        ov9650_power_down(sd);
 
-        err = m5602_read_sensor(sd, OV9650_AECH, &i2c_data, 1);
-        if (err < 0)
-                goto out;
-        *val |= (i2c_data << 2);
+        sd->sensor = NULL;
+        kfree(sd->sensor_priv);
+}
 
-        err = m5602_read_sensor(sd, OV9650_AECHM, &i2c_data, 1);
-        if (err < 0)
-                goto out;
-        *val |= (i2c_data & 0x3f) << 10;
+int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
+        *val = sensor_settings[EXPOSURE_IDX];
         PDEBUG(D_V4L2, "Read exposure %d", *val);
-out:
-        return err;
+        return 0;
 }
 
 int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
         u8 i2c_data;
         int err;
 
-        PDEBUG(D_V4L2, "Set exposure to %d",
-               val & 0xffff);
+        PDEBUG(D_V4L2, "Set exposure to %d", val);
 
+        sensor_settings[EXPOSURE_IDX] = val;
         /* The 6 MSBs */
         i2c_data = (val >> 10) & 0x3f;
         err = m5602_write_sensor(sd, OV9650_AECHM,
                                   &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* The 8 middle bits */
         i2c_data = (val >> 2) & 0xff;
         err = m5602_write_sensor(sd, OV9650_AECH,
                                   &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* The 2 LSBs */
         i2c_data = val & 0x03;
         err = m5602_write_sensor(sd, OV9650_COM1, &i2c_data, 1);
-
-out:
         return err;
 }
 
 int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        m5602_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
-        *val = (i2c_data & 0x03) << 8;
-
-        err = m5602_read_sensor(sd, OV9650_GAIN, &i2c_data, 1);
-        *val |= i2c_data;
+        *val = sensor_settings[GAIN_IDX];
         PDEBUG(D_V4L2, "Read gain %d", *val);
-        return err;
+        return 0;
 }
 
 int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val)
@@ -291,15 +547,25 @@ int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
+
+        PDEBUG(D_V4L2, "Setting gain to %d", val);
+
+        sensor_settings[GAIN_IDX] = val;
 
         /* The 2 MSB */
         /* Read the OV9650_VREF register first to avoid
            corrupting the VREF high and low bits */
-        m5602_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        err = m5602_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                return err;
+
         /* Mask away all uninteresting bits */
         i2c_data = ((val & 0x0300) >> 2) |
                         (i2c_data & 0x3F);
         err = m5602_write_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                return err;
 
         /* The 8 LSBs */
         i2c_data = val & 0xff;
@@ -309,16 +575,12 @@ int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val)
 
 int ov9650_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        err = m5602_read_sensor(sd, OV9650_RED, &i2c_data, 1);
-        *val = i2c_data;
-
+        *val = sensor_settings[RED_BALANCE_IDX];
         PDEBUG(D_V4L2, "Read red gain %d", *val);
-
-        return err;
+        return 0;
 }
 
 int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
@@ -326,28 +588,26 @@ int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        PDEBUG(D_V4L2, "Set red gain to %d",
-                             val & 0xff);
+        PDEBUG(D_V4L2, "Set red gain to %d", val);
+
+        sensor_settings[RED_BALANCE_IDX] = val;
 
         i2c_data = val & 0xff;
         err = m5602_write_sensor(sd, OV9650_RED, &i2c_data, 1);
-
         return err;
 }
 
 int ov9650_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        err = m5602_read_sensor(sd, OV9650_BLUE, &i2c_data, 1);
-        *val = i2c_data;
-
+        *val = sensor_settings[BLUE_BALANCE_IDX];
         PDEBUG(D_V4L2, "Read blue gain %d", *val);
 
-        return err;
+        return 0;
 }
 
 int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
@@ -355,30 +615,25 @@ int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
+
+        PDEBUG(D_V4L2, "Set blue gain to %d", val);
 
-        PDEBUG(D_V4L2, "Set blue gain to %d",
-               val & 0xff);
+        sensor_settings[BLUE_BALANCE_IDX] = val;
 
         i2c_data = val & 0xff;
         err = m5602_write_sensor(sd, OV9650_BLUE, &i2c_data, 1);
-
         return err;
 }
 
 int ov9650_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        err = m5602_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
-        if (dmi_check_system(ov9650_flip_dmi_table))
-                *val = ((i2c_data & OV9650_HFLIP) >> 5) ? 0 : 1;
-        else
-                *val = (i2c_data & OV9650_HFLIP) >> 5;
+        *val = sensor_settings[HFLIP_IDX];
         PDEBUG(D_V4L2, "Read horizontal flip %d", *val);
-
-        return err;
+        return 0;
 }
 
 int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
@@ -386,38 +641,26 @@ int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
         PDEBUG(D_V4L2, "Set horizontal flip to %d", val);
-        err = m5602_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
-        if (err < 0)
-                goto out;
-
-        if (dmi_check_system(ov9650_flip_dmi_table))
-                i2c_data = ((i2c_data & 0xdf) |
-                           (((val ? 0 : 1) & 0x01) << 5));
-        else
-                i2c_data = ((i2c_data & 0xdf) |
-                           ((val & 0x01) << 5));
 
+        sensor_settings[HFLIP_IDX] = val;
+        i2c_data = ((val & 0x01) << 5) | (sensor_settings[VFLIP_IDX] << 4);
         err = m5602_write_sensor(sd, OV9650_MVFP, &i2c_data, 1);
-out:
+
         return err;
 }
 
 int ov9650_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        err = m5602_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
-        if (dmi_check_system(ov9650_flip_dmi_table))
-                *val = ((i2c_data & 0x10) >> 4) ? 0 : 1;
-        else
-                *val = (i2c_data & 0x10) >> 4;
+        *val = sensor_settings[VFLIP_IDX];
         PDEBUG(D_V4L2, "Read vertical flip %d", *val);
 
-        return err;
+        return 0;
 }
 
 int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
@@ -425,40 +668,32 @@ int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
         PDEBUG(D_V4L2, "Set vertical flip to %d", val);
-        err = m5602_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        sensor_settings[VFLIP_IDX] = val;
+
+        i2c_data = ((val & 0x01) << 4) | (sensor_settings[VFLIP_IDX] << 5);
+        err = m5602_write_sensor(sd, OV9650_MVFP, &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
-        if (dmi_check_system(ov9650_flip_dmi_table))
-                i2c_data = ((i2c_data & 0xef) |
-                                (((val ? 0 : 1) & 0x01) << 4));
-        else
-                i2c_data = ((i2c_data & 0xef) |
-                                ((val & 0x01) << 4));
+        /* When vflip is toggled we need to readjust the bridge hsync/vsync */
+        if (gspca_dev->streaming)
+                err = ov9650_start(sd);
 
-        err = m5602_write_sensor(sd, OV9650_MVFP, &i2c_data, 1);
-out:
         return err;
 }
 
 int ov9650_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        err = m5602_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
-        if (err < 0)
-                goto out;
-        *val = (i2c_data & 0x03) << 8;
-
-        err = m5602_read_sensor(sd, OV9650_GAIN, &i2c_data, 1);
-        *val |= i2c_data;
+        *val = sensor_settings[GAIN_IDX];
         PDEBUG(D_V4L2, "Read gain %d", *val);
-out:
-        return err;
+
+        return 0;
 }
 
 int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
@@ -466,40 +701,38 @@ int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        PDEBUG(D_V4L2, "Set gain to %d", val & 0x3ff);
+        PDEBUG(D_V4L2, "Set gain to %d", val);
+
+        sensor_settings[GAIN_IDX] = val;
 
         /* Read the OV9650_VREF register first to avoid
                 corrupting the VREF high and low bits */
         err = m5602_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* Mask away all uninteresting bits */
         i2c_data = ((val & 0x0300) >> 2) | (i2c_data & 0x3F);
         err = m5602_write_sensor(sd, OV9650_VREF, &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* The 8 LSBs */
         i2c_data = val & 0xff;
         err = m5602_write_sensor(sd, OV9650_GAIN, &i2c_data, 1);
 
-out:
         return err;
 }
 
 int ov9650_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        err = m5602_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
-        *val = (i2c_data & OV9650_AWB_EN) >> 1;
-        PDEBUG(D_V4L2, "Read auto white balance %d", *val);
-
-        return err;
+        *val = sensor_settings[AUTO_WHITE_BALANCE_IDX];
+        return 0;
 }
 
 int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val)
@@ -507,29 +740,29 @@ int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
         PDEBUG(D_V4L2, "Set auto white balance to %d", val);
+
+        sensor_settings[AUTO_WHITE_BALANCE_IDX] = val;
         err = m5602_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         i2c_data = ((i2c_data & 0xfd) | ((val & 0x01) << 1));
         err = m5602_write_sensor(sd, OV9650_COM8, &i2c_data, 1);
-out:
+
         return err;
 }
 
 int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val)
 {
-        int err;
-        u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
-        err = m5602_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
-        *val = (i2c_data & OV9650_AGC_EN) >> 2;
+        *val = sensor_settings[AUTO_GAIN_CTRL_IDX];
         PDEBUG(D_V4L2, "Read auto gain control %d", *val);
-
-        return err;
+        return 0;
 }
 
 int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val)
@@ -537,15 +770,18 @@ int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val)
         int err;
         u8 i2c_data;
         struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
 
         PDEBUG(D_V4L2, "Set auto gain control to %d", val);
+
+        sensor_settings[AUTO_GAIN_CTRL_IDX] = val;
         err = m5602_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         i2c_data = ((i2c_data & 0xfb) | ((val & 0x01) << 2));
         err = m5602_write_sensor(sd, OV9650_COM8, &i2c_data, 1);
-out:
+
         return err;
 }
 
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h
index f4b33b8e8dae..fcc54e4c0f4f 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.h
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -32,6 +32,7 @@
 #define OV9650_BAVE                     0x05
 #define OV9650_GEAVE                    0x06
 #define OV9650_RSVD7                    0x07
+#define OV9650_COM2                     0x09
 #define OV9650_PID                      0x0a
 #define OV9650_VER                      0x0b
 #define OV9650_COM3                     0x0c
@@ -96,6 +97,7 @@
 #define OV9650_VGA_SELECT               (1 << 6)
 #define OV9650_CIF_SELECT               (1 << 5)
 #define OV9650_QVGA_SELECT              (1 << 4)
+#define OV9650_QCIF_SELECT              (1 << 3)
 #define OV9650_RGB_SELECT               (1 << 2)
 #define OV9650_RAW_RGB_SELECT           (1 << 0)
 
@@ -115,10 +117,15 @@
 #define OV9650_VFLIP                    (1 << 4)
 #define OV9650_HFLIP                    (1 << 5)
 
+#define OV9650_SOFT_SLEEP               (1 << 4)
+#define OV9650_OUTPUT_DRIVE_2X          (1 << 0)
+
+#define OV9650_LEFT_OFFSET              0x62
+
 #define GAIN_DEFAULT                    0x14
 #define RED_GAIN_DEFAULT                0x70
 #define BLUE_GAIN_DEFAULT               0x20
-#define EXPOSURE_DEFAULT                0x5003
+#define EXPOSURE_DEFAULT                0x1ff
 
 /*****************************************************************************/
 
@@ -129,7 +136,9 @@ extern int dump_sensor;
 int ov9650_probe(struct sd *sd);
 int ov9650_init(struct sd *sd);
 int ov9650_start(struct sd *sd);
+int ov9650_stop(struct sd *sd);
 int ov9650_power_down(struct sd *sd);
+void ov9650_disconnect(struct sd *sd);
 
 int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
 int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
@@ -150,152 +159,16 @@ int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val);
 int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val);
 int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val);
 
-static struct m5602_sensor ov9650 = {
+const static struct m5602_sensor ov9650 = {
         .name = "OV9650",
         .i2c_slave_id = 0x60,
         .i2c_regW = 1,
         .probe = ov9650_probe,
         .init = ov9650_init,
         .start = ov9650_start,
+        .stop = ov9650_stop,
         .power_down = ov9650_power_down,
-
-        .nctrls = 8,
-        .ctrls = {
-        {
-                {
-                        .id             = V4L2_CID_EXPOSURE,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "exposure",
-                        .minimum        = 0x00,
-                        .maximum        = 0xffff,
-                        .step           = 0x1,
-                        .default_value  = EXPOSURE_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = ov9650_set_exposure,
-                .get = ov9650_get_exposure
-        }, {
-                {
-                        .id             = V4L2_CID_GAIN,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "gain",
-                        .minimum        = 0x00,
-                        .maximum        = 0x3ff,
-                        .step           = 0x1,
-                        .default_value  = GAIN_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = ov9650_set_gain,
-                .get = ov9650_get_gain
-        }, {
-                {
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "red balance",
-                        .minimum        = 0x00,
-                        .maximum        = 0xff,
-                        .step           = 0x1,
-                        .default_value  = RED_GAIN_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = ov9650_set_red_balance,
-                .get = ov9650_get_red_balance
-        }, {
-                {
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "blue balance",
-                        .minimum        = 0x00,
-                        .maximum        = 0xff,
-                        .step           = 0x1,
-                        .default_value  = BLUE_GAIN_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = ov9650_set_blue_balance,
-                .get = ov9650_get_blue_balance
-        }, {
-                {
-                        .id             = V4L2_CID_HFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "horizontal flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = ov9650_set_hflip,
-                .get = ov9650_get_hflip
-        }, {
-                {
-                        .id             = V4L2_CID_VFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "vertical flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = ov9650_set_vflip,
-                .get = ov9650_get_vflip
-        }, {
-                {
-                        .id             = V4L2_CID_AUTO_WHITE_BALANCE,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "auto white balance",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = ov9650_set_auto_white_balance,
-                .get = ov9650_get_auto_white_balance
-        }, {
-                {
-                        .id             = V4L2_CID_AUTOGAIN,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "auto gain control",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = ov9650_set_auto_gain,
-                .get = ov9650_get_auto_gain
-        }
-        },
-
-        .nmodes = 3,
-        .modes = {
-        {
-                320,
-                240,
-                V4L2_PIX_FMT_SBGGR8,
-                V4L2_FIELD_NONE,
-                .sizeimage =
-                        320 * 240,
-                .bytesperline = 320,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 0
-        }, {
-                352,
-                288,
-                V4L2_PIX_FMT_SBGGR8,
-                V4L2_FIELD_NONE,
-                .sizeimage =
-                        352 * 288,
-                .bytesperline = 352,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 0
-        }, {
-                640,
-                480,
-                V4L2_PIX_FMT_SBGGR8,
-                V4L2_FIELD_NONE,
-                .sizeimage =
-                        640 * 480,
-                .bytesperline = 640,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 0
-        }
-        }
+        .disconnect = ov9650_disconnect,
 };
 
 static const unsigned char preinit_ov9650[][3] =
@@ -345,6 +218,10 @@ static const unsigned char init_ov9650[][3] =
 
         /* Reset chip */
         {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},
+        /* One extra reset is needed in order to make the sensor behave
+           properly when resuming from ram */
+        {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},
+
         /* Enable double clock */
         {SENSOR, OV9650_CLKRC, 0x80},
         /* Do something out of spec with the power */
@@ -427,18 +304,12 @@ static const unsigned char init_ov9650[][3] =
         /* Enable denoise, and white-pixel erase */
         {SENSOR, OV9650_COM22, 0x23},
 
-        /* Set the high bits of the exposure value */
-        {SENSOR, OV9650_AECH, ((EXPOSURE_DEFAULT & 0xff00) >> 8)},
-
         /* Enable VARIOPIXEL */
         {SENSOR, OV9650_COM3, OV9650_VARIOPIXEL},
         {SENSOR, OV9650_COM4, OV9650_QVGA_VARIOPIXEL},
 
-        /* Set the low bits of the exposure value */
-        {SENSOR, OV9650_COM1, (EXPOSURE_DEFAULT & 0xff)},
-        {SENSOR, OV9650_GAIN, GAIN_DEFAULT},
-        {SENSOR, OV9650_BLUE, BLUE_GAIN_DEFAULT},
-        {SENSOR, OV9650_RED, RED_GAIN_DEFAULT},
+        /* Put the sensor in soft sleep mode */
+        {SENSOR, OV9650_COM2, OV9650_SOFT_SLEEP | OV9650_OUTPUT_DRIVE_2X},
 };
 
 static const unsigned char power_down_ov9650[][3] =
@@ -461,73 +332,15 @@ static const unsigned char power_down_ov9650[][3] =
         {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
 };
 
-static const unsigned char res_init_ov9650[][2] =
-{
-        {M5602_XB_LINE_OF_FRAME_H, 0x82},
-        {M5602_XB_LINE_OF_FRAME_L, 0x00},
-        {M5602_XB_PIX_OF_LINE_H, 0x82},
-        {M5602_XB_PIX_OF_LINE_L, 0x00},
-        {M5602_XB_SIG_INI, 0x01}
-};
-
-static const unsigned char VGA_ov9650[][3] =
+static const unsigned char res_init_ov9650[][3] =
 {
-        /* Moves the view window in a vertical orientation */
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x09},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0}, /* 480 */
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02}, /* 640 + 98 */
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0xe2},
-
-        {SENSOR, OV9650_COM7, OV9650_VGA_SELECT |
-                              OV9650_RGB_SELECT |
-                              OV9650_RAW_RGB_SELECT},
-};
+        {SENSOR, OV9650_COM2, OV9650_OUTPUT_DRIVE_2X},
 
-static const unsigned char CIF_ov9650[][3] =
-{
-        /* Moves the view window in a vertical orientation */
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x09},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x20}, /* 288 */
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 352 + 98 */
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0xc2},
-
-        {SENSOR, OV9650_COM7, OV9650_CIF_SELECT |
-                              OV9650_RGB_SELECT |
-                              OV9650_RAW_RGB_SELECT},
-};
-
-static const unsigned char QVGA_ov9650[][3] =
-{
-        /* Moves the view window in a vertical orientation */
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x08},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0xf0}, /* 240 */
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x31}, /* 50 */
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 320 + 50 */
-        {BRIDGE, M5602_XB_HSYNC_PARA, 0x71},
-
-        {SENSOR, OV9650_COM7, OV9650_QVGA_SELECT |
-                              OV9650_RGB_SELECT |
-                              OV9650_RAW_RGB_SELECT},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_L, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_L, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01}
 };
 
 #endif
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.c b/drivers/media/video/gspca/m5602/m5602_po1030.c
index 2e7fb91673cf..eaddf488bad1 100644
--- a/drivers/media/video/gspca/m5602/m5602_po1030.c
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.c
@@ -18,6 +18,99 @@
 
 #include "m5602_po1030.h"
 
+static struct v4l2_pix_format po1030_modes[] = {
+        {
+                640,
+                480,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage = 640 * 480,
+                .bytesperline = 640,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0
+        }
+};
+
+const static struct ctrl po1030_ctrls[] = {
+        {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0x00,
+                        .maximum        = 0x4f,
+                        .step           = 0x1,
+                        .default_value  = PO1030_GLOBAL_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_gain,
+                .get = po1030_get_gain
+        }, {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "exposure",
+                        .minimum        = 0x00,
+                        .maximum        = 0x02ff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_EXPOSURE_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_exposure,
+                .get = po1030_get_exposure
+        }, {
+                {
+                        .id             = V4L2_CID_RED_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "red balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_RED_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_red_balance,
+                .get = po1030_get_red_balance
+        }, {
+                {
+                        .id             = V4L2_CID_BLUE_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "blue balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_BLUE_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_blue_balance,
+                .get = po1030_get_blue_balance
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0,
+                },
+                .set = po1030_set_hflip,
+                .get = po1030_get_hflip
+        }, {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0,
+                },
+                .set = po1030_set_vflip,
+                .get = po1030_get_vflip
+        }
+};
+
 static void po1030_dump_registers(struct sd *sd);
 
 int po1030_probe(struct sd *sd)
@@ -59,10 +152,10 @@ int po1030_probe(struct sd *sd)
         return -ENODEV;
 
 sensor_found:
-        sd->gspca_dev.cam.cam_mode = po1030.modes;
-        sd->gspca_dev.cam.nmodes = po1030.nmodes;
-        sd->desc->ctrls = po1030.ctrls;
-        sd->desc->nctrls = po1030.nctrls;
+        sd->gspca_dev.cam.cam_mode = po1030_modes;
+        sd->gspca_dev.cam.nmodes = ARRAY_SIZE(po1030_modes);
+        sd->desc->ctrls = po1030_ctrls;
+        sd->desc->nctrls = ARRAY_SIZE(po1030_ctrls);
         return 0;
 }
 
@@ -108,7 +201,7 @@ int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
         err = m5602_read_sensor(sd, PO1030_REG_INTEGLINES_H,
                                  &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
         *val = (i2c_data << 8);
 
         err = m5602_read_sensor(sd, PO1030_REG_INTEGLINES_M,
@@ -116,7 +209,7 @@ int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
         *val |= i2c_data;
 
         PDEBUG(D_V4L2, "Exposure read as %d", *val);
-out:
+
         return err;
 }
 
@@ -135,7 +228,7 @@ int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
         err = m5602_write_sensor(sd, PO1030_REG_INTEGLINES_H,
                                   &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         i2c_data = (val & 0xff);
         PDEBUG(D_V4L2, "Set exposure to low byte to 0x%x",
@@ -143,7 +236,6 @@ int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
         err = m5602_write_sensor(sd, PO1030_REG_INTEGLINES_M,
                                   &i2c_data, 1);
 
-out:
         return err;
 }
 
@@ -186,14 +278,13 @@ int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
         PDEBUG(D_V4L2, "Set hflip %d", val);
         err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         i2c_data = (0x7f & i2c_data) | ((val & 0x01) << 7);
 
         err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
                                  &i2c_data, 1);
 
-out:
         return err;
 }
 
@@ -222,14 +313,13 @@ int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
         PDEBUG(D_V4L2, "Set vflip %d", val);
         err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         i2c_data = (i2c_data & 0xbf) | ((val & 0x01) << 6);
 
         err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
                                  &i2c_data, 1);
 
-out:
         return err;
 }
 
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h
index def39d5bcec6..c10b12335818 100644
--- a/drivers/media/video/gspca/m5602/m5602_po1030.h
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.h
@@ -141,7 +141,7 @@ int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
 int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
 int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
 
-static struct m5602_sensor po1030 = {
+static const struct m5602_sensor po1030 = {
         .name = "PO1030",
 
         .i2c_slave_id = 0xdc,
@@ -150,102 +150,6 @@ static struct m5602_sensor po1030 = {
         .probe = po1030_probe,
         .init = po1030_init,
         .power_down = po1030_power_down,
-
-        .nctrls = 6,
-        .ctrls = {
-        {
-                {
-                        .id             = V4L2_CID_GAIN,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "gain",
-                        .minimum        = 0x00,
-                        .maximum        = 0x4f,
-                        .step           = 0x1,
-                        .default_value  = PO1030_GLOBAL_GAIN_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = po1030_set_gain,
-                .get = po1030_get_gain
-        }, {
-                {
-                        .id             = V4L2_CID_EXPOSURE,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "exposure",
-                        .minimum        = 0x00,
-                        .maximum        = 0x02ff,
-                        .step           = 0x1,
-                        .default_value  = PO1030_EXPOSURE_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = po1030_set_exposure,
-                .get = po1030_get_exposure
-        }, {
-                {
-                        .id             = V4L2_CID_RED_BALANCE,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "red balance",
-                        .minimum        = 0x00,
-                        .maximum        = 0xff,
-                        .step           = 0x1,
-                        .default_value  = PO1030_RED_GAIN_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = po1030_set_red_balance,
-                .get = po1030_get_red_balance
-        }, {
-                {
-                        .id             = V4L2_CID_BLUE_BALANCE,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "blue balance",
-                        .minimum        = 0x00,
-                        .maximum        = 0xff,
-                        .step           = 0x1,
-                        .default_value  = PO1030_BLUE_GAIN_DEFAULT,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = po1030_set_blue_balance,
-                .get = po1030_get_blue_balance
-        }, {
-                {
-                        .id             = V4L2_CID_HFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "horizontal flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0,
-                },
-                .set = po1030_set_hflip,
-                .get = po1030_get_hflip
-        }, {
-                {
-                        .id             = V4L2_CID_VFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "vertical flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0,
-                },
-                .set = po1030_set_vflip,
-                .get = po1030_get_vflip
-        }
-        },
-
-        .nmodes = 1,
-        .modes = {
-        {
-                M5602_DEFAULT_FRAME_WIDTH,
-                M5602_DEFAULT_FRAME_HEIGHT,
-                V4L2_PIX_FMT_SBGGR8,
-                V4L2_FIELD_NONE,
-                .sizeimage =
-                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
-                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1
-        }
-        }
 };
 
 static const unsigned char preinit_po1030[][3] =
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index 48892b5715d5..4306d596056d 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -50,6 +50,76 @@ static
         { }
 };
 
+static struct v4l2_pix_format s5k4aa_modes[] = {
+        {
+                640,
+                480,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        640 * 480,
+                .bytesperline = 640,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0
+        }
+};
+
+const static struct ctrl s5k4aa_ctrls[] = {
+        {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = s5k4aa_set_vflip,
+                .get = s5k4aa_get_vflip
+
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = s5k4aa_set_hflip,
+                .get = s5k4aa_get_hflip
+
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "Gain",
+                        .minimum        = 0,
+                        .maximum        = 127,
+                        .step           = 1,
+                        .default_value  = 0xa0,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = s5k4aa_set_gain,
+                .get = s5k4aa_get_gain
+        }, {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "Exposure",
+                        .minimum        = 13,
+                        .maximum        = 0xfff,
+                        .step           = 1,
+                        .default_value  = 0x100,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = s5k4aa_set_exposure,
+                .get = s5k4aa_get_exposure
+        }
+};
+
 static void s5k4aa_dump_registers(struct sd *sd);
 
 int s5k4aa_probe(struct sd *sd)
@@ -115,14 +185,56 @@ int s5k4aa_probe(struct sd *sd)
                 info("Detected a s5k4aa sensor");
 
 sensor_found:
-        sd->gspca_dev.cam.cam_mode = s5k4aa.modes;
-        sd->gspca_dev.cam.nmodes = s5k4aa.nmodes;
-        sd->desc->ctrls = s5k4aa.ctrls;
-        sd->desc->nctrls = s5k4aa.nctrls;
-
+        sd->gspca_dev.cam.cam_mode = s5k4aa_modes;
+        sd->gspca_dev.cam.nmodes = ARRAY_SIZE(s5k4aa_modes);
+        sd->desc->ctrls = s5k4aa_ctrls;
+        sd->desc->nctrls = ARRAY_SIZE(s5k4aa_ctrls);
         return 0;
 }
 
+int s5k4aa_start(struct sd *sd)
+{
+        int i, err = 0;
+        u8 data[2];
+        struct cam *cam = &sd->gspca_dev.cam;
+
+        switch (cam->cam_mode[sd->gspca_dev.curr_mode].width)
+        {
+        case 640:
+                PDEBUG(D_V4L2, "Configuring camera for VGA mode");
+
+                for (i = 0; i < ARRAY_SIZE(VGA_s5k4aa); i++) {
+                        switch (VGA_s5k4aa[i][0]) {
+                        case BRIDGE:
+                                err = m5602_write_bridge(sd,
+                                                 VGA_s5k4aa[i][1],
+                                                 VGA_s5k4aa[i][2]);
+                        break;
+
+                        case SENSOR:
+                                data[0] = VGA_s5k4aa[i][2];
+                                err = m5602_write_sensor(sd,
+                                                 VGA_s5k4aa[i][1],
+                                                 data, 1);
+                        break;
+
+                        case SENSOR_LONG:
+                                data[0] = VGA_s5k4aa[i][2];
+                                data[1] = VGA_s5k4aa[i][3];
+                                err = m5602_write_sensor(sd,
+                                                  VGA_s5k4aa[i][1],
+                                                  data, 2);
+                        break;
+
+                        default:
+                                err("Invalid stream command, exiting init");
+                                return -EINVAL;
+                        }
+                }
+        }
+        return err;
+}
+
 int s5k4aa_init(struct sd *sd)
 {
         int i, err = 0;
@@ -194,17 +306,17 @@ int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K4AA_EXPOSURE_HI, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         *val = data << 8;
         err = m5602_read_sensor(sd, S5K4AA_EXPOSURE_LO, &data, 1);
         *val |= data;
         PDEBUG(D_V4L2, "Read exposure %d", *val);
-out:
+
         return err;
 }
 
@@ -217,14 +329,14 @@ int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
         PDEBUG(D_V4L2, "Set exposure to %d", val);
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
         data = (val >> 8) & 0xff;
         err = m5602_write_sensor(sd, S5K4AA_EXPOSURE_HI, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
         data = val & 0xff;
         err = m5602_write_sensor(sd, S5K4AA_EXPOSURE_LO, &data, 1);
-out:
+
         return err;
 }
 
@@ -236,13 +348,12 @@ int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         *val = (data & S5K4AA_RM_V_FLIP) >> 7;
         PDEBUG(D_V4L2, "Read vertical flip %d", *val);
 
-out:
         return err;
 }
 
@@ -255,32 +366,32 @@ int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
         PDEBUG(D_V4L2, "Set vertical flip to %d", val);
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
         err = m5602_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
         data = ((data & ~S5K4AA_RM_V_FLIP)
                         | ((val & 0x01) << 7));
         err = m5602_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         if (val) {
                 err = m5602_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
                 if (err < 0)
-                        goto out;
+                        return err;
 
                 data++;
                 err = m5602_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
         } else {
                 err = m5602_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
                 if (err < 0)
-                        goto out;
+                        return err;
 
                 data--;
                 err = m5602_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
         }
-out:
+
         return err;
 }
 
@@ -292,12 +403,12 @@ int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         *val = (data & S5K4AA_RM_H_FLIP) >> 6;
         PDEBUG(D_V4L2, "Read horizontal flip %d", *val);
-out:
+
         return err;
 }
 
@@ -311,32 +422,32 @@ int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
                val);
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
         err = m5602_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         data = ((data & ~S5K4AA_RM_H_FLIP) | ((val & 0x01) << 6));
         err = m5602_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         if (val) {
                 err = m5602_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
                 if (err < 0)
-                        goto out;
+                        return err;
                 data++;
                 err = m5602_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
                 if (err < 0)
-                        goto out;
+                        return err;
         } else {
                 err = m5602_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
                 if (err < 0)
-                        goto out;
+                        return err;
                 data--;
                 err = m5602_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
         }
-out:
+
         return err;
 }
 
@@ -348,13 +459,12 @@ int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K4AA_GAIN_2, &data, 1);
         *val = data;
         PDEBUG(D_V4L2, "Read gain %d", *val);
 
-out:
         return err;
 }
 
@@ -367,12 +477,11 @@ int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val)
         PDEBUG(D_V4L2, "Set gain to %d", val);
         err = m5602_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         data = val & 0xff;
         err = m5602_write_sensor(sd, S5K4AA_GAIN_2, &data, 1);
 
-out:
         return err;
 }
 
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index 1f88b0d040c4..ca854d4f9475 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -65,6 +65,7 @@ extern int dump_sensor;
 
 int s5k4aa_probe(struct sd *sd);
 int s5k4aa_init(struct sd *sd);
+int s5k4aa_start(struct sd *sd);
 int s5k4aa_power_down(struct sd *sd);
 
 int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
@@ -76,84 +77,14 @@ int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
 int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
 int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val);
 
-static struct m5602_sensor s5k4aa = {
+static const struct m5602_sensor s5k4aa = {
         .name = "S5K4AA",
         .probe = s5k4aa_probe,
         .init = s5k4aa_init,
+        .start = s5k4aa_start,
         .power_down = s5k4aa_power_down,
         .i2c_slave_id = 0x5a,
         .i2c_regW = 2,
-        .nctrls = 4,
-        .ctrls = {
-        {
-                {
-                        .id             = V4L2_CID_VFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "vertical flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = s5k4aa_set_vflip,
-                .get = s5k4aa_get_vflip
-
-        }, {
-                {
-                        .id             = V4L2_CID_HFLIP,
-                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name           = "horizontal flip",
-                        .minimum        = 0,
-                        .maximum        = 1,
-                        .step           = 1,
-                        .default_value  = 0
-                },
-                .set = s5k4aa_set_hflip,
-                .get = s5k4aa_get_hflip
-
-        }, {
-                {
-                        .id             = V4L2_CID_GAIN,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "Gain",
-                        .minimum        = 0,
-                        .maximum        = 127,
-                        .step           = 1,
-                        .default_value  = 0xa0,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = s5k4aa_set_gain,
-                .get = s5k4aa_get_gain
-        }, {
-                {
-                        .id             = V4L2_CID_EXPOSURE,
-                        .type           = V4L2_CTRL_TYPE_INTEGER,
-                        .name           = "Exposure",
-                        .minimum        = 13,
-                        .maximum        = 0xfff,
-                        .step           = 1,
-                        .default_value  = 0x100,
-                        .flags          = V4L2_CTRL_FLAG_SLIDER
-                },
-                .set = s5k4aa_set_exposure,
-                .get = s5k4aa_get_exposure
-        }
-        },
-
-        .nmodes = 1,
-        .modes = {
-        {
-                M5602_DEFAULT_FRAME_WIDTH,
-                M5602_DEFAULT_FRAME_HEIGHT,
-                V4L2_PIX_FMT_SBGGR8,
-                V4L2_FIELD_NONE,
-                .sizeimage =
-                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
-                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1
-        }
-        }
 };
 
 static const unsigned char preinit_s5k4aa[][4] =
@@ -329,4 +260,63 @@ static const unsigned char init_s5k4aa[][4] =
         {SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00}
 };
 
+static const unsigned char VGA_s5k4aa[][4] =
+{
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        /* VSYNC_PARA, VSYNC_PARA : img height 480 = 0x01e0 */
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        /* HSYNC_PARA, HSYNC_PARA : img width 640 = 0x0280 */
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00}, /* 48 MHz */
+
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, S5K4AA_READ_MODE, S5K4AA_RM_H_FLIP | S5K4AA_RM_ROW_SKIP_2X
+                | S5K4AA_RM_COL_SKIP_2X, 0x00},
+        /* 0x37 : Fix image stability when light is too bright and improves
+         * image quality in 640x480, but worsens it in 1280x1024 */
+        {SENSOR, 0x37, 0x01, 0x00},
+        /* ROWSTART_HI, ROWSTART_LO : 10 + (1024-960)/2 = 42 = 0x002a */
+        {SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_ROWSTART_LO, 0x2a, 0x00},
+        {SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_COLSTART_LO, 0x0c, 0x00},
+        /* window_height_hi, window_height_lo : 960 = 0x03c0 */
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x03, 0x00},
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0xc0, 0x00},
+        /* window_width_hi, window_width_lo : 1280 = 0x0500 */
+        {SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00},
+        {SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_LO__, 0xa8, 0x00}, /* helps to sync... */
+        {SENSOR, S5K4AA_EXPOSURE_HI, 0x01, 0x00},
+        {SENSOR, S5K4AA_EXPOSURE_LO, 0x00, 0x00},
+        {SENSOR, 0x11, 0x04, 0x00},
+        {SENSOR, 0x12, 0xc3, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, 0x02, 0x0e, 0x00},
+        {SENSOR_LONG, S5K4AA_GLOBAL_GAIN__, 0x0f, 0x00},
+        {SENSOR, S5K4AA_GAIN_1, 0x0b, 0x00},
+        {SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00}
+};
+
 #endif
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
index ccea4a758464..42c86aa4dc8d 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
@@ -18,6 +18,88 @@
 
 #include "m5602_s5k83a.h"
 
+static struct v4l2_pix_format s5k83a_modes[] = {
+        {
+                640,
+                480,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        640 * 480,
+                .bytesperline = 640,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0
+        }
+};
+
+const static struct ctrl s5k83a_ctrls[] = {
+        {
+                {
+                        .id = V4L2_CID_BRIGHTNESS,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "brightness",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_BRIGHTNESS,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_brightness,
+                        .get = s5k83a_get_brightness
+
+        }, {
+                {
+                        .id = V4L2_CID_WHITENESS,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "whiteness",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_WHITENESS,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_whiteness,
+                        .get = s5k83a_get_whiteness,
+        }, {
+                {
+                        .id = V4L2_CID_GAIN,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "gain",
+                        .minimum = 0x00,
+                        .maximum = S5K83A_MAXIMUM_GAIN,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_GAIN,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_gain,
+                        .get = s5k83a_get_gain
+        }, {
+                {
+                        .id         = V4L2_CID_HFLIP,
+                        .type       = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name       = "horizontal flip",
+                        .minimum    = 0,
+                        .maximum    = 1,
+                        .step       = 1,
+                        .default_value  = 0
+                },
+                        .set = s5k83a_set_hflip,
+                        .get = s5k83a_get_hflip
+        }, {
+                {
+                 .id         = V4L2_CID_VFLIP,
+                .type       = V4L2_CTRL_TYPE_BOOLEAN,
+                .name       = "vertical flip",
+                .minimum    = 0,
+                .maximum    = 1,
+                .step       = 1,
+                .default_value  = 0
+                },
+                .set = s5k83a_set_vflip,
+                .get = s5k83a_get_vflip
+        }
+};
+
 static void s5k83a_dump_registers(struct sd *sd);
 
 int s5k83a_probe(struct sd *sd)
@@ -63,10 +145,10 @@ int s5k83a_probe(struct sd *sd)
                 info("Detected a s5k83a sensor");
 
 sensor_found:
-        sd->gspca_dev.cam.cam_mode = s5k83a.modes;
-        sd->gspca_dev.cam.nmodes = s5k83a.nmodes;
-        sd->desc->ctrls = s5k83a.ctrls;
-        sd->desc->nctrls = s5k83a.nctrls;
+        sd->gspca_dev.cam.cam_mode = s5k83a_modes;
+        sd->gspca_dev.cam.nmodes = ARRAY_SIZE(s5k83a_modes);
+        sd->desc->ctrls = s5k83a_ctrls;
+        sd->desc->nctrls = ARRAY_SIZE(s5k83a_ctrls);
         return 0;
 }
 
@@ -108,6 +190,16 @@ int s5k83a_init(struct sd *sd)
         return (err < 0) ? err : 0;
 }
 
+int s5k83a_start(struct sd *sd)
+{
+        return s5k83a_set_led_indication(sd, 1);
+}
+
+int s5k83a_stop(struct sd *sd)
+{
+        return s5k83a_set_led_indication(sd, 0);
+}
+
 int s5k83a_power_down(struct sd *sd)
 {
         return 0;
@@ -163,12 +255,11 @@ int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_read_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[1] = data[1] << 1;
         *val = data[1];
 
-out:
         return err;
 }
 
@@ -182,13 +273,13 @@ int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
         data[1] = 0x20;
         err = m5602_write_sensor(sd, 0x14, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = 0x01;
         data[1] = 0x00;
         err = m5602_write_sensor(sd, 0x0d, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         /* FIXME: This is not sane, we need to figure out the composition
                   of these registers */
@@ -196,7 +287,6 @@ int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
         data[1] = val >> 1; /* brightness, high 7 bits */
         err = m5602_write_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
 
-out:
         return err;
 }
 
@@ -208,11 +298,10 @@ int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_read_sensor(sd, S5K83A_WHITENESS, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         *val = data;
 
-out:
         return err;
 }
 
@@ -236,7 +325,7 @@ int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_read_sensor(sd, S5K83A_GAIN, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[1] = data[1] & 0x3f;
         if (data[1] > S5K83A_MAXIMUM_GAIN)
@@ -244,7 +333,6 @@ int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 
         *val = data[1];
 
-out:
         return err;
 }
 
@@ -269,12 +357,11 @@ int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         *val = (data[0] | 0x40) ? 1 : 0;
 
-out:
         return err;
 }
 
@@ -287,23 +374,22 @@ int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* set or zero six bit, seven is hflip */
         data[0] = (val) ? (data[0] & 0x80) | 0x40 | S5K83A_FLIP_MASK
                         : (data[0] & 0x80) | S5K83A_FLIP_MASK;
         err = m5602_write_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = (val) ? 0x0b : 0x0a;
         err = m5602_write_sensor(sd, S5K83A_VFLIP_TUNE, data, 1);
 
-out:
         return err;
 }
 
@@ -316,12 +402,11 @@ int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         *val = (data[0] | 0x80) ? 1 : 0;
 
-out:
         return err;
 }
 
@@ -334,21 +419,40 @@ int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* set or zero seven bit, six is vflip */
         data[0] = (val) ? (data[0] & 0x40) | 0x80 | S5K83A_FLIP_MASK
                         : (data[0] & 0x40) | S5K83A_FLIP_MASK;
         err = m5602_write_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = (val) ? 0x0a : 0x0b;
         err = m5602_write_sensor(sd, S5K83A_HFLIP_TUNE, data, 1);
-out:
+
         return err;
 }
+
+int s5k83a_set_led_indication(struct sd *sd, u8 val)
+{
+        int err = 0;
+        u8 data[1];
+
+        err = m5602_read_bridge(sd, M5602_XB_GPIO_DAT, data);
+        if (err < 0)
+                return err;
+
+        if (val)
+                data[0] = data[0] | S5K83A_GPIO_LED_MASK;
+        else
+                data[0] = data[0] & ~S5K83A_GPIO_LED_MASK;
+
+        err = m5602_write_bridge(sd, M5602_XB_GPIO_DAT, data[0]);
+
+        return (err < 0) ? err : 0;
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
index 05ccb5b57a88..819ab25272be 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -34,7 +34,7 @@
 #define S5K83A_DEFAULT_GAIN                     0x00
 #define S5K83A_MAXIMUM_GAIN                     0x3c
 #define S5K83A_FLIP_MASK                        0x10
-
+#define S5K83A_GPIO_LED_MASK            0x10
 
 /*****************************************************************************/
 
@@ -44,8 +44,12 @@ extern int dump_sensor;
 
 int s5k83a_probe(struct sd *sd);
 int s5k83a_init(struct sd *sd);
+int s5k83a_start(struct sd *sd);
+int s5k83a_stop(struct sd *sd);
 int s5k83a_power_down(struct sd *sd);
 
+int s5k83a_set_led_indication(struct sd *sd, u8 val);
+
 int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val);
 int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);
 int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val);
@@ -57,95 +61,15 @@ int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
 int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
 int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
 
-static struct m5602_sensor s5k83a = {
+static const struct m5602_sensor s5k83a = {
         .name = "S5K83A",
         .probe = s5k83a_probe,
         .init = s5k83a_init,
+        .start = s5k83a_start,
+        .stop = s5k83a_stop,
         .power_down = s5k83a_power_down,
         .i2c_slave_id = 0x5a,
         .i2c_regW = 2,
-        .nctrls = 5,
-        .ctrls = {
-        {
-                {
-                        .id = V4L2_CID_BRIGHTNESS,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "brightness",
-                        .minimum = 0x00,
-                        .maximum = 0xff,
-                        .step = 0x01,
-                        .default_value = S5K83A_DEFAULT_BRIGHTNESS,
-                        .flags = V4L2_CTRL_FLAG_SLIDER
-                },
-                        .set = s5k83a_set_brightness,
-                        .get = s5k83a_get_brightness
-
-        }, {
-                {
-                        .id = V4L2_CID_WHITENESS,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "whiteness",
-                        .minimum = 0x00,
-                        .maximum = 0xff,
-                        .step = 0x01,
-                        .default_value = S5K83A_DEFAULT_WHITENESS,
-                        .flags = V4L2_CTRL_FLAG_SLIDER
-                },
-                        .set = s5k83a_set_whiteness,
-                        .get = s5k83a_get_whiteness,
-        }, {
-                {
-                        .id = V4L2_CID_GAIN,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "gain",
-                        .minimum = 0x00,
-                        .maximum = S5K83A_MAXIMUM_GAIN,
-                        .step = 0x01,
-                        .default_value = S5K83A_DEFAULT_GAIN,
-                        .flags = V4L2_CTRL_FLAG_SLIDER
-                },
-                        .set = s5k83a_set_gain,
-                        .get = s5k83a_get_gain
-        }, {
-                {
-                        .id         = V4L2_CID_HFLIP,
-                        .type       = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name       = "horizontal flip",
-                        .minimum    = 0,
-                        .maximum    = 1,
-                        .step       = 1,
-                        .default_value  = 0
-                },
-                        .set = s5k83a_set_hflip,
-                        .get = s5k83a_get_hflip
-        }, {
-                {
-                 .id         = V4L2_CID_VFLIP,
-                .type       = V4L2_CTRL_TYPE_BOOLEAN,
-                .name       = "vertical flip",
-                .minimum    = 0,
-                .maximum    = 1,
-                .step       = 1,
-                .default_value  = 0
-                },
-                .set = s5k83a_set_vflip,
-                .get = s5k83a_get_vflip
-                }
-        },
-        .nmodes = 1,
-        .modes = {
-        {
-                M5602_DEFAULT_FRAME_WIDTH,
-                M5602_DEFAULT_FRAME_HEIGHT,
-                V4L2_PIX_FMT_SBGGR8,
-                V4L2_FIELD_NONE,
-                .sizeimage =
-                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
-                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1
-        }
-        }
 };
 
 static const unsigned char preinit_s5k83a[][4] =
@@ -381,7 +305,7 @@ static const unsigned char init_s5k83a[][4] =
         {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
         {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
         {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
-        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
         {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
         {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
         {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/video/gspca/m5602/m5602_sensor.h
index 261623f0da48..0d3026936f2e 100644
--- a/drivers/media/video/gspca/m5602/m5602_sensor.h
+++ b/drivers/media/video/gspca/m5602/m5602_sensor.h
@@ -21,11 +21,6 @@
 
 #include "m5602_bridge.h"
 
-#define M5602_DEFAULT_FRAME_WIDTH  640
-#define M5602_DEFAULT_FRAME_HEIGHT 480
-
-#define M5602_MAX_CTRLS         (V4L2_CID_LASTP1 - V4L2_CID_BASE + 10)
-
 /* Enumerates all supported sensors */
 enum sensors {
         OV9650_SENSOR   = 1,
@@ -61,14 +56,14 @@ struct m5602_sensor {
         /* Executed when the camera starts to send data */
         int (*start)(struct sd *sd);
 
-        /* Performs a power down sequence */
-        int (*power_down)(struct sd *sd);
+        /* Executed when the camera ends to send data */
+        int (*stop)(struct sd *sd);
 
-        int nctrls;
-        struct ctrl ctrls[M5602_MAX_CTRLS];
+        /* Executed when the device is disconnected */
+        void (*disconnect)(struct sd *sd);
 
-        char nmodes;
-        struct v4l2_pix_format modes[];
+        /* Performs a power down sequence */
+        int (*power_down)(struct sd *sd);
 };
 
 #endif
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c
index 04e3ae57a2e3..2e1cdf068fda 100644
--- a/drivers/media/video/gspca/sq905.c
+++ b/drivers/media/video/gspca/sq905.c
@@ -360,6 +360,12 @@ static int sd_init(struct gspca_dev *gspca_dev)
         gspca_dev->cam.nmodes = ARRAY_SIZE(sq905_mode);
         if (!(ident & SQ905_HIRES_MASK))
                 gspca_dev->cam.nmodes--;
+
+        if (ident & SQ905_ORIENTATION_MASK)
+                gspca_dev->cam.input_flags = V4L2_IN_ST_VFLIP;
+        else
+                gspca_dev->cam.input_flags = V4L2_IN_ST_VFLIP |
+                                             V4L2_IN_ST_HFLIP;
         return 0;
 }
 
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index 4c802fb12cd6..e4e933c400bc 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -159,37 +159,16 @@ static const struct v4l2_pix_format vc0323_mode[] = {
                 .priv = 2},
 };
 static const struct v4l2_pix_format bi_mode[] = {
-/*fixme: jeg does not work
-        {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 320,
-                .sizeimage = 320 * 240 * 3 / 8 + 590,
-                .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 5},
-*/
         {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 * 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 4},
-/*
-        {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 640,
-                .sizeimage = 640 * 480 * 3 / 8 + 590,
-                .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 3},
-*/
+                .priv = 2},
         {640, 480, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480 * 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 2},
-/*
-        {1280, 1024, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 1280,
-                .sizeimage = 1280 * 1024 * 1 / 4 + 590,
-                .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 1},
-*/
         {1280, 1024, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
                 .bytesperline = 1280,
                 .sizeimage = 1280 * 1024 * 2,
@@ -1034,121 +1013,6 @@ static const u8 mi1320_soc_InitVGA[][4] = {
         {0xb3, 0x5c, 0x01, 0xcc},
         {}
 };
-static const u8 mi1320_soc_InitVGA_JPG[][4] = {
-        {0xb3, 0x01, 0x01, 0xcc},
-        {0xb0, 0x03, 0x19, 0xcc},
-        {0xb0, 0x04, 0x02, 0xcc},
-        {0x00, 0x00, 0x30, 0xdd},
-        {0xb3, 0x00, 0x64, 0xcc},
-        {0xb3, 0x00, 0x67, 0xcc},
-        {0xb3, 0x05, 0x01, 0xcc},
-        {0xb3, 0x06, 0x01, 0xcc},
-        {0xb3, 0x08, 0x01, 0xcc},
-        {0xb3, 0x09, 0x0c, 0xcc},
-        {0xb3, 0x34, 0x02, 0xcc},
-        {0xb3, 0x35, 0xc8, 0xcc},
-        {0xb3, 0x02, 0x00, 0xcc},
-        {0xb3, 0x03, 0x0a, 0xcc},
-        {0xb3, 0x04, 0x05, 0xcc},
-        {0xb3, 0x20, 0x00, 0xcc},
-        {0xb3, 0x21, 0x00, 0xcc},
-        {0xb3, 0x22, 0x01, 0xcc},
-        {0xb3, 0x23, 0xe0, 0xcc},
-        {0xb3, 0x14, 0x00, 0xcc},
-        {0xb3, 0x15, 0x00, 0xcc},
-        {0xb3, 0x16, 0x02, 0xcc},
-        {0xb3, 0x17, 0x7f, 0xcc},
-        {0xb3, 0x00, 0x67, 0xcc},
-        {0xb8, 0x00, 0x00, 0xcc},
-        {0xbc, 0x00, 0x71, 0xcc},
-        {0xbc, 0x01, 0x01, 0xcc},
-        {0xb3, 0x5c, 0x01, 0xcc},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x00, 0x00, 0x10, 0xdd},
-        {0xc8, 0x00, 0x00, 0xbb},
-        {0x00, 0x00, 0x30, 0xdd},
-        {0xf0, 0x00, 0x00, 0xbb},
-        {0x00, 0x00, 0x10, 0xdd},
-        {0x07, 0x00, 0xe0, 0xbb},
-        {0x08, 0x00, 0x0b, 0xbb},
-        {0x21, 0x00, 0x0c, 0xbb},
-        {0x20, 0x01, 0x03, 0xbb},
-        {0xb6, 0x00, 0x00, 0xcc},
-        {0xb6, 0x03, 0x02, 0xcc},
-        {0xb6, 0x02, 0x80, 0xcc},
-        {0xb6, 0x05, 0x01, 0xcc},
-        {0xb6, 0x04, 0xe0, 0xcc},
-        {0xb6, 0x12, 0xf8, 0xcc},
-        {0xb6, 0x13, 0x05, 0xcc},
-        {0xb6, 0x18, 0x02, 0xcc},
-        {0xb6, 0x17, 0x58, 0xcc},
-        {0xb6, 0x16, 0x00, 0xcc},
-        {0xb6, 0x22, 0x12, 0xcc},
-        {0xb6, 0x23, 0x0b, 0xcc},
-        {0xbf, 0xc0, 0x39, 0xcc},
-        {0xbf, 0xc1, 0x04, 0xcc},
-        {0xbf, 0xcc, 0x00, 0xcc},
-        {0xb3, 0x01, 0x41, 0xcc},
-        {0xf0, 0x00, 0x00, 0xbb},
-        {0x05, 0x01, 0x78, 0xbb},
-        {0x06, 0x00, 0x11, 0xbb},
-        {0x07, 0x01, 0x42, 0xbb},
-        {0x08, 0x00, 0x11, 0xbb},
-        {0x20, 0x01, 0x03, 0xbb},
-        {0x21, 0x80, 0x00, 0xbb},
-        {0x22, 0x0d, 0x0f, 0xbb},
-        {0x24, 0x80, 0x00, 0xbb},
-        {0x59, 0x00, 0xff, 0xbb},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x39, 0x03, 0xca, 0xbb},
-        {0x3a, 0x06, 0x80, 0xbb},
-        {0x3b, 0x01, 0x52, 0xbb},
-        {0x3c, 0x05, 0x40, 0xbb},
-        {0x57, 0x01, 0x9c, 0xbb},
-        {0x58, 0x01, 0xee, 0xbb},
-        {0x59, 0x00, 0xf0, 0xbb},
-        {0x5a, 0x01, 0x20, 0xbb},
-        {0x5c, 0x1d, 0x17, 0xbb},
-        {0x5d, 0x22, 0x1c, 0xbb},
-        {0x64, 0x1e, 0x1c, 0xbb},
-        {0x5b, 0x00, 0x00, 0xbb},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x22, 0xa0, 0x78, 0xbb},
-        {0x23, 0xa0, 0x78, 0xbb},
-        {0x24, 0x7f, 0x00, 0xbb},
-        {0x28, 0xea, 0x02, 0xbb},
-        {0x29, 0x86, 0x7a, 0xbb},
-        {0x5e, 0x52, 0x4c, 0xbb},
-        {0x5f, 0x20, 0x24, 0xbb},
-        {0x60, 0x00, 0x02, 0xbb},
-        {0x02, 0x00, 0xee, 0xbb},
-        {0x03, 0x39, 0x23, 0xbb},
-        {0x04, 0x07, 0x24, 0xbb},
-        {0x09, 0x00, 0xc0, 0xbb},
-        {0x0a, 0x00, 0x79, 0xbb},
-        {0x0b, 0x00, 0x04, 0xbb},
-        {0x0c, 0x00, 0x5c, 0xbb},
-        {0x0d, 0x00, 0xd9, 0xbb},
-        {0x0e, 0x00, 0x53, 0xbb},
-        {0x0f, 0x00, 0x21, 0xbb},
-        {0x10, 0x00, 0xa4, 0xbb},
-        {0x11, 0x00, 0xe5, 0xbb},
-        {0x15, 0x00, 0x00, 0xbb},
-        {0x16, 0x00, 0x00, 0xbb},
-        {0x17, 0x00, 0x00, 0xbb},
-        {0x18, 0x00, 0x00, 0xbb},
-        {0x19, 0x00, 0x00, 0xbb},
-        {0x1a, 0x00, 0x00, 0xbb},
-        {0x1b, 0x00, 0x00, 0xbb},
-        {0x1c, 0x00, 0x00, 0xbb},
-        {0x1d, 0x00, 0x00, 0xbb},
-        {0x1e, 0x00, 0x00, 0xbb},
-        {0xf0, 0x00, 0x01, 0xbb},
-        {0x06, 0xe0, 0x0e, 0xbb},
-        {0x06, 0x60, 0x0e, 0xbb},
-        {0xb3, 0x5c, 0x01, 0xcc},
-        {}
-};
 static const u8 mi1320_soc_InitQVGA[][4] = {
         {0xb3, 0x01, 0x01, 0xcc},
         {0xb0, 0x03, 0x19, 0xcc},
@@ -1262,268 +1126,6 @@ static const u8 mi1320_soc_InitQVGA[][4] = {
         {0xb3, 0x5c, 0x01, 0xcc},
         {}
 };
-static const u8 mi1320_soc_InitQVGA_JPG[][4] = {
-        {0xb3, 0x01, 0x01, 0xcc},
-        {0xb0, 0x03, 0x19, 0xcc},
-        {0xb0, 0x04, 0x02, 0xcc},
-        {0x00, 0x00, 0x30, 0xdd},
-        {0xb3, 0x00, 0x64, 0xcc},
-        {0xb3, 0x00, 0x67, 0xcc},
-        {0xb3, 0x05, 0x01, 0xcc},
-        {0xb3, 0x06, 0x01, 0xcc},
-        {0xb3, 0x08, 0x01, 0xcc},
-        {0xb3, 0x09, 0x0c, 0xcc},
-        {0xb3, 0x34, 0x02, 0xcc},
-        {0xb3, 0x35, 0xc8, 0xcc},
-        {0xb3, 0x02, 0x00, 0xcc},
-        {0xb3, 0x03, 0x0a, 0xcc},
-        {0xb3, 0x04, 0x05, 0xcc},
-        {0xb3, 0x20, 0x00, 0xcc},
-        {0xb3, 0x21, 0x00, 0xcc},
-        {0xb3, 0x22, 0x01, 0xcc},
-        {0xb3, 0x23, 0xe0, 0xcc},
-        {0xb3, 0x14, 0x00, 0xcc},
-        {0xb3, 0x15, 0x00, 0xcc},
-        {0xb3, 0x16, 0x02, 0xcc},
-        {0xb3, 0x17, 0x7f, 0xcc},
-        {0xb3, 0x00, 0x67, 0xcc},
-        {0xb8, 0x00, 0x00, 0xcc},
-        {0xbc, 0x00, 0xd1, 0xcc},
-        {0xbc, 0x01, 0x01, 0xcc},
-        {0xb3, 0x5c, 0x01, 0xcc},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x00, 0x00, 0x10, 0xdd},
-        {0xc8, 0x00, 0x00, 0xbb},
-        {0x00, 0x00, 0x30, 0xdd},
-        {0xf0, 0x00, 0x00, 0xbb},
-        {0x00, 0x00, 0x10, 0xdd},
-        {0x07, 0x00, 0xe0, 0xbb},
-        {0x08, 0x00, 0x0b, 0xbb},
-        {0x21, 0x00, 0x0c, 0xbb},
-        {0x20, 0x01, 0x03, 0xbb},
-        {0xb6, 0x00, 0x00, 0xcc},
-        {0xb6, 0x03, 0x01, 0xcc},
-        {0xb6, 0x02, 0x40, 0xcc},
-        {0xb6, 0x05, 0x00, 0xcc},
-        {0xb6, 0x04, 0xf0, 0xcc},
-        {0xb6, 0x12, 0xf8, 0xcc},
-        {0xb6, 0x13, 0x05, 0xcc},
-        {0xb6, 0x18, 0x00, 0xcc},
-        {0xb6, 0x17, 0x96, 0xcc},
-        {0xb6, 0x16, 0x00, 0xcc},
-        {0xb6, 0x22, 0x12, 0xcc},
-        {0xb6, 0x23, 0x0b, 0xcc},
-        {0xbf, 0xc0, 0x39, 0xcc},
-        {0xbf, 0xc1, 0x04, 0xcc},
-        {0xbf, 0xcc, 0x00, 0xcc},
-        {0xbc, 0x02, 0x18, 0xcc},
-        {0xbc, 0x03, 0x50, 0xcc},
-        {0xbc, 0x04, 0x18, 0xcc},
-        {0xbc, 0x05, 0x00, 0xcc},
-        {0xbc, 0x06, 0x00, 0xcc},
-        {0xbc, 0x08, 0x30, 0xcc},
-        {0xbc, 0x09, 0x40, 0xcc},
-        {0xbc, 0x0a, 0x10, 0xcc},
-        {0xbc, 0x0b, 0x00, 0xcc},
-        {0xbc, 0x0c, 0x00, 0xcc},
-        {0xb3, 0x01, 0x41, 0xcc},
-        {0xf0, 0x00, 0x00, 0xbb},
-        {0x05, 0x01, 0x78, 0xbb},
-        {0x06, 0x00, 0x11, 0xbb},
-        {0x07, 0x01, 0x42, 0xbb},
-        {0x08, 0x00, 0x11, 0xbb},
-        {0x20, 0x01, 0x03, 0xbb},
-        {0x21, 0x80, 0x00, 0xbb},
-        {0x22, 0x0d, 0x0f, 0xbb},
-        {0x24, 0x80, 0x00, 0xbb},
-        {0x59, 0x00, 0xff, 0xbb},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x39, 0x03, 0xca, 0xbb},
-        {0x3a, 0x06, 0x80, 0xbb},
-        {0x3b, 0x01, 0x52, 0xbb},
-        {0x3c, 0x05, 0x40, 0xbb},
-        {0x57, 0x01, 0x9c, 0xbb},
-        {0x58, 0x01, 0xee, 0xbb},
-        {0x59, 0x00, 0xf0, 0xbb},
-        {0x5a, 0x01, 0x20, 0xbb},
-        {0x5c, 0x1d, 0x17, 0xbb},
-        {0x5d, 0x22, 0x1c, 0xbb},
-        {0x64, 0x1e, 0x1c, 0xbb},
-        {0x5b, 0x00, 0x00, 0xbb},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x22, 0xa0, 0x78, 0xbb},
-        {0x23, 0xa0, 0x78, 0xbb},
-        {0x24, 0x7f, 0x00, 0xbb},
-        {0x28, 0xea, 0x02, 0xbb},
-        {0x29, 0x86, 0x7a, 0xbb},
-        {0x5e, 0x52, 0x4c, 0xbb},
-        {0x5f, 0x20, 0x24, 0xbb},
-        {0x60, 0x00, 0x02, 0xbb},
-        {0x02, 0x00, 0xee, 0xbb},
-        {0x03, 0x39, 0x23, 0xbb},
-        {0x04, 0x07, 0x24, 0xbb},
-        {0x09, 0x00, 0xc0, 0xbb},
-        {0x0a, 0x00, 0x79, 0xbb},
-        {0x0b, 0x00, 0x04, 0xbb},
-        {0x0c, 0x00, 0x5c, 0xbb},
-        {0x0d, 0x00, 0xd9, 0xbb},
-        {0x0e, 0x00, 0x53, 0xbb},
-        {0x0f, 0x00, 0x21, 0xbb},
-        {0x10, 0x00, 0xa4, 0xbb},
-        {0x11, 0x00, 0xe5, 0xbb},
-        {0x15, 0x00, 0x00, 0xbb},
-        {0x16, 0x00, 0x00, 0xbb},
-        {0x17, 0x00, 0x00, 0xbb},
-        {0x18, 0x00, 0x00, 0xbb},
-        {0x19, 0x00, 0x00, 0xbb},
-        {0x1a, 0x00, 0x00, 0xbb},
-        {0x1b, 0x00, 0x00, 0xbb},
-        {0x1c, 0x00, 0x00, 0xbb},
-        {0x1d, 0x00, 0x00, 0xbb},
-        {0x1e, 0x00, 0x00, 0xbb},
-        {0xf0, 0x00, 0x01, 0xbb},
-        {0x06, 0xe0, 0x0e, 0xbb},
-        {0x06, 0x60, 0x0e, 0xbb},
-        {0xb3, 0x5c, 0x01, 0xcc},
-        {}
-};
-static const u8 mi1320_soc_InitSXGA_JPG[][4] = {
-        {0xb3, 0x01, 0x01, 0xcc},
-        {0xb0, 0x03, 0x19, 0xcc},
-        {0xb0, 0x04, 0x02, 0xcc},
-        {0x00, 0x00, 0x33, 0xdd},
-        {0xb3, 0x00, 0x64, 0xcc},
-        {0xb3, 0x00, 0x67, 0xcc},
-        {0xb3, 0x05, 0x00, 0xcc},
-        {0xb3, 0x06, 0x00, 0xcc},
-        {0xb3, 0x08, 0x01, 0xcc},
-        {0xb3, 0x09, 0x0c, 0xcc},
-        {0xb3, 0x34, 0x02, 0xcc},
-        {0xb3, 0x35, 0xc8, 0xcc},
-        {0xb3, 0x02, 0x00, 0xcc},
-        {0xb3, 0x03, 0x0a, 0xcc},
-        {0xb3, 0x04, 0x05, 0xcc},
-        {0xb3, 0x20, 0x00, 0xcc},
-        {0xb3, 0x21, 0x00, 0xcc},
-        {0xb3, 0x22, 0x04, 0xcc},
-        {0xb3, 0x23, 0x00, 0xcc},
-        {0xb3, 0x14, 0x00, 0xcc},
-        {0xb3, 0x15, 0x00, 0xcc},
-        {0xb3, 0x16, 0x04, 0xcc},
-        {0xb3, 0x17, 0xff, 0xcc},
-        {0xb3, 0x00, 0x67, 0xcc},
-        {0xbc, 0x00, 0x71, 0xcc},
-        {0xbc, 0x01, 0x01, 0xcc},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x00, 0x00, 0x30, 0xdd},
-        {0xc8, 0x9f, 0x0b, 0xbb},
-        {0x00, 0x00, 0x20, 0xdd},
-        {0x5b, 0x00, 0x01, 0xbb},
-        {0x00, 0x00, 0x20, 0xdd},
-        {0xf0, 0x00, 0x00, 0xbb},
-        {0x00, 0x00, 0x30, 0xdd},
-        {0x20, 0x01, 0x03, 0xbb},
-        {0x00, 0x00, 0x20, 0xdd},
-        {0xb6, 0x00, 0x00, 0xcc},
-        {0xb6, 0x03, 0x05, 0xcc},
-        {0xb6, 0x02, 0x00, 0xcc},
-        {0xb6, 0x05, 0x04, 0xcc},
-        {0xb6, 0x04, 0x00, 0xcc},
-        {0xb6, 0x12, 0xf8, 0xcc},
-        {0xb6, 0x13, 0x29, 0xcc},
-        {0xb6, 0x18, 0x0a, 0xcc},
-        {0xb6, 0x17, 0x00, 0xcc},
-        {0xb6, 0x16, 0x00, 0xcc},
-        {0xb6, 0x22, 0x12, 0xcc},
-        {0xb6, 0x23, 0x0b, 0xcc},
-        {0xbf, 0xc0, 0x39, 0xcc},
-        {0xbf, 0xc1, 0x04, 0xcc},
-        {0xbf, 0xcc, 0x00, 0xcc},
-        {0xb3, 0x5c, 0x01, 0xcc},
-        {0xb3, 0x01, 0x41, 0xcc},
-        {0xf0, 0x00, 0x00, 0xbb},
-        {0x05, 0x01, 0x78, 0xbb},
-        {0x06, 0x00, 0x11, 0xbb},
-        {0x07, 0x01, 0x42, 0xbb},
-        {0x08, 0x00, 0x11, 0xbb},
-        {0x20, 0x01, 0x03, 0xbb},
-        {0x21, 0x80, 0x00, 0xbb},
-        {0x22, 0x0d, 0x0f, 0xbb},
-        {0x24, 0x80, 0x00, 0xbb},
-        {0x59, 0x00, 0xff, 0xbb},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x39, 0x03, 0xca, 0xbb},
-        {0x3a, 0x06, 0x80, 0xbb},
-        {0x3b, 0x01, 0x52, 0xbb},
-        {0x3c, 0x05, 0x40, 0xbb},
-        {0x57, 0x01, 0x9c, 0xbb},
-        {0x58, 0x01, 0xee, 0xbb},
-        {0x59, 0x00, 0xf0, 0xbb},
-        {0x5a, 0x01, 0x20, 0xbb},
-        {0x5c, 0x1d, 0x17, 0xbb},
-        {0x5d, 0x22, 0x1c, 0xbb},
-        {0x64, 0x1e, 0x1c, 0xbb},
-        {0x5b, 0x00, 0x00, 0xbb},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x22, 0xa0, 0x78, 0xbb},
-        {0x23, 0xa0, 0x78, 0xbb},
-        {0x24, 0x7f, 0x00, 0xbb},
-        {0x28, 0xea, 0x02, 0xbb},
-        {0x29, 0x86, 0x7a, 0xbb},
-        {0x5e, 0x52, 0x4c, 0xbb},
-        {0x5f, 0x20, 0x24, 0xbb},
-        {0x60, 0x00, 0x02, 0xbb},
-        {0x02, 0x00, 0xee, 0xbb},
-        {0x03, 0x39, 0x23, 0xbb},
-        {0x04, 0x07, 0x24, 0xbb},
-        {0x09, 0x00, 0xc0, 0xbb},
-        {0x0a, 0x00, 0x79, 0xbb},
-        {0x0b, 0x00, 0x04, 0xbb},
-        {0x0c, 0x00, 0x5c, 0xbb},
-        {0x0d, 0x00, 0xd9, 0xbb},
-        {0x0e, 0x00, 0x53, 0xbb},
-        {0x0f, 0x00, 0x21, 0xbb},
-        {0x10, 0x00, 0xa4, 0xbb},
-        {0x11, 0x00, 0xe5, 0xbb},
-        {0x15, 0x00, 0x00, 0xbb},
-        {0x16, 0x00, 0x00, 0xbb},
-        {0x17, 0x00, 0x00, 0xbb},
-        {0x18, 0x00, 0x00, 0xbb},
-        {0x19, 0x00, 0x00, 0xbb},
-        {0x1a, 0x00, 0x00, 0xbb},
-        {0x1b, 0x00, 0x00, 0xbb},
-        {0x1c, 0x00, 0x00, 0xbb},
-        {0x1d, 0x00, 0x00, 0xbb},
-        {0x1e, 0x00, 0x00, 0xbb},
-        {0xf0, 0x00, 0x01, 0xbb},
-        {0x06, 0xe0, 0x0e, 0xbb},
-        {0x06, 0x60, 0x0e, 0xbb},
-        {0xb3, 0x5c, 0x01, 0xcc},
-        {0xf0, 0x00, 0x00, 0xbb},
-        {0x05, 0x01, 0x13, 0xbb},
-        {0x06, 0x00, 0x11, 0xbb},
-        {0x07, 0x00, 0x85, 0xbb},
-        {0x08, 0x00, 0x27, 0xbb},
-        {0x20, 0x01, 0x03, 0xbb},
-        {0x21, 0x80, 0x00, 0xbb},
-        {0x22, 0x0d, 0x0f, 0xbb},
-        {0x24, 0x80, 0x00, 0xbb},
-        {0x59, 0x00, 0xff, 0xbb},
-        {0xf0, 0x00, 0x02, 0xbb},
-        {0x39, 0x03, 0x0d, 0xbb},
-        {0x3a, 0x06, 0x1b, 0xbb},
-        {0x3b, 0x00, 0x95, 0xbb},
-        {0x3c, 0x04, 0xdb, 0xbb},
-        {0x57, 0x02, 0x00, 0xbb},
-        {0x58, 0x02, 0x66, 0xbb},
-        {0x59, 0x00, 0xff, 0xbb},
-        {0x5a, 0x01, 0x33, 0xbb},
-        {0x5c, 0x12, 0x0d, 0xbb},
-        {0x5d, 0x16, 0x11, 0xbb},
-        {0x64, 0x5e, 0x1c, 0xbb},
-        {0x2f, 0x90, 0x00, 0xbb},
-        {}
-};
 static const u8 mi1320_soc_InitSXGA[][4] = {
         {0xb3, 0x01, 0x01, 0xcc},
         {0xb0, 0x03, 0x19, 0xcc},
@@ -3015,11 +2617,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         int mode;
         static const u8 (*mi1320_soc_init[])[4] = {
                 mi1320_soc_InitSXGA,
-                mi1320_soc_InitSXGA_JPG,
                 mi1320_soc_InitVGA,
-                mi1320_soc_InitVGA_JPG,
                 mi1320_soc_InitQVGA,
-                mi1320_soc_InitQVGA_JPG
         };
 
         /* Assume start use the good resolution from gspca_dev->mode */
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index eca8bf92a225..b0195e8ee4d1 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -884,12 +884,9 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
         }
         else if (itv->card->type == IVTV_CARD_GV_MVPRX ||
                  itv->card->type == IVTV_CARD_GV_MVPRX2E) {
-                struct v4l2_crystal_freq crystal_freq;
-
                 /* The crystal frequency of GVMVPRX is 24.576MHz */
-                crystal_freq.freq = SAA7115_FREQ_24_576_MHZ;
-                crystal_freq.flags = SAA7115_FREQ_FL_UCGC;
-                v4l2_subdev_call(itv->sd_video, video, s_crystal_freq, &crystal_freq);
+                v4l2_subdev_call(itv->sd_video, video, s_crystal_freq,
+                        SAA7115_FREQ_24_576_MHZ, SAA7115_FREQ_FL_UCGC);
         }
 
         if (hw & IVTV_HW_CX25840) {
@@ -1234,7 +1231,7 @@ int ivtv_init_on_first_open(struct ivtv *itv)
         if (itv->card->hw_all & IVTV_HW_CX25840) {
                 struct v4l2_control ctrl;
 
-                v4l2_subdev_call(itv->sd_video, core, init, 0);
+                v4l2_subdev_call(itv->sd_video, core, load_fw);
                 /* CX25840_CID_ENABLE_PVR150_WORKAROUND */
                 ctrl.id = V4L2_CID_PRIVATE_BASE;
                 ctrl.value = itv->pvr150_workaround;
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index cfaacf6096d0..e707ef3086b2 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -857,15 +857,12 @@ int ivtv_v4l2_close(struct file *filp)
                 /* Mark that the radio is no longer in use */
                 clear_bit(IVTV_F_I_RADIO_USER, &itv->i_flags);
                 /* Switch tuner to TV */
-                ivtv_call_all(itv, tuner, s_std, itv->std);
+                ivtv_call_all(itv, core, s_std, itv->std);
                 /* Select correct audio input (i.e. TV tuner or Line in) */
                 ivtv_audio_set_io(itv);
-                if (itv->hw_flags & IVTV_HW_SAA711X)
-                {
-                        struct v4l2_crystal_freq crystal_freq;
-                        crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
-                        crystal_freq.flags = 0;
-                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
+                if (itv->hw_flags & IVTV_HW_SAA711X) {
+                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
+                                        SAA7115_FREQ_32_11_MHZ, 0);
                 }
                 if (atomic_read(&itv->capturing) > 0) {
                         /* Undo video mute */
@@ -956,10 +953,8 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
                 /* Select the correct audio input (i.e. radio tuner) */
                 ivtv_audio_set_io(itv);
                 if (itv->hw_flags & IVTV_HW_SAA711X) {
-                        struct v4l2_crystal_freq crystal_freq;
-                        crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
-                        crystal_freq.flags = SAA7115_FREQ_FL_APLL;
-                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
+                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
+                                SAA7115_FREQ_32_11_MHZ, SAA7115_FREQ_FL_APLL);
                 }
                 /* Done! Unmute and continue. */
                 ivtv_unmute(itv);
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index 3321983d89e5..ceb05bdcaf62 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -248,15 +248,16 @@ static int subdev_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int subdev_s_audio_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int subdev_s_audio_routing(struct v4l2_subdev *sd,
+                                  u32 input, u32 output, u32 config)
 {
         struct ivtv *itv = sd_to_ivtv(sd);
         u16 mask, data;
 
-        if (route->input > 2)
+        if (input > 2)
                 return -EINVAL;
         mask = itv->card->gpio_audio_input.mask;
-        switch (route->input) {
+        switch (input) {
         case 0:
                 data = itv->card->gpio_audio_input.tuner;
                 break;
@@ -318,17 +319,18 @@ static int subdev_log_status(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int subdev_s_video_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int subdev_s_video_routing(struct v4l2_subdev *sd,
+                                  u32 input, u32 output, u32 config)
 {
         struct ivtv *itv = sd_to_ivtv(sd);
         u16 mask, data;
 
-        if (route->input > 2) /* 0:Tuner 1:Composite 2:S-Video */
+        if (input > 2) /* 0:Tuner 1:Composite 2:S-Video */
                 return -EINVAL;
         mask = itv->card->gpio_video_input.mask;
-        if  (route->input == 0)
+        if (input == 0)
                 data = itv->card->gpio_video_input.tuner;
-        else if  (route->input == 1)
+        else if (input == 1)
                 data = itv->card->gpio_video_input.composite;
         else
                 data = itv->card->gpio_video_input.svideo;
@@ -342,10 +344,10 @@ static const struct v4l2_subdev_core_ops subdev_core_ops = {
         .g_ctrl = subdev_g_ctrl,
         .s_ctrl = subdev_s_ctrl,
         .queryctrl = subdev_queryctrl,
+        .s_std = subdev_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops subdev_tuner_ops = {
-        .s_std = subdev_s_std,
         .s_radio = subdev_s_radio,
         .g_tuner = subdev_g_tuner,
         .s_tuner = subdev_s_tuner,
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index e73a196ecc7a..9e3d32b8004c 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -161,15 +161,18 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
                 return -1;
         if (hw == IVTV_HW_TUNER) {
                 /* special tuner handling */
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
+                sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+                                adap, mod, type,
                                 itv->card_i2c->radio);
                 if (sd)
                         sd->grp_id = 1 << idx;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
+                sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+                                adap, mod, type,
                                 itv->card_i2c->demod);
                 if (sd)
                         sd->grp_id = 1 << idx;
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type,
+                sd = v4l2_i2c_new_probed_subdev(&itv->v4l2_dev,
+                                adap, mod, type,
                                 itv->card_i2c->tv);
                 if (sd)
                         sd->grp_id = 1 << idx;
@@ -178,11 +181,11 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
         if (!hw_addrs[idx])
                 return -1;
         if (hw == IVTV_HW_UPD64031A || hw == IVTV_HW_UPD6408X) {
-                unsigned short addrs[2] = { hw_addrs[idx], I2C_CLIENT_END };
-
-                sd = v4l2_i2c_new_probed_subdev(adap, mod, type, addrs);
+                sd = v4l2_i2c_new_probed_subdev_addr(&itv->v4l2_dev,
+                                adap, mod, type, hw_addrs[idx]);
         } else {
-                sd = v4l2_i2c_new_subdev(adap, mod, type, hw_addrs[idx]);
+                sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
+                                adap, mod, type, hw_addrs[idx]);
         }
         if (sd)
                 sd->grp_id = 1 << idx;
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 9a0424298af1..4a2d464f055e 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1033,7 +1033,6 @@ static int ivtv_g_output(struct file *file, void *fh, unsigned int *i)
 static int ivtv_s_output(struct file *file, void *fh, unsigned int outp)
 {
         struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
-        struct v4l2_routing route;
 
         if (outp >= itv->card->nof_outputs)
                 return -EINVAL;
@@ -1046,9 +1045,9 @@ static int ivtv_s_output(struct file *file, void *fh, unsigned int outp)
                    itv->active_output, outp);
 
         itv->active_output = outp;
-        route.input = SAA7127_INPUT_TYPE_NORMAL;
-        route.output = itv->card->video_outputs[outp].video_output;
-        ivtv_call_hw(itv, IVTV_HW_SAA7127, video, s_routing, &route);
+        ivtv_call_hw(itv, IVTV_HW_SAA7127, video, s_routing,
+                        SAA7127_INPUT_TYPE_NORMAL,
+                        itv->card->video_outputs[outp].video_output, 0);
 
         return 0;
 }
@@ -1121,7 +1120,7 @@ int ivtv_s_std(struct file *file, void *fh, v4l2_std_id *std)
         IVTV_DEBUG_INFO("Switching standard to %llx.\n", (unsigned long long)itv->std);
 
         /* Tuner */
-        ivtv_call_all(itv, tuner, s_std, itv->std);
+        ivtv_call_all(itv, core, s_std, itv->std);
 
         if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
                 /* set display standard */
@@ -1735,13 +1734,6 @@ static long ivtv_default(struct file *file, void *fh, int cmd, void *arg)
         struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
 
         switch (cmd) {
-        case VIDIOC_INT_S_AUDIO_ROUTING: {
-                struct v4l2_routing *route = arg;
-
-                ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing, route);
-                break;
-        }
-
         case VIDIOC_INT_RESET: {
                 u32 val = *(u32 *)arg;
 
diff --git a/drivers/media/video/ivtv/ivtv-routing.c b/drivers/media/video/ivtv/ivtv-routing.c
index 3fd302294497..8898c569a1c9 100644
--- a/drivers/media/video/ivtv/ivtv-routing.c
+++ b/drivers/media/video/ivtv/ivtv-routing.c
@@ -34,7 +34,7 @@
 void ivtv_audio_set_io(struct ivtv *itv)
 {
         const struct ivtv_card_audio_input *in;
-        struct v4l2_routing route;
+        u32 input, output = 0;
 
         /* Determine which input to use */
         if (test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags))
@@ -43,73 +43,77 @@ void ivtv_audio_set_io(struct ivtv *itv)
                 in = &itv->card->audio_inputs[itv->audio_input];
 
         /* handle muxer chips */
-        route.input = in->muxer_input;
-        route.output = 0;
+        input = in->muxer_input;
         if (itv->card->hw_muxer & IVTV_HW_M52790)
-                route.output = M52790_OUT_STEREO;
-        v4l2_subdev_call(itv->sd_muxer, audio, s_routing, &route);
+                output = M52790_OUT_STEREO;
+        v4l2_subdev_call(itv->sd_muxer, audio, s_routing,
+                        input, output, 0);
 
-        route.input = in->audio_input;
-        route.output = 0;
+        input = in->audio_input;
+        output = 0;
         if (itv->card->hw_audio & IVTV_HW_MSP34XX)
-                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
-        ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing, &route);
+                output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
+        ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing,
+                        input, output, 0);
 }
 
 /* Selects the video input and output according to the current
    settings. */
 void ivtv_video_set_io(struct ivtv *itv)
 {
-        struct v4l2_routing route;
         int inp = itv->active_input;
+        u32 input;
         u32 type;
 
-        route.input = itv->card->video_inputs[inp].video_input;
-        route.output = 0;
-        v4l2_subdev_call(itv->sd_video, video, s_routing, &route);
+        v4l2_subdev_call(itv->sd_video, video, s_routing,
+                itv->card->video_inputs[inp].video_input, 0, 0);
 
         type = itv->card->video_inputs[inp].video_type;
 
         if (type == IVTV_CARD_INPUT_VID_TUNER) {
-                route.input = 0;  /* Tuner */
+                input = 0;  /* Tuner */
         } else if (type < IVTV_CARD_INPUT_COMPOSITE1) {
-                route.input = 2;  /* S-Video */
+                input = 2;  /* S-Video */
         } else {
-                route.input = 1;  /* Composite */
+                input = 1;  /* Composite */
         }
 
         if (itv->card->hw_video & IVTV_HW_GPIO)
-                ivtv_call_hw(itv, IVTV_HW_GPIO, video, s_routing, &route);
+                ivtv_call_hw(itv, IVTV_HW_GPIO, video, s_routing,
+                                input, 0, 0);
 
         if (itv->card->hw_video & IVTV_HW_UPD64031A) {
                 if (type == IVTV_CARD_INPUT_VID_TUNER ||
                     type >= IVTV_CARD_INPUT_COMPOSITE1) {
                         /* Composite: GR on, connect to 3DYCS */
-                        route.input = UPD64031A_GR_ON | UPD64031A_3DYCS_COMPOSITE;
+                        input = UPD64031A_GR_ON | UPD64031A_3DYCS_COMPOSITE;
                 } else {
                         /* S-Video: GR bypassed, turn it off */
-                        route.input = UPD64031A_GR_OFF | UPD64031A_3DYCS_DISABLE;
+                        input = UPD64031A_GR_OFF | UPD64031A_3DYCS_DISABLE;
                 }
-                route.input |= itv->card->gr_config;
+                input |= itv->card->gr_config;
 
-                ivtv_call_hw(itv, IVTV_HW_UPD64031A, video, s_routing, &route);
+                ivtv_call_hw(itv, IVTV_HW_UPD64031A, video, s_routing,
+                                input, 0, 0);
         }
 
         if (itv->card->hw_video & IVTV_HW_UPD6408X) {
-                route.input = UPD64083_YCS_MODE;
+                input = UPD64083_YCS_MODE;
                 if (type > IVTV_CARD_INPUT_VID_TUNER &&
                     type < IVTV_CARD_INPUT_COMPOSITE1) {
-                        /* S-Video uses YCNR mode and internal Y-ADC, the upd64031a
-                           is not used. */
-                        route.input |= UPD64083_YCNR_MODE;
+                        /* S-Video uses YCNR mode and internal Y-ADC, the
+                           upd64031a is not used. */
+                        input |= UPD64083_YCNR_MODE;
                 }
                 else if (itv->card->hw_video & IVTV_HW_UPD64031A) {
-                  /* Use upd64031a output for tuner and composite(CX23416GYC only) inputs */
-                  if ((type == IVTV_CARD_INPUT_VID_TUNER)||
-                      (itv->card->type == IVTV_CARD_CX23416GYC)) {
-                    route.input |= UPD64083_EXT_Y_ADC;
-                  }
+                        /* Use upd64031a output for tuner and
+                           composite(CX23416GYC only) inputs */
+                        if (type == IVTV_CARD_INPUT_VID_TUNER ||
+                            itv->card->type == IVTV_CARD_CX23416GYC) {
+                                input |= UPD64083_EXT_Y_ADC;
+                        }
                 }
-                ivtv_call_hw(itv, IVTV_HW_UPD6408X, video, s_routing, &route);
+                ivtv_call_hw(itv, IVTV_HW_UPD6408X, video, s_routing,
+                                input, 0, 0);
         }
 }
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c
index 841024b6bcdf..fab8e0254bbc 100644
--- a/drivers/media/video/ks0127.c
+++ b/drivers/media/video/ks0127.c
@@ -409,11 +409,12 @@ static void ks0127_init(struct v4l2_subdev *sd)
         }
 }
 
-static int ks0127_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int ks0127_s_routing(struct v4l2_subdev *sd,
+                            u32 input, u32 output, u32 config)
 {
         struct ks0127 *ks = to_ks0127(sd);
 
-        switch (route->input) {
+        switch (input) {
         case KS_INPUT_COMPOSITE_1:
         case KS_INPUT_COMPOSITE_2:
         case KS_INPUT_COMPOSITE_3:
@@ -421,13 +422,13 @@ static int ks0127_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *r
         case KS_INPUT_COMPOSITE_5:
         case KS_INPUT_COMPOSITE_6:
                 v4l2_dbg(1, debug, sd,
-                        "s_routing %d: Composite\n", route->input);
+                        "s_routing %d: Composite\n", input);
                 /* autodetect 50/60 Hz */
                 ks0127_and_or(sd, KS_CMDA,   0xfc, 0x00);
                 /* VSE=0 */
                 ks0127_and_or(sd, KS_CMDA,   ~0x40, 0x00);
                 /* set input line */
-                ks0127_and_or(sd, KS_CMDB,   0xb0, route->input);
+                ks0127_and_or(sd, KS_CMDB,   0xb0, input);
                 /* non-freerunning mode */
                 ks0127_and_or(sd, KS_CMDC,   0x70, 0x0a);
                 /* analog input */
@@ -455,13 +456,13 @@ static int ks0127_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *r
         case KS_INPUT_SVIDEO_2:
         case KS_INPUT_SVIDEO_3:
                 v4l2_dbg(1, debug, sd,
-                        "s_routing %d: S-Video\n", route->input);
+                        "s_routing %d: S-Video\n", input);
                 /* autodetect 50/60 Hz */
                 ks0127_and_or(sd, KS_CMDA,   0xfc, 0x00);
                 /* VSE=0 */
                 ks0127_and_or(sd, KS_CMDA,   ~0x40, 0x00);
                 /* set input line */
-                ks0127_and_or(sd, KS_CMDB,   0xb0, route->input);
+                ks0127_and_or(sd, KS_CMDB,   0xb0, input);
                 /* non-freerunning mode */
                 ks0127_and_or(sd, KS_CMDC,   0x70, 0x0a);
                 /* analog input */
@@ -496,7 +497,7 @@ static int ks0127_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *r
 
                 ks0127_and_or(sd, KS_CMDA,   0xff, 0x40); /* VSE=1 */
                 /* set input line and VALIGN */
-                ks0127_and_or(sd, KS_CMDB,   0xb0, (route->input | 0x40));
+                ks0127_and_or(sd, KS_CMDB,   0xb0, (input | 0x40));
                 /* freerunning mode, */
                 /* TSTGEN = 1 TSTGFR=11 TSTGPH=0 TSTGPK=0  VMEM=1*/
                 ks0127_and_or(sd, KS_CMDC,   0x70, 0x87);
@@ -531,7 +532,7 @@ static int ks0127_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *r
 
         default:
                 v4l2_dbg(1, debug, sd,
-                        "s_routing: Unknown input %d\n", route->input);
+                        "s_routing: Unknown input %d\n", input);
                 break;
         }
 
@@ -648,9 +649,6 @@ static int ks0127_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_iden
 
 static const struct v4l2_subdev_core_ops ks0127_core_ops = {
         .g_chip_ident = ks0127_g_chip_ident,
-};
-
-static const struct v4l2_subdev_tuner_ops ks0127_tuner_ops = {
         .s_std = ks0127_s_std,
 };
 
@@ -663,7 +661,6 @@ static const struct v4l2_subdev_video_ops ks0127_video_ops = {
 
 static const struct v4l2_subdev_ops ks0127_ops = {
         .core = &ks0127_core_ops,
-        .tuner = &ks0127_tuner_ops,
         .video = &ks0127_video_ops,
 };
 
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 1f340fefc49d..d7317e798cc4 100644
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -69,12 +69,13 @@ static int m52790_write(struct v4l2_subdev *sd)
    part of the audio output routing. The normal case is that another
    chip takes care of the actual muting so making it part of the
    output routing seems to be the right thing to do for now. */
-static int m52790_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int m52790_s_routing(struct v4l2_subdev *sd,
+                            u32 input, u32 output, u32 config)
 {
         struct m52790_state *state = to_state(sd);
 
-        state->input = route->input;
-        state->output = route->output;
+        state->input = input;
+        state->output = output;
         m52790_write(sd);
         return 0;
 }
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 9e8e06cfe5c6..e9df3cb02cc1 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -56,7 +56,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/msp3400.h>
 #include <media/tvaudio.h>
 #include "msp3400-driver.h"
@@ -108,10 +108,6 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
 /* DSP unit subaddress */
 #define I2C_MSP_DSP     0x12
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
 /* functions for talking to the MSP3400C Sound processor                   */
@@ -509,25 +505,26 @@ static int msp_s_std(struct v4l2_subdev *sd, v4l2_std_id id)
         return 0;
 }
 
-static int msp_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *rt)
+static int msp_s_routing(struct v4l2_subdev *sd,
+                         u32 input, u32 output, u32 config)
 {
         struct msp_state *state = to_state(sd);
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        int tuner = (rt->input >> 3) & 1;
-        int sc_in = rt->input & 0x7;
-        int sc1_out = rt->output & 0xf;
-        int sc2_out = (rt->output >> 4) & 0xf;
+        int tuner = (input >> 3) & 1;
+        int sc_in = input & 0x7;
+        int sc1_out = output & 0xf;
+        int sc2_out = (output >> 4) & 0xf;
         u16 val, reg;
         int i;
         int extern_input = 1;
 
-        if (state->routing.input == rt->input &&
-                        state->routing.output == rt->output)
+        if (state->route_in == input && state->route_out == output)
                 return 0;
-        state->routing = *rt;
+        state->route_in = input;
+        state->route_out = output;
         /* check if the tuner input is used */
         for (i = 0; i < 5; i++) {
-                if (((rt->input >> (4 + i * 4)) & 0xf) == 0)
+                if (((input >> (4 + i * 4)) & 0xf) == 0)
                         extern_input = 0;
         }
         state->mode = extern_input ? MSP_MODE_EXTERN : MSP_MODE_AM_DETECT;
@@ -677,7 +674,7 @@ static int msp_log_status(struct v4l2_subdev *sd)
         }
         v4l_info(client, "Audmode:  0x%04x\n", state->audmode);
         v4l_info(client, "Routing:  0x%08x (input) 0x%08x (output)\n",
-                        state->routing.input, state->routing.output);
+                        state->route_in, state->route_out);
         v4l_info(client, "ACB:      0x%04x\n", state->acb);
         return 0;
 }
@@ -696,11 +693,6 @@ static int msp_resume(struct i2c_client *client)
         return 0;
 }
 
-static int msp_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-        return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops msp_core_ops = {
@@ -709,6 +701,7 @@ static const struct v4l2_subdev_core_ops msp_core_ops = {
         .g_ctrl = msp_g_ctrl,
         .s_ctrl = msp_s_ctrl,
         .queryctrl = msp_queryctrl,
+        .s_std = msp_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops msp_tuner_ops = {
@@ -716,7 +709,6 @@ static const struct v4l2_subdev_tuner_ops msp_tuner_ops = {
         .g_tuner = msp_g_tuner,
         .s_tuner = msp_s_tuner,
         .s_radio = msp_s_radio,
-        .s_std = msp_s_std,
 };
 
 static const struct v4l2_subdev_audio_ops msp_audio_ops = {
@@ -770,8 +762,8 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
         state->i2s_mode = 0;
         init_waitqueue_head(&state->wq);
         /* These are the reset input/output positions */
-        state->routing.input = MSP_INPUT_DEFAULT;
-        state->routing.output = MSP_OUTPUT_DEFAULT;
+        state->route_in = MSP_INPUT_DEFAULT;
+        state->route_out = MSP_OUTPUT_DEFAULT;
 
         state->rev1 = msp_read_dsp(client, 0x1e);
         if (state->rev1 != -1)
@@ -925,8 +917,6 @@ MODULE_DEVICE_TABLE(i2c, msp_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "msp3400",
-        .driverid = I2C_DRIVERID_MSP3400,
-        .command = msp_command,
         .probe = msp_probe,
         .remove = msp_remove,
         .suspend = msp_suspend,
diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h
index 3fe1c1b10f53..d6b3e6d0eef7 100644
--- a/drivers/media/video/msp3400-driver.h
+++ b/drivers/media/video/msp3400-driver.h
@@ -80,7 +80,8 @@ struct msp_state {
         int i2s_mode;
         int main, second;       /* sound carrier */
         int input;
-        struct v4l2_routing routing;
+        u32 route_in;
+        u32 route_out;
 
         /* v4l2 */
         int audmode;
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index a655e9c30146..168bca703614 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -188,7 +188,7 @@ void msp3400c_set_mode(struct i2c_client *client, int mode)
 {
         struct msp_state *state = to_state(i2c_get_clientdata(client));
         struct msp3400c_init_data_dem *data = &msp3400c_init_data[mode];
-        int tuner = (state->routing.input >> 3) & 1;
+        int tuner = (state->route_in >> 3) & 1;
         int i;
 
         v4l_dbg(1, msp_debug, client, "set_mode: %d\n", mode);
@@ -896,7 +896,7 @@ static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)
 static void msp34xxg_set_sources(struct i2c_client *client)
 {
         struct msp_state *state = to_state(i2c_get_clientdata(client));
-        u32 in = state->routing.input;
+        u32 in = state->route_in;
 
         msp34xxg_set_source(client, 0x0008, (in >> 4) & 0xf);
         /* quasi-peak detector is set to same input as the loudspeaker (MAIN) */
@@ -912,7 +912,7 @@ static void msp34xxg_set_sources(struct i2c_client *client)
 static void msp34xxg_reset(struct i2c_client *client)
 {
         struct msp_state *state = to_state(i2c_get_clientdata(client));
-        int tuner = (state->routing.input >> 3) & 1;
+        int tuner = (state->route_in >> 3) & 1;
         int modus;
 
         /* initialize std to 1 (autodetect) to signal that no standard is
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index fa7e5093edeb..684f62fa7897 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -207,7 +207,7 @@ static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
         struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
         struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
         /* MT9M001 has all capture_format parameters fixed */
-        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING |
+        unsigned long flags = SOCAM_PCLK_SAMPLE_FALLING |
                 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
                 SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER;
 
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c
index 23f9ce9d67ef..2b0927bfd217 100644
--- a/drivers/media/video/mt9t031.c
+++ b/drivers/media/video/mt9t031.c
@@ -141,8 +141,19 @@ static int get_shutter(struct soc_camera_device *icd, u32 *data)
 
 static int mt9t031_init(struct soc_camera_device *icd)
 {
+        struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+        struct soc_camera_link *icl = mt9t031->client->dev.platform_data;
         int ret;
 
+        if (icl->power) {
+                ret = icl->power(&mt9t031->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
         /* Disable chip output, synchronous option update */
         ret = reg_write(icd, MT9T031_RESET, 1);
         if (ret >= 0)
@@ -150,13 +161,23 @@ static int mt9t031_init(struct soc_camera_device *icd)
         if (ret >= 0)
                 ret = reg_clear(icd, MT9T031_OUTPUT_CONTROL, 2);
 
+        if (ret < 0 && icl->power)
+                icl->power(&mt9t031->client->dev, 0);
+
         return ret >= 0 ? 0 : -EIO;
 }
 
 static int mt9t031_release(struct soc_camera_device *icd)
 {
+        struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
+        struct soc_camera_link *icl = mt9t031->client->dev.platform_data;
+
         /* Disable the chip */
         reg_clear(icd, MT9T031_OUTPUT_CONTROL, 2);
+
+        if (icl->power)
+                icl->power(&mt9t031->client->dev, 0);
+
         return 0;
 }
 
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
new file mode 100644
index 000000000000..86fab56c5a20
--- /dev/null
+++ b/drivers/media/video/mx1_camera.c
@@ -0,0 +1,827 @@
+/*
+ * V4L2 Driver for i.MXL/i.MXL camera (CSI) host
+ *
+ * Copyright (C) 2008, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ * Copyright (C) 2009, Darius Augulis <augulis.darius@gmail.com>
+ *
+ * Based on PXA SoC camera driver
+ * Copyright (C) 2006, Sascha Hauer, Pengutronix
+ * Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/time.h>
+#include <linux/version.h>
+#include <linux/videodev2.h>
+
+#include <media/soc_camera.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-dev.h>
+#include <media/videobuf-dma-contig.h>
+
+#include <asm/dma.h>
+#include <asm/fiq.h>
+#include <mach/dma-mx1-mx2.h>
+#include <mach/hardware.h>
+#include <mach/mx1_camera.h>
+
+/*
+ * CSI registers
+ */
+#define DMA_CCR(x)      (0x8c + ((x) << 6))     /* Control Registers */
+#define DMA_DIMR        0x08                    /* Interrupt mask Register */
+#define CSICR1          0x00                    /* CSI Control Register 1 */
+#define CSISR           0x08                    /* CSI Status Register */
+#define CSIRXR          0x10                    /* CSI RxFIFO Register */
+
+#define CSICR1_RXFF_LEVEL(x)    (((x) & 0x3) << 19)
+#define CSICR1_SOF_POL          (1 << 17)
+#define CSICR1_SOF_INTEN        (1 << 16)
+#define CSICR1_MCLKDIV(x)       (((x) & 0xf) << 12)
+#define CSICR1_MCLKEN           (1 << 9)
+#define CSICR1_FCC              (1 << 8)
+#define CSICR1_BIG_ENDIAN       (1 << 7)
+#define CSICR1_CLR_RXFIFO       (1 << 5)
+#define CSICR1_GCLK_MODE        (1 << 4)
+#define CSICR1_DATA_POL         (1 << 2)
+#define CSICR1_REDGE            (1 << 1)
+#define CSICR1_EN               (1 << 0)
+
+#define CSISR_SFF_OR_INT        (1 << 25)
+#define CSISR_RFF_OR_INT        (1 << 24)
+#define CSISR_STATFF_INT        (1 << 21)
+#define CSISR_RXFF_INT          (1 << 18)
+#define CSISR_SOF_INT           (1 << 16)
+#define CSISR_DRDY              (1 << 0)
+
+#define VERSION_CODE KERNEL_VERSION(0, 0, 1)
+#define DRIVER_NAME "mx1-camera"
+
+#define CSI_IRQ_MASK    (CSISR_SFF_OR_INT | CSISR_RFF_OR_INT | \
+                        CSISR_STATFF_INT | CSISR_RXFF_INT | CSISR_SOF_INT)
+
+#define CSI_BUS_FLAGS   (SOCAM_MASTER | SOCAM_HSYNC_ACTIVE_HIGH | \
+                        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW | \
+                        SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | \
+                        SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW | \
+                        SOCAM_DATAWIDTH_8)
+
+#define MAX_VIDEO_MEM 16        /* Video memory limit in megabytes */
+
+/*
+ * Structures
+ */
+
+/* buffer for one video frame */
+struct mx1_buffer {
+        /* common v4l buffer stuff -- must be first */
+        struct videobuf_buffer vb;
+        const struct soc_camera_data_format *fmt;
+        int inwork;
+};
+
+/* i.MX1/i.MXL is only supposed to handle one camera on its Camera Sensor
+ * Interface. If anyone ever builds hardware to enable more than
+ * one camera, they will have to modify this driver too */
+struct mx1_camera_dev {
+        struct soc_camera_device        *icd;
+        struct mx1_camera_pdata         *pdata;
+        struct mx1_buffer               *active;
+        struct device                   *dev;
+        struct resource                 *res;
+        struct clk                      *clk;
+        struct list_head                capture;
+
+        void __iomem                    *base;
+        int                             dma_chan;
+        unsigned int                    irq;
+        unsigned long                   mclk;
+
+        spinlock_t                      lock;
+};
+
+/*
+ *  Videobuf operations
+ */
+static int mx1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
+                              unsigned int *size)
+{
+        struct soc_camera_device *icd = vq->priv_data;
+
+        *size = icd->width * icd->height *
+                ((icd->current_fmt->depth + 7) >> 3);
+
+        if (!*count)
+                *count = 32;
+
+        while (*size * *count > MAX_VIDEO_MEM * 1024 * 1024)
+                (*count)--;
+
+        dev_dbg(&icd->dev, "count=%d, size=%d\n", *count, *size);
+
+        return 0;
+}
+
+static void free_buffer(struct videobuf_queue *vq, struct mx1_buffer *buf)
+{
+        struct soc_camera_device *icd = vq->priv_data;
+        struct videobuf_buffer *vb = &buf->vb;
+
+        BUG_ON(in_interrupt());
+
+        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+                vb, vb->baddr, vb->bsize);
+
+        /* This waits until this buffer is out of danger, i.e., until it is no
+         * longer in STATE_QUEUED or STATE_ACTIVE */
+        videobuf_waiton(vb, 0, 0);
+        videobuf_dma_contig_free(vq, vb);
+
+        vb->state = VIDEOBUF_NEEDS_INIT;
+}
+
+static int mx1_videobuf_prepare(struct videobuf_queue *vq,
+                struct videobuf_buffer *vb, enum v4l2_field field)
+{
+        struct soc_camera_device *icd = vq->priv_data;
+        struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
+        int ret;
+
+        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+                vb, vb->baddr, vb->bsize);
+
+        /* Added list head initialization on alloc */
+        WARN_ON(!list_empty(&vb->queue));
+
+        BUG_ON(NULL == icd->current_fmt);
+
+        /* I think, in buf_prepare you only have to protect global data,
+         * the actual buffer is yours */
+        buf->inwork = 1;
+
+        if (buf->fmt    != icd->current_fmt ||
+            vb->width   != icd->width ||
+            vb->height  != icd->height ||
+            vb->field   != field) {
+                buf->fmt        = icd->current_fmt;
+                vb->width       = icd->width;
+                vb->height      = icd->height;
+                vb->field       = field;
+                vb->state       = VIDEOBUF_NEEDS_INIT;
+        }
+
+        vb->size = vb->width * vb->height * ((buf->fmt->depth + 7) >> 3);
+        if (0 != vb->baddr && vb->bsize < vb->size) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (vb->state == VIDEOBUF_NEEDS_INIT) {
+                ret = videobuf_iolock(vq, vb, NULL);
+                if (ret)
+                        goto fail;
+
+                vb->state = VIDEOBUF_PREPARED;
+        }
+
+        buf->inwork = 0;
+
+        return 0;
+
+fail:
+        free_buffer(vq, buf);
+out:
+        buf->inwork = 0;
+        return ret;
+}
+
+static int mx1_camera_setup_dma(struct mx1_camera_dev *pcdev)
+{
+        struct videobuf_buffer *vbuf = &pcdev->active->vb;
+        int ret;
+
+        if (unlikely(!pcdev->active)) {
+                dev_err(pcdev->dev, "DMA End IRQ with no active buffer\n");
+                return -EFAULT;
+        }
+
+        /* setup sg list for future DMA */
+        ret = imx_dma_setup_single(pcdev->dma_chan,
+                videobuf_to_dma_contig(vbuf),
+                vbuf->size, pcdev->res->start +
+                CSIRXR, DMA_MODE_READ);
+        if (unlikely(ret))
+                dev_err(pcdev->dev, "Failed to setup DMA sg list\n");
+
+        return ret;
+}
+
+static void mx1_videobuf_queue(struct videobuf_queue *vq,
+                                                struct videobuf_buffer *vb)
+{
+        struct soc_camera_device *icd = vq->priv_data;
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        struct mx1_camera_dev *pcdev = ici->priv;
+        struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
+        unsigned long flags;
+
+        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+                vb, vb->baddr, vb->bsize);
+
+        spin_lock_irqsave(&pcdev->lock, flags);
+
+        list_add_tail(&vb->queue, &pcdev->capture);
+
+        vb->state = VIDEOBUF_ACTIVE;
+
+        if (!pcdev->active) {
+                pcdev->active = buf;
+
+                /* setup sg list for future DMA */
+                if (!mx1_camera_setup_dma(pcdev)) {
+                        unsigned int temp;
+                        /* enable SOF irq */
+                        temp = __raw_readl(pcdev->base + CSICR1) |
+                                                        CSICR1_SOF_INTEN;
+                        __raw_writel(temp, pcdev->base + CSICR1);
+                }
+        }
+
+        spin_unlock_irqrestore(&pcdev->lock, flags);
+}
+
+static void mx1_videobuf_release(struct videobuf_queue *vq,
+                                 struct videobuf_buffer *vb)
+{
+        struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
+#ifdef DEBUG
+        struct soc_camera_device *icd = vq->priv_data;
+
+        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+                vb, vb->baddr, vb->bsize);
+
+        switch (vb->state) {
+        case VIDEOBUF_ACTIVE:
+                dev_dbg(&icd->dev, "%s (active)\n", __func__);
+                break;
+        case VIDEOBUF_QUEUED:
+                dev_dbg(&icd->dev, "%s (queued)\n", __func__);
+                break;
+        case VIDEOBUF_PREPARED:
+                dev_dbg(&icd->dev, "%s (prepared)\n", __func__);
+                break;
+        default:
+                dev_dbg(&icd->dev, "%s (unknown)\n", __func__);
+                break;
+        }
+#endif
+
+        free_buffer(vq, buf);
+}
+
+static void mx1_camera_wakeup(struct mx1_camera_dev *pcdev,
+                              struct videobuf_buffer *vb,
+                              struct mx1_buffer *buf)
+{
+        /* _init is used to debug races, see comment in mx1_camera_reqbufs() */
+        list_del_init(&vb->queue);
+        vb->state = VIDEOBUF_DONE;
+        do_gettimeofday(&vb->ts);
+        vb->field_count++;
+        wake_up(&vb->done);
+
+        if (list_empty(&pcdev->capture)) {
+                pcdev->active = NULL;
+                return;
+        }
+
+        pcdev->active = list_entry(pcdev->capture.next,
+                                   struct mx1_buffer, vb.queue);
+
+        /* setup sg list for future DMA */
+        if (likely(!mx1_camera_setup_dma(pcdev))) {
+                unsigned int temp;
+
+                /* enable SOF irq */
+                temp = __raw_readl(pcdev->base + CSICR1) | CSICR1_SOF_INTEN;
+                __raw_writel(temp, pcdev->base + CSICR1);
+        }
+}
+
+static void mx1_camera_dma_irq(int channel, void *data)
+{
+        struct mx1_camera_dev *pcdev = data;
+        struct mx1_buffer *buf;
+        struct videobuf_buffer *vb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&pcdev->lock, flags);
+
+        imx_dma_disable(channel);
+
+        if (unlikely(!pcdev->active)) {
+                dev_err(pcdev->dev, "DMA End IRQ with no active buffer\n");
+                goto out;
+        }
+
+        vb = &pcdev->active->vb;
+        buf = container_of(vb, struct mx1_buffer, vb);
+        WARN_ON(buf->inwork || list_empty(&vb->queue));
+        dev_dbg(pcdev->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+                vb, vb->baddr, vb->bsize);
+
+        mx1_camera_wakeup(pcdev, vb, buf);
+out:
+        spin_unlock_irqrestore(&pcdev->lock, flags);
+}
+
+static struct videobuf_queue_ops mx1_videobuf_ops = {
+        .buf_setup      = mx1_videobuf_setup,
+        .buf_prepare    = mx1_videobuf_prepare,
+        .buf_queue      = mx1_videobuf_queue,
+        .buf_release    = mx1_videobuf_release,
+};
+
+static void mx1_camera_init_videobuf(struct videobuf_queue *q,
+                                     struct soc_camera_device *icd)
+{
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        struct mx1_camera_dev *pcdev = ici->priv;
+
+        videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, pcdev->dev,
+                                        &pcdev->lock,
+                                        V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                                        V4L2_FIELD_NONE,
+                                        sizeof(struct mx1_buffer), icd);
+}
+
+static int mclk_get_divisor(struct mx1_camera_dev *pcdev)
+{
+        unsigned int mclk = pcdev->mclk;
+        unsigned long div;
+        unsigned long lcdclk;
+
+        lcdclk = clk_get_rate(pcdev->clk);
+
+        /* We verify platform_mclk_10khz != 0, so if anyone breaks it, here
+         * they get a nice Oops */
+        div = (lcdclk + 2 * mclk - 1) / (2 * mclk) - 1;
+
+        dev_dbg(pcdev->dev, "System clock %lukHz, target freq %dkHz, "
+                "divisor %lu\n", lcdclk / 1000, mclk / 1000, div);
+
+        return div;
+}
+
+static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
+{
+        unsigned int csicr1 = CSICR1_EN;
+
+        dev_dbg(pcdev->dev, "Activate device\n");
+
+        clk_enable(pcdev->clk);
+
+        /* enable CSI before doing anything else */
+        __raw_writel(csicr1, pcdev->base + CSICR1);
+
+        csicr1 |= CSICR1_MCLKEN | CSICR1_FCC | CSICR1_GCLK_MODE;
+        csicr1 |= CSICR1_MCLKDIV(mclk_get_divisor(pcdev));
+        csicr1 |= CSICR1_RXFF_LEVEL(2); /* 16 words */
+
+        __raw_writel(csicr1, pcdev->base + CSICR1);
+}
+
+static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
+{
+        dev_dbg(pcdev->dev, "Deactivate device\n");
+
+        /* Disable all CSI interface */
+        __raw_writel(0x00, pcdev->base + CSICR1);
+
+        clk_disable(pcdev->clk);
+}
+
+/* The following two functions absolutely depend on the fact, that
+ * there can be only one camera on i.MX1/i.MXL camera sensor interface */
+static int mx1_camera_add_device(struct soc_camera_device *icd)
+{
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        struct mx1_camera_dev *pcdev = ici->priv;
+        int ret;
+
+        if (pcdev->icd) {
+                ret = -EBUSY;
+                goto ebusy;
+        }
+
+        dev_info(&icd->dev, "MX1 Camera driver attached to camera %d\n",
+                 icd->devnum);
+
+        mx1_camera_activate(pcdev);
+        ret = icd->ops->init(icd);
+
+        if (!ret)
+                pcdev->icd = icd;
+
+ebusy:
+        return ret;
+}
+
+static void mx1_camera_remove_device(struct soc_camera_device *icd)
+{
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        struct mx1_camera_dev *pcdev = ici->priv;
+        unsigned int csicr1;
+
+        BUG_ON(icd != pcdev->icd);
+
+        /* disable interrupts */
+        csicr1 = __raw_readl(pcdev->base + CSICR1) & ~CSI_IRQ_MASK;
+        __raw_writel(csicr1, pcdev->base + CSICR1);
+
+        /* Stop DMA engine */
+        imx_dma_disable(pcdev->dma_chan);
+
+        dev_info(&icd->dev, "MX1 Camera driver detached from camera %d\n",
+                 icd->devnum);
+
+        icd->ops->release(icd);
+
+        mx1_camera_deactivate(pcdev);
+
+        pcdev->icd = NULL;
+}
+
+static int mx1_camera_set_crop(struct soc_camera_device *icd,
+                               struct v4l2_rect *rect)
+{
+        return icd->ops->set_crop(icd, rect);
+}
+
+static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
+{
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        struct mx1_camera_dev *pcdev = ici->priv;
+        unsigned long camera_flags, common_flags;
+        unsigned int csicr1;
+        int ret;
+
+        camera_flags = icd->ops->query_bus_param(icd);
+
+        /* MX1 supports only 8bit buswidth */
+        common_flags = soc_camera_bus_param_compatible(camera_flags,
+                                                               CSI_BUS_FLAGS);
+        if (!common_flags)
+                return -EINVAL;
+
+        icd->buswidth = 8;
+
+        /* Make choises, based on platform choice */
+        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+                (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+                        if (!pcdev->pdata ||
+                             pcdev->pdata->flags & MX1_CAMERA_VSYNC_HIGH)
+                                common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+                        else
+                                common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+        }
+
+        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+                (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+                        if (!pcdev->pdata ||
+                             pcdev->pdata->flags & MX1_CAMERA_PCLK_RISING)
+                                common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                        else
+                                common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+        }
+
+        if ((common_flags & SOCAM_DATA_ACTIVE_HIGH) &&
+                (common_flags & SOCAM_DATA_ACTIVE_LOW)) {
+                        if (!pcdev->pdata ||
+                             pcdev->pdata->flags & MX1_CAMERA_DATA_HIGH)
+                                common_flags &= ~SOCAM_DATA_ACTIVE_LOW;
+                        else
+                                common_flags &= ~SOCAM_DATA_ACTIVE_HIGH;
+        }
+
+        ret = icd->ops->set_bus_param(icd, common_flags);
+        if (ret < 0)
+                return ret;
+
+        csicr1 = __raw_readl(pcdev->base + CSICR1);
+
+        if (common_flags & SOCAM_PCLK_SAMPLE_RISING)
+                csicr1 |= CSICR1_REDGE;
+        if (common_flags & SOCAM_VSYNC_ACTIVE_HIGH)
+                csicr1 |= CSICR1_SOF_POL;
+        if (common_flags & SOCAM_DATA_ACTIVE_LOW)
+                csicr1 |= CSICR1_DATA_POL;
+
+        __raw_writel(csicr1, pcdev->base + CSICR1);
+
+        return 0;
+}
+
+static int mx1_camera_set_fmt(struct soc_camera_device *icd,
+                              struct v4l2_format *f)
+{
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        const struct soc_camera_format_xlate *xlate;
+        struct v4l2_pix_format *pix = &f->fmt.pix;
+        int ret;
+
+        xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
+        if (!xlate) {
+                dev_warn(&ici->dev, "Format %x not found\n", pix->pixelformat);
+                return -EINVAL;
+        }
+
+        ret = icd->ops->set_fmt(icd, f);
+        if (!ret) {
+                icd->buswidth = xlate->buswidth;
+                icd->current_fmt = xlate->host_fmt;
+        }
+
+        return ret;
+}
+
+static int mx1_camera_try_fmt(struct soc_camera_device *icd,
+                              struct v4l2_format *f)
+{
+        /* TODO: limit to mx1 hardware capabilities */
+
+        /* limit to sensor capabilities */
+        return icd->ops->try_fmt(icd, f);
+}
+
+static int mx1_camera_reqbufs(struct soc_camera_file *icf,
+                              struct v4l2_requestbuffers *p)
+{
+        int i;
+
+        /* This is for locking debugging only. I removed spinlocks and now I
+         * check whether .prepare is ever called on a linked buffer, or whether
+         * a dma IRQ can occur for an in-work or unlinked buffer. Until now
+         * it hadn't triggered */
+        for (i = 0; i < p->count; i++) {
+                struct mx1_buffer *buf = container_of(icf->vb_vidq.bufs[i],
+                                                      struct mx1_buffer, vb);
+                buf->inwork = 0;
+                INIT_LIST_HEAD(&buf->vb.queue);
+        }
+
+        return 0;
+}
+
+static unsigned int mx1_camera_poll(struct file *file, poll_table *pt)
+{
+        struct soc_camera_file *icf = file->private_data;
+        struct mx1_buffer *buf;
+
+        buf = list_entry(icf->vb_vidq.stream.next, struct mx1_buffer,
+                         vb.stream);
+
+        poll_wait(file, &buf->vb.done, pt);
+
+        if (buf->vb.state == VIDEOBUF_DONE ||
+            buf->vb.state == VIDEOBUF_ERROR)
+                return POLLIN | POLLRDNORM;
+
+        return 0;
+}
+
+static int mx1_camera_querycap(struct soc_camera_host *ici,
+                               struct v4l2_capability *cap)
+{
+        /* cap->name is set by the friendly caller:-> */
+        strlcpy(cap->card, "i.MX1/i.MXL Camera", sizeof(cap->card));
+        cap->version = VERSION_CODE;
+        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+
+        return 0;
+}
+
+static struct soc_camera_host_ops mx1_soc_camera_host_ops = {
+        .owner          = THIS_MODULE,
+        .add            = mx1_camera_add_device,
+        .remove         = mx1_camera_remove_device,
+        .set_bus_param  = mx1_camera_set_bus_param,
+        .set_crop       = mx1_camera_set_crop,
+        .set_fmt        = mx1_camera_set_fmt,
+        .try_fmt        = mx1_camera_try_fmt,
+        .init_videobuf  = mx1_camera_init_videobuf,
+        .reqbufs        = mx1_camera_reqbufs,
+        .poll           = mx1_camera_poll,
+        .querycap       = mx1_camera_querycap,
+};
+
+/* Should be allocated dynamically too, but we have only one. */
+static struct soc_camera_host mx1_soc_camera_host = {
+        .drv_name       = DRIVER_NAME,
+        .ops            = &mx1_soc_camera_host_ops,
+};
+
+static struct fiq_handler fh = {
+        .name           = "csi_sof"
+};
+
+static int __init mx1_camera_probe(struct platform_device *pdev)
+{
+        struct mx1_camera_dev *pcdev;
+        struct resource *res;
+        struct pt_regs regs;
+        struct clk *clk;
+        void __iomem *base;
+        unsigned int irq;
+        int err = 0;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(pdev, 0);
+        if (!res || !irq) {
+                err = -ENODEV;
+                goto exit;
+        }
+
+        clk = clk_get(&pdev->dev, "csi_clk");
+        if (IS_ERR(clk)) {
+                err = PTR_ERR(clk);
+                goto exit;
+        }
+
+        pcdev = kzalloc(sizeof(*pcdev), GFP_KERNEL);
+        if (!pcdev) {
+                dev_err(&pdev->dev, "Could not allocate pcdev\n");
+                err = -ENOMEM;
+                goto exit_put_clk;
+        }
+
+        dev_set_drvdata(&pdev->dev, pcdev);
+        pcdev->res = res;
+        pcdev->clk = clk;
+
+        pcdev->pdata = pdev->dev.platform_data;
+
+        if (pcdev->pdata)
+                pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
+
+        if (!pcdev->mclk) {
+                dev_warn(&pdev->dev,
+                         "mclk_10khz == 0! Please, fix your platform data. "
+                         "Using default 20MHz\n");
+                pcdev->mclk = 20000000;
+        }
+
+        INIT_LIST_HEAD(&pcdev->capture);
+        spin_lock_init(&pcdev->lock);
+
+        /*
+         * Request the regions.
+         */
+        if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME)) {
+                err = -EBUSY;
+                goto exit_kfree;
+        }
+
+        base = ioremap(res->start, resource_size(res));
+        if (!base) {
+                err = -ENOMEM;
+                goto exit_release;
+        }
+        pcdev->irq = irq;
+        pcdev->base = base;
+        pcdev->dev = &pdev->dev;
+
+        /* request dma */
+        pcdev->dma_chan = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_HIGH);
+        if (pcdev->dma_chan < 0) {
+                dev_err(pcdev->dev, "Can't request DMA for MX1 CSI\n");
+                err = -EBUSY;
+                goto exit_iounmap;
+        }
+        dev_dbg(pcdev->dev, "got DMA channel %d\n", pcdev->dma_chan);
+
+        imx_dma_setup_handlers(pcdev->dma_chan, mx1_camera_dma_irq, NULL,
+                               pcdev);
+
+        imx_dma_config_channel(pcdev->dma_chan, IMX_DMA_TYPE_FIFO,
+                               IMX_DMA_MEMSIZE_32, DMA_REQ_CSI_R, 0);
+        /* burst length : 16 words = 64 bytes */
+        imx_dma_config_burstlen(pcdev->dma_chan, 0);
+
+        /* request irq */
+        err = claim_fiq(&fh);
+        if (err) {
+                dev_err(pcdev->dev, "Camera interrupt register failed \n");
+                goto exit_free_dma;
+        }
+
+        set_fiq_handler(&mx1_camera_sof_fiq_start, &mx1_camera_sof_fiq_end -
+                                                   &mx1_camera_sof_fiq_start);
+
+        regs.ARM_r8 = DMA_BASE + DMA_DIMR;
+        regs.ARM_r9 = DMA_BASE + DMA_CCR(pcdev->dma_chan);
+        regs.ARM_r10 = (long)pcdev->base + CSICR1;
+        regs.ARM_fp = (long)pcdev->base + CSISR;
+        regs.ARM_sp = 1 << pcdev->dma_chan;
+        set_fiq_regs(&regs);
+
+        mxc_set_irq_fiq(irq, 1);
+        enable_fiq(irq);
+
+        mx1_soc_camera_host.priv        = pcdev;
+        mx1_soc_camera_host.dev.parent  = &pdev->dev;
+        mx1_soc_camera_host.nr          = pdev->id;
+        err = soc_camera_host_register(&mx1_soc_camera_host);
+        if (err)
+                goto exit_free_irq;
+
+        dev_info(&pdev->dev, "MX1 Camera driver loaded\n");
+
+        return 0;
+
+exit_free_irq:
+        disable_fiq(irq);
+        mxc_set_irq_fiq(irq, 0);
+        release_fiq(&fh);
+exit_free_dma:
+        imx_dma_free(pcdev->dma_chan);
+exit_iounmap:
+        iounmap(base);
+exit_release:
+        release_mem_region(res->start, resource_size(res));
+exit_kfree:
+        kfree(pcdev);
+exit_put_clk:
+        clk_put(clk);
+exit:
+        return err;
+}
+
+static int __exit mx1_camera_remove(struct platform_device *pdev)
+{
+        struct mx1_camera_dev *pcdev = platform_get_drvdata(pdev);
+        struct resource *res;
+
+        imx_dma_free(pcdev->dma_chan);
+        disable_fiq(pcdev->irq);
+        mxc_set_irq_fiq(pcdev->irq, 0);
+        release_fiq(&fh);
+
+        clk_put(pcdev->clk);
+
+        soc_camera_host_unregister(&mx1_soc_camera_host);
+
+        iounmap(pcdev->base);
+
+        res = pcdev->res;
+        release_mem_region(res->start, resource_size(res));
+
+        kfree(pcdev);
+
+        dev_info(&pdev->dev, "MX1 Camera driver unloaded\n");
+
+        return 0;
+}
+
+static struct platform_driver mx1_camera_driver = {
+        .driver         = {
+                .name   = DRIVER_NAME,
+        },
+        .remove         = __exit_p(mx1_camera_remove),
+};
+
+static int __init mx1_camera_init(void)
+{
+        return platform_driver_probe(&mx1_camera_driver, mx1_camera_probe);
+}
+
+static void __exit mx1_camera_exit(void)
+{
+        return platform_driver_unregister(&mx1_camera_driver);
+}
+
+module_init(mx1_camera_init);
+module_exit(mx1_camera_exit);
+
+MODULE_DESCRIPTION("i.MX1/i.MXL SoC Camera Host driver");
+MODULE_AUTHOR("Paulius Zaleckas <paulius.zaleckas@teltonika.lt>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index 70629e172e65..c462b811e994 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -1100,7 +1100,7 @@ static int mx3_camera_probe(struct platform_device *pdev)
         }
         memset(mx3_cam, 0, sizeof(*mx3_cam));
 
-        mx3_cam->clk = clk_get(&pdev->dev, "csi_clk");
+        mx3_cam->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(mx3_cam->clk)) {
                 err = PTR_ERR(mx3_cam->clk);
                 goto eclkget;
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 84aec62e8452..3be5a71bdac2 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -83,9 +83,14 @@ static struct {
 static int video_audio_connect[MXB_INPUTS] =
         { 0, 1, 3, 3 };
 
+struct mxb_routing {
+        u32 input;
+        u32 output;
+};
+
 /* These are the necessary input-output-pins for bringing one audio source
    (see above) to the CD-output. Note that gain is set to 0 in this table. */
-static struct v4l2_routing TEA6420_cd[MXB_AUDIOS + 1][2] = {
+static struct mxb_routing TEA6420_cd[MXB_AUDIOS + 1][2] = {
         { { 1, 1 }, { 1, 1 } }, /* Tuner */
         { { 5, 1 }, { 6, 1 } }, /* AUX 1 */
         { { 4, 1 }, { 6, 1 } }, /* AUX 2 */
@@ -97,7 +102,7 @@ static struct v4l2_routing TEA6420_cd[MXB_AUDIOS + 1][2] = {
 
 /* These are the necessary input-output-pins for bringing one audio source
    (see above) to the line-output. Note that gain is set to 0 in this table. */
-static struct v4l2_routing TEA6420_line[MXB_AUDIOS + 1][2] = {
+static struct mxb_routing TEA6420_line[MXB_AUDIOS + 1][2] = {
         { { 2, 3 }, { 1, 2 } },
         { { 5, 3 }, { 6, 2 } },
         { { 4, 3 }, { 6, 2 } },
@@ -134,10 +139,6 @@ struct mxb
 
 #define saa7111a_call(mxb, o, f, args...) \
         v4l2_subdev_call(mxb->saa7111a, o, f, ##args)
-#define tea6420_1_call(mxb, o, f, args...) \
-        v4l2_subdev_call(mxb->tea6420_1, o, f, ##args)
-#define tea6420_2_call(mxb, o, f, args...) \
-        v4l2_subdev_call(mxb->tea6420_2, o, f, ##args)
 #define tda9840_call(mxb, o, f, args...) \
         v4l2_subdev_call(mxb->tda9840, o, f, ##args)
 #define tea6415c_call(mxb, o, f, args...) \
@@ -147,6 +148,22 @@ struct mxb
 #define call_all(dev, o, f, args...) \
         v4l2_device_call_until_err(&dev->v4l2_dev, 0, o, f, ##args)
 
+static inline void tea6420_route_cd(struct mxb *mxb, int idx)
+{
+        v4l2_subdev_call(mxb->tea6420_1, audio, s_routing,
+                TEA6420_cd[idx][0].input, TEA6420_cd[idx][0].output, 0);
+        v4l2_subdev_call(mxb->tea6420_2, audio, s_routing,
+                TEA6420_cd[idx][1].input, TEA6420_cd[idx][1].output, 0);
+}
+
+static inline void tea6420_route_line(struct mxb *mxb, int idx)
+{
+        v4l2_subdev_call(mxb->tea6420_1, audio, s_routing,
+                TEA6420_line[idx][0].input, TEA6420_line[idx][0].output, 0);
+        v4l2_subdev_call(mxb->tea6420_2, audio, s_routing,
+                TEA6420_line[idx][1].input, TEA6420_line[idx][1].output, 0);
+}
+
 static struct saa7146_extension extension;
 
 static int mxb_probe(struct saa7146_dev *dev)
@@ -168,13 +185,20 @@ static int mxb_probe(struct saa7146_dev *dev)
                 return -EFAULT;
         }
 
-        mxb->saa7111a = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "saa7115", "saa7111", I2C_SAA7111A);
-        mxb->tea6420_1 = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tea6420", "tea6420", I2C_TEA6420_1);
-        mxb->tea6420_2 = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tea6420", "tea6420", I2C_TEA6420_2);
-        mxb->tea6415c = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tea6415c", "tea6415c", I2C_TEA6415C);
-        mxb->tda9840 = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tda9840", "tda9840", I2C_TDA9840);
-        mxb->tuner = v4l2_i2c_new_subdev(&mxb->i2c_adapter, "tuner", "tuner", I2C_TUNER);
-        if (v4l2_i2c_new_subdev(&mxb->i2c_adapter, "saa5246a", "saa5246a", I2C_SAA5246A)) {
+        mxb->saa7111a = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "saa7115", "saa7111", I2C_SAA7111A);
+        mxb->tea6420_1 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tea6420", "tea6420", I2C_TEA6420_1);
+        mxb->tea6420_2 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tea6420", "tea6420", I2C_TEA6420_2);
+        mxb->tea6415c = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tea6415c", "tea6415c", I2C_TEA6415C);
+        mxb->tda9840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tda9840", "tda9840", I2C_TDA9840);
+        mxb->tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "tuner", "tuner", I2C_TUNER);
+        if (v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
+                        "saa5246a", "saa5246a", I2C_SAA5246A)) {
                 printk(KERN_INFO "mxb: found teletext decoder\n");
         }
 
@@ -261,18 +285,16 @@ static int mxb_init_done(struct saa7146_dev* dev)
         struct i2c_msg msg;
         struct tuner_setup tun_setup;
         v4l2_std_id std = V4L2_STD_PAL_BG;
-        struct v4l2_routing route;
 
         int i = 0, err = 0;
 
         /* select video mode in saa7111a */
-        saa7111a_call(mxb, tuner, s_std, std);
+        saa7111a_call(mxb, core, s_std, std);
 
         /* select tuner-output on saa7111a */
         i = 0;
-        route.input = SAA7115_COMPOSITE0;
-        route.output = SAA7111_FMT_CCIR | SAA7111_VBI_BYPASS;
-        saa7111a_call(mxb, video, s_routing, &route);
+        saa7111a_call(mxb, video, s_routing, SAA7115_COMPOSITE0,
+                SAA7111_FMT_CCIR | SAA7111_VBI_BYPASS, 0);
 
         /* select a tuner type */
         tun_setup.mode_mask = T_ANALOG_TV;
@@ -286,23 +308,17 @@ static int mxb_init_done(struct saa7146_dev* dev)
         tuner_call(mxb, tuner, s_frequency, &mxb->cur_freq);
 
         /* set a default video standard */
-        tuner_call(mxb, tuner, s_std, std);
+        tuner_call(mxb, core, s_std, std);
 
         /* mute audio on tea6420s */
-        tea6420_1_call(mxb, audio, s_routing, &TEA6420_line[6][0]);
-        tea6420_2_call(mxb, audio, s_routing, &TEA6420_line[6][1]);
-        tea6420_1_call(mxb, audio, s_routing, &TEA6420_line[6][0]);
-        tea6420_2_call(mxb, audio, s_routing, &TEA6420_line[6][1]);
+        tea6420_route_line(mxb, 6);
+        tea6420_route_cd(mxb, 6);
 
         /* switch to tuner-channel on tea6415c */
-        route.input = 3;
-        route.output = 17;
-        tea6415c_call(mxb, video, s_routing, &route);
+        tea6415c_call(mxb, video, s_routing, 3, 17, 0);
 
         /* select tuner-output on multicable on tea6415c */
-        route.input = 3;
-        route.output = 13;
-        tea6415c_call(mxb, video, s_routing, &route);
+        tea6415c_call(mxb, video, s_routing, 3, 13, 0);
 
         /* the rest for mxb */
         mxb->cur_input = 0;
@@ -426,18 +442,9 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *vc)
 
         if (vc->id == V4L2_CID_AUDIO_MUTE) {
                 mxb->cur_mute = vc->value;
-                if (!vc->value) {
-                        /* switch the audio-source */
-                        tea6420_1_call(mxb, audio, s_routing,
-                                        &TEA6420_line[video_audio_connect[mxb->cur_input]][0]);
-                        tea6420_2_call(mxb, audio, s_routing,
-                                        &TEA6420_line[video_audio_connect[mxb->cur_input]][1]);
-                } else {
-                        tea6420_1_call(mxb, audio, s_routing,
-                                        &TEA6420_line[6][0]);
-                        tea6420_2_call(mxb, audio, s_routing,
-                                        &TEA6420_line[6][1]);
-                }
+                /* switch the audio-source */
+                tea6420_route_line(mxb, vc->value ? 6 :
+                                video_audio_connect[mxb->cur_input]);
                 DEB_EE(("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE: %d.\n", vc->value));
         }
         return 0;
@@ -466,7 +473,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
 {
         struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
         struct mxb *mxb = (struct mxb *)dev->ext_priv;
-        struct v4l2_routing route;
+        int err = 0;
         int i = 0;
 
         DEB_EE(("VIDIOC_S_INPUT %d.\n", input));
@@ -484,16 +491,12 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
         switch (input) {
         case TUNER:
                 i = SAA7115_COMPOSITE0;
-                route.input = 3;
-                route.output = 17;
 
-                if (tea6415c_call(mxb, video, s_routing, &route)) {
-                        printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #1\n");
-                        return -EFAULT;
-                }
+                err = tea6415c_call(mxb, video, s_routing, 3, 17, 0);
+
                 /* connect tuner-output always to multicable */
-                route.input = 3;
-                route.output = 13;
+                if (!err)
+                        err = tea6415c_call(mxb, video, s_routing, 3, 13, 0);
                 break;
         case AUX3_YC:
                 /* nothing to be done here. aux3_yc is
@@ -507,37 +510,20 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
                 break;
         case AUX1:
                 i = SAA7115_COMPOSITE0;
-                route.input = 1;
-                route.output = 17;
+                err = tea6415c_call(mxb, video, s_routing, 1, 17, 0);
                 break;
         }
 
-        /* switch video in tea6415c only if necessary */
-        switch (input) {
-        case TUNER:
-        case AUX1:
-                if (tea6415c_call(mxb, video, s_routing, &route)) {
-                        printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #3\n");
-                        return -EFAULT;
-                }
-                break;
-        default:
-                break;
-        }
+        if (err)
+                return err;
 
         /* switch video in saa7111a */
-        route.input = i;
-        route.output = 0;
-        if (saa7111a_call(mxb, video, s_routing, &route))
+        if (saa7111a_call(mxb, video, s_routing, i, 0, 0))
                 printk(KERN_ERR "VIDIOC_S_INPUT: could not address saa7111a #1.\n");
 
         /* switch the audio-source only if necessary */
-        if (0 == mxb->cur_mute) {
-                tea6420_1_call(mxb, audio, s_routing,
-                                &TEA6420_line[video_audio_connect[input]][0]);
-                tea6420_2_call(mxb, audio, s_routing,
-                                &TEA6420_line[video_audio_connect[input]][1]);
-        }
+        if (0 == mxb->cur_mute)
+                tea6420_route_line(mxb, video_audio_connect[input]);
 
         return 0;
 }
@@ -679,9 +665,7 @@ static long vidioc_default(struct file *file, void *fh, int cmd, void *arg)
 
                 DEB_EE(("MXB_S_AUDIO_CD: i:%d.\n", i));
 
-                tea6420_1_call(mxb, audio, s_routing, &TEA6420_cd[i][0]);
-                tea6420_2_call(mxb, audio, s_routing, &TEA6420_cd[i][1]);
-
+                tea6420_route_cd(mxb, i);
                 return 0;
         }
         case MXB_S_AUDIO_LINE:
@@ -694,9 +678,7 @@ static long vidioc_default(struct file *file, void *fh, int cmd, void *arg)
                 }
 
                 DEB_EE(("MXB_S_AUDIO_LINE: i:%d.\n", i));
-                tea6420_1_call(mxb, audio, s_routing, &TEA6420_line[i][0]);
-                tea6420_2_call(mxb, audio, s_routing, &TEA6420_line[i][1]);
-
+                tea6420_route_line(mxb, i);
                 return 0;
         }
         default:
@@ -788,7 +770,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 /* unset the 7111 gpio register -- I don't know what this does exactly */
                 saa7111a_call(mxb, core, s_gpio, 0);
-                tuner_call(mxb, tuner, s_std, std);
+                tuner_call(mxb, core, s_std, std);
         } else {
                 v4l2_std_id std = V4L2_STD_PAL_BG;
 
@@ -797,7 +779,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 /* set the 7111 gpio register -- I don't know what this does exactly */
                 saa7111a_call(mxb, core, s_gpio, 1);
-                tuner_call(mxb, tuner, s_std, std);
+                tuner_call(mxb, core, s_std, std);
         }
         return 0;
 }
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 84b0fc1bb237..c0d911252862 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -169,11 +169,11 @@
 #define GAM15       0x8C /* Gamma Curve 15th segment input end point */
 #define SLOP        0x8D /* Gamma curve highest segment slope */
 #define DNSTH       0x8E /* De-noise threshold */
-#define EDGE0       0x8F /* Edge enhancement control 0 */
-#define EDGE1       0x90 /* Edge enhancement control 1 */
+#define EDGE_STRNGT 0x8F /* Edge strength  control when manual mode */
+#define EDGE_TRSHLD 0x90 /* Edge threshold control when manual mode */
 #define DNSOFF      0x91 /* Auto De-noise threshold control */
-#define EDGE2       0x92 /* Edge enhancement strength low  point control */
-#define EDGE3       0x93 /* Edge enhancement strength high point control */
+#define EDGE_UPPER  0x92 /* Edge strength upper limit when Auto mode */
+#define EDGE_LOWER  0x93 /* Edge strength lower limit when Auto mode */
 #define MTX1        0x94 /* Matrix coefficient 1 */
 #define MTX2        0x95 /* Matrix coefficient 2 */
 #define MTX3        0x96 /* Matrix coefficient 3 */
@@ -358,6 +358,14 @@
 #define VOSZ_VGA        0xF0
 #define VOSZ_QVGA       0x78
 
+/* DSPAUTO (DSP Auto Function ON/OFF Control) */
+#define AWB_ACTRL       0x80 /* AWB auto threshold control */
+#define DENOISE_ACTRL   0x40 /* De-noise auto threshold control */
+#define EDGE_ACTRL      0x20 /* Edge enhancement auto strength control */
+#define UV_ACTRL        0x10 /* UV adjust auto slope control */
+#define SCAL0_ACTRL     0x08 /* Auto scaling factor control */
+#define SCAL1_2_ACTRL   0x04 /* Auto scaling factor control */
+
 /*
  * ID
  */
@@ -670,7 +678,7 @@ static int ov772x_set_bus_param(struct soc_camera_device *icd,
 static unsigned long ov772x_query_bus_param(struct soc_camera_device *icd)
 {
         struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd);
-        struct soc_camera_link *icl = priv->client->dev.platform_data;
+        struct soc_camera_link *icl = &priv->info->link;
         unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
                 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
                 SOCAM_DATA_ACTIVE_HIGH | priv->info->buswidth;
@@ -816,6 +824,53 @@ static int ov772x_set_params(struct ov772x_priv *priv, u32 width, u32 height,
         ov772x_reset(priv->client);
 
         /*
+         * Edge Ctrl
+         */
+        if (priv->info->edgectrl.strength & OV772X_MANUAL_EDGE_CTRL) {
+
+                /*
+                 * Manual Edge Control Mode
+                 *
+                 * Edge auto strength bit is set by default.
+                 * Remove it when manual mode.
+                 */
+
+                ret = ov772x_mask_set(priv->client, DSPAUTO, EDGE_ACTRL, 0x00);
+                if (ret < 0)
+                        goto ov772x_set_fmt_error;
+
+                ret = ov772x_mask_set(priv->client,
+                                      EDGE_TRSHLD, EDGE_THRESHOLD_MASK,
+                                      priv->info->edgectrl.threshold);
+                if (ret < 0)
+                        goto ov772x_set_fmt_error;
+
+                ret = ov772x_mask_set(priv->client,
+                                      EDGE_STRNGT, EDGE_STRENGTH_MASK,
+                                      priv->info->edgectrl.strength);
+                if (ret < 0)
+                        goto ov772x_set_fmt_error;
+
+        } else if (priv->info->edgectrl.upper > priv->info->edgectrl.lower) {
+                /*
+                 * Auto Edge Control Mode
+                 *
+                 * set upper and lower limit
+                 */
+                ret = ov772x_mask_set(priv->client,
+                                      EDGE_UPPER, EDGE_UPPER_MASK,
+                                      priv->info->edgectrl.upper);
+                if (ret < 0)
+                        goto ov772x_set_fmt_error;
+
+                ret = ov772x_mask_set(priv->client,
+                                      EDGE_LOWER, EDGE_LOWER_MASK,
+                                      priv->info->edgectrl.lower);
+                if (ret < 0)
+                        goto ov772x_set_fmt_error;
+        }
+
+        /*
          * set size format
          */
         ret = ov772x_write_array(priv->client, priv->win->regs);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index ccf2a3c7ad06..10ef1a2c13ea 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -58,9 +58,9 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
 
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev msp3400 v4l2 set_stereo");
 
@@ -68,7 +68,7 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev msp3400 set_input:"
@@ -77,8 +77,8 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input,
+                        MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
index b5c3428ebb9f..9023adf3fdcc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
@@ -60,16 +60,16 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
                            hdw->input_val);
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev v4l2 set_input:"
@@ -78,8 +78,7 @@ void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = 0;
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 203f54cd18a1..1b992b847198 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -137,14 +137,12 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)
 int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
 {
         int ret = 0;
-        if (!cptr) return 0;
+        if (!cptr) return -EINVAL;
         LOCK_TAKE(cptr->hdw->big_lock); do {
-                if (cptr->info->type == pvr2_ctl_int) {
-                        if (cptr->info->get_def_value) {
-                                ret = cptr->info->get_def_value(cptr, valptr);
-                        } else {
-                                *valptr = cptr->info->default_value;
-                        }
+                if (cptr->info->get_def_value) {
+                        ret = cptr->info->get_def_value(cptr, valptr);
+                } else {
+                        *valptr = cptr->info->default_value;
                 }
         } while(0); LOCK_GIVE(cptr->hdw->big_lock);
         return ret;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 4e017ff26c36..05e52358ae49 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -105,14 +105,11 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         pvr2_trace(PVR2_TRACE_CHIPS, "subdev cx2584x update...");
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 enum cx25840_video_input vid_input;
                 enum cx25840_audio_input aud_input;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
 
-                memset(&route, 0, sizeof(route));
-
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
@@ -131,10 +128,8 @@ void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                 pvr2_trace(PVR2_TRACE_CHIPS,
                            "subdev cx2584x set_input vid=0x%x aud=0x%x",
                            vid_input, aud_input);
-                route.input = (u32)vid_input;
-                sd->ops->video->s_routing(sd, &route);
-                route.input = (u32)aud_input;
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->video->s_routing(sd, (u32)vid_input, 0, 0);
+                sd->ops->audio->s_routing(sd, (u32)aud_input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 7a65b42a4f53..d9d974a8f52a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2039,7 +2039,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                            "Module ID %u:"
                            " Setting up with specified i2c address 0x%x",
                            mid, i2caddr[0]);
-                sd = v4l2_i2c_new_subdev(&hdw->i2c_adap,
+                sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                          fname, fname,
                                          i2caddr[0]);
         } else {
@@ -2047,7 +2047,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                            "Module ID %u:"
                            " Setting up with address probe list",
                            mid);
-                sd = v4l2_i2c_new_probed_subdev(&hdw->i2c_adap,
+                sd = v4l2_i2c_new_probed_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
                                                 fname, fname,
                                                 i2caddr);
         }
@@ -2185,7 +2185,7 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
         pvr2_hdw_load_modules(hdw);
         if (!pvr2_hdw_dev_ok(hdw)) return;
 
-        v4l2_device_call_all(&hdw->v4l2_dev, 0, core, init, 0);
+        v4l2_device_call_all(&hdw->v4l2_dev, 0, core, load_fw);
 
         for (idx = 0; idx < CTRLDEF_COUNT; idx++) {
                 cptr = hdw->controls + idx;
@@ -2574,7 +2574,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         hdw->ctl_read_urb = usb_alloc_urb(0,GFP_KERNEL);
         if (!hdw->ctl_read_urb) goto fail;
 
-        if (v4l2_device_register(&usb_dev->dev, &hdw->v4l2_dev) != 0) {
+        if (v4l2_device_register(&intf->dev, &hdw->v4l2_dev) != 0) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                            "Error registering with v4l core, giving up");
                 goto fail;
@@ -2926,6 +2926,7 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev tuner set_type(%d)",
                            hdw->tuner_type);
                 if (((int)(hdw->tuner_type)) >= 0) {
+                        memset(&setup, 0, sizeof(setup));
                         setup.addr = ADDR_UNSET;
                         setup.type = hdw->tuner_type;
                         setup.mode_mask = T_RADIO | T_ANALOG_TV;
@@ -2943,7 +2944,7 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
                         v4l2_std_id vs;
                         vs = hdw->std_mask_cur;
                         v4l2_device_call_all(&hdw->v4l2_dev, 0,
-                                             tuner, s_std, vs);
+                                             core, s_std, vs);
                 }
                 hdw->tuner_signal_stale = !0;
                 hdw->cropcap_stale = !0;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 9464862745fa..9af282f9e765 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -520,16 +520,6 @@ static u32 pvr2_i2c_functionality(struct i2c_adapter *adap)
         return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
 }
 
-static int pvr2_i2c_attach_inform(struct i2c_client *client)
-{
-        return 0;
-}
-
-static int pvr2_i2c_detach_inform(struct i2c_client *client)
-{
-        return 0;
-}
-
 static struct i2c_algorithm pvr2_i2c_algo_template = {
         .master_xfer   = pvr2_i2c_xfer,
         .functionality = pvr2_i2c_functionality,
@@ -539,8 +529,6 @@ static struct i2c_adapter pvr2_i2c_adap_template = {
         .owner         = THIS_MODULE,
         .class         = 0,
         .id            = I2C_HW_B_BT848,
-        .client_register = pvr2_i2c_attach_inform,
-        .client_unregister = pvr2_i2c_detach_inform,
 };
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index e20ba1e6e0ea..299c1cbc3832 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -153,14 +153,16 @@ static ssize_t show_def(struct device *class_dev,
         struct pvr2_sysfs_ctl_item *cip;
         int val;
         int ret;
+        unsigned int cnt = 0;
         cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_def);
         ret = pvr2_ctrl_get_def(cip->cptr, &val);
-        pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d",
-                         cip->chptr, cip->ctl_id, val, ret);
-        if (ret < 0) {
-                return ret;
-        }
-        return scnprintf(buf, PAGE_SIZE, "%d\n", val);
+        if (ret < 0) return ret;
+        ret = pvr2_ctrl_value_to_sym(cip->cptr, ~0, val,
+                                     buf, PAGE_SIZE - 1, &cnt);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %.*s (%d)",
+                         cip->chptr, cip->ctl_id, cnt, buf, val);
+        buf[cnt] = '\n';
+        return cnt + 1;
 }
 
 static ssize_t show_val_norm(struct device *class_dev,
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index b3862f5554bd..d2fe7c8f2c3a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -75,16 +75,17 @@ static const struct routing_scheme routing_schemes[] = {
 void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
                 const struct routing_scheme *sp;
                 unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                u32 input;
+
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
                            hdw->input_val);
                 if ((sid < ARRAY_SIZE(routing_schemes)) &&
                     ((sp = routing_schemes + sid) != NULL) &&
                     (hdw->input_val >= 0) &&
                     (hdw->input_val < sp->cnt)) {
-                        route.input = sp->def[hdw->input_val];
+                        input = sp->def[hdw->input_val];
                 } else {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "*** WARNING *** subdev v4l2 set_input:"
@@ -93,8 +94,7 @@ void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
                                    sid, hdw->input_val);
                         return;
                 }
-                route.output = 0;
-                sd->ops->video->s_routing(sd, &route);
+                sd->ops->video->s_routing(sd, input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
index 1670aa4051ce..8c1eae05aa08 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -39,24 +39,22 @@
 void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
         if (hdw->input_dirty || hdw->force_dirty) {
-                struct v4l2_routing route;
-
-                memset(&route, 0, sizeof(route));
+                u32 input;
 
                 switch (hdw->input_val) {
                 case PVR2_CVAL_INPUT_RADIO:
-                        route.input = 1;
+                        input = 1;
                         break;
                 default:
                         /* All other cases just use the second input */
-                        route.input = 2;
+                        input = 2;
                         break;
                 }
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev wm8775"
                            " set_input(val=%d route=0x%x)",
-                           hdw->input_val, route.input);
+                           hdw->input_val, input);
 
-                sd->ops->audio->s_routing(sd, &route);
+                sd->ops->audio->s_routing(sd, input, 0, 0);
         }
 }
 
diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/video/pwc/Kconfig
index 8b9f0aa844a1..340f954aba34 100644
--- a/drivers/media/video/pwc/Kconfig
+++ b/drivers/media/video/pwc/Kconfig
@@ -39,7 +39,7 @@ config USB_PWC_DEBUG
 config USB_PWC_INPUT_EVDEV
         bool "USB Philips Cameras input events device support"
         default y
-        depends on USB_PWC && INPUT
+        depends on USB_PWC=INPUT || INPUT=y
         ---help---
           This option makes USB Philips cameras register the snapshot button as
           an input device to report button events.
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index c522616ef38f..c639845460ff 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -163,6 +163,13 @@
                         CICR0_EOFM | CICR0_FOM)
 
 /*
+ * YUV422P picture size should be a multiple of 16, so the heuristic aligns
+ * height, width on 4 byte boundaries to reach the 16 multiple for the size.
+ */
+#define YUV422P_X_Y_ALIGN 4
+#define YUV422P_SIZE_ALIGN YUV422P_X_Y_ALIGN * YUV422P_X_Y_ALIGN
+
+/*
  * Structures
  */
 enum pxa_camera_active_dma {
@@ -236,20 +243,11 @@ static int pxa_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
                               unsigned int *size)
 {
         struct soc_camera_device *icd = vq->priv_data;
-        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-        struct pxa_camera_dev *pcdev = ici->priv;
 
         dev_dbg(&icd->dev, "count=%d, size=%d\n", *count, *size);
 
-        /* planar capture requires Y, U and V buffers to be page aligned */
-        if (pcdev->channels == 3) {
-                *size = PAGE_ALIGN(icd->width * icd->height); /* Y pages */
-                *size += PAGE_ALIGN(icd->width * icd->height / 2); /* U pages */
-                *size += PAGE_ALIGN(icd->width * icd->height / 2); /* V pages */
-        } else {
-                *size = icd->width * icd->height *
-                        ((icd->current_fmt->depth + 7) >> 3);
-        }
+        *size = roundup(icd->width * icd->height *
+                        ((icd->current_fmt->depth + 7) >> 3), 8);
 
         if (0 == *count)
                 *count = 32;
@@ -289,19 +287,63 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf)
         buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
 
+static int calculate_dma_sglen(struct scatterlist *sglist, int sglen,
+                               int sg_first_ofs, int size)
+{
+        int i, offset, dma_len, xfer_len;
+        struct scatterlist *sg;
+
+        offset = sg_first_ofs;
+        for_each_sg(sglist, sg, sglen, i) {
+                dma_len = sg_dma_len(sg);
+
+                /* PXA27x Developer's Manual 27.4.4.1: round up to 8 bytes */
+                xfer_len = roundup(min(dma_len - offset, size), 8);
+
+                size = max(0, size - xfer_len);
+                offset = 0;
+                if (size == 0)
+                        break;
+        }
+
+        BUG_ON(size != 0);
+        return i + 1;
+}
+
+/**
+ * pxa_init_dma_channel - init dma descriptors
+ * @pcdev: pxa camera device
+ * @buf: pxa buffer to find pxa dma channel
+ * @dma: dma video buffer
+ * @channel: dma channel (0 => 'Y', 1 => 'U', 2 => 'V')
+ * @cibr: camera Receive Buffer Register
+ * @size: bytes to transfer
+ * @sg_first: first element of sg_list
+ * @sg_first_ofs: offset in first element of sg_list
+ *
+ * Prepares the pxa dma descriptors to transfer one camera channel.
+ * Beware sg_first and sg_first_ofs are both input and output parameters.
+ *
+ * Returns 0 or -ENOMEM if no coherent memory is available
+ */
 static int pxa_init_dma_channel(struct pxa_camera_dev *pcdev,
                                 struct pxa_buffer *buf,
                                 struct videobuf_dmabuf *dma, int channel,
-                                int sglen, int sg_start, int cibr,
-                                unsigned int size)
+                                int cibr, int size,
+                                struct scatterlist **sg_first, int *sg_first_ofs)
 {
         struct pxa_cam_dma *pxa_dma = &buf->dmas[channel];
-        int i;
+        struct scatterlist *sg;
+        int i, offset, sglen;
+        int dma_len = 0, xfer_len = 0;
 
         if (pxa_dma->sg_cpu)
                 dma_free_coherent(pcdev->dev, pxa_dma->sg_size,
                                   pxa_dma->sg_cpu, pxa_dma->sg_dma);
 
+        sglen = calculate_dma_sglen(*sg_first, dma->sglen,
+                                    *sg_first_ofs, size);
+
         pxa_dma->sg_size = (sglen + 1) * sizeof(struct pxa_dma_desc);
         pxa_dma->sg_cpu = dma_alloc_coherent(pcdev->dev, pxa_dma->sg_size,
                                              &pxa_dma->sg_dma, GFP_KERNEL);
@@ -309,31 +351,75 @@ static int pxa_init_dma_channel(struct pxa_camera_dev *pcdev,
                 return -ENOMEM;
 
         pxa_dma->sglen = sglen;
+        offset = *sg_first_ofs;
 
-        for (i = 0; i < sglen; i++) {
-                int sg_i = sg_start + i;
-                struct scatterlist *sg = dma->sglist;
-                unsigned int dma_len = sg_dma_len(&sg[sg_i]), xfer_len;
+        dev_dbg(pcdev->dev, "DMA: sg_first=%p, sglen=%d, ofs=%d, dma.desc=%x\n",
+                *sg_first, sglen, *sg_first_ofs, pxa_dma->sg_dma);
 
-                pxa_dma->sg_cpu[i].dsadr = pcdev->res->start + cibr;
-                pxa_dma->sg_cpu[i].dtadr = sg_dma_address(&sg[sg_i]);
+
+        for_each_sg(*sg_first, sg, sglen, i) {
+                dma_len = sg_dma_len(sg);
 
                 /* PXA27x Developer's Manual 27.4.4.1: round up to 8 bytes */
-                xfer_len = (min(dma_len, size) + 7) & ~7;
+                xfer_len = roundup(min(dma_len - offset, size), 8);
 
+                size = max(0, size - xfer_len);
+
+                pxa_dma->sg_cpu[i].dsadr = pcdev->res->start + cibr;
+                pxa_dma->sg_cpu[i].dtadr = sg_dma_address(sg) + offset;
                 pxa_dma->sg_cpu[i].dcmd =
                         DCMD_FLOWSRC | DCMD_BURST8 | DCMD_INCTRGADDR | xfer_len;
-                size -= dma_len;
+#ifdef DEBUG
+                if (!i)
+                        pxa_dma->sg_cpu[i].dcmd |= DCMD_STARTIRQEN;
+#endif
                 pxa_dma->sg_cpu[i].ddadr =
                         pxa_dma->sg_dma + (i + 1) * sizeof(struct pxa_dma_desc);
+
+                dev_vdbg(pcdev->dev, "DMA: desc.%08x->@phys=0x%08x, len=%d\n",
+                         pxa_dma->sg_dma + i * sizeof(struct pxa_dma_desc),
+                         sg_dma_address(sg) + offset, xfer_len);
+                offset = 0;
+
+                if (size == 0)
+                        break;
         }
 
-        pxa_dma->sg_cpu[sglen - 1].ddadr = DDADR_STOP;
-        pxa_dma->sg_cpu[sglen - 1].dcmd |= DCMD_ENDIRQEN;
+        pxa_dma->sg_cpu[sglen].ddadr = DDADR_STOP;
+        pxa_dma->sg_cpu[sglen].dcmd  = DCMD_FLOWSRC | DCMD_BURST8 | DCMD_ENDIRQEN;
+
+        /*
+         * Handle 1 special case :
+         *  - in 3 planes (YUV422P format), we might finish with xfer_len equal
+         *    to dma_len (end on PAGE boundary). In this case, the sg element
+         *    for next plane should be the next after the last used to store the
+         *    last scatter gather RAM page
+         */
+        if (xfer_len >= dma_len) {
+                *sg_first_ofs = xfer_len - dma_len;
+                *sg_first = sg_next(sg);
+        } else {
+                *sg_first_ofs = xfer_len;
+                *sg_first = sg;
+        }
 
         return 0;
 }
 
+static void pxa_videobuf_set_actdma(struct pxa_camera_dev *pcdev,
+                                    struct pxa_buffer *buf)
+{
+        buf->active_dma = DMA_Y;
+        if (pcdev->channels == 3)
+                buf->active_dma |= DMA_U | DMA_V;
+}
+
+/*
+ * Please check the DMA prepared buffer structure in :
+ *   Documentation/video4linux/pxa_camera.txt
+ * Please check also in pxa_camera_check_link_miss() to understand why DMA chain
+ * modification while DMA chain is running will work anyway.
+ */
 static int pxa_videobuf_prepare(struct videobuf_queue *vq,
                 struct videobuf_buffer *vb, enum v4l2_field field)
 {
@@ -342,7 +428,6 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
         struct pxa_camera_dev *pcdev = ici->priv;
         struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
         int ret;
-        int sglen_y,  sglen_yu = 0, sglen_u = 0, sglen_v = 0;
         int size_y, size_u = 0, size_v = 0;
 
         dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
@@ -381,62 +466,58 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
         }
 
         if (vb->state == VIDEOBUF_NEEDS_INIT) {
-                unsigned int size = vb->size;
+                int size = vb->size;
+                int next_ofs = 0;
                 struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
+                struct scatterlist *sg;
 
                 ret = videobuf_iolock(vq, vb, NULL);
                 if (ret)
                         goto fail;
 
                 if (pcdev->channels == 3) {
-                        /* FIXME the calculations should be more precise */
-                        sglen_y = dma->sglen / 2;
-                        sglen_u = sglen_v = dma->sglen / 4 + 1;
-                        sglen_yu = sglen_y + sglen_u;
                         size_y = size / 2;
                         size_u = size_v = size / 4;
                 } else {
-                        sglen_y = dma->sglen;
                         size_y = size;
                 }
 
-                /* init DMA for Y channel */
-                ret = pxa_init_dma_channel(pcdev, buf, dma, 0, sglen_y,
-                                           0, 0x28, size_y);
+                sg = dma->sglist;
 
+                /* init DMA for Y channel */
+                ret = pxa_init_dma_channel(pcdev, buf, dma, 0, CIBR0, size_y,
+                                           &sg, &next_ofs);
                 if (ret) {
                         dev_err(pcdev->dev,
                                 "DMA initialization for Y/RGB failed\n");
                         goto fail;
                 }
 
-                if (pcdev->channels == 3) {
-                        /* init DMA for U channel */
-                        ret = pxa_init_dma_channel(pcdev, buf, dma, 1, sglen_u,
-                                                   sglen_y, 0x30, size_u);
-                        if (ret) {
-                                dev_err(pcdev->dev,
-                                        "DMA initialization for U failed\n");
-                                goto fail_u;
-                        }
-
-                        /* init DMA for V channel */
-                        ret = pxa_init_dma_channel(pcdev, buf, dma, 2, sglen_v,
-                                                   sglen_yu, 0x38, size_v);
-                        if (ret) {
-                                dev_err(pcdev->dev,
-                                        "DMA initialization for V failed\n");
-                                goto fail_v;
-                        }
+                /* init DMA for U channel */
+                if (size_u)
+                        ret = pxa_init_dma_channel(pcdev, buf, dma, 1, CIBR1,
+                                                   size_u, &sg, &next_ofs);
+                if (ret) {
+                        dev_err(pcdev->dev,
+                                "DMA initialization for U failed\n");
+                        goto fail_u;
+                }
+
+                /* init DMA for V channel */
+                if (size_v)
+                        ret = pxa_init_dma_channel(pcdev, buf, dma, 2, CIBR2,
+                                                   size_v, &sg, &next_ofs);
+                if (ret) {
+                        dev_err(pcdev->dev,
+                                "DMA initialization for V failed\n");
+                        goto fail_v;
                 }
 
                 vb->state = VIDEOBUF_PREPARED;
         }
 
         buf->inwork = 0;
-        buf->active_dma = DMA_Y;
-        if (pcdev->channels == 3)
-                buf->active_dma |= DMA_U | DMA_V;
+        pxa_videobuf_set_actdma(pcdev, buf);
 
         return 0;
 
@@ -453,6 +534,92 @@ out:
         return ret;
 }
 
+/**
+ * pxa_dma_start_channels - start DMA channel for active buffer
+ * @pcdev: pxa camera device
+ *
+ * Initialize DMA channels to the beginning of the active video buffer, and
+ * start these channels.
+ */
+static void pxa_dma_start_channels(struct pxa_camera_dev *pcdev)
+{
+        int i;
+        struct pxa_buffer *active;
+
+        active = pcdev->active;
+
+        for (i = 0; i < pcdev->channels; i++) {
+                dev_dbg(pcdev->dev, "%s (channel=%d) ddadr=%08x\n", __func__,
+                        i, active->dmas[i].sg_dma);
+                DDADR(pcdev->dma_chans[i]) = active->dmas[i].sg_dma;
+                DCSR(pcdev->dma_chans[i]) = DCSR_RUN;
+        }
+}
+
+static void pxa_dma_stop_channels(struct pxa_camera_dev *pcdev)
+{
+        int i;
+
+        for (i = 0; i < pcdev->channels; i++) {
+                dev_dbg(pcdev->dev, "%s (channel=%d)\n", __func__, i);
+                DCSR(pcdev->dma_chans[i]) = 0;
+        }
+}
+
+static void pxa_dma_add_tail_buf(struct pxa_camera_dev *pcdev,
+                                 struct pxa_buffer *buf)
+{
+        int i;
+        struct pxa_dma_desc *buf_last_desc;
+
+        for (i = 0; i < pcdev->channels; i++) {
+                buf_last_desc = buf->dmas[i].sg_cpu + buf->dmas[i].sglen;
+                buf_last_desc->ddadr = DDADR_STOP;
+
+                if (pcdev->sg_tail[i])
+                        /* Link the new buffer to the old tail */
+                        pcdev->sg_tail[i]->ddadr = buf->dmas[i].sg_dma;
+
+                /* Update the channel tail */
+                pcdev->sg_tail[i] = buf_last_desc;
+        }
+}
+
+/**
+ * pxa_camera_start_capture - start video capturing
+ * @pcdev: camera device
+ *
+ * Launch capturing. DMA channels should not be active yet. They should get
+ * activated at the end of frame interrupt, to capture only whole frames, and
+ * never begin the capture of a partial frame.
+ */
+static void pxa_camera_start_capture(struct pxa_camera_dev *pcdev)
+{
+        unsigned long cicr0, cifr;
+
+        dev_dbg(pcdev->dev, "%s\n", __func__);
+        /* Reset the FIFOs */
+        cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
+        __raw_writel(cifr, pcdev->base + CIFR);
+        /* Enable End-Of-Frame Interrupt */
+        cicr0 = __raw_readl(pcdev->base + CICR0) | CICR0_ENB;
+        cicr0 &= ~CICR0_EOFM;
+        __raw_writel(cicr0, pcdev->base + CICR0);
+}
+
+static void pxa_camera_stop_capture(struct pxa_camera_dev *pcdev)
+{
+        unsigned long cicr0;
+
+        pxa_dma_stop_channels(pcdev);
+
+        cicr0 = __raw_readl(pcdev->base + CICR0) & ~CICR0_ENB;
+        __raw_writel(cicr0, pcdev->base + CICR0);
+
+        pcdev->active = NULL;
+        dev_dbg(pcdev->dev, "%s\n", __func__);
+}
+
 static void pxa_videobuf_queue(struct videobuf_queue *vq,
                                struct videobuf_buffer *vb)
 {
@@ -460,81 +627,20 @@ static void pxa_videobuf_queue(struct videobuf_queue *vq,
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct pxa_camera_dev *pcdev = ici->priv;
         struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
-        struct pxa_buffer *active;
         unsigned long flags;
-        int i;
 
-        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
-                vb, vb->baddr, vb->bsize);
+        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d active=%p\n", __func__,
+                vb, vb->baddr, vb->bsize, pcdev->active);
+
         spin_lock_irqsave(&pcdev->lock, flags);
 
         list_add_tail(&vb->queue, &pcdev->capture);
 
         vb->state = VIDEOBUF_ACTIVE;
-        active = pcdev->active;
+        pxa_dma_add_tail_buf(pcdev, buf);
 
-        if (!active) {
-                unsigned long cifr, cicr0;
-
-                cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
-                __raw_writel(cifr, pcdev->base + CIFR);
-
-                for (i = 0; i < pcdev->channels; i++) {
-                        DDADR(pcdev->dma_chans[i]) = buf->dmas[i].sg_dma;
-                        DCSR(pcdev->dma_chans[i]) = DCSR_RUN;
-                        pcdev->sg_tail[i] = buf->dmas[i].sg_cpu + buf->dmas[i].sglen - 1;
-                }
-
-                pcdev->active = buf;
-
-                cicr0 = __raw_readl(pcdev->base + CICR0) | CICR0_ENB;
-                __raw_writel(cicr0, pcdev->base + CICR0);
-        } else {
-                struct pxa_cam_dma *buf_dma;
-                struct pxa_cam_dma *act_dma;
-                int nents;
-
-                for (i = 0; i < pcdev->channels; i++) {
-                        buf_dma = &buf->dmas[i];
-                        act_dma = &active->dmas[i];
-                        nents = buf_dma->sglen;
-
-                        /* Stop DMA engine */
-                        DCSR(pcdev->dma_chans[i]) = 0;
-
-                        /* Add the descriptors we just initialized to
-                           the currently running chain */
-                        pcdev->sg_tail[i]->ddadr = buf_dma->sg_dma;
-                        pcdev->sg_tail[i] = buf_dma->sg_cpu + buf_dma->sglen - 1;
-
-                        /* Setup a dummy descriptor with the DMA engines current
-                         * state
-                         */
-                        buf_dma->sg_cpu[nents].dsadr =
-                                pcdev->res->start + 0x28 + i*8; /* CIBRx */
-                        buf_dma->sg_cpu[nents].dtadr =
-                                DTADR(pcdev->dma_chans[i]);
-                        buf_dma->sg_cpu[nents].dcmd =
-                                DCMD(pcdev->dma_chans[i]);
-
-                        if (DDADR(pcdev->dma_chans[i]) == DDADR_STOP) {
-                                /* The DMA engine is on the last
-                                   descriptor, set the next descriptors
-                                   address to the descriptors we just
-                                   initialized */
-                                buf_dma->sg_cpu[nents].ddadr = buf_dma->sg_dma;
-                        } else {
-                                buf_dma->sg_cpu[nents].ddadr =
-                                        DDADR(pcdev->dma_chans[i]);
-                        }
-
-                        /* The next descriptor is the dummy descriptor */
-                        DDADR(pcdev->dma_chans[i]) = buf_dma->sg_dma + nents *
-                                sizeof(struct pxa_dma_desc);
-
-                        DCSR(pcdev->dma_chans[i]) = DCSR_RUN;
-                }
-        }
+        if (!pcdev->active)
+                pxa_camera_start_capture(pcdev);
 
         spin_unlock_irqrestore(&pcdev->lock, flags);
 }
@@ -572,7 +678,7 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
                               struct videobuf_buffer *vb,
                               struct pxa_buffer *buf)
 {
-        unsigned long cicr0;
+        int i;
 
         /* _init is used to debug races, see comment in pxa_camera_reqbufs() */
         list_del_init(&vb->queue);
@@ -580,15 +686,12 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
         do_gettimeofday(&vb->ts);
         vb->field_count++;
         wake_up(&vb->done);
+        dev_dbg(pcdev->dev, "%s dequeud buffer (vb=0x%p)\n", __func__, vb);
 
         if (list_empty(&pcdev->capture)) {
-                pcdev->active = NULL;
-                DCSR(pcdev->dma_chans[0]) = 0;
-                DCSR(pcdev->dma_chans[1]) = 0;
-                DCSR(pcdev->dma_chans[2]) = 0;
-
-                cicr0 = __raw_readl(pcdev->base + CICR0) & ~CICR0_ENB;
-                __raw_writel(cicr0, pcdev->base + CICR0);
+                pxa_camera_stop_capture(pcdev);
+                for (i = 0; i < pcdev->channels; i++)
+                        pcdev->sg_tail[i] = NULL;
                 return;
         }
 
@@ -596,6 +699,35 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
                                    struct pxa_buffer, vb.queue);
 }
 
+/**
+ * pxa_camera_check_link_miss - check missed DMA linking
+ * @pcdev: camera device
+ *
+ * The DMA chaining is done with DMA running. This means a tiny temporal window
+ * remains, where a buffer is queued on the chain, while the chain is already
+ * stopped. This means the tailed buffer would never be transfered by DMA.
+ * This function restarts the capture for this corner case, where :
+ *  - DADR() == DADDR_STOP
+ *  - a videobuffer is queued on the pcdev->capture list
+ *
+ * Please check the "DMA hot chaining timeslice issue" in
+ *   Documentation/video4linux/pxa_camera.txt
+ *
+ * Context: should only be called within the dma irq handler
+ */
+static void pxa_camera_check_link_miss(struct pxa_camera_dev *pcdev)
+{
+        int i, is_dma_stopped = 1;
+
+        for (i = 0; i < pcdev->channels; i++)
+                if (DDADR(pcdev->dma_chans[i]) != DDADR_STOP)
+                        is_dma_stopped = 0;
+        dev_dbg(pcdev->dev, "%s : top queued buffer=%p, dma_stopped=%d\n",
+                __func__, pcdev->active, is_dma_stopped);
+        if (pcdev->active && is_dma_stopped)
+                pxa_camera_start_capture(pcdev);
+}
+
 static void pxa_camera_dma_irq(int channel, struct pxa_camera_dev *pcdev,
                                enum pxa_camera_active_dma act_dma)
 {
@@ -603,61 +735,70 @@ static void pxa_camera_dma_irq(int channel, struct pxa_camera_dev *pcdev,
         unsigned long flags;
         u32 status, camera_status, overrun;
         struct videobuf_buffer *vb;
-        unsigned long cifr, cicr0;
 
         spin_lock_irqsave(&pcdev->lock, flags);
 
         status = DCSR(channel);
-        DCSR(channel) = status | DCSR_ENDINTR;
+        DCSR(channel) = status;
+
+        camera_status = __raw_readl(pcdev->base + CISR);
+        overrun = CISR_IFO_0;
+        if (pcdev->channels == 3)
+                overrun |= CISR_IFO_1 | CISR_IFO_2;
 
         if (status & DCSR_BUSERR) {
                 dev_err(pcdev->dev, "DMA Bus Error IRQ!\n");
                 goto out;
         }
 
-        if (!(status & DCSR_ENDINTR)) {
+        if (!(status & (DCSR_ENDINTR | DCSR_STARTINTR))) {
                 dev_err(pcdev->dev, "Unknown DMA IRQ source, "
                         "status: 0x%08x\n", status);
                 goto out;
         }
 
-        if (!pcdev->active) {
-                dev_err(pcdev->dev, "DMA End IRQ with no active buffer!\n");
-                goto out;
-        }
-
-        camera_status = __raw_readl(pcdev->base + CISR);
-        overrun = CISR_IFO_0;
-        if (pcdev->channels == 3)
-                overrun |= CISR_IFO_1 | CISR_IFO_2;
-        if (camera_status & overrun) {
-                dev_dbg(pcdev->dev, "FIFO overrun! CISR: %x\n", camera_status);
-                /* Stop the Capture Interface */
-                cicr0 = __raw_readl(pcdev->base + CICR0) & ~CICR0_ENB;
-                __raw_writel(cicr0, pcdev->base + CICR0);
-
-                /* Stop DMA */
-                DCSR(channel) = 0;
-                /* Reset the FIFOs */
-                cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
-                __raw_writel(cifr, pcdev->base + CIFR);
-                /* Enable End-Of-Frame Interrupt */
-                cicr0 &= ~CICR0_EOFM;
-                __raw_writel(cicr0, pcdev->base + CICR0);
-                /* Restart the Capture Interface */
-                __raw_writel(cicr0 | CICR0_ENB, pcdev->base + CICR0);
+        /*
+         * pcdev->active should not be NULL in DMA irq handler.
+         *
+         * But there is one corner case : if capture was stopped due to an
+         * overrun of channel 1, and at that same channel 2 was completed.
+         *
+         * When handling the overrun in DMA irq for channel 1, we'll stop the
+         * capture and restart it (and thus set pcdev->active to NULL). But the
+         * DMA irq handler will already be pending for channel 2. So on entering
+         * the DMA irq handler for channel 2 there will be no active buffer, yet
+         * that is normal.
+         */
+        if (!pcdev->active)
                 goto out;
-        }
 
         vb = &pcdev->active->vb;
         buf = container_of(vb, struct pxa_buffer, vb);
         WARN_ON(buf->inwork || list_empty(&vb->queue));
-        dev_dbg(pcdev->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
-                vb, vb->baddr, vb->bsize);
 
-        buf->active_dma &= ~act_dma;
-        if (!buf->active_dma)
-                pxa_camera_wakeup(pcdev, vb, buf);
+        dev_dbg(pcdev->dev, "%s channel=%d %s%s(vb=0x%p) dma.desc=%x\n",
+                __func__, channel, status & DCSR_STARTINTR ? "SOF " : "",
+                status & DCSR_ENDINTR ? "EOF " : "", vb, DDADR(channel));
+
+        if (status & DCSR_ENDINTR) {
+                /*
+                 * It's normal if the last frame creates an overrun, as there
+                 * are no more DMA descriptors to fetch from QCI fifos
+                 */
+                if (camera_status & overrun &&
+                    !list_is_last(pcdev->capture.next, &pcdev->capture)) {
+                        dev_dbg(pcdev->dev, "FIFO overrun! CISR: %x\n",
+                                camera_status);
+                        pxa_camera_stop_capture(pcdev);
+                        pxa_camera_start_capture(pcdev);
+                        goto out;
+                }
+                buf->active_dma &= ~act_dma;
+                if (!buf->active_dma) {
+                        pxa_camera_wakeup(pcdev, vb, buf);
+                        pxa_camera_check_link_miss(pcdev);
+                }
+        }
 
 out:
         spin_unlock_irqrestore(&pcdev->lock, flags);
@@ -786,6 +927,8 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)
 {
         struct pxa_camera_dev *pcdev = data;
         unsigned long status, cicr0;
+        struct pxa_buffer *buf;
+        struct videobuf_buffer *vb;
 
         status = __raw_readl(pcdev->base + CISR);
         dev_dbg(pcdev->dev, "Camera interrupt status 0x%lx\n", status);
@@ -796,12 +939,14 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)
         __raw_writel(status, pcdev->base + CISR);
 
         if (status & CISR_EOF) {
-                int i;
-                for (i = 0; i < pcdev->channels; i++) {
-                        DDADR(pcdev->dma_chans[i]) =
-                                pcdev->active->dmas[i].sg_dma;
-                        DCSR(pcdev->dma_chans[i]) = DCSR_RUN;
-                }
+                pcdev->active = list_first_entry(&pcdev->capture,
+                                           struct pxa_buffer, vb.queue);
+                vb = &pcdev->active->vb;
+                buf = container_of(vb, struct pxa_buffer, vb);
+                pxa_videobuf_set_actdma(pcdev, buf);
+
+                pxa_dma_start_channels(pcdev);
+
                 cicr0 = __raw_readl(pcdev->base + CICR0) | CICR0_EOFM;
                 __raw_writel(cicr0, pcdev->base + CICR0);
         }
@@ -1265,6 +1410,18 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
                 pix->width = 2048;
         pix->width &= ~0x01;
 
+        /*
+         * YUV422P planar format requires images size to be a 16 bytes
+         * multiple. If not, zeros will be inserted between Y and U planes, and
+         * U and V planes, and YUV422P standard would be violated.
+         */
+        if (xlate->host_fmt->fourcc == V4L2_PIX_FMT_YUV422P) {
+                if (!IS_ALIGNED(pix->width * pix->height, YUV422P_SIZE_ALIGN))
+                        pix->height = ALIGN(pix->height, YUV422P_X_Y_ALIGN);
+                if (!IS_ALIGNED(pix->width * pix->height, YUV422P_SIZE_ALIGN))
+                        pix->width = ALIGN(pix->width, YUV422P_X_Y_ALIGN);
+        }
+
         pix->bytesperline = pix->width *
                 DIV_ROUND_UP(xlate->host_fmt->depth, 8);
         pix->sizeimage = pix->height * pix->bytesperline;
@@ -1372,18 +1529,8 @@ static int pxa_camera_resume(struct soc_camera_device *icd)
                 ret = pcdev->icd->ops->resume(pcdev->icd);
 
         /* Restart frame capture if active buffer exists */
-        if (!ret && pcdev->active) {
-                unsigned long cifr, cicr0;
-
-                /* Reset the FIFOs */
-                cifr = __raw_readl(pcdev->base + CIFR) | CIFR_RESET_F;
-                __raw_writel(cifr, pcdev->base + CIFR);
-
-                cicr0 = __raw_readl(pcdev->base + CICR0);
-                cicr0 &= ~CICR0_EOFM;   /* Enable End-Of-Frame Interrupt */
-                cicr0 |= CICR0_ENB;     /* Restart the Capture Interface */
-                __raw_writel(cicr0, pcdev->base + CICR0);
-        }
+        if (!ret && pcdev->active)
+                pxa_camera_start_capture(pcdev);
 
         return ret;
 }
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index b5be633e3bb0..5202cadb2aae 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -722,7 +722,6 @@ static void free_buffer(struct videobuf_queue *vq, struct s2255_buffer *buf)
 {
         dprintk(4, "%s\n", __func__);
 
-        videobuf_waiton(&buf->vb, 0, 0);
         videobuf_vmalloc_free(&buf->vb);
         buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
@@ -1324,7 +1323,6 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 
 static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
 {
-        int res;
         struct s2255_fh *fh = priv;
         struct s2255_dev *dev = fh->dev;
 
@@ -1338,9 +1336,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
                 return -EINVAL;
         }
         s2255_stop_acquire(dev, fh->channel);
-        res = videobuf_streamoff(&fh->vb_vidq);
-        if (res < 0)
-                return res;
+        videobuf_streamoff(&fh->vb_vidq);
         res_free(dev, fh);
         return 0;
 }
@@ -1707,13 +1703,13 @@ static void s2255_destroy(struct kref *kref)
         kfree(dev->fw_data);
         usb_put_dev(dev->udev);
         dprintk(1, "%s", __func__);
-        kfree(dev);
 
         while (!list_empty(&s2255_devlist)) {
                 list = s2255_devlist.next;
                 list_del(list);
         }
         mutex_unlock(&dev->open_lock);
+        kfree(dev);
 }
 
 static int s2255_close(struct file *file)
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index df4e08d2dceb..5c24c993ac16 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -299,17 +299,18 @@ static int saa7110_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int saa7110_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int saa7110_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct saa7110 *decoder = to_saa7110(sd);
 
-        if (route->input < 0 || route->input >= SAA7110_MAX_INPUT) {
-                v4l2_dbg(1, debug, sd, "input=%d not available\n", route->input);
+        if (input < 0 || input >= SAA7110_MAX_INPUT) {
+                v4l2_dbg(1, debug, sd, "input=%d not available\n", input);
                 return -EINVAL;
         }
-        if (decoder->input != route->input) {
-                saa7110_selmux(sd, route->input);
-                v4l2_dbg(1, debug, sd, "switched to input=%d\n", route->input);
+        if (decoder->input != input) {
+                saa7110_selmux(sd, input);
+                v4l2_dbg(1, debug, sd, "switched to input=%d\n", input);
         }
         return 0;
 }
@@ -414,9 +415,6 @@ static const struct v4l2_subdev_core_ops saa7110_core_ops = {
         .g_ctrl = saa7110_g_ctrl,
         .s_ctrl = saa7110_s_ctrl,
         .queryctrl = saa7110_queryctrl,
-};
-
-static const struct v4l2_subdev_tuner_ops saa7110_tuner_ops = {
         .s_std = saa7110_s_std,
 };
 
@@ -429,7 +427,6 @@ static const struct v4l2_subdev_video_ops saa7110_video_ops = {
 
 static const struct v4l2_subdev_ops saa7110_ops = {
         .core = &saa7110_core_ops,
-        .tuner = &saa7110_tuner_ops,
         .video = &saa7110_video_ops,
 };
 
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index cebf159f52cf..44873a016c2c 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -46,7 +46,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/saa7115.h>
 #include <asm/div64.h>
 
@@ -62,12 +62,6 @@ module_param(debug, bool, 0644);
 
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
-static unsigned short normal_i2c[] = {
-                0x4a >> 1, 0x48 >> 1,   /* SAA7111, SAA7111A and SAA7113 */
-                0x42 >> 1, 0x40 >> 1,   /* SAA7114, SAA7115 and SAA7118 */
-                I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
 
 struct saa711x_state {
         struct v4l2_subdev sd;
@@ -1234,30 +1228,32 @@ static int saa711x_s_radio(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int saa711x_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int saa711x_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct saa711x_state *state = to_state(sd);
-        u32 input = route->input;
         u8 mask = (state->ident == V4L2_IDENT_SAA7111) ? 0xf8 : 0xf0;
 
-        v4l2_dbg(1, debug, sd, "decoder set input %d output %d\n", route->input, route->output);
+        v4l2_dbg(1, debug, sd, "decoder set input %d output %d\n",
+                input, output);
+
         /* saa7111/3 does not have these inputs */
         if ((state->ident == V4L2_IDENT_SAA7113 ||
              state->ident == V4L2_IDENT_SAA7111) &&
-            (route->input == SAA7115_COMPOSITE4 ||
-             route->input == SAA7115_COMPOSITE5)) {
+            (input == SAA7115_COMPOSITE4 ||
+             input == SAA7115_COMPOSITE5)) {
                 return -EINVAL;
         }
-        if (route->input > SAA7115_SVIDEO3)
+        if (input > SAA7115_SVIDEO3)
                 return -EINVAL;
-        if (route->output > SAA7115_IPORT_ON)
+        if (output > SAA7115_IPORT_ON)
                 return -EINVAL;
-        if (state->input == route->input && state->output == route->output)
+        if (state->input == input && state->output == output)
                 return 0;
         v4l2_dbg(1, debug, sd, "now setting %s input %s output\n",
-                (route->input >= SAA7115_SVIDEO0) ? "S-Video" : "Composite",
-                (route->output == SAA7115_IPORT_ON) ? "iport on" : "iport off");
-        state->input = route->input;
+                (input >= SAA7115_SVIDEO0) ? "S-Video" : "Composite",
+                (output == SAA7115_IPORT_ON) ? "iport on" : "iport off");
+        state->input = input;
 
         /* saa7111 has slightly different input numbering */
         if (state->ident == V4L2_IDENT_SAA7111) {
@@ -1266,10 +1262,10 @@ static int saa711x_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *
                 /* saa7111 specific */
                 saa711x_write(sd, R_10_CHROMA_CNTL_2,
                                 (saa711x_read(sd, R_10_CHROMA_CNTL_2) & 0x3f) |
-                                ((route->output & 0xc0) ^ 0x40));
+                                ((output & 0xc0) ^ 0x40));
                 saa711x_write(sd, R_13_RT_X_PORT_OUT_CNTL,
                                 (saa711x_read(sd, R_13_RT_X_PORT_OUT_CNTL) & 0xf0) |
-                                ((route->output & 2) ? 0x0a : 0));
+                                ((output & 2) ? 0x0a : 0));
         }
 
         /* select mode */
@@ -1282,7 +1278,7 @@ static int saa711x_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *
                         (saa711x_read(sd, R_09_LUMA_CNTL) & 0x7f) |
                         (state->input >= SAA7115_SVIDEO0 ? 0x80 : 0x0));
 
-        state->output = route->output;
+        state->output = output;
         if (state->ident == V4L2_IDENT_SAA7114 ||
                         state->ident == V4L2_IDENT_SAA7115) {
                 saa711x_write(sd, R_83_X_PORT_I_O_ENA_AND_OUT_CLK,
@@ -1319,17 +1315,16 @@ static int saa711x_s_stream(struct v4l2_subdev *sd, int enable)
         return 0;
 }
 
-static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq)
+static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, u32 freq, u32 flags)
 {
         struct saa711x_state *state = to_state(sd);
 
-        if (freq->freq != SAA7115_FREQ_32_11_MHZ &&
-                        freq->freq != SAA7115_FREQ_24_576_MHZ)
+        if (freq != SAA7115_FREQ_32_11_MHZ && freq != SAA7115_FREQ_24_576_MHZ)
                 return -EINVAL;
-        state->crystal_freq = freq->freq;
-        state->cgcdiv = (freq->flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;
-        state->ucgc = (freq->flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0;
-        state->apll = (freq->flags & SAA7115_FREQ_FL_APLL) ? 1 : 0;
+        state->crystal_freq = freq;
+        state->cgcdiv = (flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;
+        state->ucgc = (flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0;
+        state->apll = (flags & SAA7115_FREQ_FL_APLL) ? 1 : 0;
         saa711x_s_clock_freq(sd, state->audclk_freq);
         return 0;
 }
@@ -1498,11 +1493,6 @@ static int saa711x_log_status(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int saa711x_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-        return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops saa711x_core_ops = {
@@ -1511,6 +1501,7 @@ static const struct v4l2_subdev_core_ops saa711x_core_ops = {
         .g_ctrl = saa711x_g_ctrl,
         .s_ctrl = saa711x_s_ctrl,
         .queryctrl = saa711x_queryctrl,
+        .s_std = saa711x_s_std,
         .reset = saa711x_reset,
         .s_gpio = saa711x_s_gpio,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -1520,7 +1511,6 @@ static const struct v4l2_subdev_core_ops saa711x_core_ops = {
 };
 
 static const struct v4l2_subdev_tuner_ops saa711x_tuner_ops = {
-        .s_std = saa711x_s_std,
         .s_radio = saa711x_s_radio,
         .g_tuner = saa711x_g_tuner,
 };
@@ -1676,10 +1666,7 @@ MODULE_DEVICE_TABLE(i2c, saa7115_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "saa7115",
-        .driverid = I2C_DRIVERID_SAA711X,
-        .command = saa711x_command,
         .probe = saa711x_probe,
         .remove = saa711x_remove,
-        .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
         .id_table = saa7115_id,
 };
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 128bb8b8dbbf..2fe7a701b954 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -570,15 +570,16 @@ static int saa7127_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
         return saa7127_set_std(sd, std);
 }
 
-static int saa7127_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int saa7127_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct saa7127_state *state = to_state(sd);
         int rc = 0;
 
-        if (state->input_type != route->input)
-                rc = saa7127_set_input_type(sd, route->input);
-        if (rc == 0 && state->output_type != route->output)
-                rc = saa7127_set_output_type(sd, route->output);
+        if (state->input_type != input)
+                rc = saa7127_set_input_type(sd, input);
+        if (rc == 0 && state->output_type != output)
+                rc = saa7127_set_output_type(sd, output);
         return rc;
 }
 
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index dc2213e2f86e..63c4b8f1f541 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -928,9 +928,6 @@ static const struct v4l2_subdev_core_ops saa6752hs_core_ops = {
         .g_ext_ctrls = saa6752hs_g_ext_ctrls,
         .s_ext_ctrls = saa6752hs_s_ext_ctrls,
         .try_ext_ctrls = saa6752hs_try_ext_ctrls,
-};
-
-static const struct v4l2_subdev_tuner_ops saa6752hs_tuner_ops = {
         .s_std = saa6752hs_s_std,
 };
 
@@ -941,7 +938,6 @@ static const struct v4l2_subdev_video_ops saa6752hs_video_ops = {
 
 static const struct v4l2_subdev_ops saa6752hs_ops = {
         .core = &saa6752hs_core_ops,
-        .tuner = &saa6752hs_tuner_ops,
         .video = &saa6752hs_video_ops,
 };
 
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index a790a7246a63..fdb19449d269 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4508,12 +4508,17 @@ struct saa7134_board saa7134_boards[] = {
                 /* Matthias Schwarzott <zzam@gentoo.org> */
                 .name           = "Avermedia DVB-S Hybrid+FM A700",
                 .audio_clock    = 0x00187de7,
-                .tuner_type     = TUNER_ABSENT, /* TUNER_XC2028 */
+                .tuner_type     = TUNER_XC2028,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = { {
+                        .name   = name_tv,
+                        .vmux   = 4,
+                        .amux   = TV,
+                        .tv     = 1,
+                }, {
                         .name = name_comp,
                         .vmux = 1,
                         .amux = LINE1,
@@ -4522,6 +4527,10 @@ struct saa7134_board saa7134_boards[] = {
                         .vmux = 6,
                         .amux = LINE1,
                 } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                },
         },
         [SAA7134_BOARD_BEHOLD_H6] = {
                 /* Igor Kuznetsov <igk@igk.ru> */
@@ -5914,6 +5923,11 @@ static int saa7134_xc2028_callback(struct saa7134_dev *dev,
                         msleep(10);
                         saa7134_set_gpio(dev, 21, 1);
                 break;
+                case SAA7134_BOARD_AVERMEDIA_A700_HYBRID:
+                        saa7134_set_gpio(dev, 18, 0);
+                        msleep(10);
+                        saa7134_set_gpio(dev, 18, 1);
+                break;
                 }
         return 0;
         }
@@ -6259,10 +6273,6 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0c0007cd, 0x0c0007cd);
                 break;
         case SAA7134_BOARD_AVERMEDIA_A700_HYBRID:
-                printk("%s: %s: hybrid analog/dvb card\n"
-                       "%s: Sorry, of the analog inputs, only analog s-video and composite "
-                       "are supported for now.\n",
-                        dev->name, card(dev).name, dev->name);
         case SAA7134_BOARD_AVERMEDIA_A700_PRO:
                 /* write windows gpio values */
                 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x80040100, 0x80040100);
@@ -6326,6 +6336,7 @@ static void saa7134_tuner_setup(struct saa7134_dev *dev)
                 case SAA7134_BOARD_AVERMEDIA_A16D:
                 case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:
                 case SAA7134_BOARD_AVERMEDIA_M103:
+                case SAA7134_BOARD_AVERMEDIA_A700_HYBRID:
                         ctl.demod = XC3028_FE_ZARLINK456;
                         break;
                 default:
@@ -6599,20 +6610,24 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 /* Note: radio tuner address is always filled in,
                    so we do not need to probe for a radio tuner device. */
                 if (dev->radio_type != UNSET)
-                        v4l2_i2c_new_subdev(&dev->i2c_adap,
-                                "tuner", "tuner", dev->radio_addr);
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                dev->radio_addr);
                 if (has_demod)
-                        v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                        v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                 if (dev->tuner_addr == ADDR_UNSET) {
                         enum v4l2_i2c_tuner_type type =
                                 has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
 
-                        v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tuner",
-                                "tuner", v4l2_i2c_tuner_addrs(type));
+                        v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                v4l2_i2c_tuner_addrs(type));
                 } else {
-                        v4l2_i2c_new_subdev(&dev->i2c_adap,
-                                "tuner", "tuner", dev->tuner_addr);
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_adap, "tuner", "tuner",
+                                dev->tuner_addr);
                 }
         }
 
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index dafa0d88bed0..0bb09f1723d1 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -982,7 +982,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         /* load i2c helpers */
         if (card_is_empress(dev)) {
                 struct v4l2_subdev *sd =
-                        v4l2_i2c_new_subdev(&dev->i2c_adap,
+                        v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
                                 "saa6752hs", "saa6752hs",
                                 saa7134_boards[dev->board].empress_addr);
 
@@ -991,12 +991,11 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         }
 
         if (saa7134_boards[dev->board].rds_addr) {
-                unsigned short addrs[2] = { 0, I2C_CLIENT_END };
                 struct v4l2_subdev *sd;
 
-                addrs[0] = saa7134_boards[dev->board].rds_addr;
-                sd = v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "saa6588",
-                            "saa6588", addrs);
+                sd = v4l2_i2c_new_probed_subdev_addr(&dev->v4l2_dev,
+                                &dev->i2c_adap, "saa6588", "saa6588",
+                                saa7134_boards[dev->board].rds_addr);
                 if (sd)
                         printk(KERN_INFO "%s: found RDS decoder\n", dev->name);
         }
@@ -1015,7 +1014,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         saa7134_irq_video_signalchange(dev);
 
         if (TUNER_ABSENT != dev->tuner_type)
-                saa_call_all(dev, core, s_standby, 0);
+                saa_call_all(dev, tuner, s_standby);
 
         /* register v4l devices */
         if (saa7134_no_overlay > 0)
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 404f70eeb355..493cad941460 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -625,10 +625,10 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
         saa7134_set_decoder(dev);
 
         if (card_in(dev, dev->ctl_input).tv)
-                saa_call_all(dev, tuner, s_std, dev->tvnorm->id);
+                saa_call_all(dev, core, s_std, dev->tvnorm->id);
         /* Set the correct norm for the saa6752hs. This function
            does nothing if there is no saa6752hs. */
-        saa_call_empress(dev, tuner, s_std, dev->tvnorm->id);
+        saa_call_empress(dev, core, s_std, dev->tvnorm->id);
 }
 
 static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)
@@ -1496,7 +1496,7 @@ static int video_release(struct file *file)
         saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0);
         saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0);
 
-        saa_call_all(dev, core, s_standby, 0);
+        saa_call_all(dev, tuner, s_standby);
         if (fh->radio)
                 saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd);
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index a2dd326de5b9..0cbaf90d4874 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -20,7 +20,7 @@
  */
 
 #include <linux/version.h>
-#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14)
+#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,15)
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c
index 25bf2303a6b5..b15c40908e84 100644
--- a/drivers/media/video/saa717x.c
+++ b/drivers/media/video/saa717x.c
@@ -1104,22 +1104,22 @@ static struct v4l2_queryctrl saa717x_qctrl[] = {
         },
 };
 
-static int saa717x_s_video_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int saa717x_s_video_routing(struct v4l2_subdev *sd,
+                                   u32 input, u32 output, u32 config)
 {
         struct saa717x_state *decoder = to_state(sd);
-        int inp = route->input;
-        int is_tuner = inp & 0x80;  /* tuner input flag */
+        int is_tuner = input & 0x80;  /* tuner input flag */
 
-        inp &= 0x7f;
+        input &= 0x7f;
 
-        v4l2_dbg(1, debug, sd, "decoder set input (%d)\n", inp);
+        v4l2_dbg(1, debug, sd, "decoder set input (%d)\n", input);
         /* inputs from 0-9 are available*/
         /* saa717x have mode0-mode9 but mode5 is reserved. */
-        if (inp < 0 || inp > 9 || inp == 5)
+        if (input < 0 || input > 9 || input == 5)
                 return -EINVAL;
 
-        if (decoder->input != inp) {
-                int input_line = inp;
+        if (decoder->input != input) {
+                int input_line = input;
 
                 decoder->input = input_line;
                 v4l2_dbg(1, debug, sd,  "now setting %s input %d\n",
@@ -1276,12 +1276,13 @@ static int saa717x_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int saa717x_s_audio_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int saa717x_s_audio_routing(struct v4l2_subdev *sd,
+                                   u32 input, u32 output, u32 config)
 {
         struct saa717x_state *decoder = to_state(sd);
 
-        if (route->input < 3) { /* FIXME! --tadachi */
-                decoder->audio_input = route->input;
+        if (input < 3) { /* FIXME! --tadachi */
+                decoder->audio_input = input;
                 v4l2_dbg(1, debug, sd,
                                 "set decoder audio input to %d\n",
                                 decoder->audio_input);
@@ -1390,12 +1391,12 @@ static const struct v4l2_subdev_core_ops saa717x_core_ops = {
         .queryctrl = saa717x_queryctrl,
         .g_ctrl = saa717x_g_ctrl,
         .s_ctrl = saa717x_s_ctrl,
+        .s_std = saa717x_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops saa717x_tuner_ops = {
         .g_tuner = saa717x_g_tuner,
         .s_tuner = saa717x_s_tuner,
-        .s_std = saa717x_s_std,
         .s_radio = saa717x_s_radio,
 };
 
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 75747b104d07..212baa10829b 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -245,14 +245,15 @@ static int saa7185_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int saa7185_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int saa7185_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct saa7185 *encoder = to_saa7185(sd);
 
-        /* RJ: route->input = 0: input is from SA7111
-         route->input = 1: input is from ZR36060 */
+        /* RJ: input = 0: input is from SA7111
+         input = 1: input is from ZR36060 */
 
-        switch (route->input) {
+        switch (input) {
         case 0:
                 /* turn off colorbar */
                 saa7185_write(sd, 0x3a, 0x0f);
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 3f523aeec56e..a2513772196b 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -160,14 +160,14 @@ static int saa7191_write_block(struct v4l2_subdev *sd,
 /* Helper functions */
 
 static int saa7191_s_routing(struct v4l2_subdev *sd,
-                                const struct v4l2_routing *route)
+                             u32 input, u32 output, u32 config)
 {
         struct saa7191 *decoder = to_saa7191(sd);
         u8 luma = saa7191_read_reg(sd, SAA7191_REG_LUMA);
         u8 iock = saa7191_read_reg(sd, SAA7191_REG_IOCK);
         int err;
 
-        switch (route->input) {
+        switch (input) {
         case SAA7191_INPUT_COMPOSITE: /* Set Composite input */
                 iock &= ~(SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW1
                           | SAA7191_IOCK_GPSW2);
@@ -190,7 +190,7 @@ static int saa7191_s_routing(struct v4l2_subdev *sd,
         if (err)
                 return -EIO;
 
-        decoder->input = route->input;
+        decoder->input = input;
 
         return 0;
 }
@@ -582,9 +582,6 @@ static const struct v4l2_subdev_core_ops saa7191_core_ops = {
         .g_chip_ident = saa7191_g_chip_ident,
         .g_ctrl = saa7191_g_ctrl,
         .s_ctrl = saa7191_s_ctrl,
-};
-
-static const struct v4l2_subdev_tuner_ops saa7191_tuner_ops = {
         .s_std = saa7191_s_std,
 };
 
@@ -597,7 +594,6 @@ static const struct v4l2_subdev_video_ops saa7191_video_ops = {
 static const struct v4l2_subdev_ops saa7191_ops = {
         .core = &saa7191_core_ops,
         .video = &saa7191_video_ops,
-        .tuner = &saa7191_tuner_ops,
 };
 
 static int saa7191_probe(struct i2c_client *client,
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 6d8bfd4d97e2..0e890cc23377 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -764,7 +764,10 @@ static int soc_camera_s_register(struct file *file, void *fh,
 
 static int device_register_link(struct soc_camera_device *icd)
 {
-        int ret = device_register(&icd->dev);
+        int ret = dev_set_name(&icd->dev, "%u-%u", icd->iface, icd->devnum);
+
+        if (!ret)
+                ret = device_register(&icd->dev);
 
         if (ret < 0) {
                 /* Prevent calling device_unregister() */
@@ -1060,7 +1063,6 @@ int soc_camera_device_register(struct soc_camera_device *icd)
 
         icd->devnum = num;
         icd->dev.bus = &soc_camera_bus_type;
-        dev_set_name(&icd->dev, "%u-%u", icd->iface, icd->devnum);
 
         icd->dev.release        = dummy_release;
         icd->use_count          = 0;
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index fe1158094c24..d381fce3db40 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -192,7 +192,6 @@ static int tda9840_remove(struct i2c_client *client)
         return 0;
 }
 
-
 static const struct i2c_device_id tda9840_id[] = {
         { "tda9840", 0 },
         { }
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index d61c56f42bcd..d4a9ed45764b 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -47,12 +47,11 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 
 /* makes a connection between the input-pin 'i' and the output-pin 'o' */
-static int tea6415c_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int tea6415c_s_routing(struct v4l2_subdev *sd,
+                              u32 i, u32 o, u32 config)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         u8 byte = 0;
-        u32 i = route->input;
-        u32 o = route->output;
         int ret;
 
         v4l2_dbg(1, debug, sd, "i=%d, o=%d\n", i, o);
@@ -170,7 +169,6 @@ static int tea6415c_remove(struct i2c_client *client)
         return 0;
 }
 
-
 static const struct i2c_device_id tea6415c_id[] = {
         { "tea6415c", 0 },
         { }
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 34922232402a..ced6eadf347a 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -48,15 +48,15 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* make a connection between the input 'i' and the output 'o'
    with gain 'g' (note: i = 6 means 'mute') */
-static int tea6420_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int tea6420_s_routing(struct v4l2_subdev *sd,
+                             u32 i, u32 o, u32 config)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        int i = route->input;
-        int o = route->output & 0xf;
-        int g = (route->output >> 4) & 0xf;
+        int g = (o >> 4) & 0xf;
         u8 byte;
         int ret;
 
+        o &= 0xf;
         v4l2_dbg(1, debug, sd, "i=%d, o=%d, g=%d\n", i, o, g);
 
         /* check if the parameters are valid */
@@ -133,13 +133,8 @@ static int tea6420_probe(struct i2c_client *client,
 
         /* set initial values: set "mute"-input to all outputs at gain 0 */
         err = 0;
-        for (i = 1; i < 5; i++) {
-                struct v4l2_routing route;
-
-                route.input = 6;
-                route.output = i;
-                err += tea6420_s_routing(sd, &route);
-        }
+        for (i = 1; i < 5; i++)
+                err += tea6420_s_routing(sd, 6, i, 0);
         if (err) {
                 v4l_dbg(1, debug, client, "could not initialize tea6420\n");
                 return -ENODEV;
@@ -156,7 +151,6 @@ static int tea6420_remove(struct i2c_client *client)
         return 0;
 }
 
-
 static const struct i2c_device_id tea6420_id[] = {
         { "tea6420", 0 },
         { }
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 72d41032742d..78c377a399cb 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -15,12 +15,12 @@
 #include <linux/i2c.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/tuner.h>
 #include <media/tuner-types.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include "mt20xx.h"
 #include "tda8290.h"
 #include "tea5761.h"
@@ -101,18 +101,6 @@ static inline struct tuner *to_tuner(struct v4l2_subdev *sd)
         return container_of(sd, struct tuner, sd);
 }
 
-/* standard i2c insmod options */
-static unsigned short normal_i2c[] = {
-#if defined(CONFIG_MEDIA_TUNER_TEA5761) || (defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) && defined(MODULE))
-        0x10,
-#endif
-        0x42, 0x43, 0x4a, 0x4b,                 /* tda8290 */
-        0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-        0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-        I2C_CLIENT_END
-};
-
-I2C_CLIENT_INSMOD;
 
 /* insmod options used at init time => read/only */
 static unsigned int addr;
@@ -785,7 +773,7 @@ static int tuner_s_radio(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int tuner_s_standby(struct v4l2_subdev *sd, u32 standby)
+static int tuner_s_standby(struct v4l2_subdev *sd)
 {
         struct tuner *t = to_tuner(sd);
         struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops;
@@ -951,11 +939,6 @@ static int tuner_log_status(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int tuner_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-        return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
 static int tuner_suspend(struct i2c_client *c, pm_message_t state)
 {
         struct tuner *t = to_tuner(i2c_get_clientdata(c));
@@ -980,15 +963,28 @@ static int tuner_resume(struct i2c_client *c)
         return 0;
 }
 
+static int tuner_command(struct i2c_client *client, unsigned cmd, void *arg)
+{
+        struct v4l2_subdev *sd = i2c_get_clientdata(client);
+
+        /* TUNER_SET_CONFIG is still called by tuner-simple.c, so we have
+           to handle it here.
+           There must be a better way of doing this... */
+        switch (cmd) {
+        case TUNER_SET_CONFIG:
+                return tuner_s_config(sd, arg);
+        }
+        return -ENOIOCTLCMD;
+}
+
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops tuner_core_ops = {
         .log_status = tuner_log_status,
-        .s_standby = tuner_s_standby,
+        .s_std = tuner_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = {
-        .s_std = tuner_s_std,
         .s_radio = tuner_s_radio,
         .g_tuner = tuner_g_tuner,
         .s_tuner = tuner_s_tuner,
@@ -996,6 +992,7 @@ static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = {
         .g_frequency = tuner_g_frequency,
         .s_type_addr = tuner_s_type_addr,
         .s_config = tuner_s_config,
+        .s_standby = tuner_s_standby,
 };
 
 static const struct v4l2_subdev_ops tuner_ops = {
@@ -1023,7 +1020,7 @@ static void tuner_lookup(struct i2c_adapter *adap,
                 int mode_mask;
 
                 if (pos->i2c->adapter != adap ||
-                    pos->i2c->driver->id != I2C_DRIVERID_TUNER)
+                    strcmp(pos->i2c->driver->driver.name, "tuner"))
                         continue;
 
                 mode_mask = pos->mode_mask & ~T_STANDBY;
@@ -1167,40 +1164,6 @@ register_client:
         return 0;
 }
 
-static int tuner_legacy_probe(struct i2c_adapter *adap)
-{
-        if (0 != addr) {
-                normal_i2c[0] = addr;
-                normal_i2c[1] = I2C_CLIENT_END;
-        }
-
-        if ((adap->class & I2C_CLASS_TV_ANALOG) == 0)
-                return 0;
-
-        /* HACK: Ignore 0x6b and 0x6f on cx88 boards.
-         * FusionHDTV5 RT Gold has an ir receiver at 0x6b
-         * and an RTC at 0x6f which can get corrupted if probed.
-         */
-        if ((adap->id == I2C_HW_B_CX2388x) ||
-            (adap->id == I2C_HW_B_CX23885)) {
-                unsigned int i = 0;
-
-                while (i < I2C_CLIENT_MAX_OPTS && ignore[i] != I2C_CLIENT_END)
-                        i += 2;
-                if (i + 4 < I2C_CLIENT_MAX_OPTS) {
-                        ignore[i+0] = adap->nr;
-                        ignore[i+1] = 0x6b;
-                        ignore[i+2] = adap->nr;
-                        ignore[i+3] = 0x6f;
-                        ignore[i+4] = I2C_CLIENT_END;
-                } else
-                        printk(KERN_WARNING "tuner: "
-                               "too many options specified "
-                               "in i2c probe ignore list!\n");
-        }
-        return 1;
-}
-
 static int tuner_remove(struct i2c_client *client)
 {
         struct tuner *t = to_tuner(i2c_get_clientdata(client));
@@ -1227,13 +1190,11 @@ MODULE_DEVICE_TABLE(i2c, tuner_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tuner",
-        .driverid = I2C_DRIVERID_TUNER,
-        .command = tuner_command,
         .probe = tuner_probe,
         .remove = tuner_remove,
+        .command = tuner_command,
         .suspend = tuner_suspend,
         .resume = tuner_resume,
-        .legacy_probe = tuner_legacy_probe,
         .id_table = tuner_id,
 };
 
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 226bf3565ac9..0869bafc2b56 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -35,7 +35,7 @@
 #include <media/tvaudio.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 
 #include <media/i2c-addr.h>
 
@@ -136,20 +136,6 @@ static inline struct CHIPSTATE *to_state(struct v4l2_subdev *sd)
         return container_of(sd, struct CHIPSTATE, sd);
 }
 
-/* ---------------------------------------------------------------------- */
-/* i2c addresses                                                          */
-
-static unsigned short normal_i2c[] = {
-        I2C_ADDR_TDA8425   >> 1,
-        I2C_ADDR_TEA6300   >> 1,
-        I2C_ADDR_TEA6420   >> 1,
-        I2C_ADDR_TDA9840   >> 1,
-        I2C_ADDR_TDA985x_L >> 1,
-        I2C_ADDR_TDA985x_H >> 1,
-        I2C_ADDR_TDA9874   >> 1,
-        I2C_ADDR_PIC16C54  >> 1,
-        I2C_CLIENT_END };
-I2C_CLIENT_INSMOD;
 
 /* ---------------------------------------------------------------------- */
 /* i2c I/O functions                                                      */
@@ -1795,17 +1781,18 @@ static int tvaudio_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
         return -EINVAL;
 }
 
-static int tvaudio_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *rt)
+static int tvaudio_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct CHIPSTATE *chip = to_state(sd);
         struct CHIPDESC *desc = chip->desc;
 
         if (!(desc->flags & CHIP_HAS_INPUTSEL))
                 return 0;
-        if (rt->input >= 4)
+        if (input >= 4)
                 return -EINVAL;
         /* There are four inputs: tuner, radio, extern and intern. */
-        chip->input = rt->input;
+        chip->input = input;
         if (chip->muted)
                 return 0;
         chip_write_masked(chip, desc->inputreg,
@@ -1918,11 +1905,6 @@ static int tvaudio_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide
         return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_TVAUDIO, 0);
 }
 
-static int tvaudio_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-        return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops tvaudio_core_ops = {
@@ -1930,12 +1912,12 @@ static const struct v4l2_subdev_core_ops tvaudio_core_ops = {
         .queryctrl = tvaudio_queryctrl,
         .g_ctrl = tvaudio_g_ctrl,
         .s_ctrl = tvaudio_s_ctrl,
+        .s_std = tvaudio_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops tvaudio_tuner_ops = {
         .s_radio = tvaudio_s_radio,
         .s_frequency = tvaudio_s_frequency,
-        .s_std = tvaudio_s_std,
         .s_tuner = tvaudio_s_tuner,
         .s_tuner = tvaudio_g_tuner,
 };
@@ -2088,17 +2070,6 @@ static int tvaudio_remove(struct i2c_client *client)
         return 0;
 }
 
-static int tvaudio_legacy_probe(struct i2c_adapter *adap)
-{
-        /* don't attach on saa7146 based cards,
-           because dedicated drivers are used */
-        if ((adap->id == I2C_HW_SAA7146))
-                return 0;
-        if (adap->class & I2C_CLASS_TV_ANALOG)
-                return 1;
-        return 0;
-}
-
 /* This driver supports many devices and the idea is to let the driver
    detect which device is present. So rather than listing all supported
    devices here, we pretend to support a single, fake device type. */
@@ -2110,10 +2081,7 @@ MODULE_DEVICE_TABLE(i2c, tvaudio_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tvaudio",
-        .driverid = I2C_DRIVERID_TVAUDIO,
-        .command = tvaudio_command,
         .probe = tvaudio_probe,
         .remove = tvaudio_remove,
-        .legacy_probe = tvaudio_legacy_probe,
         .id_table = tvaudio_id,
 };
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 3a5a95f134b4..2d38e253f14e 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -10,7 +10,7 @@
 #include <linux/delay.h>
 #include <media/v4l2-device.h>
 #include <media/tvp5150.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/v4l2-chip-ident.h>
 
 #include "tvp5150_reg.h"
@@ -19,14 +19,6 @@ MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");
 
-/* standard i2c insmod options */
-static unsigned short normal_i2c[] = {
-        0xb8 >> 1,
-        0xba >> 1,
-        I2C_CLIENT_END
-};
-
-I2C_CLIENT_INSMOD;
 
 static int debug;
 module_param(debug, int, 0);
@@ -77,7 +69,8 @@ struct tvp5150 {
         struct v4l2_subdev sd;
 
         v4l2_std_id norm;       /* Current set standard */
-        struct v4l2_routing route;
+        u32 input;
+        u32 output;
         int enable;
         int bright;
         int contrast;
@@ -288,10 +281,10 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd)
         int input = 0;
         unsigned char val;
 
-        if ((decoder->route.output & TVP5150_BLACK_SCREEN) || !decoder->enable)
+        if ((decoder->output & TVP5150_BLACK_SCREEN) || !decoder->enable)
                 input = 8;
 
-        switch (decoder->route.input) {
+        switch (decoder->input) {
         case TVP5150_COMPOSITE1:
                 input |= 2;
                 /* fall through */
@@ -307,8 +300,8 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd)
 
         v4l2_dbg(1, debug, sd, "Selecting video route: route input=%i, output=%i "
                         "=> tvp5150 input=%i, opmode=%i\n",
-                        decoder->route.input,decoder->route.output,
-                        input, opmode );
+                        decoder->input, decoder->output,
+                        input, opmode);
 
         tvp5150_write(sd, TVP5150_OP_MODE_CTL, opmode);
         tvp5150_write(sd, TVP5150_VD_IN_SRC_SEL_1, input);
@@ -317,7 +310,7 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd)
          * For Composite and TV, it should be the reverse
          */
         val = tvp5150_read(sd, TVP5150_MISC_CTL);
-        if (decoder->route.input == TVP5150_SVIDEO)
+        if (decoder->input == TVP5150_SVIDEO)
                 val = (val & ~0x40) | 0x10;
         else
                 val = (val & ~0x10) | 0x40;
@@ -886,11 +879,13 @@ static int tvp5150_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                         I2C Command
  ****************************************************************************/
 
-static int tvp5150_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int tvp5150_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct tvp5150 *decoder = to_tvp5150(sd);
 
-        decoder->route = *route;
+        decoder->input = input;
+        decoder->output = output;
         tvp5150_selmux(sd);
         return 0;
 }
@@ -1026,11 +1021,6 @@ static int tvp5150_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
         return -EINVAL;
 }
 
-static int tvp5150_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-        return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops tvp5150_core_ops = {
@@ -1038,6 +1028,7 @@ static const struct v4l2_subdev_core_ops tvp5150_core_ops = {
         .g_ctrl = tvp5150_g_ctrl,
         .s_ctrl = tvp5150_s_ctrl,
         .queryctrl = tvp5150_queryctrl,
+        .s_std = tvp5150_s_std,
         .reset = tvp5150_reset,
         .g_chip_ident = tvp5150_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -1047,7 +1038,6 @@ static const struct v4l2_subdev_core_ops tvp5150_core_ops = {
 };
 
 static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = {
-        .s_std = tvp5150_s_std,
         .g_tuner = tvp5150_g_tuner,
 };
 
@@ -1090,7 +1080,7 @@ static int tvp5150_probe(struct i2c_client *c,
                  c->addr << 1, c->adapter->name);
 
         core->norm = V4L2_STD_ALL;      /* Default is autodetect */
-        core->route.input = TVP5150_COMPOSITE1;
+        core->input = TVP5150_COMPOSITE1;
         core->enable = 1;
         core->bright = 128;
         core->contrast = 128;
@@ -1125,9 +1115,7 @@ MODULE_DEVICE_TABLE(i2c, tvp5150_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tvp5150",
-        .command = tvp5150_command,
         .probe = tvp5150_probe,
         .remove = tvp5150_remove,
-        .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
         .id_table = tvp5150_id,
 };
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index c0ac651bb358..a07a3fbb51eb 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -124,17 +124,18 @@ static int upd64031a_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *
 
 /* ------------------------------------------------------------------------ */
 
-static int upd64031a_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int upd64031a_s_routing(struct v4l2_subdev *sd,
+                               u32 input, u32 output, u32 config)
 {
         struct upd64031a_state *state = to_state(sd);
         u8 r00, r05, r08;
 
-        state->gr_mode = (route->input & 3) << 6;
-        state->direct_3dycs_connect = (route->input & 0xc) << 4;
+        state->gr_mode = (input & 3) << 6;
+        state->direct_3dycs_connect = (input & 0xc) << 4;
         state->ext_comp_sync =
-                (route->input & UPD64031A_COMPOSITE_EXTERNAL) << 1;
+                (input & UPD64031A_COMPOSITE_EXTERNAL) << 1;
         state->ext_vert_sync =
-                (route->input & UPD64031A_VERTICAL_EXTERNAL) << 2;
+                (input & UPD64031A_VERTICAL_EXTERNAL) << 2;
         r00 = (state->regs[R00] & ~GR_MODE_MASK) | state->gr_mode;
         r05 = (state->regs[R00] & ~SYNC_CIRCUIT_MASK) |
                 state->ext_comp_sync | state->ext_vert_sync;
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 410c915d51fa..6eb0e5b00c32 100644
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -102,15 +102,16 @@ static u8 upd64083_read(struct v4l2_subdev *sd, u8 reg)
 
 /* ------------------------------------------------------------------------ */
 
-static int upd64083_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int upd64083_s_routing(struct v4l2_subdev *sd,
+                              u32 input, u32 output, u32 config)
 {
         struct upd64083_state *state = to_state(sd);
         u8 r00, r02;
 
-        if (route->input > 7 || (route->input & 6) == 6)
+        if (input > 7 || (input & 6) == 6)
                 return -EINVAL;
-        state->mode = (route->input & 3) << 6;
-        state->ext_y_adc = (route->input & UPD64083_EXT_Y_ADC) << 3;
+        state->mode = (input & 3) << 6;
+        state->ext_y_adc = (input & UPD64083_EXT_Y_ADC) << 3;
         r00 = (state->regs[R00] & ~(3 << 6)) | state->mode;
         r02 = (state->regs[R02] & ~(1 << 5)) | state->ext_y_adc;
         upd64083_write(sd, R00, r00);
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index a0feb1c97736..8bc03b9e1315 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -2597,7 +2597,6 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel)
         /* 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)
         //channel 1 is Composite with audio channel 0 (line in)
         //channel 2 is S-Video with audio channel 0 (line in)
@@ -2630,9 +2629,7 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel)
                         mode[2] = SAA7115_SVIDEO1;
                         break;
         }
-        route.input = mode[channel];
-        route.output = 0;
-        call_all(usbvision, video, s_routing, &route);
+        call_all(usbvision, video, s_routing, mode[channel], 0, 0);
         usbvision_set_audio(usbvision, audio[channel]);
         return 0;
 }
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index dd2f8f27c73b..1fe5befbbf85 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -28,7 +28,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 #include <linux/utsname.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
@@ -247,7 +246,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
         switch (usbvision_device_data[usbvision->DevModel].Codec) {
         case CODEC_SAA7113:
         case CODEC_SAA7111:
-                v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "saa7115",
+                v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+                                &usbvision->i2c_adap, "saa7115",
                                 "saa7115_auto", saa711x_addrs);
                 break;
         }
@@ -256,13 +256,15 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
                 enum v4l2_i2c_tuner_type type;
                 struct tuner_setup tun_setup;
 
-                sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner",
+                sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+                                &usbvision->i2c_adap, "tuner",
                                 "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                 /* depending on whether we found a demod or not, select
                    the tuner type. */
                 type = sd ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
 
-                sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner",
+                sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev,
+                                &usbvision->i2c_adap, "tuner",
                                 "tuner", v4l2_i2c_tuner_addrs(type));
 
                 if (usbvision->tuner_type != -1) {
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index fa62a2fd7b22..d7056a5b7f9b 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1,5 +1,5 @@
 /*
- * USB USBVISION Video device driver 0.9.9
+ * USB USBVISION Video device driver 0.9.10
  *
  *
  *
@@ -79,7 +79,7 @@
 #define DRIVER_LICENSE "GPL"
 #define USBVISION_DRIVER_VERSION_MAJOR 0
 #define USBVISION_DRIVER_VERSION_MINOR 9
-#define USBVISION_DRIVER_VERSION_PATCHLEVEL 9
+#define USBVISION_DRIVER_VERSION_PATCHLEVEL 10
 #define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,\
 USBVISION_DRIVER_VERSION_MINOR,\
 USBVISION_DRIVER_VERSION_PATCHLEVEL)
@@ -621,7 +621,7 @@ static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
         usbvision->tvnormId=*id;
 
         mutex_lock(&usbvision->lock);
-        call_all(usbvision, tuner, s_std, usbvision->tvnormId);
+        call_all(usbvision, core, s_std, usbvision->tvnormId);
         mutex_unlock(&usbvision->lock);
         /* propagate the change to the decoder */
         usbvision_muxsel(usbvision, usbvision->ctl_input);
@@ -1522,7 +1522,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
  * Returns NULL on error, a pointer to usb_usbvision else.
  *
  */
-static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
+static struct usb_usbvision *usbvision_alloc(struct usb_device *dev,
+                                             struct usb_interface *intf)
 {
         struct usb_usbvision *usbvision;
 
@@ -1531,7 +1532,7 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
                 return NULL;
 
         usbvision->dev = dev;
-        if (v4l2_device_register(&dev->dev, &usbvision->v4l2_dev))
+        if (v4l2_device_register(&intf->dev, &usbvision->v4l2_dev))
                 goto err_free;
 
         mutex_init(&usbvision->lock);   /* available */
@@ -1669,7 +1670,8 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
                 return -ENODEV;
         }
 
-        if ((usbvision = usbvision_alloc(dev)) == NULL) {
+        usbvision = usbvision_alloc(dev, intf);
+        if (usbvision == NULL) {
                 dev_err(&intf->dev, "%s: couldn't allocate USBVision struct\n", __func__);
                 return -ENOMEM;
         }
diff --git a/drivers/media/video/uvc/Kconfig b/drivers/media/video/uvc/Kconfig
index c2d9760de832..2956a7637219 100644
--- a/drivers/media/video/uvc/Kconfig
+++ b/drivers/media/video/uvc/Kconfig
@@ -9,7 +9,7 @@ config USB_VIDEO_CLASS
 config USB_VIDEO_CLASS_INPUT_EVDEV
         bool "UVC input events device support"
         default y
-        depends on USB_VIDEO_CLASS && INPUT
+        depends on USB_VIDEO_CLASS=INPUT || INPUT=y
         ---help---
           This option makes USB Video Class devices register an input device
           to report button events.
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index b617bf05e2d7..02f2a6d18b45 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -575,6 +575,8 @@ static noinline long v4l1_compat_get_input_info(
                         chan->norm = VIDEO_MODE_NTSC;
                 if (sid & V4L2_STD_SECAM)
                         chan->norm = VIDEO_MODE_SECAM;
+                if (sid == V4L2_STD_ALL)
+                        chan->norm = VIDEO_MODE_AUTO;
         }
 done:
         return err;
@@ -601,6 +603,9 @@ static noinline long v4l1_compat_set_input(
         case VIDEO_MODE_SECAM:
                 sid = V4L2_STD_SECAM;
                 break;
+        case VIDEO_MODE_AUTO:
+                sid = V4L2_STD_ALL;
+                break;
         }
         if (0 != sid) {
                 err = drv(file, VIDIOC_S_STD, &sid);
@@ -804,9 +809,9 @@ static noinline long v4l1_compat_select_tuner(
 
         t.index = tun->tuner;
 
-        err = drv(file, VIDIOC_S_INPUT, &t);
+        err = drv(file, VIDIOC_S_TUNER, &t);
         if (err < 0)
-                dprintk("VIDIOCSTUNER / VIDIOC_S_INPUT: %ld\n", err);
+                dprintk("VIDIOCSTUNER / VIDIOC_S_TUNER: %ld\n", err);
         return err;
 }
 
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 1da8cb836cb6..f576ef66b807 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -739,33 +739,8 @@ EXPORT_SYMBOL(v4l2_chip_ident_i2c_client);
 
 /* ----------------------------------------------------------------- */
 
-/* Helper function for I2C legacy drivers */
+/* I2C Helper functions */
 
-int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver,
-                const char *name,
-                int (*probe)(struct i2c_client *, const struct i2c_device_id *))
-{
-        struct i2c_client *client;
-        int err;
-
-        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client)
-                return -ENOMEM;
-
-        client->addr = address;
-        client->adapter = adapter;
-        client->driver = driver;
-        strlcpy(client->name, name, sizeof(client->name));
-
-        err = probe(client, NULL);
-        if (err == 0) {
-                i2c_attach_client(client);
-        } else {
-                kfree(client);
-        }
-        return err != -ENOMEM ? 0 : err;
-}
-EXPORT_SYMBOL(v4l2_i2c_attach);
 
 void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
                 const struct v4l2_subdev_ops *ops)
@@ -785,18 +760,16 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
 
 
 
-/* Load an i2c sub-device. It assumes that i2c_get_adapdata(adapter)
-   returns the v4l2_device and that i2c_get_clientdata(client)
-   returns the v4l2_subdev. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+/* Load an i2c sub-device. */
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type, u8 addr)
 {
-        struct v4l2_device *dev = i2c_get_adapdata(adapter);
         struct v4l2_subdev *sd = NULL;
         struct i2c_client *client;
         struct i2c_board_info info;
 
-        BUG_ON(!dev);
+        BUG_ON(!v4l2_dev);
 
         if (module_name)
                 request_module(module_name);
@@ -823,7 +796,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
 
         /* Register with the v4l2_device which increases the module's
            use count as well. */
-        if (v4l2_device_register_subdev(dev, sd))
+        if (v4l2_device_register_subdev(v4l2_dev, sd))
                 sd = NULL;
         /* Decrease the module use count to match the first try_module_get. */
         module_put(client->driver->driver.owner);
@@ -837,19 +810,17 @@ error:
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
 
-/* Probe and load an i2c sub-device. It assumes that i2c_get_adapdata(adapter)
-   returns the v4l2_device and that i2c_get_clientdata(client)
-   returns the v4l2_subdev. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+/* Probe and load an i2c sub-device. */
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+        struct i2c_adapter *adapter,
         const char *module_name, const char *client_type,
         const unsigned short *addrs)
 {
-        struct v4l2_device *dev = i2c_get_adapdata(adapter);
         struct v4l2_subdev *sd = NULL;
         struct i2c_client *client = NULL;
         struct i2c_board_info info;
 
-        BUG_ON(!dev);
+        BUG_ON(!v4l2_dev);
 
         if (module_name)
                 request_module(module_name);
@@ -875,7 +846,7 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
 
         /* Register with the v4l2_device which increases the module's
            use count as well. */
-        if (v4l2_device_register_subdev(dev, sd))
+        if (v4l2_device_register_subdev(v4l2_dev, sd))
                 sd = NULL;
         /* Decrease the module use count to match the first try_module_get. */
         module_put(client->driver->driver.owner);
@@ -889,6 +860,17 @@ error:
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_new_probed_subdev);
 
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
+                const char *module_name, const char *client_type, u8 addr)
+{
+        unsigned short addrs[2] = { addr, I2C_CLIENT_END };
+
+        return v4l2_i2c_new_probed_subdev(v4l2_dev, adapter,
+                        module_name, client_type, addrs);
+}
+EXPORT_SYMBOL_GPL(v4l2_i2c_new_probed_subdev_addr);
+
 /* Return i2c client address of v4l2_subdev. */
 unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd)
 {
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 91228b3df07d..31eac66411d7 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -229,7 +229,7 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
 static int v4l2_open(struct inode *inode, struct file *filp)
 {
         struct video_device *vdev;
-        int ret;
+        int ret = 0;
 
         /* Check if the video device is available */
         mutex_lock(&videodev_lock);
@@ -243,7 +243,9 @@ static int v4l2_open(struct inode *inode, struct file *filp)
         /* and increase the device refcount */
         video_get(vdev);
         mutex_unlock(&videodev_lock);
-        ret = vdev->fops->open(filp);
+        if (vdev->fops->open)
+                ret = vdev->fops->open(filp);
+
         /* decrease the refcount in case of an error */
         if (ret)
                 video_put(vdev);
@@ -254,7 +256,10 @@ static int v4l2_open(struct inode *inode, struct file *filp)
 static int v4l2_release(struct inode *inode, struct file *filp)
 {
         struct video_device *vdev = video_devdata(filp);
-        int ret = vdev->fops->release(filp);
+        int ret = 0;
+
+        if (vdev->fops->release)
+                vdev->fops->release(filp);
 
         /* decrease the refcount unconditionally since the release()
            return value is ignored. */
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index f41c6f506f42..88f10d6cbc92 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -275,32 +275,6 @@ static const char *v4l2_ioctls[] = {
 };
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
 
-static const char *v4l2_int_ioctls[] = {
-        [_IOC_NR(AUDC_SET_RADIO)]              = "AUDC_SET_RADIO",
-
-        [_IOC_NR(TUNER_SET_TYPE_ADDR)]         = "TUNER_SET_TYPE_ADDR",
-        [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
-        [_IOC_NR(TUNER_SET_CONFIG)]            = "TUNER_SET_CONFIG",
-
-        [_IOC_NR(VIDIOC_INT_S_TUNER_MODE)]     = "VIDIOC_INT_S_TUNER_MODE",
-        [_IOC_NR(VIDIOC_INT_RESET)]            = "VIDIOC_INT_RESET",
-        [_IOC_NR(VIDIOC_INT_AUDIO_CLOCK_FREQ)] = "VIDIOC_INT_AUDIO_CLOCK_FREQ",
-        [_IOC_NR(VIDIOC_INT_DECODE_VBI_LINE)]  = "VIDIOC_INT_DECODE_VBI_LINE",
-        [_IOC_NR(VIDIOC_INT_S_VBI_DATA)]       = "VIDIOC_INT_S_VBI_DATA",
-        [_IOC_NR(VIDIOC_INT_G_VBI_DATA)]       = "VIDIOC_INT_G_VBI_DATA",
-        [_IOC_NR(VIDIOC_INT_I2S_CLOCK_FREQ)]   = "VIDIOC_INT_I2S_CLOCK_FREQ",
-        [_IOC_NR(VIDIOC_INT_S_STANDBY)]        = "VIDIOC_INT_S_STANDBY",
-        [_IOC_NR(VIDIOC_INT_S_AUDIO_ROUTING)]  = "VIDIOC_INT_S_AUDIO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)]  = "VIDIOC_INT_G_AUDIO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)]  = "VIDIOC_INT_S_VIDEO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)]  = "VIDIOC_INT_G_VIDEO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)]   = "VIDIOC_INT_S_CRYSTAL_FREQ",
-        [_IOC_NR(VIDIOC_INT_INIT)]             = "VIDIOC_INT_INIT",
-        [_IOC_NR(VIDIOC_INT_G_STD_OUTPUT)]     = "VIDIOC_INT_G_STD_OUTPUT",
-        [_IOC_NR(VIDIOC_INT_S_STD_OUTPUT)]     = "VIDIOC_INT_S_STD_OUTPUT",
-};
-#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
-
 /* Common ioctl debug function. This function can be used by
    external ioctl messages as well as internal V4L ioctl */
 void v4l_printk_ioctl(unsigned int cmd)
@@ -309,12 +283,8 @@ void v4l_printk_ioctl(unsigned int cmd)
 
         switch (_IOC_TYPE(cmd)) {
         case 'd':
-                if (_IOC_NR(cmd) >= V4L2_INT_IOCTLS) {
-                        type = "v4l2_int";
-                        break;
-                }
-                printk("%s", v4l2_int_ioctls[_IOC_NR(cmd)]);
-                return;
+                type = "v4l2_int";
+                break;
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
         case 'v':
                 if (_IOC_NR(cmd) >= V4L1_IOCTLS) {
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
deleted file mode 100644
index dc881671d536..000000000000
--- a/drivers/media/video/v4l2-subdev.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-    V4L2 sub-device support.
-
-    Copyright (C) 2008  Hans Verkuil <hverkuil@xs4all.nl>
-
-    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/i2c.h>
-#include <linux/videodev2.h>
-#include <media/v4l2-subdev.h>
-
-int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
-{
-        switch (cmd) {
-        case VIDIOC_QUERYCTRL:
-                return v4l2_subdev_call(sd, core, queryctrl, arg);
-        case VIDIOC_G_CTRL:
-                return v4l2_subdev_call(sd, core, g_ctrl, arg);
-        case VIDIOC_S_CTRL:
-                return v4l2_subdev_call(sd, core, s_ctrl, arg);
-        case VIDIOC_G_EXT_CTRLS:
-                return v4l2_subdev_call(sd, core, g_ext_ctrls, arg);
-        case VIDIOC_S_EXT_CTRLS:
-                return v4l2_subdev_call(sd, core, s_ext_ctrls, arg);
-        case VIDIOC_TRY_EXT_CTRLS:
-                return v4l2_subdev_call(sd, core, try_ext_ctrls, arg);
-        case VIDIOC_QUERYMENU:
-                return v4l2_subdev_call(sd, core, querymenu, arg);
-        case VIDIOC_LOG_STATUS:
-                return v4l2_subdev_call(sd, core, log_status);
-        case VIDIOC_DBG_G_CHIP_IDENT:
-                return v4l2_subdev_call(sd, core, g_chip_ident, arg);
-        case VIDIOC_INT_S_STANDBY:
-                return v4l2_subdev_call(sd, core, s_standby, arg ? (*(u32 *)arg) : 0);
-        case VIDIOC_INT_RESET:
-                return v4l2_subdev_call(sd, core, reset, arg ? (*(u32 *)arg) : 0);
-        case VIDIOC_INT_S_GPIO:
-                return v4l2_subdev_call(sd, core, s_gpio, arg ? (*(u32 *)arg) : 0);
-        case VIDIOC_INT_INIT:
-                return v4l2_subdev_call(sd, core, init, arg ? (*(u32 *)arg) : 0);
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_DBG_G_REGISTER:
-                return v4l2_subdev_call(sd, core, g_register, arg);
-        case VIDIOC_DBG_S_REGISTER:
-                return v4l2_subdev_call(sd, core, s_register, arg);
-#endif
-
-        case VIDIOC_INT_S_TUNER_MODE:
-                return v4l2_subdev_call(sd, tuner, s_mode, *(enum v4l2_tuner_type *)arg);
-        case AUDC_SET_RADIO:
-                return v4l2_subdev_call(sd, tuner, s_radio);
-        case VIDIOC_S_TUNER:
-                return v4l2_subdev_call(sd, tuner, s_tuner, arg);
-        case VIDIOC_G_TUNER:
-                return v4l2_subdev_call(sd, tuner, g_tuner, arg);
-        case VIDIOC_S_STD:
-                return v4l2_subdev_call(sd, tuner, s_std, *(v4l2_std_id *)arg);
-        case VIDIOC_S_FREQUENCY:
-                return v4l2_subdev_call(sd, tuner, s_frequency, arg);
-        case VIDIOC_G_FREQUENCY:
-                return v4l2_subdev_call(sd, tuner, g_frequency, arg);
-        case TUNER_SET_TYPE_ADDR:
-                return v4l2_subdev_call(sd, tuner, s_type_addr, arg);
-        case TUNER_SET_CONFIG:
-                return v4l2_subdev_call(sd, tuner, s_config, arg);
-
-        case VIDIOC_INT_AUDIO_CLOCK_FREQ:
-                return v4l2_subdev_call(sd, audio, s_clock_freq, *(u32 *)arg);
-        case VIDIOC_INT_S_AUDIO_ROUTING:
-                return v4l2_subdev_call(sd, audio, s_routing, arg);
-        case VIDIOC_INT_I2S_CLOCK_FREQ:
-                return v4l2_subdev_call(sd, audio, s_i2s_clock_freq, *(u32 *)arg);
-
-        case VIDIOC_INT_S_VIDEO_ROUTING:
-                return v4l2_subdev_call(sd, video, s_routing, arg);
-        case VIDIOC_INT_S_CRYSTAL_FREQ:
-                return v4l2_subdev_call(sd, video, s_crystal_freq, arg);
-        case VIDIOC_INT_DECODE_VBI_LINE:
-                return v4l2_subdev_call(sd, video, decode_vbi_line, arg);
-        case VIDIOC_INT_S_VBI_DATA:
-                return v4l2_subdev_call(sd, video, s_vbi_data, arg);
-        case VIDIOC_INT_G_VBI_DATA:
-                return v4l2_subdev_call(sd, video, g_vbi_data, arg);
-        case VIDIOC_G_SLICED_VBI_CAP:
-                return v4l2_subdev_call(sd, video, g_sliced_vbi_cap, arg);
-        case VIDIOC_ENUM_FMT:
-                return v4l2_subdev_call(sd, video, enum_fmt, arg);
-        case VIDIOC_TRY_FMT:
-                return v4l2_subdev_call(sd, video, try_fmt, arg);
-        case VIDIOC_S_FMT:
-                return v4l2_subdev_call(sd, video, s_fmt, arg);
-        case VIDIOC_G_FMT:
-                return v4l2_subdev_call(sd, video, g_fmt, arg);
-        case VIDIOC_INT_S_STD_OUTPUT:
-                return v4l2_subdev_call(sd, video, s_std_output, *(v4l2_std_id *)arg);
-        case VIDIOC_QUERYSTD:
-                return v4l2_subdev_call(sd, video, querystd, arg);
-        case VIDIOC_INT_G_INPUT_STATUS:
-                return v4l2_subdev_call(sd, video, g_input_status, arg);
-        case VIDIOC_STREAMON:
-                return v4l2_subdev_call(sd, video, s_stream, 1);
-        case VIDIOC_STREAMOFF:
-                return v4l2_subdev_call(sd, video, s_stream, 0);
-        case VIDIOC_S_PARM:
-                return v4l2_subdev_call(sd, video, s_parm, arg);
-        case VIDIOC_G_PARM:
-                return v4l2_subdev_call(sd, video, g_parm, arg);
-
-        default:
-                return v4l2_subdev_call(sd, core, ioctl, cmd, arg);
-        }
-}
-EXPORT_SYMBOL_GPL(v4l2_subdev_command);
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 8da4dd1e0e94..43e0998adb53 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -60,8 +60,8 @@
 // #define VINO_DEBUG
 // #define VINO_DEBUG_INT
 
-#define VINO_MODULE_VERSION "0.0.5"
-#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 5)
+#define VINO_MODULE_VERSION "0.0.6"
+#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 6)
 
 MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
 MODULE_VERSION(VINO_MODULE_VERSION);
@@ -2565,12 +2565,11 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
                 int input;
                 int data_norm;
                 v4l2_std_id norm;
-                struct v4l2_routing route = { 0, 0 };
 
                 input = VINO_INPUT_COMPOSITE;
 
-                route.input = vino_get_saa7191_input(input);
-                ret = decoder_call(video, s_routing, &route);
+                ret = decoder_call(video, s_routing,
+                                vino_get_saa7191_input(input), 0, 0);
                 if (ret) {
                         ret = -EINVAL;
                         goto out;
@@ -2589,7 +2588,7 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
                         }
                         if (data_norm == 3)
                                 data_norm = VINO_DATA_NORM_PAL;
-                        ret = decoder_call(tuner, s_std, norm);
+                        ret = decoder_call(core, s_std, norm);
                 }
 
                 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
@@ -2656,10 +2655,9 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
                 if (vino_drvdata->decoder_owner == vcs->channel) {
                         int data_norm;
                         v4l2_std_id norm;
-                        struct v4l2_routing route = { 0, 0 };
 
-                        route.input = vino_get_saa7191_input(input);
-                        ret = decoder_call(video, s_routing, &route);
+                        ret = decoder_call(video, s_routing,
+                                        vino_get_saa7191_input(input), 0, 0);
                         if (ret) {
                                 vino_drvdata->decoder_owner = VINO_NO_CHANNEL;
                                 ret = -EINVAL;
@@ -2679,7 +2677,7 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
                                 }
                                 if (data_norm == 3)
                                         data_norm = VINO_DATA_NORM_PAL;
-                                ret = decoder_call(tuner, s_std, norm);
+                                ret = decoder_call(core, s_std, norm);
                         }
 
                         spin_lock_irqsave(&vino_drvdata->input_lock, flags);
@@ -2813,7 +2811,7 @@ static int vino_set_data_norm(struct vino_channel_settings *vcs,
                  * as it may take a while... */
 
                 norm = vino_data_norms[data_norm].std;
-                err = decoder_call(tuner, s_std, norm);
+                err = decoder_call(core, s_std, norm);
 
                 spin_lock_irqsave(&vino_drvdata->input_lock, *flags);
 
@@ -4266,7 +4264,6 @@ static int vino_init_channel_settings(struct vino_channel_settings *vcs,
 
 static int __init vino_module_init(void)
 {
-        unsigned short addr[] = { 0, I2C_CLIENT_END };
         int ret;
 
         printk(KERN_INFO "SGI VINO driver version %s\n",
@@ -4336,12 +4333,12 @@ static int __init vino_module_init(void)
         }
         vino_init_stage++;
 
-        addr[0] = 0x45;
-        vino_drvdata->decoder = v4l2_i2c_new_probed_subdev(&vino_i2c_adapter,
-                        "saa7191", "saa7191", addr);
-        addr[0] = 0x2b;
-        vino_drvdata->camera = v4l2_i2c_new_probed_subdev(&vino_i2c_adapter,
-                        "indycam", "indycam", addr);
+        vino_drvdata->decoder =
+                v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev,
+                        &vino_i2c_adapter, "saa7191", "saa7191", 0x45);
+        vino_drvdata->camera =
+                v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev,
+                        &vino_i2c_adapter, "indycam", "indycam", 0x2b);
 
         dprintk("init complete!\n");
 
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
index 42e23a4fa607..38e53b303cc3 100644
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
@@ -134,11 +134,11 @@ static int vp27smpx_log_status(struct v4l2_subdev *sd)
 static const struct v4l2_subdev_core_ops vp27smpx_core_ops = {
         .log_status = vp27smpx_log_status,
         .g_chip_ident = vp27smpx_g_chip_ident,
+        .s_std = vp27smpx_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops vp27smpx_tuner_ops = {
         .s_radio = vp27smpx_s_radio,
-        .s_std = vp27smpx_s_std,
         .s_tuner = vp27smpx_s_tuner,
         .g_tuner = vp27smpx_g_tuner,
 };
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 2fa7e8bb5746..97e0ce28ff18 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -376,33 +376,34 @@ static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int vpx3220_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int vpx3220_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         int data;
 
-        /* RJ:   route->input = 0: ST8 (PCTV) input
-                 route->input = 1: COMPOSITE  input
-                 route->input = 2: SVHS       input  */
+        /* RJ:   input = 0: ST8 (PCTV) input
+                 input = 1: COMPOSITE  input
+                 input = 2: SVHS       input  */
 
-        const int input[3][2] = {
+        const int input_vals[3][2] = {
                 {0x0c, 0},
                 {0x0d, 0},
                 {0x0e, 1}
         };
 
-        if (route->input < 0 || route->input > 2)
+        if (input < 0 || input > 2)
                 return -EINVAL;
 
-        v4l2_dbg(1, debug, sd, "input switched to %s\n", inputs[route->input]);
+        v4l2_dbg(1, debug, sd, "input switched to %s\n", inputs[input]);
 
-        vpx3220_write(sd, 0x33, input[route->input][0]);
+        vpx3220_write(sd, 0x33, input_vals[input][0]);
 
         data = vpx3220_fp_read(sd, 0xf2) & ~(0x0020);
         if (data < 0)
                 return data;
         /* 0x0010 is required to latch the setting */
         vpx3220_fp_write(sd, 0xf2,
-                        data | (input[route->input][1] << 5) | 0x0010);
+                        data | (input_vals[input][1] << 5) | 0x0010);
 
         udelay(10);
         return 0;
@@ -516,9 +517,6 @@ static const struct v4l2_subdev_core_ops vpx3220_core_ops = {
         .g_ctrl = vpx3220_g_ctrl,
         .s_ctrl = vpx3220_s_ctrl,
         .queryctrl = vpx3220_queryctrl,
-};
-
-static const struct v4l2_subdev_tuner_ops vpx3220_tuner_ops = {
         .s_std = vpx3220_s_std,
 };
 
@@ -531,7 +529,6 @@ static const struct v4l2_subdev_video_ops vpx3220_video_ops = {
 
 static const struct v4l2_subdev_ops vpx3220_ops = {
         .core = &vpx3220_core_ops,
-        .tuner = &vpx3220_tuner_ops,
         .video = &vpx3220_video_ops,
 };
 
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 3b08bc4af909..f59b2bd07e89 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -3440,7 +3440,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         if (!cam)
                 return -ENOMEM;
 
-        err = v4l2_device_register(&udev->dev, &cam->v4l2_dev);
+        err = v4l2_device_register(&intf->dev, &cam->v4l2_dev);
         if (err)
                 goto fail0;
 
@@ -3523,7 +3523,8 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         w9968cf_turn_on_led(cam);
 
         w9968cf_i2c_init(cam);
-        cam->sensor_sd = v4l2_i2c_new_probed_subdev(&cam->i2c_adapter,
+        cam->sensor_sd = v4l2_i2c_new_probed_subdev(&cam->v4l2_dev,
+                        &cam->i2c_adapter,
                         "ovcamchip", "ovcamchip", addrs);
 
         usb_set_intfdata(intf, cam);
diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h
index fdfc6a4e1c8f..73ad864b4842 100644
--- a/drivers/media/video/w9968cf.h
+++ b/drivers/media/video/w9968cf.h
@@ -134,7 +134,7 @@ static const struct w9968cf_format w9968cf_formatlist[] = {
 
 #define W9968CF_MODULE_NAME     "V4L driver for W996[87]CF JPEG USB " \
                                 "Dual Mode Camera Chip"
-#define W9968CF_MODULE_VERSION  "1:1.33-basic"
+#define W9968CF_MODULE_VERSION  "1:1.34-basic"
 #define W9968CF_MODULE_AUTHOR   "(C) 2002-2004 Luca Risolia"
 #define W9968CF_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
 #define W9968CF_MODULE_LICENSE  "GPL"
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index eddf11abe1d9..f1f261a35245 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -79,7 +79,8 @@ static int wm8775_write(struct v4l2_subdev *sd, int reg, u16 val)
         return -1;
 }
 
-static int wm8775_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int wm8775_s_routing(struct v4l2_subdev *sd,
+                            u32 input, u32 output, u32 config)
 {
         struct wm8775_state *state = to_state(sd);
 
@@ -88,11 +89,11 @@ static int wm8775_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *r
            16 combinations.
            If only one input is active (the normal case) then the
            input values 1, 2, 4 or 8 should be used. */
-        if (route->input > 15) {
-                v4l2_err(sd, "Invalid input %d.\n", route->input);
+        if (input > 15) {
+                v4l2_err(sd, "Invalid input %d.\n", input);
                 return -EINVAL;
         }
-        state->input = route->input;
+        state->input = input;
         if (state->muted)
                 return 0;
         wm8775_write(sd, R21, 0x0c0);
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index afecf32f1a87..d439c76b27e1 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -143,8 +143,8 @@ Private IOCTL to set up for displaying MJPEG
 #ifdef __KERNEL__
 
 #define MAJOR_VERSION 0         /* driver major version */
-#define MINOR_VERSION 9         /* driver minor version */
-#define RELEASE_VERSION 5       /* release version */
+#define MINOR_VERSION 10        /* driver minor version */
+#define RELEASE_VERSION 0       /* release version */
 
 #define ZORAN_NAME    "ZORAN"   /* name of the device */
 
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index f91bba435ed5..ea6c577b0eb3 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1087,10 +1087,8 @@ zr36057_init (struct zoran *zr)
                 detect_guest_activity(zr);
         test_interrupts(zr);
         if (!pass_through) {
-                struct v4l2_routing route = { 2, 0 };
-
                 decoder_call(zr, video, s_stream, 0);
-                encoder_call(zr, video, s_routing, &route);
+                encoder_call(zr, video, s_routing, 2, 0, 0);
         }
 
         zr->zoran_proc = NULL;
@@ -1360,11 +1358,13 @@ static int __devinit zoran_probe(struct pci_dev *pdev,
                 goto zr_free_irq;
         }
 
-        zr->decoder = v4l2_i2c_new_probed_subdev(&zr->i2c_adapter,
-                zr->card.mod_decoder, zr->card.i2c_decoder, zr->card.addrs_decoder);
+        zr->decoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+                &zr->i2c_adapter, zr->card.mod_decoder, zr->card.i2c_decoder,
+                zr->card.addrs_decoder);
 
         if (zr->card.mod_encoder)
-                zr->encoder = v4l2_i2c_new_probed_subdev(&zr->i2c_adapter,
+                zr->encoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+                        &zr->i2c_adapter,
                         zr->card.mod_encoder, zr->card.i2c_encoder,
                         zr->card.addrs_encoder);
 
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index e0223deed35e..f6c2fb4fc3b4 100644
--- a/drivers/media/video/zoran/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -971,7 +971,6 @@ zr36057_enable_jpg (struct zoran          *zr,
         struct vfe_settings cap;
         int field_size =
             zr->jpg_buffers.buffer_size / zr->jpg_settings.field_per_buff;
-        struct v4l2_routing route = { 0, 0 };
 
         zr->codec_mode = mode;
 
@@ -994,8 +993,7 @@ zr36057_enable_jpg (struct zoran          *zr,
                  */
                 set_videobus_dir(zr, 0);
                 decoder_call(zr, video, s_stream, 1);
-                route.input = 0;
-                encoder_call(zr, video, s_routing, &route);
+                encoder_call(zr, video, s_routing, 0, 0, 0);
 
                 /* Take the JPEG codec and the VFE out of sleep */
                 jpeg_codec_sleep(zr, 0);
@@ -1043,8 +1041,7 @@ zr36057_enable_jpg (struct zoran          *zr,
                  */
                 decoder_call(zr, video, s_stream, 0);
                 set_videobus_dir(zr, 1);
-                route.input = 1;
-                encoder_call(zr, video, s_routing, &route);
+                encoder_call(zr, video, s_routing, 1, 0, 0);
 
                 /* Take the JPEG codec and the VFE out of sleep */
                 jpeg_codec_sleep(zr, 0);
@@ -1089,8 +1086,7 @@ zr36057_enable_jpg (struct zoran          *zr,
                 zr36057_adjust_vfe(zr, mode);
 
                 decoder_call(zr, video, s_stream, 1);
-                route.input = 0;
-                encoder_call(zr, video, s_routing, &route);
+                encoder_call(zr, video, s_routing, 0, 0, 0);
 
                 dprintk(2, KERN_INFO "%s: enable_jpg(IDLE)\n", ZR_DEVNAME(zr));
                 break;
@@ -1571,8 +1567,6 @@ zoran_set_pci_master (struct zoran *zr,
 void
 zoran_init_hardware (struct zoran *zr)
 {
-        struct v4l2_routing route = { 0, 0 };
-
         /* Enable bus-mastering */
         zoran_set_pci_master(zr, 1);
 
@@ -1581,16 +1575,14 @@ zoran_init_hardware (struct zoran *zr)
                 zr->card.init(zr);
         }
 
-        route.input = zr->card.input[zr->input].muxsel;
-
         decoder_call(zr, core, init, 0);
-        decoder_call(zr, tuner, s_std, zr->norm);
-        decoder_call(zr, video, s_routing, &route);
+        decoder_call(zr, core, s_std, zr->norm);
+        decoder_call(zr, video, s_routing,
+                zr->card.input[zr->input].muxsel, 0, 0);
 
         encoder_call(zr, core, init, 0);
         encoder_call(zr, video, s_std_output, zr->norm);
-        route.input = 0;
-        encoder_call(zr, video, s_routing, &route);
+        encoder_call(zr, video, s_routing, 0, 0, 0);
 
         /* toggle JPEG codec sleep to sync PLL */
         jpeg_codec_sleep(zr, 1);
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index f16e57cf11e4..092333b1c34f 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1018,10 +1018,8 @@ zoran_close(struct file  *file)
                 zoran_set_pci_master(zr, 0);
 
                 if (!pass_through) {    /* Switch to color bar */
-                        struct v4l2_routing route = { 2, 0 };
-
                         decoder_call(zr, video, s_stream, 0);
-                        encoder_call(zr, video, s_routing, &route);
+                        encoder_call(zr, video, s_routing, 2, 0, 0);
                 }
         }
 
@@ -1449,7 +1447,7 @@ zoran_set_norm (struct zoran *zr,
                 v4l2_std_id std = 0;
 
                 decoder_call(zr, video, querystd, &std);
-                decoder_call(zr, tuner, s_std, std);
+                decoder_call(zr, core, s_std, std);
 
                 /* let changes come into effect */
                 ssleep(2);
@@ -1461,7 +1459,7 @@ zoran_set_norm (struct zoran *zr,
                                 "%s: %s - no norm detected\n",
                                 ZR_DEVNAME(zr), __func__);
                         /* reset norm */
-                        decoder_call(zr, tuner, s_std, zr->norm);
+                        decoder_call(zr, core, s_std, zr->norm);
                         return -EIO;
                 }
 
@@ -1480,7 +1478,7 @@ zoran_set_norm (struct zoran *zr,
         if (on)
                 zr36057_overlay(zr, 0);
 
-        decoder_call(zr, tuner, s_std, norm);
+        decoder_call(zr, core, s_std, norm);
         encoder_call(zr, video, s_std_output, norm);
 
         if (on)
@@ -1496,8 +1494,6 @@ static int
 zoran_set_input (struct zoran *zr,
                  int           input)
 {
-        struct v4l2_routing route = { 0, 0 };
-
         if (input == zr->input) {
                 return 0;
         }
@@ -1519,10 +1515,10 @@ zoran_set_input (struct zoran *zr,
                 return -EINVAL;
         }
 
-        route.input = zr->card.input[input].muxsel;
         zr->input = input;
 
-        decoder_call(zr, video, s_routing, &route);
+        decoder_call(zr, video, s_routing,
+                        zr->card.input[input].muxsel, 0, 0);
 
         return 0;
 }
@@ -1748,7 +1744,6 @@ jpgreqbuf_unlock_and_return:
         case BUZIOC_G_STATUS:
         {
                 struct zoran_status *bstat = arg;
-                struct v4l2_routing route = { 0, 0 };
                 int status = 0, res = 0;
                 v4l2_std_id norm;
 
@@ -1762,8 +1757,6 @@ jpgreqbuf_unlock_and_return:
                         return -EINVAL;
                 }
 
-                route.input = zr->card.input[bstat->input].muxsel;
-
                 mutex_lock(&zr->resource_lock);
 
                 if (zr->codec_mode != BUZ_MODE_IDLE) {
@@ -1775,7 +1768,8 @@ jpgreqbuf_unlock_and_return:
                         goto gstat_unlock_and_return;
                 }
 
-                decoder_call(zr, video, s_routing, &route);
+                decoder_call(zr, video, s_routing,
+                                zr->card.input[bstat->input].muxsel, 0, 0);
 
                 /* sleep 1 second */
                 ssleep(1);
@@ -1785,8 +1779,8 @@ jpgreqbuf_unlock_and_return:
                 decoder_call(zr, video, g_input_status, &status);
 
                 /* restore previous input and norm */
-                route.input = zr->card.input[zr->input].muxsel;
-                decoder_call(zr, video, s_routing, &route);
+                decoder_call(zr, video, s_routing,
+                                zr->card.input[zr->input].muxsel, 0, 0);
 gstat_unlock_and_return:
                 mutex_unlock(&zr->resource_lock);
 
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 221409fe1682..ac169c9eb18d 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -26,7 +26,6 @@
  */
 
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index ee9fbc172405..c9087de5c6c6 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -51,6 +51,7 @@
 #define I2C_HW_B_CX2341X        0x010020 /* Conexant CX2341X MPEG encoder cards */
 #define I2C_HW_B_CX23885        0x010022 /* conexant 23885 based tv cards (bus1) */
 #define I2C_HW_B_AU0828         0x010023 /* auvitek au0828 usb bridge */
+#define I2C_HW_B_CX231XX        0x010024 /* Conexant CX231XX USB based cards */
 #define I2C_HW_B_HDPVR          0x010025 /* Hauppauge HD PVR */
 
 /* --- SGI adapters                                                     */
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 139d234923cd..ebb2ea6b4995 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -737,6 +737,11 @@ struct v4l2_input {
 #define V4L2_IN_ST_NO_SIGNAL   0x00000002
 #define V4L2_IN_ST_NO_COLOR    0x00000004
 
+/* field 'status' - sensor orientation */
+/* If sensor is mounted upside down set both bits */
+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
+
 /* field 'status' - analog */
 #define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
 #define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 6ab854931c05..90cf22ada8b4 100644
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -54,13 +54,13 @@
    =======
 
    So to specify a complete routing scheme for the msp3400 you will have to
-   specify in the 'input' field of the v4l2_routing struct:
+   specify in the 'input' arg of the s_routing function:
 
    1) which tuner input to use
    2) which SCART input to use
    3) which DSP input to use for each DSP output
 
-   And in the 'output' field of the v4l2_routing struct you specify:
+   And in the 'output' arg of the s_routing function you specify:
 
    1) which SCART input to use for each SCART output
 
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 57db48dd85b8..30d9629198ef 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -17,10 +17,45 @@
 #define OV772X_FLAG_VFLIP     0x00000001 /* Vertical flip image */
 #define OV772X_FLAG_HFLIP     0x00000002 /* Horizontal flip image */
 
+/*
+ * for Edge ctrl
+ *
+ * strength also control Auto or Manual Edge Control Mode
+ * see also OV772X_MANUAL_EDGE_CTRL
+ */
+struct ov772x_edge_ctrl {
+        unsigned char strength;
+        unsigned char threshold;
+        unsigned char upper;
+        unsigned char lower;
+};
+
+#define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */
+#define EDGE_STRENGTH_MASK      0x1F
+#define EDGE_THRESHOLD_MASK     0x0F
+#define EDGE_UPPER_MASK         0xFF
+#define EDGE_LOWER_MASK         0xFF
+
+#define OV772X_AUTO_EDGECTRL(u, l)      \
+{                                       \
+        .upper = (u & EDGE_UPPER_MASK), \
+        .lower = (l & EDGE_LOWER_MASK), \
+}
+
+#define OV772X_MANUAL_EDGECTRL(s, t)                                    \
+{                                                                       \
+        .strength  = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\
+        .threshold = (t & EDGE_THRESHOLD_MASK),                         \
+}
+
+/*
+ * ov772x camera info
+ */
 struct ov772x_camera_info {
         unsigned long          buswidth;
         unsigned long          flags;
         struct soc_camera_link link;
+        struct ov772x_edge_ctrl edgectrl;
 };
 
 #endif /* __OV772X_H__ */
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index fff4235adae5..7a9f76ecbbbd 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -18,7 +18,7 @@
 #include <linux/vmalloc.h>      /* for vmalloc() */
 #include <linux/mm.h>           /* for vmalloc_to_page() */
 
-#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
+#define SAA7146_VERSION_CODE 0x000600   /* 0.6.0 */
 
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
diff --git a/include/media/tvaudio.h b/include/media/tvaudio.h
index 6915aafc875a..1ac8184693f8 100644
--- a/include/media/tvaudio.h
+++ b/include/media/tvaudio.h
@@ -21,10 +21,29 @@
 #ifndef _TVAUDIO_H
 #define _TVAUDIO_H
 
+#include <media/i2c-addr.h>
+
 /* The tvaudio module accepts the following inputs: */
 #define TVAUDIO_INPUT_TUNER  0
 #define TVAUDIO_INPUT_RADIO  1
 #define TVAUDIO_INPUT_EXTERN 2
 #define TVAUDIO_INPUT_INTERN 3
 
+static inline const unsigned short *tvaudio_addrs(void)
+{
+        static const unsigned short addrs[] = {
+                I2C_ADDR_TDA8425   >> 1,
+                I2C_ADDR_TEA6300   >> 1,
+                I2C_ADDR_TEA6420   >> 1,
+                I2C_ADDR_TDA9840   >> 1,
+                I2C_ADDR_TDA985x_L >> 1,
+                I2C_ADDR_TDA985x_H >> 1,
+                I2C_ADDR_TDA9874   >> 1,
+                I2C_ADDR_PIC16C54  >> 1,
+                I2C_CLIENT_END
+        };
+
+        return addrs;
+}
+
 #endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 3a6905615d68..c48c24e4d0fa 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -125,7 +125,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match);
 
 /* ------------------------------------------------------------------------- */
 
-/* Helper function for I2C legacy drivers */
+/* I2C Helper functions */
 
 struct i2c_driver;
 struct i2c_adapter;
@@ -135,21 +135,24 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct v4l2_subdev_ops;
 
-int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver,
-                const char *name,
-                int (*probe)(struct i2c_client *, const struct i2c_device_id *));
 
 /* Load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type, u8 addr);
 /* Probe and load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type,
                 const unsigned short *addrs);
+/* Like v4l2_i2c_new_probed_subdev, except probe for a single address. */
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
+                const char *module_name, const char *client_type, u8 addr);
 /* Initialize an v4l2_subdev with data from an i2c_client struct */
 void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
                 const struct v4l2_subdev_ops *ops);
@@ -171,139 +174,23 @@ const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type);
 
 /* ------------------------------------------------------------------------- */
 
-/* Internal ioctls */
-
-/* VIDIOC_INT_DECODE_VBI_LINE */
-struct v4l2_decode_vbi_line {
-        u32 is_second_field;    /* Set to 0 for the first (odd) field,
-                                   set to 1 for the second (even) field. */
-        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
-                                   On exit points to the start of the payload. */
-        u32 line;               /* Line number of the sliced VBI data (1-23) */
-        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
-};
+/* Note: these remaining ioctls/structs should be removed as well, but they are
+   still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and
+   v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup
+   is needed in those modules. */
 
+/* s_config */
 struct v4l2_priv_tun_config {
         int tuner;
         void *priv;
 };
-
-/* audio ioctls */
-
-/* v4l device was opened in Radio mode, to be replaced by VIDIOC_INT_S_TUNER_MODE */
-#define AUDC_SET_RADIO        _IO('d',88)
-
-/* tuner ioctls */
-
-/* Sets tuner type and its I2C addr */
-#define TUNER_SET_TYPE_ADDR          _IOW('d', 90, int)
-
-/* Puts tuner on powersaving state, disabling it, except for i2c. To be replaced
-   by VIDIOC_INT_S_STANDBY. */
-#define TUNER_SET_STANDBY            _IOW('d', 91, int)
-
-/* Sets tda9887 specific stuff, like port1, port2 and qss */
 #define TUNER_SET_CONFIG           _IOW('d', 92, struct v4l2_priv_tun_config)
 
-/* Switch the tuner to a specific tuner mode. Replacement of AUDC_SET_RADIO */
-#define VIDIOC_INT_S_TUNER_MODE      _IOW('d', 93, enum v4l2_tuner_type)
-
-/* Generic standby command. Passing -1 (all bits set to 1) will put the whole
-   chip into standby mode, value 0 will make the chip fully active. Specific
-   bits can be used by certain chips to enable/disable specific subsystems.
-   Replacement of TUNER_SET_STANDBY. */
-#define VIDIOC_INT_S_STANDBY         _IOW('d', 94, u32)
-
-/* 100, 101 used by  VIDIOC_DBG_[SG]_REGISTER */
-
-/* Generic reset command. The argument selects which subsystems to reset.
-   Passing 0 will always reset the whole chip. */
 #define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
 
-/* Set the frequency (in Hz) of the audio clock output.
-   Used to slave an audio processor to the video decoder, ensuring that audio
-   and video remain synchronized.
-   Usual values for the frequency are 48000, 44100 or 32000 Hz.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_AUDIO_CLOCK_FREQ     _IOW ('d', 103, u32)
-
-/* Video decoders that support sliced VBI need to implement this ioctl.
-   Field p of the v4l2_sliced_vbi_line struct is set to the start of the VBI
-   data that was generated by the decoder. The driver then parses the sliced
-   VBI data and sets the other fields in the struct accordingly. The pointer p
-   is updated to point to the start of the payload which can be copied
-   verbatim into the data field of the v4l2_sliced_vbi_data struct. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_DECODE_VBI_LINE      _IOWR('d', 104, struct v4l2_decode_vbi_line)
-
-/* Used to generate VBI signals on a video signal. v4l2_sliced_vbi_data is
-   filled with the data packets that should be output. Note that if you set
-   the line field to 0, then that VBI signal is disabled. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_S_VBI_DATA           _IOW ('d', 105, struct v4l2_sliced_vbi_data)
-
-/* Used to obtain the sliced VBI packet from a readback register. Not all
-   video decoders support this. If no data is available because the readback
-   register contains invalid or erroneous data -EIO is returned. Note that
-   you must fill in the 'id' member and the 'field' member (to determine
-   whether CC data from the first or second field should be obtained). */
-#define VIDIOC_INT_G_VBI_DATA           _IOWR('d', 106, struct v4l2_sliced_vbi_data)
-
-/* Sets I2S speed in bps. This is used to provide a standard way to select I2S
-   clock used by driving digital audio streams at some board designs.
-   Usual values for the frequency are 1024000 and 2048000.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_I2S_CLOCK_FREQ       _IOW ('d', 108, u32)
-
-/* Routing definition, device dependent. It specifies which inputs (if any)
-   should be routed to which outputs (if any). */
 struct v4l2_routing {
         u32 input;
         u32 output;
 };
 
-/* These internal commands should be used to define the inputs and outputs
-   of an audio/video chip. They will replace the v4l2 API commands
-   VIDIOC_S/G_INPUT, VIDIOC_S/G_OUTPUT, VIDIOC_S/G_AUDIO and VIDIOC_S/G_AUDOUT
-   that are meant to be used by the user.
-   The internal commands should be used to switch inputs/outputs
-   because only the driver knows how to map a 'Television' input to the precise
-   input/output routing of an A/D converter, or a DSP, or a video digitizer.
-   These four commands should only be sent directly to an i2c device, they
-   should not be broadcast as the routing is very device specific. */
-#define VIDIOC_INT_S_AUDIO_ROUTING      _IOW ('d', 109, struct v4l2_routing)
-#define VIDIOC_INT_G_AUDIO_ROUTING      _IOR ('d', 110, struct v4l2_routing)
-#define VIDIOC_INT_S_VIDEO_ROUTING      _IOW ('d', 111, struct v4l2_routing)
-#define VIDIOC_INT_G_VIDEO_ROUTING      _IOR ('d', 112, struct v4l2_routing)
-
-struct v4l2_crystal_freq {
-        u32 freq;       /* frequency in Hz of the crystal */
-        u32 flags;      /* device specific flags */
-};
-
-/* Sets the frequency of the crystal used to generate the clocks.
-   An extra flags field allows device specific configuration regarding
-   clock frequency dividers, etc. If not used, then set flags to 0.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_S_CRYSTAL_FREQ       _IOW('d', 113, struct v4l2_crystal_freq)
-
-/* Initialize the sensor registors to some sort of reasonable
-   default values. */
-#define VIDIOC_INT_INIT                 _IOW('d', 114, u32)
-
-/* Set v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_S_STD_OUTPUT         _IOW('d', 115, v4l2_std_id)
-
-/* Get v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_G_STD_OUTPUT         _IOW('d', 116, v4l2_std_id)
-
-/* Set GPIO pins. Very simple right now, might need to be extended with
-   a v4l2_gpio struct if a direction is also needed. */
-#define VIDIOC_INT_S_GPIO               _IOW('d', 117, u32)
-
-/* Get input status. Same as the status field in the v4l2_input struct. */
-#define VIDIOC_INT_G_INPUT_STATUS       _IOR('d', 118, u32)
-
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h
deleted file mode 100644
index e65dd9d84e8b..000000000000
--- a/include/media/v4l2-i2c-drv-legacy.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * v4l2-i2c-drv-legacy.h - contains I2C handling code that's identical
- *                  for all V4L2 I2C drivers. Use this header if the
- *                  I2C driver is used by both legacy drivers and
- *                  drivers converted to the bus-based I2C API.
- *
- * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
- *
- * 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.
- */
-
-/* NOTE: the full version of this header is in the v4l-dvb repository
- * and allows v4l i2c drivers to be compiled on older kernels as well.
- * The version of this header as it appears in the kernel is a stripped
- * version (without all the backwards compatibility stuff) and so it
- * looks a bit odd.
- *
- * If you look at the full version then you will understand the reason
- * for introducing this header since you really don't want to have all
- * the tricky backwards compatibility code in each and every i2c driver.
- */
-
-struct v4l2_i2c_driver_data {
-        const char * const name;
-        int driverid;
-        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
-        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
-        int (*remove)(struct i2c_client *client);
-        int (*suspend)(struct i2c_client *client, pm_message_t state);
-        int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
-        const struct i2c_device_id *id_table;
-};
-
-static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static const struct i2c_client_address_data addr_data;
-static struct i2c_driver v4l2_i2c_driver_legacy;
-static char v4l2_i2c_drv_name_legacy[32];
-
-static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address, int kind)
-{
-        return v4l2_i2c_attach(adapter, address, &v4l2_i2c_driver_legacy,
-                        v4l2_i2c_drv_name_legacy, v4l2_i2c_data.probe);
-}
-
-static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
-{
-        if (v4l2_i2c_data.legacy_probe) {
-                if (v4l2_i2c_data.legacy_probe(adapter))
-                        return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-                return 0;
-        }
-        if (adapter->class & v4l2_i2c_data.legacy_class)
-                return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-        return 0;
-}
-
-static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
-{
-        int err;
-
-        if (v4l2_i2c_data.remove)
-                v4l2_i2c_data.remove(client);
-
-        err = i2c_detach_client(client);
-        if (err)
-                return err;
-        kfree(client);
-        return 0;
-}
-
-static int v4l2_i2c_drv_suspend_helper(struct i2c_client *client, pm_message_t state)
-{
-        return v4l2_i2c_data.suspend ? v4l2_i2c_data.suspend(client, state) : 0;
-}
-
-static int v4l2_i2c_drv_resume_helper(struct i2c_client *client)
-{
-        return v4l2_i2c_data.resume ? v4l2_i2c_data.resume(client) : 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver_legacy = {
-        .driver = {
-                .owner = THIS_MODULE,
-        },
-        .attach_adapter = v4l2_i2c_drv_probe_legacy,
-        .detach_client = v4l2_i2c_drv_detach_legacy,
-        .suspend = v4l2_i2c_drv_suspend_helper,
-        .resume  = v4l2_i2c_drv_resume_helper,
-};
-
-/* ----------------------------------------------------------------------- */
-
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver = {
-        .suspend        = v4l2_i2c_drv_suspend_helper,
-        .resume         = v4l2_i2c_drv_resume_helper,
-};
-
-static int __init v4l2_i2c_drv_init(void)
-{
-        int err;
-
-        strlcpy(v4l2_i2c_drv_name_legacy, v4l2_i2c_data.name, sizeof(v4l2_i2c_drv_name_legacy));
-        strlcat(v4l2_i2c_drv_name_legacy, "'", sizeof(v4l2_i2c_drv_name_legacy));
-
-        if (v4l2_i2c_data.legacy_class == 0)
-                v4l2_i2c_data.legacy_class = I2C_CLASS_TV_ANALOG;
-
-        v4l2_i2c_driver_legacy.driver.name = v4l2_i2c_drv_name_legacy;
-        v4l2_i2c_driver_legacy.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver_legacy.command = v4l2_i2c_data.command;
-        err = i2c_add_driver(&v4l2_i2c_driver_legacy);
-
-        if (err)
-                return err;
-        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver.command = v4l2_i2c_data.command;
-        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
-        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
-        v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table;
-        err = i2c_add_driver(&v4l2_i2c_driver);
-        if (err)
-                i2c_del_driver(&v4l2_i2c_driver_legacy);
-        return err;
-}
-
-static void __exit v4l2_i2c_drv_cleanup(void)
-{
-        i2c_del_driver(&v4l2_i2c_driver_legacy);
-        i2c_del_driver(&v4l2_i2c_driver);
-}
-
-module_init(v4l2_i2c_drv_init);
-module_exit(v4l2_i2c_drv_cleanup);
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index efdc8bf27f87..10a2882c3cbf 100644
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -39,14 +39,11 @@
 
 struct v4l2_i2c_driver_data {
         const char * const name;
-        int driverid;
         int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
         int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
         int (*remove)(struct i2c_client *client);
         int (*suspend)(struct i2c_client *client, pm_message_t state);
         int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
         const struct i2c_device_id *id_table;
 };
 
@@ -54,12 +51,11 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data;
 static struct i2c_driver v4l2_i2c_driver;
 
 
-/* Bus-based I2C implementation for kernels >= 2.6.22 */
+/* Bus-based I2C implementation for kernels >= 2.6.26 */
 
 static int __init v4l2_i2c_drv_init(void)
 {
         v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
         v4l2_i2c_driver.command = v4l2_i2c_data.command;
         v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
         v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 1d181b4ccb01..17856081c809 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -27,6 +27,16 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct tuner_setup;
 
+/* decode_vbi_line */
+struct v4l2_decode_vbi_line {
+        u32 is_second_field;    /* Set to 0 for the first (odd) field,
+                                   set to 1 for the second (even) field. */
+        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
+                                   On exit points to the start of the payload. */
+        u32 line;               /* Line number of the sliced VBI data (1-23) */
+        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
+};
+
 /* Sub-devices are devices that are connected somehow to the main bridge
    device. These devices are usually audio/video muxers/encoders/decoders or
    sensors and webcam controllers.
@@ -68,11 +78,26 @@ struct tuner_setup;
    the use-case it might be better to use subdev-specific ops (currently
    not yet implemented) since ops provide proper type-checking.
  */
+
+/* init: initialize the sensor registors to some sort of reasonable default
+        values. Do not use for new drivers and should be removed in existing
+        drivers.
+
+   load_fw: load firmware.
+
+   reset: generic reset command. The argument selects which subsystems to
+        reset. Passing 0 will always reset the whole chip. Do not use for new
+        drivers without discussing this first on the linux-media mailinglist.
+        There should be no reason normally to reset a device.
+
+   s_gpio: set GPIO pins. Very simple right now, might need to be extended with
+        a direction argument if needed.
+ */
 struct v4l2_subdev_core_ops {
         int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
         int (*log_status)(struct v4l2_subdev *sd);
         int (*init)(struct v4l2_subdev *sd, u32 val);
-        int (*s_standby)(struct v4l2_subdev *sd, u32 standby);
+        int (*load_fw)(struct v4l2_subdev *sd);
         int (*reset)(struct v4l2_subdev *sd, u32 val);
         int (*s_gpio)(struct v4l2_subdev *sd, u32 val);
         int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc);
@@ -82,6 +107,7 @@ struct v4l2_subdev_core_ops {
         int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
         int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
         int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
+        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
         long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
@@ -89,6 +115,16 @@ struct v4l2_subdev_core_ops {
 #endif
 };
 
+/* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
+
+   s_radio: v4l device was opened in Radio mode, to be replaced by s_mode.
+
+   s_type_addr: sets tuner type and its I2C addr.
+
+   s_config: sets tda9887 specific stuff, like port1, port2 and qss
+
+   s_standby: puts tuner on powersaving state, disabling it, except for i2c.
+ */
 struct v4l2_subdev_tuner_ops {
         int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
         int (*s_radio)(struct v4l2_subdev *sd);
@@ -96,20 +132,77 @@ struct v4l2_subdev_tuner_ops {
         int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
         int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
         int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
-        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
         int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type);
         int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config);
+        int (*s_standby)(struct v4l2_subdev *sd);
 };
 
+/* s_clock_freq: set the frequency (in Hz) of the audio clock output.
+        Used to slave an audio processor to the video decoder, ensuring that
+        audio and video remain synchronized. Usual values for the frequency
+        are 48000, 44100 or 32000 Hz. If the frequency is not supported, then
+        -EINVAL is returned.
+
+   s_i2s_clock_freq: sets I2S speed in bps. This is used to provide a standard
+        way to select I2S clock used by driving digital audio streams at some
+        board designs. Usual values for the frequency are 1024000 and 2048000.
+        If the frequency is not supported, then -EINVAL is returned.
+
+   s_routing: used to define the input and/or output pins of an audio chip,
+        and any additional configuration data.
+        Never attempt to use user-level input IDs (e.g. Composite, S-Video,
+        Tuner) at this level. An i2c device shouldn't know about whether an
+        input pin is connected to a Composite connector, become on another
+        board or platform it might be connected to something else entirely.
+        The calling driver is responsible for mapping a user-level input to
+        the right pins on the i2c device.
+ */
 struct v4l2_subdev_audio_ops {
         int (*s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
         int (*s_i2s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
 };
 
+/*
+   decode_vbi_line: video decoders that support sliced VBI need to implement
+        this ioctl. Field p of the v4l2_sliced_vbi_line struct is set to the
+        start of the VBI data that was generated by the decoder. The driver
+        then parses the sliced VBI data and sets the other fields in the
+        struct accordingly. The pointer p is updated to point to the start of
+        the payload which can be copied verbatim into the data field of the
+        v4l2_sliced_vbi_data struct. If no valid VBI data was found, then the
+        type field is set to 0 on return.
+
+   s_vbi_data: used to generate VBI signals on a video signal.
+        v4l2_sliced_vbi_data is filled with the data packets that should be
+        output. Note that if you set the line field to 0, then that VBI signal
+        is disabled. If no valid VBI data was found, then the type field is
+        set to 0 on return.
+
+   g_vbi_data: used to obtain the sliced VBI packet from a readback register.
+        Not all video decoders support this. If no data is available because
+        the readback register contains invalid or erroneous data -EIO is
+        returned. Note that you must fill in the 'id' member and the 'field'
+        member (to determine whether CC data from the first or second field
+        should be obtained).
+
+   s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
+        video input devices.
+
+  s_crystal_freq: sets the frequency of the crystal used to generate the
+        clocks in Hz. An extra flags field allows device specific configuration
+        regarding clock frequency dividers, etc. If not used, then set flags
+        to 0. If the frequency is not supported, then -EINVAL is returned.
+
+   g_input_status: get input status. Same as the status field in the v4l2_input
+        struct.
+
+   s_routing: see s_routing in audio_ops, except this version is for video
+        devices.
+ */
 struct v4l2_subdev_video_ops {
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
-        int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
+        int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags);
         int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
         int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
         int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
@@ -163,18 +256,6 @@ static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
         return sd->priv;
 }
 
-/* Convert an ioctl-type command to the proper v4l2_subdev_ops function call.
-   This is used by subdev modules that can be called by both old-style ioctl
-   commands and through the v4l2_subdev_ops.
-
-   The ioctl API of the subdev driver can call this function to call the
-   right ops based on the ioctl cmd and arg.
-
-   Once all subdev drivers have been converted and all drivers no longer
-   use the ioctl interface, then this function can be removed.
- */
-int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg);
-
 static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
                                         const struct v4l2_subdev_ops *ops)
 {