149 files changed, 8744 insertions, 4188 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 87410dbd3df4..91d25798ae4a 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -70,6 +70,7 @@ config VIDEO_TUNER
         depends on I2C
 
 config VIDEO_BUF
+        depends on PCI
         tristate
 
 config VIDEO_BUF_DVB
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index f33e5d973413..c120114c241b 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -5,8 +5,4 @@ config VIDEO_SAA7146
 config VIDEO_SAA7146_VV
         tristate
         select VIDEO_BUF
-        select VIDEO_VIDEOBUF
         select VIDEO_SAA7146
-
-config VIDEO_VIDEOBUF
-        tristate
diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
index 9a8dd8764c99..cbf7c0564889 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/common/ir-functions.c
@@ -256,6 +256,112 @@ int ir_decode_biphase(u32 *samples, int count, int low, int high)
         return value;
 }
 
+/* RC5 decoding stuff, moved from bttv-input.c to share it with
+ * saa7134 */
+
+/* decode raw bit pattern to RC5 code */
+u32 ir_rc5_decode(unsigned int code)
+{
+        unsigned int org_code = code;
+        unsigned int pair;
+        unsigned int rc5 = 0;
+        int i;
+
+        for (i = 0; i < 14; ++i) {
+                pair = code & 0x3;
+                code >>= 2;
+
+                rc5 <<= 1;
+                switch (pair) {
+                case 0:
+                case 2:
+                        break;
+                case 1:
+                        rc5 |= 1;
+                        break;
+                case 3:
+                        dprintk(1, "ir-common: ir_rc5_decode(%x) bad code\n", org_code);
+                        return 0;
+                }
+        }
+        dprintk(1, "ir-common: code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
+                "instr=%x\n", rc5, org_code, RC5_START(rc5),
+                RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
+        return rc5;
+}
+
+void ir_rc5_timer_end(unsigned long data)
+{
+        struct card_ir *ir = (struct card_ir *)data;
+        struct timeval tv;
+        unsigned long current_jiffies, timeout;
+        u32 gap;
+        u32 rc5 = 0;
+
+        /* get time */
+        current_jiffies = jiffies;
+        do_gettimeofday(&tv);
+
+        /* avoid overflow with gap >1s */
+        if (tv.tv_sec - ir->base_time.tv_sec > 1) {
+                gap = 200000;
+        } else {
+                gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+                    tv.tv_usec - ir->base_time.tv_usec;
+        }
+
+        /* Allow some timmer jitter (RC5 is ~24ms anyway so this is ok) */
+        if (gap < 28000) {
+                dprintk(1, "ir-common: spurious timer_end\n");
+                return;
+        }
+
+        ir->active = 0;
+        if (ir->last_bit < 20) {
+                /* ignore spurious codes (caused by light/other remotes) */
+                dprintk(1, "ir-common: short code: %x\n", ir->code);
+        } else {
+                ir->code = (ir->code << ir->shift_by) | 1;
+                rc5 = ir_rc5_decode(ir->code);
+
+                /* two start bits? */
+                if (RC5_START(rc5) != ir->start) {
+                        dprintk(1, "ir-common: rc5 start bits invalid: %u\n", RC5_START(rc5));
+
+                        /* right address? */
+                } else if (RC5_ADDR(rc5) == ir->addr) {
+                        u32 toggle = RC5_TOGGLE(rc5);
+                        u32 instr = RC5_INSTR(rc5);
+
+                        /* Good code, decide if repeat/repress */
+                        if (toggle != RC5_TOGGLE(ir->last_rc5) ||
+                            instr != RC5_INSTR(ir->last_rc5)) {
+                                dprintk(1, "ir-common: instruction %x, toggle %x\n", instr,
+                                        toggle);
+                                ir_input_nokey(ir->dev, &ir->ir);
+                                ir_input_keydown(ir->dev, &ir->ir, instr,
+                                                 instr);
+                        }
+
+                        /* Set/reset key-up timer */
+                        timeout = current_jiffies + (500 + ir->rc5_key_timeout
+                                                     * HZ) / 1000;
+                        mod_timer(&ir->timer_keyup, timeout);
+
+                        /* Save code for repeat test */
+                        ir->last_rc5 = rc5;
+                }
+        }
+}
+
+void ir_rc5_timer_keyup(unsigned long data)
+{
+        struct card_ir *ir = (struct card_ir *)data;
+
+        dprintk(1, "ir-common: key released\n");
+        ir_input_nokey(ir->dev, &ir->ir);
+}
+
 EXPORT_SYMBOL_GPL(ir_input_init);
 EXPORT_SYMBOL_GPL(ir_input_nokey);
 EXPORT_SYMBOL_GPL(ir_input_keydown);
@@ -265,6 +371,10 @@ EXPORT_SYMBOL_GPL(ir_dump_samples);
 EXPORT_SYMBOL_GPL(ir_decode_biphase);
 EXPORT_SYMBOL_GPL(ir_decode_pulsedistance);
 
+EXPORT_SYMBOL_GPL(ir_rc5_decode);
+EXPORT_SYMBOL_GPL(ir_rc5_timer_end);
+EXPORT_SYMBOL_GPL(ir_rc5_timer_keyup);
+
 /*
  * Local variables:
  * c-basic-offset: 8
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 0e948a5c5a03..03b47a262f27 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1606,3 +1606,174 @@ IR_KEYTAB_TYPE ir_codes_budget_ci_old[IR_KEYTAB_SIZE] = {
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_budget_ci_old);
+
+/*
+ * Marc Fargas <telenieko@telenieko.com>
+ * this is the remote control that comes with the asus p7131
+ * which has a label saying is "Model PC-39"
+ */
+IR_KEYTAB_TYPE ir_codes_asus_pc39[IR_KEYTAB_SIZE] = {
+        /* Keys 0 to 9 */
+        [ 0x15 ] = KEY_0,
+        [ 0x29 ] = KEY_1,
+        [ 0x2d ] = KEY_2,
+        [ 0x2b ] = KEY_3,
+        [ 0x09 ] = KEY_4,
+        [ 0x0d ] = KEY_5,
+        [ 0x0b ] = KEY_6,
+        [ 0x31 ] = KEY_7,
+        [ 0x35 ] = KEY_8,
+        [ 0x33 ] = KEY_9,
+
+        [ 0x3e ] = KEY_RADIO,           /* radio */
+        [ 0x03 ] = KEY_MENU,            /* dvd/menu */
+        [ 0x2a ] = KEY_VOLUMEUP,
+        [ 0x19 ] = KEY_VOLUMEDOWN,
+        [ 0x37 ] = KEY_UP,
+        [ 0x3b ] = KEY_DOWN,
+        [ 0x27 ] = KEY_LEFT,
+        [ 0x2f ] = KEY_RIGHT,
+        [ 0x25 ] = KEY_VIDEO,           /* video */
+        [ 0x39 ] = KEY_AUDIO,           /* music */
+
+        [ 0x21 ] = KEY_TV,              /* tv */
+        [ 0x1d ] = KEY_EXIT,            /* back */
+        [ 0x0a ] = KEY_CHANNELUP,       /* channel / program + */
+        [ 0x1b ] = KEY_CHANNELDOWN,     /* channel / program - */
+        [ 0x1a ] = KEY_ENTER,           /* enter */
+
+        [ 0x06 ] = KEY_PAUSE,           /* play/pause */
+        [ 0x1e ] = KEY_PREVIOUS,        /* rew */
+        [ 0x26 ] = KEY_NEXT,            /* forward */
+        [ 0x0e ] = KEY_REWIND,          /* backward << */
+        [ 0x3a ] = KEY_FASTFORWARD,     /* forward >> */
+        [ 0x36 ] = KEY_STOP,
+        [ 0x2e ] = KEY_RECORD,          /* recording */
+        [ 0x16 ] = KEY_POWER,           /* the button that reads "close" */
+
+        [ 0x11 ] = KEY_ZOOM,            /* full screen */
+        [ 0x13 ] = KEY_MACRO,           /* recall */
+        [ 0x23 ] = KEY_HOME,            /* home */
+        [ 0x05 ] = KEY_PVR,             /* picture */
+        [ 0x3d ] = KEY_MUTE,            /* mute */
+        [ 0x01 ] = KEY_DVD,             /* dvd */
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_asus_pc39);
+
+
+/* Encore ENLTV-FM  - black plastic, white front cover with white glowing buttons
+    Juan Pablo Sormani <sorman@gmail.com> */
+IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE] = {
+
+        /* Power button does nothing, neither in Windows app,
+         although it sends data (used for BIOS wakeup?) */
+        [ 0x0d ] = KEY_MUTE,
+
+        [ 0x1e ] = KEY_TV,
+        [ 0x00 ] = KEY_VIDEO,
+        [ 0x01 ] = KEY_AUDIO,           /* music */
+        [ 0x02 ] = KEY_MHP,             /* picture */
+
+        [ 0x1f ] = KEY_1,
+        [ 0x03 ] = KEY_2,
+        [ 0x04 ] = KEY_3,
+        [ 0x05 ] = KEY_4,
+        [ 0x1c ] = KEY_5,
+        [ 0x06 ] = KEY_6,
+        [ 0x07 ] = KEY_7,
+        [ 0x08 ] = KEY_8,
+        [ 0x1d ] = KEY_9,
+        [ 0x0a ] = KEY_0,
+
+        [ 0x09 ] = KEY_LIST,        /* -/-- */
+        [ 0x0b ] = KEY_LAST,        /* recall */
+
+        [ 0x14 ] = KEY_HOME,            /* win start menu */
+        [ 0x15 ] = KEY_EXIT,            /* exit */
+        [ 0x16 ] = KEY_UP,
+        [ 0x12 ] = KEY_DOWN,
+        [ 0x0c ] = KEY_RIGHT,
+        [ 0x17 ] = KEY_LEFT,
+
+        [ 0x18 ] = KEY_ENTER,           /* OK */
+
+        [ 0x0e ] = KEY_ESC,
+        [ 0x13 ] = KEY_D,               /* desktop */
+        [ 0x11 ] = KEY_TAB,
+        [ 0x19 ] = KEY_SWITCHVIDEOMODE, /* switch */
+
+        [ 0x1a ] = KEY_MENU,
+        [ 0x1b ] = KEY_ZOOM,            /* fullscreen */
+        [ 0x44 ] = KEY_TIME,            /* time shift */
+        [ 0x40 ] = KEY_MODE,            /* source */
+
+        [ 0x5a ] = KEY_RECORD,
+        [ 0x42 ] = KEY_PLAY,            /* play/pause */
+        [ 0x45 ] = KEY_STOP,
+        [ 0x43 ] = KEY_CAMERA,          /* camera icon */
+
+        [ 0x48 ] = KEY_REWIND,
+        [ 0x4a ] = KEY_FASTFORWARD,
+        [ 0x49 ] = KEY_PREVIOUS,
+        [ 0x4b ] = KEY_NEXT,
+
+        [ 0x4c ] = KEY_FAVORITES,       /* tv wall */
+        [ 0x4d ] = KEY_SOUND,           /* DVD sound */
+        [ 0x4e ] = KEY_LANGUAGE,        /* DVD lang */
+        [ 0x4f ] = KEY_TEXT,            /* DVD text */
+
+        [ 0x50 ] = KEY_SLEEP,           /* shutdown */
+        [ 0x51 ] = KEY_MODE,            /* stereo > main */
+        [ 0x52 ] = KEY_SELECT,          /* stereo > sap */
+        [ 0x53 ] = KEY_PROG1,           /* teletext */
+
+
+        [ 0x59 ] = KEY_RED,             /* AP1 */
+        [ 0x41 ] = KEY_GREEN,           /* AP2 */
+        [ 0x47 ] = KEY_YELLOW,          /* AP3 */
+        [ 0x57 ] = KEY_BLUE,            /* AP4 */
+
+
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_encore_enltv);
+
+/* for the Technotrend 1500 bundled remote: */
+IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE] = {
+        [ 0x01 ] = KEY_POWER,
+        [ 0x02 ] = KEY_SHUFFLE, /* ? double-arrow key */
+        [ 0x03 ] = KEY_1,
+        [ 0x04 ] = KEY_2,
+        [ 0x05 ] = KEY_3,
+        [ 0x06 ] = KEY_4,
+        [ 0x07 ] = KEY_5,
+        [ 0x08 ] = KEY_6,
+        [ 0x09 ] = KEY_7,
+        [ 0x0a ] = KEY_8,
+        [ 0x0b ] = KEY_9,
+        [ 0x0c ] = KEY_0,
+        [ 0x0d ] = KEY_UP,
+        [ 0x0e ] = KEY_LEFT,
+        [ 0x0f ] = KEY_OK,
+        [ 0x10 ] = KEY_RIGHT,
+        [ 0x11 ] = KEY_DOWN,
+        [ 0x12 ] = KEY_INFO,
+        [ 0x13 ] = KEY_EXIT,
+        [ 0x14 ] = KEY_RED,
+        [ 0x15 ] = KEY_GREEN,
+        [ 0x16 ] = KEY_YELLOW,
+        [ 0x17 ] = KEY_BLUE,
+        [ 0x18 ] = KEY_MUTE,
+        [ 0x19 ] = KEY_TEXT,
+        [ 0x1a ] = KEY_MODE,    /* ? TV/Radio */
+        [ 0x21 ] = KEY_OPTION,
+        [ 0x22 ] = KEY_EPG,
+        [ 0x23 ] = KEY_CHANNELUP,
+        [ 0x24 ] = KEY_CHANNELDOWN,
+        [ 0x25 ] = KEY_VOLUMEUP,
+        [ 0x26 ] = KEY_VOLUMEDOWN,
+        [ 0x27 ] = KEY_SETUP,
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_tt_1500);
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index b8dcfa165266..c18a5da64934 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -508,7 +508,7 @@ int saa7146_vv_release(struct saa7146_dev* dev)
 
         DEB_EE(("dev:%p\n",dev));
 
-        pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
+        pci_free_consistent(dev->pci, SAA7146_CLIPPING_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
         kfree(vv);
         dev->vv_data = NULL;
         dev->vv_callback = NULL;
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index c2b35e366242..752cf79c532f 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -385,9 +385,9 @@ static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,
         else buf[3] = 0x88;
 
         if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
+                fe->ops.i2c_gate_ctrl(fe, 0);
         deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep->frequency, buf[0],buf[1],buf[2],buf[3]);
-        ret = fc->i2c_request(fc,FC_WRITE,FC_I2C_PORT_TUNER,0x61,buf[0],&buf[1],3);
+        ret = fc->i2c_request(fc, FC_WRITE, FC_I2C_PORT_TUNER, 0x61, buf[0], &buf[1], 3);
         deb_tuner("tuner write returned: %d\n",ret);
 
         return 0;
@@ -398,91 +398,71 @@ static u8 alps_tdee4_stv0297_inittab[] = {
         0x80, 0x00,
         0x81, 0x01,
         0x81, 0x00,
-        0x00, 0x09,
-        0x01, 0x69,
+        0x00, 0x48,
+        0x01, 0x58,
         0x03, 0x00,
         0x04, 0x00,
         0x07, 0x00,
         0x08, 0x00,
-        0x20, 0x00,
-        0x21, 0x40,
-        0x22, 0x00,
-        0x23, 0x00,
-        0x24, 0x40,
-        0x25, 0x88,
         0x30, 0xff,
-        0x31, 0x00,
+        0x31, 0x9d,
         0x32, 0xff,
         0x33, 0x00,
-        0x34, 0x50,
-        0x35, 0x7f,
-        0x36, 0x00,
-        0x37, 0x20,
-        0x38, 0x00,
-        0x40, 0x1c,
-        0x41, 0xff,
-        0x42, 0x29,
+        0x34, 0x29,
+        0x35, 0x55,
+        0x36, 0x80,
+        0x37, 0x6e,
+        0x38, 0x9c,
+        0x40, 0x1a,
+        0x41, 0xfe,
+        0x42, 0x33,
         0x43, 0x00,
         0x44, 0xff,
         0x45, 0x00,
         0x46, 0x00,
         0x49, 0x04,
-        0x4a, 0x00,
+        0x4a, 0x51,
         0x4b, 0xf8,
         0x52, 0x30,
-        0x55, 0xae,
-        0x56, 0x47,
-        0x57, 0xe1,
-        0x58, 0x3a,
-        0x5a, 0x1e,
-        0x5b, 0x34,
-        0x60, 0x00,
-        0x63, 0x00,
-        0x64, 0x00,
-        0x65, 0x00,
-        0x66, 0x00,
-        0x67, 0x00,
-        0x68, 0x00,
-        0x69, 0x00,
-        0x6a, 0x02,
-        0x6b, 0x00,
+        0x53, 0x06,
+        0x59, 0x06,
+        0x5a, 0x5e,
+        0x5b, 0x04,
+        0x61, 0x49,
+        0x62, 0x0a,
         0x70, 0xff,
-        0x71, 0x00,
+        0x71, 0x04,
         0x72, 0x00,
         0x73, 0x00,
         0x74, 0x0c,
-        0x80, 0x00,
+        0x80, 0x20,
         0x81, 0x00,
-        0x82, 0x00,
+        0x82, 0x30,
         0x83, 0x00,
         0x84, 0x04,
-        0x85, 0x80,
-        0x86, 0x24,
-        0x87, 0x78,
-        0x88, 0x10,
+        0x85, 0x22,
+        0x86, 0x08,
+        0x87, 0x1b,
+        0x88, 0x00,
         0x89, 0x00,
-        0x90, 0x01,
-        0x91, 0x01,
-        0xa0, 0x04,
+        0x90, 0x00,
+        0x91, 0x04,
+        0xa0, 0x86,
         0xa1, 0x00,
         0xa2, 0x00,
         0xb0, 0x91,
         0xb1, 0x0b,
-        0xc0, 0x53,
-        0xc1, 0x70,
+        0xc0, 0x5b,
+        0xc1, 0x10,
         0xc2, 0x12,
-        0xd0, 0x00,
+        0xd0, 0x02,
         0xd1, 0x00,
         0xd2, 0x00,
         0xd3, 0x00,
-        0xd4, 0x00,
+        0xd4, 0x02,
         0xd5, 0x00,
         0xde, 0x00,
-        0xdf, 0x00,
-        0x61, 0x49,
-        0x62, 0x0b,
-        0x53, 0x08,
-        0x59, 0x08,
+        0xdf, 0x01,
         0xff, 0xff,
 };
 
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index 329a51c18562..83b090ef2445 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -390,6 +390,7 @@ static struct cards card_list[] __devinitdata = {
         { 0xfc00270f, BTTV_BOARD_TWINHAN_DST,                   "ChainTech digitop DST-1000 DVB-S" },
         { 0x07711461, BTTV_BOARD_AVDVBT_771,                    "AVermedia AverTV DVB-T 771" },
         { 0xdb1018ac, BTTV_BOARD_DVICO_DVBT_LITE,               "DViCO FusionHDTV DVB-T Lite" },
+        { 0xdb1118ac, BTTV_BOARD_DVICO_DVBT_LITE,               "Ultraview DVB-T Lite" },
         { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE,       "DViCO FusionHDTV 5 Lite" },
         { 0x20007063, BTTV_BOARD_PC_HDTV,                       "pcHDTV HD-2000 TV" },
         { 0x00261822, BTTV_BOARD_TWINHAN_DST,                   "DNTV Live! Mini" },
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 9f72b7000c08..0393a3d19920 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1161,7 +1161,7 @@ static int dst_get_device_id(struct dst_state *state)
                 }
         }
 
-        if (i >= sizeof (dst_tlist) / sizeof (dst_tlist [0])) {
+        if (i >= ARRAY_SIZE(dst_tlist)) {
                 dprintk(verbose, DST_ERROR, 1, "Unable to recognize %s or %s", &state->rxbuffer[0], &state->rxbuffer[1]);
                 dprintk(verbose, DST_ERROR, 1, "please email linux-dvb@linuxtv.org with this type in");
                 use_dst_type = DST_TYPE_IS_SAT;
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 3e35931af35d..58f69f6ae391 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
@@ -213,7 +214,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend
                 freq = 2150000; /* satellite IF is 950..2150MHz */
 
         /* decide which VCO to use for the input frequency */
-        for(i=1;(i<sizeof(osci)/sizeof(osci[0]))&&(osci[i]<freq);i++);
+        for(i = 1; (i < ARRAY_SIZE(osci)) && (osci[i] < freq); i++);
         printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq);
         band=bandsel[i];
         /* the gain values must be set by SetSymbolrate */
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index d64b96cb0c46..a6cbbdd262d6 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -819,6 +819,11 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
                 set_bit(rc_keys[i + 2], input_dev->keybit);
         input_dev->keycodesize = 0;
         input_dev->keycodemax = 0;
+        input_dev->id.bustype = BUS_USB;
+        input_dev->id.vendor = cinergyt2->udev->descriptor.idVendor;
+        input_dev->id.product = cinergyt2->udev->descriptor.idProduct;
+        input_dev->id.version = 1;
+        input_dev->cdev.dev = &cinergyt2->udev->dev;
 
         err = input_register_device(input_dev);
         if (err) {
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 7c42d53a1cc7..a21a894d3f98 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -36,6 +36,7 @@
 #include <linux/list.h>
 #include <linux/freezer.h>
 #include <linux/jiffies.h>
+#include <linux/kthread.h>
 #include <asm/processor.h>
 
 #include "dvb_frontend.h"
@@ -100,7 +101,7 @@ struct dvb_frontend_private {
         struct semaphore sem;
         struct list_head list_head;
         wait_queue_head_t wait_queue;
-        pid_t thread_pid;
+        struct task_struct *thread;
         unsigned long release_jiffies;
         unsigned int exit;
         unsigned int wakeup;
@@ -508,19 +509,11 @@ static int dvb_frontend_thread(void *data)
         struct dvb_frontend *fe = data;
         struct dvb_frontend_private *fepriv = fe->frontend_priv;
         unsigned long timeout;
-        char name [15];
         fe_status_t s;
         struct dvb_frontend_parameters *params;
 
         dprintk("%s\n", __FUNCTION__);
 
-        snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num);
-
-        lock_kernel();
-        daemonize(name);
-        sigfillset(&current->blocked);
-        unlock_kernel();
-
         fepriv->check_wrapped = 0;
         fepriv->quality = 0;
         fepriv->delay = 3*HZ;
@@ -532,16 +525,18 @@ static int dvb_frontend_thread(void *data)
 
         while (1) {
                 up(&fepriv->sem);           /* is locked when we enter the thread... */
-
+restart:
                 timeout = wait_event_interruptible_timeout(fepriv->wait_queue,
-                                                           dvb_frontend_should_wakeup(fe),
-                                                           fepriv->delay);
-                if (0 != dvb_frontend_is_exiting(fe)) {
+                        dvb_frontend_should_wakeup(fe) || kthread_should_stop(),
+                        fepriv->delay);
+
+                if (kthread_should_stop() || dvb_frontend_is_exiting(fe)) {
                         /* got signal or quitting */
                         break;
                 }
 
-                try_to_freeze();
+                if (try_to_freeze())
+                        goto restart;
 
                 if (down_interruptible(&fepriv->sem))
                         break;
@@ -591,7 +586,7 @@ static int dvb_frontend_thread(void *data)
                         fe->ops.sleep(fe);
         }
 
-        fepriv->thread_pid = 0;
+        fepriv->thread = NULL;
         mb();
 
         dvb_frontend_wakeup(fe);
@@ -600,7 +595,6 @@ static int dvb_frontend_thread(void *data)
 
 static void dvb_frontend_stop(struct dvb_frontend *fe)
 {
-        unsigned long ret;
         struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         dprintk ("%s\n", __FUNCTION__);
@@ -608,33 +602,17 @@ static void dvb_frontend_stop(struct dvb_frontend *fe)
         fepriv->exit = 1;
         mb();
 
-        if (!fepriv->thread_pid)
+        if (!fepriv->thread)
                 return;
 
-        /* check if the thread is really alive */
-        if (kill_proc(fepriv->thread_pid, 0, 1) == -ESRCH) {
-                printk("dvb_frontend_stop: thread PID %d already died\n",
-                                fepriv->thread_pid);
-                /* make sure the mutex was not held by the thread */
-                init_MUTEX (&fepriv->sem);
-                return;
-        }
-
-        /* wake up the frontend thread, so it notices that fe->exit == 1 */
-        dvb_frontend_wakeup(fe);
-
-        /* wait until the frontend thread has exited */
-        ret = wait_event_interruptible(fepriv->wait_queue,0 == fepriv->thread_pid);
-        if (-ERESTARTSYS != ret) {
-                fepriv->state = FESTATE_IDLE;
-                return;
-        }
+        kthread_stop(fepriv->thread);
+        init_MUTEX (&fepriv->sem);
         fepriv->state = FESTATE_IDLE;
 
         /* paranoia check in case a signal arrived */
-        if (fepriv->thread_pid)
-                printk("dvb_frontend_stop: warning: thread PID %d won't exit\n",
-                                fepriv->thread_pid);
+        if (fepriv->thread)
+                printk("dvb_frontend_stop: warning: thread %p won't exit\n",
+                                fepriv->thread);
 }
 
 s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime)
@@ -684,10 +662,11 @@ static int dvb_frontend_start(struct dvb_frontend *fe)
 {
         int ret;
         struct dvb_frontend_private *fepriv = fe->frontend_priv;
+        struct task_struct *fe_thread;
 
         dprintk ("%s\n", __FUNCTION__);
 
-        if (fepriv->thread_pid) {
+        if (fepriv->thread) {
                 if (!fepriv->exit)
                         return 0;
                 else
@@ -701,18 +680,18 @@ static int dvb_frontend_start(struct dvb_frontend *fe)
 
         fepriv->state = FESTATE_IDLE;
         fepriv->exit = 0;
-        fepriv->thread_pid = 0;
+        fepriv->thread = NULL;
         mb();
 
-        ret = kernel_thread (dvb_frontend_thread, fe, 0);
-
-        if (ret < 0) {
-                printk("dvb_frontend_start: failed to start kernel_thread (%d)\n", ret);
+        fe_thread = kthread_run(dvb_frontend_thread, fe,
+                "kdvb-fe-%i", fe->dvb->num);
+        if (IS_ERR(fe_thread)) {
+                ret = PTR_ERR(fe_thread);
+                printk("dvb_frontend_start: failed to start kthread (%d)\n", ret);
                 up(&fepriv->sem);
                 return ret;
         }
-        fepriv->thread_pid = ret;
-
+        fepriv->thread = fe_thread;
         return 0;
 }
 
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 826b47f155a0..490337b5ee3e 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -199,12 +199,14 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
                         const struct dvb_device *template, void *priv, int type)
 {
         struct dvb_device *dvbdev;
+        struct file_operations *dvbdevfops;
+
         int id;
 
         if (mutex_lock_interruptible(&dvbdev_register_lock))
                 return -ERESTARTSYS;
 
-        if ((id = dvbdev_get_free_id (adap, type)) < 0) {
+        if ((id = dvbdev_get_free_id (adap, type)) < 0){
                 mutex_unlock(&dvbdev_register_lock);
                 *pdvbdev = NULL;
                 printk ("%s: could get find free device id...\n", __FUNCTION__);
@@ -213,7 +215,15 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 
         *pdvbdev = dvbdev = kmalloc(sizeof(struct dvb_device), GFP_KERNEL);
 
-        if (!dvbdev) {
+        if (!dvbdev){
+                mutex_unlock(&dvbdev_register_lock);
+                return -ENOMEM;
+        }
+
+        dvbdevfops = kzalloc(sizeof(struct file_operations), GFP_KERNEL);
+
+        if (!dvbdevfops){
+                kfree (dvbdev);
                 mutex_unlock(&dvbdev_register_lock);
                 return -ENOMEM;
         }
@@ -223,7 +233,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
         dvbdev->id = id;
         dvbdev->adapter = adap;
         dvbdev->priv = priv;
+        dvbdev->fops = dvbdevfops;
 
+        memcpy(dvbdev->fops, template->fops, sizeof(struct file_operations));
         dvbdev->fops->owner = adap->module;
 
         list_add_tail (&dvbdev->list_head, &adap->device_list);
@@ -251,6 +263,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
                                         dvbdev->type, dvbdev->id)));
 
         list_del (&dvbdev->list_head);
+        kfree (dvbdev->fops);
         kfree (dvbdev);
 }
 EXPORT_SYMBOL(dvb_unregister_device);
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index ad52143602cd..80f67a51b908 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -109,6 +109,34 @@ config DVB_USB_CXUSB
           Medion MD95700 hybrid USB2.0 device.
           DViCO FusionHDTV (Bluebird) USB2.0 devices
 
+config DVB_USB_M920X
+        tristate "Uli m920x DVB-T USB2.0 support"
+        depends on DVB_USB
+        select DVB_MT352 if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        help
+          Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
+          Currently, only devices with a product id of
+          "DTV USB MINI" (in cold state) are supported.
+          Firmware required.
+
+config DVB_USB_GL861
+        tristate "Genesys Logic GL861 USB2.0 support"
+        depends on DVB_USB
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        help
+          Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
+          receiver with USB ID 0db0:5581.
+
+config DVB_USB_AU6610
+        tristate "Alcor Micro AU6610 USB2.0 support"
+        depends on DVB_USB
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        help
+          Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.
+
 config DVB_USB_DIGITV
         tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
         depends on DVB_USB
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 154d593bbb02..40f28f559b54 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -30,6 +30,15 @@ obj-$(CONFIG_DVB_USB_NOVA_T_USB2) += dvb-usb-dibusb-common.o dvb-usb-nova-t-usb2
 dvb-usb-umt-010-objs = umt-010.o
 obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o
 
+dvb-usb-m920x-objs = m920x.o
+obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m920x.o
+
+dvb-usb-gl861-objs = gl861.o
+obj-$(CONFIG_DVB_USB_GL861) += dvb-usb-gl861.o
+
+dvb-usb-au6610-objs = au6610.o
+obj-$(CONFIG_DVB_USB_AU6610) += dvb-usb-au6610.o
+
 dvb-usb-digitv-objs = digitv.o
 obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
 
diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c
new file mode 100644
index 000000000000..0dc66a8d2baf
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -0,0 +1,255 @@
+/* DVB USB compliant linux driver for Sigmatek DVB-110 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
+ *
+ *      This program is free software; you can redistribute it and/or modify it
+ *      under the terms of the GNU General Public License as published by the Free
+ *      Software Foundation, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+
+#include "au6610.h"
+
+#include "zl10353.h"
+#include "qt1010.h"
+
+/* debug */
+static int dvb_usb_au6610_debug;
+module_param_named(debug, dvb_usb_au6610_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
+
+static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr,
+                          u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+        int ret;
+        u16 index;
+        u8 usb_buf[6]; /* enough for all known requests,
+                          read returns 5 and write 6 bytes */
+        switch (wlen) {
+        case 1:
+                index = wbuf[0] << 8;
+                break;
+        case 2:
+                index = wbuf[0] << 8;
+                index += wbuf[1];
+                break;
+        default:
+                warn("wlen = %x, aborting.", wlen);
+                return -EINVAL;
+        }
+
+        ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation,
+                              USB_TYPE_VENDOR|USB_DIR_IN, addr, index, usb_buf,
+                              sizeof(usb_buf), AU6610_USB_TIMEOUT);
+
+        if (ret < 0)
+                return ret;
+
+        switch (operation) {
+        case AU6610_REQ_I2C_READ:
+        case AU6610_REQ_USB_READ:
+                /* requested value is always 5th byte in buffer */
+                rbuf[0] = usb_buf[4];
+        }
+
+        return ret;
+}
+
+static int au6610_i2c_msg(struct dvb_usb_device *d, u8 addr,
+                          u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+        u8 request;
+        u8 wo = (rbuf == NULL || rlen == 0); /* write-only */
+
+        if (wo) {
+                request = AU6610_REQ_I2C_WRITE;
+        } else { /* rw */
+                request = AU6610_REQ_I2C_READ;
+        }
+
+        return au6610_usb_msg(d, request, addr, wbuf, wlen, rbuf, rlen);
+}
+
+
+/* I2C */
+static int au6610_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                           int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int i;
+
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        if (num > 2)
+                return -EINVAL;
+
+        for (i = 0; i < num; i++) {
+                /* write/read request */
+                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+                        if (au6610_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                           msg[i].len, msg[i+1].buf,
+                                           msg[i+1].len) < 0)
+                                break;
+                        i++;
+                } else if (au6610_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                               msg[i].len, NULL, 0) < 0)
+                                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return i;
+}
+
+
+static u32 au6610_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm au6610_i2c_algo = {
+        .master_xfer   = au6610_i2c_xfer,
+        .functionality = au6610_i2c_func,
+};
+
+/* Callbacks for DVB USB */
+static int au6610_identify_state(struct usb_device *udev,
+                                 struct dvb_usb_device_properties *props,
+                                 struct dvb_usb_device_description **desc,
+                                 int *cold)
+{
+        *cold = 0;
+        return 0;
+}
+
+static struct zl10353_config au6610_zl10353_config = {
+        .demod_address = 0x1e,
+        .no_tuner = 1,
+        .parallel_ts = 1,
+};
+
+static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        if ((adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config,
+                                   &adap->dev->i2c_adap)) != NULL) {
+                return 0;
+        }
+
+        return -EIO;
+}
+
+static struct qt1010_config au6610_qt1010_config = {
+        .i2c_address = 0xc4
+};
+
+static int au6610_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        return dvb_attach(qt1010_attach,
+                          adap->fe, &adap->dev->i2c_adap,
+                          &au6610_qt1010_config) == NULL ? -ENODEV : 0;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties au6610_properties;
+
+static int au6610_probe(struct usb_interface *intf,
+                        const struct usb_device_id *id)
+{
+        struct dvb_usb_device *d;
+        struct usb_host_interface *alt;
+        int ret;
+
+        if (intf->num_altsetting < AU6610_ALTSETTING_COUNT)
+                return -ENODEV;
+
+        if ((ret = dvb_usb_device_init(intf, &au6610_properties, THIS_MODULE, &d)) == 0) {
+                alt = usb_altnum_to_altsetting(intf, AU6610_ALTSETTING);
+
+                if (alt == NULL) {
+                        deb_rc("no alt found!\n");
+                        return -ENODEV;
+                }
+                ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
+                                        alt->desc.bAlternateSetting);
+        }
+
+        return ret;
+}
+
+
+static struct usb_device_id au6610_table [] = {
+        { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) },
+        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, au6610_table);
+
+static struct dvb_usb_device_properties au6610_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .size_of_priv     = 0,
+        .identify_state   = au6610_identify_state,
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .frontend_attach  = au6610_zl10353_frontend_attach,
+                        .tuner_attach     = au6610_qt1010_tuner_attach,
+
+                        .stream = {
+                                .type = USB_ISOC,
+                                .count = 5,
+                                .endpoint = 0x82,
+                                .u = {
+                                        .isoc = {
+                                                .framesperurb = 40,
+                                                .framesize = 942,   /* maximum packet size */
+                                                .interval = 1.25,   /* 125 us */
+                                        }
+                                }
+                        },
+                }
+        },
+        .i2c_algo = &au6610_i2c_algo,
+        .num_device_descs = 1,
+        .devices = {
+                {
+                        "Sigmatek DVB-110 DVB-T USB2.0",
+                        { &au6610_table[0], NULL },
+                        { NULL },
+                },
+        }
+};
+
+static struct usb_driver au6610_driver = {
+        .name       = "dvb_usb_au6610",
+        .probe      = au6610_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table   = au6610_table,
+};
+
+/* module stuff */
+static int __init au6610_module_init(void)
+{
+        int ret;
+
+        if ((ret = usb_register(&au6610_driver))) {
+                err("usb_register failed. Error number %d", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void __exit au6610_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&au6610_driver);
+}
+
+module_init (au6610_module_init);
+module_exit (au6610_module_exit);
+
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
+MODULE_DESCRIPTION("Driver Sigmatek DVB-110 DVB-T USB2.0 / AU6610");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/au6610.h b/drivers/media/dvb/dvb-usb/au6610.h
new file mode 100644
index 000000000000..4161b054c713
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/au6610.h
@@ -0,0 +1,19 @@
+#ifndef _DVB_USB_AU6610_H_
+#define _DVB_USB_AU6610_H_
+
+#define DVB_USB_LOG_PREFIX "au6610"
+#include "dvb-usb.h"
+
+#define deb_rc(args...)   dprintk(dvb_usb_au6610_debug,0x01,args)
+
+#define AU6610_REQ_I2C_WRITE    0x14
+#define AU6610_REQ_I2C_READ     0x13
+#define AU6610_REQ_USB_WRITE    0x16
+#define AU6610_REQ_USB_READ     0x15
+
+#define AU6610_USB_TIMEOUT 1000
+
+#define AU6610_ALTSETTING_COUNT 6
+#define AU6610_ALTSETTING       5
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 299382dcb81d..148386aba275 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -11,6 +11,7 @@
 
 /* Vendor IDs */
 #define USB_VID_ADSTECH                         0x06e1
+#define USB_VID_ALCOR_MICRO             0x058f
 #define USB_VID_ANCHOR                          0x0547
 #define USB_VID_AVERMEDIA                       0x07ca
 #define USB_VID_COMPRO                          0x185b
@@ -29,6 +30,7 @@
 #define USB_VID_LEADTEK                         0x0413
 #define USB_VID_LITEON                          0x04ca
 #define USB_VID_MEDION                          0x1660
+#define USB_VID_MSI                             0x0db0
 #define USB_VID_PINNACLE                        0x2304
 #define USB_VID_VISIONPLUS                      0x13d3
 #define USB_VID_TWINHAN                         0x1822
@@ -119,6 +121,8 @@
 #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD         0xdb54
 #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM         0xdb55
 #define USB_PID_MEDION_MD95700                          0x0932
+#define USB_PID_MSI_MEGASKY580                          0x5580
+#define USB_PID_MSI_MEGASKY580_55801                    0x5581
 #define USB_PID_KYE_DVB_T_COLD                          0x701e
 #define USB_PID_KYE_DVB_T_WARM                          0x701f
 #define USB_PID_PCTV_200E                               0x020e
@@ -134,6 +138,7 @@
 #define USB_PID_WINFAST_DTV_DONGLE_STK7700P             0x6f00
 #define USB_PID_GENPIX_8PSK_COLD                        0x0200
 #define USB_PID_GENPIX_8PSK_WARM                        0x0201
+#define USB_PID_SIGMATEK_DVB_110                        0x6610
 
 
 #endif
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 19ff5978bc91..9511a31c8f50 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -151,7 +151,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
 int dvb_usb_remote_exit(struct dvb_usb_device *d)
 {
         if (d->state & DVB_USB_STATE_REMOTE) {
-                cancel_delayed_work(&d->rc_query_work);
+                cancel_rearming_delayed_work(&d->rc_query_work);
                 flush_scheduled_work();
                 input_unregister_device(d->rc_input_dev);
         }
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
new file mode 100644
index 000000000000..c9f38a5e70d3
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -0,0 +1,231 @@
+/* DVB USB compliant linux driver for GL861 USB2.0 devices.
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "gl861.h"
+
+#include "zl10353.h"
+#include "qt1010.h"
+
+/* debug */
+int dvb_usb_gl861_debug;
+module_param_named(debug,dvb_usb_gl861_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
+
+static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
+                         u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+        u16 index;
+        u16 value = addr << 8;
+        int wo = (rbuf == NULL || rlen == 0); /* write-only */
+        u8 req, type;
+
+        if (wo) {
+                req = GL861_REQ_I2C_WRITE;
+                type = GL861_WRITE;
+        } else { /* rw */
+                req = GL861_REQ_I2C_READ;
+                type = GL861_READ;
+        }
+
+        switch (wlen) {
+        case 1:
+                index = wbuf[0];
+                break;
+        case 2:
+                index = wbuf[0];
+                value = value + wbuf[1];
+                break;
+        default:
+                warn("wlen = %x, aborting.", wlen);
+                return -EINVAL;
+        }
+
+        return usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), req, type,
+                               value, index, rbuf, rlen, 2000);
+}
+
+/* I2C */
+static int gl861_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                          int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int i;
+
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        if (num > 2)
+                return -EINVAL;
+
+        for (i = 0; i < num; i++) {
+                /* write/read request */
+                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+                        if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                          msg[i].len, msg[i+1].buf, msg[i+1].len) < 0)
+                                break;
+                        i++;
+                } else
+                        if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                          msg[i].len, NULL, 0) < 0)
+                                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return i;
+}
+
+static u32 gl861_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm gl861_i2c_algo = {
+        .master_xfer   = gl861_i2c_xfer,
+        .functionality = gl861_i2c_func,
+};
+
+/* Callbacks for DVB USB */
+static int gl861_identify_state(struct usb_device *udev,
+                                struct dvb_usb_device_properties *props,
+                                struct dvb_usb_device_description **desc,
+                                int *cold)
+{
+        *cold = 0;
+
+        return 0;
+}
+
+static struct zl10353_config gl861_zl10353_config = {
+        .demod_address = 0x1e,
+        .no_tuner = 1,
+        .parallel_ts = 1,
+};
+
+static int gl861_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        if ((adap->fe = dvb_attach(zl10353_attach, &gl861_zl10353_config,
+                                   &adap->dev->i2c_adap)) != NULL) {
+                return 0;
+        }
+
+        return -EIO;
+}
+
+static struct qt1010_config gl861_qt1010_config = {
+        .i2c_address = 0xc4
+};
+
+static int gl861_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        return dvb_attach(qt1010_attach,
+                          adap->fe, &adap->dev->i2c_adap,
+                          &gl861_qt1010_config) == NULL ? -ENODEV : 0;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties gl861_properties;
+
+static int gl861_probe(struct usb_interface *intf,
+                       const struct usb_device_id *id)
+{
+        struct dvb_usb_device *d;
+        struct usb_host_interface *alt;
+        int ret;
+
+        if (intf->num_altsetting < 2)
+                return -ENODEV;
+
+        if ((ret = dvb_usb_device_init(intf, &gl861_properties, THIS_MODULE, &d)) == 0) {
+                alt = usb_altnum_to_altsetting(intf, 0);
+
+                if (alt == NULL) {
+                        deb_rc("not alt found!\n");
+                        return -ENODEV;
+                }
+
+                ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
+                                        alt->desc.bAlternateSetting);
+        }
+
+        return ret;
+}
+
+static struct usb_device_id gl861_table [] = {
+                { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580_55801) },
+                { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, gl861_table);
+
+static struct dvb_usb_device_properties gl861_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = DEVICE_SPECIFIC,
+
+        .size_of_priv     = 0,
+
+        .identify_state   = gl861_identify_state,
+        .num_adapters = 1,
+        .adapter = {{
+
+                .frontend_attach  = gl861_frontend_attach,
+                .tuner_attach     = gl861_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 7,
+                        .endpoint = 0x81,
+                        .u = {
+                                .bulk = {
+                                        .buffersize = 512,
+                                }
+                        }
+                },
+        }},
+        .i2c_algo         = &gl861_i2c_algo,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "MSI Mega Sky 55801 DVB-T USB2.0",
+                        { &gl861_table[0], NULL },
+                        { NULL },
+                },
+        }
+};
+
+static struct usb_driver gl861_driver = {
+        .name           = "dvb_usb_gl861",
+        .probe          = gl861_probe,
+        .disconnect     = dvb_usb_device_exit,
+        .id_table       = gl861_table,
+};
+
+/* module stuff */
+static int __init gl861_module_init(void)
+{
+        int ret;
+
+        if ((ret = usb_register(&gl861_driver))) {
+                err("usb_register failed. Error number %d", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void __exit gl861_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&gl861_driver);
+}
+
+module_init (gl861_module_init);
+module_exit (gl861_module_exit);
+
+MODULE_AUTHOR("Carl Lundqvist <comabug@gmail.com>");
+MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / GL861");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/gl861.h b/drivers/media/dvb/dvb-usb/gl861.h
new file mode 100644
index 000000000000..72a51afd5ee3
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/gl861.h
@@ -0,0 +1,15 @@
+#ifndef _DVB_USB_GL861_H_
+#define _DVB_USB_GL861_H_
+
+#define DVB_USB_LOG_PREFIX "gl861"
+#include "dvb-usb.h"
+
+#define deb_rc(args...)   dprintk(dvb_usb_gl861_debug,0x01,args)
+
+#define GL861_WRITE             0x40
+#define GL861_READ              0xc0
+
+#define GL861_REQ_I2C_WRITE     0x01
+#define GL861_REQ_I2C_READ      0x02
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
new file mode 100644
index 000000000000..d48b24d9abf4
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -0,0 +1,541 @@
+/* DVB USB compliant linux driver for MSI Mega Sky 580 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2006 Aapo Tahkola (aet@rasterburn.org)
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+
+#include "m920x.h"
+
+#include "mt352.h"
+#include "mt352_priv.h"
+#include "qt1010.h"
+
+/* debug */
+static int dvb_usb_m920x_debug;
+module_param_named(debug,dvb_usb_m920x_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
+
+static struct dvb_usb_rc_key megasky_rc_keys [] = {
+        { 0x0, 0x12, KEY_POWER },
+        { 0x0, 0x1e, KEY_CYCLEWINDOWS }, /* min/max */
+        { 0x0, 0x02, KEY_CHANNELUP },
+        { 0x0, 0x05, KEY_CHANNELDOWN },
+        { 0x0, 0x03, KEY_VOLUMEUP },
+        { 0x0, 0x06, KEY_VOLUMEDOWN },
+        { 0x0, 0x04, KEY_MUTE },
+        { 0x0, 0x07, KEY_OK }, /* TS */
+        { 0x0, 0x08, KEY_STOP },
+        { 0x0, 0x09, KEY_MENU }, /* swap */
+        { 0x0, 0x0a, KEY_REWIND },
+        { 0x0, 0x1b, KEY_PAUSE },
+        { 0x0, 0x1f, KEY_FASTFORWARD },
+        { 0x0, 0x0c, KEY_RECORD },
+        { 0x0, 0x0d, KEY_CAMERA }, /* screenshot */
+        { 0x0, 0x0e, KEY_COFFEE }, /* "MTS" */
+};
+
+static inline int m9206_read(struct usb_device *udev, u8 request, u16 value,\
+                             u16 index, void *data, int size)
+{
+        int ret;
+
+        ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                              request, USB_TYPE_VENDOR | USB_DIR_IN,
+                              value, index, data, size, 2000);
+        if (ret < 0)
+                return ret;
+
+        if (ret != size)
+                return -EIO;
+
+        return 0;
+}
+
+static inline int m9206_write(struct usb_device *udev, u8 request,
+                              u16 value, u16 index)
+{
+        int ret;
+
+        ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              request, USB_TYPE_VENDOR | USB_DIR_OUT,
+                              value, index, NULL, 0, 2000);
+        return ret;
+}
+
+static int m9206_rc_init(struct usb_device *udev)
+{
+        int ret = 0;
+
+        /* Remote controller init. */
+        if ((ret = m9206_write(udev, M9206_CORE, 0xa8, M9206_RC_INIT2)) != 0)
+                return ret;
+
+        if ((ret = m9206_write(udev, M9206_CORE, 0x51, M9206_RC_INIT1)) != 0)
+                return ret;
+
+        return ret;
+}
+
+static int m9206_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        struct m9206_state *m = d->priv;
+        int i, ret = 0;
+        u8 rc_state[2];
+
+
+        if ((ret = m9206_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, rc_state, 1)) != 0)
+                goto unlock;
+
+        if ((ret = m9206_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0)
+                goto unlock;
+
+        for (i = 0; i < ARRAY_SIZE(megasky_rc_keys); i++)
+                if (megasky_rc_keys[i].data == rc_state[1]) {
+                        *event = megasky_rc_keys[i].event;
+
+                        switch(rc_state[0]) {
+                        case 0x80:
+                                *state = REMOTE_NO_KEY_PRESSED;
+                                goto unlock;
+
+                        case 0x93:
+                        case 0x92:
+                                m->rep_count = 0;
+                                *state = REMOTE_KEY_PRESSED;
+                                goto unlock;
+
+                        case 0x91:
+                                /* For comfort. */
+                                if (++m->rep_count > 2)
+                                        *state = REMOTE_KEY_REPEAT;
+                                goto unlock;
+
+                        default:
+                                deb_rc("Unexpected rc response %x\n", rc_state[0]);
+                                *state = REMOTE_NO_KEY_PRESSED;
+                                goto unlock;
+                        }
+                }
+
+        if (rc_state[1] != 0)
+                deb_rc("Unknown rc key %x\n", rc_state[1]);
+
+        *state = REMOTE_NO_KEY_PRESSED;
+
+        unlock:
+
+        return ret;
+}
+
+/* I2C */
+static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                          int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        struct m9206_state *m = d->priv;
+        int i;
+        int ret = 0;
+
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        if (num > 2)
+                return -EINVAL;
+
+        for (i = 0; i < num; i++) {
+                if ((ret = m9206_write(d->udev, M9206_I2C, msg[i].addr, 0x80)) != 0)
+                        goto unlock;
+
+                if ((ret = m9206_write(d->udev, M9206_I2C, msg[i].buf[0], 0x0)) != 0)
+                        goto unlock;
+
+                if (i + 1 < num && msg[i + 1].flags & I2C_M_RD) {
+                        int i2c_i;
+
+                        for (i2c_i = 0; i2c_i < M9206_I2C_MAX; i2c_i++)
+                                if (msg[i].addr == m->i2c_r[i2c_i].addr)
+                                        break;
+
+                        if (i2c_i >= M9206_I2C_MAX) {
+                                deb_rc("No magic for i2c addr!\n");
+                                ret = -EINVAL;
+                                goto unlock;
+                        }
+
+                        if ((ret = m9206_write(d->udev, M9206_I2C, m->i2c_r[i2c_i].magic, 0x80)) != 0)
+                                goto unlock;
+
+                        if ((ret = m9206_read(d->udev, M9206_I2C, 0x0, 0x60, msg[i + 1].buf, msg[i + 1].len)) != 0)
+                                goto unlock;
+
+                        i++;
+                } else {
+                        if (msg[i].len != 2)
+                                return -EINVAL;
+
+                        if ((ret = m9206_write(d->udev, M9206_I2C, msg[i].buf[1], 0x40)) != 0)
+                                goto unlock;
+                }
+        }
+        ret = i;
+        unlock:
+        mutex_unlock(&d->i2c_mutex);
+
+        return ret;
+}
+
+static u32 m9206_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm m9206_i2c_algo = {
+        .master_xfer   = m9206_i2c_xfer,
+        .functionality = m9206_i2c_func,
+};
+
+
+static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx,
+                            int pid)
+{
+        int ret = 0;
+
+        if (pid >= 0x8000)
+                return -EINVAL;
+
+        pid |= 0x8000;
+
+        if ((ret = m9206_write(adap->dev->udev, M9206_FILTER, pid, (type << 8) | (idx * 4) )) != 0)
+                return ret;
+
+        if ((ret = m9206_write(adap->dev->udev, M9206_FILTER, 0, (type << 8) | (idx * 4) )) != 0)
+                return ret;
+
+        return ret;
+}
+
+static int m9206_update_filters(struct dvb_usb_adapter *adap)
+{
+        struct m9206_state *m = adap->dev->priv;
+        int enabled = m->filtering_enabled;
+        int i, ret = 0, filter = 0;
+
+        for (i = 0; i < M9206_MAX_FILTERS; i++)
+                if (m->filters[i] == 8192)
+                        enabled = 0;
+
+        /* Disable all filters */
+        if ((ret = m9206_set_filter(adap, 0x81, 1, enabled)) != 0)
+                return ret;
+
+        for (i = 0; i < M9206_MAX_FILTERS; i++)
+                if ((ret = m9206_set_filter(adap, 0x81, i + 2, 0)) != 0)
+                        return ret;
+
+        if ((ret = m9206_set_filter(adap, 0x82, 0, 0x0)) != 0)
+                return ret;
+
+        /* Set */
+        if (enabled) {
+                for (i = 0; i < M9206_MAX_FILTERS; i++) {
+                        if (m->filters[i] == 0)
+                                continue;
+
+                        if ((ret = m9206_set_filter(adap, 0x81, filter + 2, m->filters[i])) != 0)
+                                return ret;
+
+                        filter++;
+                }
+        }
+
+        if ((ret = m9206_set_filter(adap, 0x82, 0, 0x02f5)) != 0)
+                return ret;
+
+        return ret;
+}
+
+static int m9206_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
+{
+        struct m9206_state *m = adap->dev->priv;
+
+        m->filtering_enabled = onoff ? 1 : 0;
+
+        return m9206_update_filters(adap);
+}
+
+static int m9206_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
+                            int onoff)
+{
+        struct m9206_state *m = adap->dev->priv;
+
+        m->filters[index] = onoff ? pid : 0;
+
+        return m9206_update_filters(adap);
+}
+
+static int m9206_firmware_download(struct usb_device *udev,
+                                   const struct firmware *fw)
+{
+        u16 value, index, size;
+        u8 read[4], *buff;
+        int i, pass, ret = 0;
+
+        buff = kmalloc(65536, GFP_KERNEL);
+
+        if ((ret = m9206_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0)
+                goto done;
+        deb_rc("%x %x %x %x\n", read[0], read[1], read[2], read[3]);
+
+        if ((ret = m9206_read(udev, M9206_FW, 0x0, 0x0, read, 1)) != 0)
+                goto done;
+        deb_rc("%x\n", read[0]);
+
+        for (pass = 0; pass < 2; pass++) {
+                for (i = 0; i + (sizeof(u16) * 3) < fw->size;) {
+                        value = le16_to_cpu(*(u16 *)(fw->data + i));
+                        i += sizeof(u16);
+
+                        index = le16_to_cpu(*(u16 *)(fw->data + i));
+                        i += sizeof(u16);
+
+                        size = le16_to_cpu(*(u16 *)(fw->data + i));
+                        i += sizeof(u16);
+
+                        if (pass == 1) {
+                                /* Will stall if using fw->data ... */
+                                memcpy(buff, fw->data + i, size);
+
+                                ret = usb_control_msg(udev, usb_sndctrlpipe(udev,0),
+                                            M9206_FW,
+                                            USB_TYPE_VENDOR | USB_DIR_OUT,
+                                            value, index, buff, size, 20);
+                                if (ret != size) {
+                                        deb_rc("error while uploading fw!\n");
+                                        ret = -EIO;
+                                        goto done;
+                                }
+                                msleep(3);
+                        }
+                        i += size;
+                }
+                if (i != fw->size) {
+                        ret = -EINVAL;
+                        goto done;
+                }
+        }
+
+        msleep(36);
+
+        /* m9206 will disconnect itself from the bus after this. */
+        (void) m9206_write(udev, M9206_CORE, 0x01, M9206_FW_GO);
+        deb_rc("firmware uploaded!\n");
+
+        done:
+        kfree(buff);
+
+        return ret;
+}
+
+/* Callbacks for DVB USB */
+static int megasky_identify_state(struct usb_device *udev,
+                                  struct dvb_usb_device_properties *props,
+                                  struct dvb_usb_device_description **desc,
+                                  int *cold)
+{
+        struct usb_host_interface *alt;
+
+        alt = usb_altnum_to_altsetting(usb_ifnum_to_if(udev, 0), 1);
+        *cold = (alt == NULL) ? 1 : 0;
+
+        return 0;
+}
+
+static int megasky_mt352_demod_init(struct dvb_frontend *fe)
+{
+        u8 config[] = { CONFIG, 0x3d };
+        u8 clock[] = { CLOCK_CTL, 0x30 };
+        u8 reset[] = { RESET, 0x80 };
+        u8 adc_ctl[] = { ADC_CTL_1, 0x40 };
+        u8 agc[] = { AGC_TARGET, 0x1c, 0x20 };
+        u8 sec_agc[] = { 0x69, 0x00, 0xff, 0xff, 0x40, 0xff, 0x00, 0x40, 0x40 };
+        u8 unk1[] = { 0x93, 0x1a };
+        u8 unk2[] = { 0xb5, 0x7a };
+
+        mt352_write(fe, config, ARRAY_SIZE(config));
+        mt352_write(fe, clock, ARRAY_SIZE(clock));
+        mt352_write(fe, reset, ARRAY_SIZE(reset));
+        mt352_write(fe, adc_ctl, ARRAY_SIZE(adc_ctl));
+        mt352_write(fe, agc, ARRAY_SIZE(agc));
+        mt352_write(fe, sec_agc, ARRAY_SIZE(sec_agc));
+        mt352_write(fe, unk1, ARRAY_SIZE(unk1));
+        mt352_write(fe, unk2, ARRAY_SIZE(unk2));
+
+        deb_rc("Demod init!\n");
+
+        return 0;
+}
+
+static struct mt352_config megasky_mt352_config = {
+        .demod_address = 0x1e,
+        .no_tuner = 1,
+        .demod_init = megasky_mt352_demod_init,
+};
+
+static int megasky_mt352_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        struct m9206_state *m = adap->dev->priv;
+
+        deb_rc("megasky_frontend_attach!\n");
+
+        m->i2c_r[M9206_I2C_DEMOD].addr = megasky_mt352_config.demod_address;
+        m->i2c_r[M9206_I2C_DEMOD].magic = 0x1f;
+
+        if ((adap->fe = dvb_attach(mt352_attach, &megasky_mt352_config, &adap->dev->i2c_adap)) == NULL)
+                return -EIO;
+
+        return 0;
+}
+
+static struct qt1010_config megasky_qt1010_config = {
+        .i2c_address = 0xc4
+};
+
+static int megasky_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct m9206_state *m = adap->dev->priv;
+
+        m->i2c_r[M9206_I2C_TUNER].addr = megasky_qt1010_config.i2c_address;
+        m->i2c_r[M9206_I2C_TUNER].magic = 0xc5;
+
+        if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap,
+                       &megasky_qt1010_config) == NULL)
+                return -ENODEV;
+
+        return 0;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties megasky_properties;
+
+static int m920x_probe(struct usb_interface *intf,
+                       const struct usb_device_id *id)
+{
+        struct dvb_usb_device *d;
+        struct usb_host_interface *alt;
+        int ret;
+
+        if ((ret = dvb_usb_device_init(intf, &megasky_properties, THIS_MODULE, &d)) == 0) {
+                deb_rc("probed!\n");
+
+                alt = usb_altnum_to_altsetting(intf, 1);
+                if (alt == NULL) {
+                        deb_rc("not alt found!\n");
+                        return -ENODEV;
+                }
+
+                ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
+                                        alt->desc.bAlternateSetting);
+                if (ret < 0)
+                        return ret;
+
+                deb_rc("Changed to alternate setting!\n");
+
+                if ((ret = m9206_rc_init(d->udev)) != 0)
+                        return ret;
+        }
+        return ret;
+}
+
+static struct usb_device_id m920x_table [] = {
+                { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580) },
+                { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, m920x_table);
+
+static struct dvb_usb_device_properties megasky_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "dvb-usb-megasky-02.fw",
+        .download_firmware = m9206_firmware_download,
+
+        .rc_interval      = 100,
+        .rc_key_map       = megasky_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(megasky_rc_keys),
+        .rc_query         = m9206_rc_query,
+
+        .size_of_priv     = sizeof(struct m9206_state),
+
+        .identify_state   = megasky_identify_state,
+        .num_adapters = 1,
+        .adapter = {{
+                .caps = DVB_USB_ADAP_HAS_PID_FILTER |
+                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+
+                .pid_filter_count = 8,
+                .pid_filter       = m9206_pid_filter,
+                .pid_filter_ctrl  = m9206_pid_filter_ctrl,
+
+                .frontend_attach  = megasky_mt352_frontend_attach,
+                .tuner_attach     = megasky_qt1010_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 8,
+                        .endpoint = 0x81,
+                        .u = {
+                                .bulk = {
+                                        .buffersize = 512,
+                                }
+                        }
+                },
+        }},
+        .i2c_algo         = &m9206_i2c_algo,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "MSI Mega Sky 580 DVB-T USB2.0",
+                        { &m920x_table[0], NULL },
+                        { NULL },
+                },
+        }
+};
+
+static struct usb_driver m920x_driver = {
+        .name           = "dvb_usb_m920x",
+        .probe          = m920x_probe,
+        .disconnect     = dvb_usb_device_exit,
+        .id_table       = m920x_table,
+};
+
+/* module stuff */
+static int __init m920x_module_init(void)
+{
+        int ret;
+
+        if ((ret = usb_register(&m920x_driver))) {
+                err("usb_register failed. Error number %d", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void __exit m920x_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&m920x_driver);
+}
+
+module_init (m920x_module_init);
+module_exit (m920x_module_exit);
+
+MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>");
+MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / Uli m920x");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/dvb/dvb-usb/m920x.h
new file mode 100644
index 000000000000..c354196ffe5d
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/m920x.h
@@ -0,0 +1,35 @@
+#ifndef _DVB_USB_M920X_H_
+#define _DVB_USB_M920X_H_
+
+#define DVB_USB_LOG_PREFIX "m920x"
+#include "dvb-usb.h"
+
+#define deb_rc(args...)   dprintk(dvb_usb_m920x_debug,0x01,args)
+
+#define M9206_CORE      0x22
+#define M9206_RC_STATE  0xff51
+#define M9206_RC_KEY    0xff52
+#define M9206_RC_INIT1  0xff54
+#define M9206_RC_INIT2  0xff55
+#define M9206_FW_GO     0xff69
+
+#define M9206_I2C       0x23
+#define M9206_FILTER    0x25
+#define M9206_FW        0x30
+
+#define M9206_MAX_FILTERS 8
+
+#define M9206_I2C_TUNER 0
+#define M9206_I2C_DEMOD 1
+#define M9206_I2C_MAX   2
+
+struct m9206_state {
+        u16 filters[M9206_MAX_FILTERS];
+        int filtering_enabled;
+        int rep_count;
+        struct {
+                unsigned char addr;
+                unsigned char magic;
+        }i2c_r[M9206_I2C_MAX];
+};
+#endif
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index af314bb1dcac..22c2cf2cea98 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -290,6 +290,13 @@ config DVB_TDA826X
         help
           A DVB-S silicon tuner module. Say Y when you want to support this tuner.
 
+config DVB_TUNER_QT1010
+        tristate "Quantek QT1010 silicon tuner"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A driver for the silicon tuner QT1010 from Quantek.
+
 config DVB_TUNER_MT2060
         tristate "Microtune MT2060 silicon IF tuner"
         depends on I2C
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 3fa6e5d32a9c..a646d9969b71 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -38,5 +38,6 @@ obj-$(CONFIG_DVB_ISL6421) += isl6421.o
 obj-$(CONFIG_DVB_TDA10086) += tda10086.o
 obj-$(CONFIG_DVB_TDA826X) += tda826x.o
 obj-$(CONFIG_DVB_TUNER_MT2060) += mt2060.o
+obj-$(CONFIG_DVB_TUNER_QT1010) += qt1010.o
 obj-$(CONFIG_DVB_TUA6100) += tua6100.o
 obj-$(CONFIG_DVB_TUNER_LGH06XF) += lgh06xf.o
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index ae96395217a2..10fc0c8316dd 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -254,7 +254,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
         if (srate<500000)
                 srate=500000;
 
-        for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++)
+        for(i = 0; (i < ARRAY_SIZE(bands)) && (srate>bands[i]); i++)
                 ;
         /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz,
            and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult,
@@ -361,7 +361,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
 
         dprintk("%s: init chip\n", __FUNCTION__);
 
-        for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) {
+        for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) {
                 cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
         };
 
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index a356d28fc3bb..732e94aaa364 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -507,7 +507,7 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa
         int i = 0;
         int pump = 2;
         int band = 0;
-        int num_bands = sizeof(cx24123_bandselect_vals) / sizeof(cx24123_bandselect_vals[0]);
+        int num_bands = ARRAY_SIZE(cx24123_bandselect_vals);
 
         /* Defaults for low freq, low rate */
         state->VCAarg = cx24123_AGC_vals[0].VCAprogdata;
@@ -516,7 +516,7 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa
         vco_div = cx24123_bandselect_vals[0].VCOdivider;
 
         /* For the given symbol rate, determine the VCA, VGA and FILTUNE programming bits */
-        for (i = 0; i < sizeof(cx24123_AGC_vals) / sizeof(cx24123_AGC_vals[0]); i++)
+        for (i = 0; i < ARRAY_SIZE(cx24123_AGC_vals); i++)
         {
                 if ((cx24123_AGC_vals[i].symbolrate_low <= p->u.qpsk.symbol_rate) &&
                     (cx24123_AGC_vals[i].symbolrate_high >= p->u.qpsk.symbol_rate) ) {
@@ -658,7 +658,7 @@ static int cx24123_initfe(struct dvb_frontend* fe)
         dprintk("%s:  init frontend\n",__FUNCTION__);
 
         /* Configure the demod to a good set of defaults */
-        for (i = 0; i < sizeof(cx24123_regdata) / sizeof(cx24123_regdata[0]); i++)
+        for (i = 0; i < ARRAY_SIZE(cx24123_regdata); i++)
                 cx24123_writereg(state, cx24123_regdata[i].reg, cx24123_regdata[i].data);
 
         /* Set the LNB polarity */
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 23aa75a27c1f..054d7e6d9662 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -475,7 +475,7 @@ static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state, struct dibx
         tmp = ((chan->nfft & 0x1) << 7) | (chan->guard << 5) | (chan->nqam << 3) | chan->vit_alpha;
         dib3000mc_write_word(state, 0, tmp);
 
-        dib3000mc_write_word(state, 5, seq);
+        dib3000mc_write_word(state, 5, (1 << 8) | ((seq & 0xf) << 4));
 
         tmp = (chan->vit_hrch << 4) | (chan->vit_select_hp);
         if (!chan->vit_hrch || (chan->vit_hrch && chan->vit_select_hp))
diff --git a/drivers/media/dvb/frontends/qt1010.c b/drivers/media/dvb/frontends/qt1010.c
new file mode 100644
index 000000000000..825aa1412e6f
--- /dev/null
+++ b/drivers/media/dvb/frontends/qt1010.c
@@ -0,0 +1,485 @@
+/*
+ *  Driver for Quantek QT1010 silicon tuner
+ *
+ *  Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
+ *                     Aapo Tahkola <aet@rasterburn.org>
+ *
+ *  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 "qt1010.h"
+#include "qt1010_priv.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
+
+#define dprintk(args...) \
+        do { \
+                if (debug) printk(KERN_DEBUG "QT1010: " args); \
+        } while (0)
+
+/* read single register */
+static int qt1010_readreg(struct qt1010_priv *priv, u8 reg, u8 *val)
+{
+        struct i2c_msg msg[2] = {
+                { .addr = priv->cfg->i2c_address,
+                  .flags = 0, .buf = &reg, .len = 1 },
+                { .addr = priv->cfg->i2c_address,
+                  .flags = I2C_M_RD, .buf = val, .len = 1 },
+        };
+
+        if (i2c_transfer(priv->i2c, msg, 2) != 2) {
+                printk(KERN_WARNING "qt1010 I2C read failed\n");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+/* write single register */
+static int qt1010_writereg(struct qt1010_priv *priv, u8 reg, u8 val)
+{
+        u8 buf[2] = { reg, val };
+        struct i2c_msg msg = { .addr = priv->cfg->i2c_address,
+                               .flags = 0, .buf = buf, .len = 2 };
+
+        if (i2c_transfer(priv->i2c, &msg, 1) != 1) {
+                printk(KERN_WARNING "qt1010 I2C write failed\n");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+/* dump all registers */
+static void qt1010_dump_regs(struct qt1010_priv *priv)
+{
+        char buf[52], buf2[4];
+        u8 reg, val;
+
+        for (reg = 0; ; reg++) {
+                if (reg % 16 == 0) {
+                        if (reg)
+                                printk("%s\n", buf);
+                        sprintf(buf, "%02x: ", reg);
+                }
+                if (qt1010_readreg(priv, reg, &val) == 0)
+                        sprintf(buf2, "%02x ", val);
+                else
+                        strcpy(buf2, "-- ");
+                strcat(buf, buf2);
+                if (reg == 0x2f)
+                        break;
+        }
+        printk("%s\n", buf);
+}
+
+static int qt1010_set_params(struct dvb_frontend *fe,
+                             struct dvb_frontend_parameters *params)
+{
+        struct qt1010_priv *priv;
+        int err;
+        u32 freq, div, mod1, mod2;
+        u8 i, tmpval, reg05;
+        qt1010_i2c_oper_t rd[48] = {
+                { QT1010_WR, 0x01, 0x80 },
+                { QT1010_WR, 0x02, 0x3f },
+                { QT1010_WR, 0x05, 0xff }, /* 02 c write */
+                { QT1010_WR, 0x06, 0x44 },
+                { QT1010_WR, 0x07, 0xff }, /* 04 c write */
+                { QT1010_WR, 0x08, 0x08 },
+                { QT1010_WR, 0x09, 0xff }, /* 06 c write */
+                { QT1010_WR, 0x0a, 0xff }, /* 07 c write */
+                { QT1010_WR, 0x0b, 0xff }, /* 08 c write */
+                { QT1010_WR, 0x0c, 0xe1 },
+                { QT1010_WR, 0x1a, 0xff }, /* 10 c write */
+                { QT1010_WR, 0x1b, 0x00 },
+                { QT1010_WR, 0x1c, 0x89 },
+                { QT1010_WR, 0x11, 0xff }, /* 13 c write */
+                { QT1010_WR, 0x12, 0xff }, /* 14 c write */
+                { QT1010_WR, 0x22, 0xff }, /* 15 c write */
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x1e, 0xd0 },
+                { QT1010_RD, 0x22, 0xff }, /* 16 c read */
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_RD, 0x05, 0xff }, /* 20 c read */
+                { QT1010_RD, 0x22, 0xff }, /* 21 c read */
+                { QT1010_WR, 0x23, 0xd0 },
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x1e, 0xe0 },
+                { QT1010_RD, 0x23, 0xff }, /* 25 c read */
+                { QT1010_RD, 0x23, 0xff }, /* 26 c read */
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x24, 0xd0 },
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x1e, 0xf0 },
+                { QT1010_RD, 0x24, 0xff }, /* 31 c read */
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x14, 0x7f },
+                { QT1010_WR, 0x15, 0x7f },
+                { QT1010_WR, 0x05, 0xff }, /* 35 c write */
+                { QT1010_WR, 0x06, 0x00 },
+                { QT1010_WR, 0x15, 0x1f },
+                { QT1010_WR, 0x16, 0xff },
+                { QT1010_WR, 0x18, 0xff },
+                { QT1010_WR, 0x1f, 0xff }, /* 40 c write */
+                { QT1010_WR, 0x20, 0xff }, /* 41 c write */
+                { QT1010_WR, 0x21, 0x53 },
+                { QT1010_WR, 0x25, 0xff }, /* 43 c write */
+                { QT1010_WR, 0x26, 0x15 },
+                { QT1010_WR, 0x00, 0xff }, /* 45 c write */
+                { QT1010_WR, 0x02, 0x00 },
+                { QT1010_WR, 0x01, 0x00 }
+        };
+
+#define FREQ1 32000000 /* 32 MHz */
+#define FREQ2  4000000 /* 4 MHz Quartz oscillator in the stick? */
+
+        priv = fe->tuner_priv;
+        freq = params->frequency;
+        div = (freq + QT1010_OFFSET) / QT1010_STEP;
+        freq = (div * QT1010_STEP) - QT1010_OFFSET;
+        mod1 = (freq + QT1010_OFFSET) % FREQ1;
+        mod2 = (freq + QT1010_OFFSET) % FREQ2;
+        priv->bandwidth =
+                (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
+        priv->frequency = freq;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
+        /* reg 05 base value */
+        if      (freq < 290000000) reg05 = 0x14; /* 290 MHz */
+        else if (freq < 610000000) reg05 = 0x34; /* 610 MHz */
+        else if (freq < 802000000) reg05 = 0x54; /* 802 MHz */
+        else                       reg05 = 0x74;
+
+        /* 0x5 */
+        rd[2].val = reg05;
+
+        /* 07 - set frequency: 32 MHz scale */
+        rd[4].val = (freq + QT1010_OFFSET) / FREQ1;
+
+        /* 09 - changes every 8/24 MHz */
+        if (mod1 < 8000000) rd[6].val = 0x1d;
+        else                rd[6].val = 0x1c;
+
+        /* 0a - set frequency: 4 MHz scale (max 28 MHz) */
+        if      (mod1 < 1*FREQ2) rd[7].val = 0x09; /*  +0 MHz */
+        else if (mod1 < 2*FREQ2) rd[7].val = 0x08; /*  +4 MHz */
+        else if (mod1 < 3*FREQ2) rd[7].val = 0x0f; /*  +8 MHz */
+        else if (mod1 < 4*FREQ2) rd[7].val = 0x0e; /* +12 MHz */
+        else if (mod1 < 5*FREQ2) rd[7].val = 0x0d; /* +16 MHz */
+        else if (mod1 < 6*FREQ2) rd[7].val = 0x0c; /* +20 MHz */
+        else if (mod1 < 7*FREQ2) rd[7].val = 0x0b; /* +24 MHz */
+        else                     rd[7].val = 0x0a; /* +28 MHz */
+
+        /* 0b - changes every 2/2 MHz */
+        if (mod2 < 2000000) rd[8].val = 0x45;
+        else                rd[8].val = 0x44;
+
+        /* 1a - set frequency: 125 kHz scale (max 3875 kHz)*/
+        tmpval = 0x78; /* byte, overflows intentionally */
+        rd[10].val = tmpval-((mod2/QT1010_STEP)*0x08);
+
+        /* 11 */
+        rd[13].val = 0xfd; /* TODO: correct value calculation */
+
+        /* 12 */
+        rd[14].val = 0x91; /* TODO: correct value calculation */
+
+        /* 22 */
+        if      (freq < 450000000) rd[15].val = 0xd0; /* 450 MHz */
+        else if (freq < 482000000) rd[15].val = 0xd1; /* 482 MHz */
+        else if (freq < 514000000) rd[15].val = 0xd4; /* 514 MHz */
+        else if (freq < 546000000) rd[15].val = 0xd7; /* 546 MHz */
+        else if (freq < 610000000) rd[15].val = 0xda; /* 610 MHz */
+        else                       rd[15].val = 0xd0;
+
+        /* 05 */
+        rd[35].val = (reg05 & 0xf0);
+
+        /* 1f */
+        if      (mod1 <  8000000) tmpval = 0x00;
+        else if (mod1 < 12000000) tmpval = 0x01;
+        else if (mod1 < 16000000) tmpval = 0x02;
+        else if (mod1 < 24000000) tmpval = 0x03;
+        else if (mod1 < 28000000) tmpval = 0x04;
+        else                      tmpval = 0x05;
+        rd[40].val = (priv->reg1f_init_val + 0x0e + tmpval);
+
+        /* 20 */
+        if      (mod1 <  8000000) tmpval = 0x00;
+        else if (mod1 < 12000000) tmpval = 0x01;
+        else if (mod1 < 20000000) tmpval = 0x02;
+        else if (mod1 < 24000000) tmpval = 0x03;
+        else if (mod1 < 28000000) tmpval = 0x04;
+        else                      tmpval = 0x05;
+        rd[41].val = (priv->reg20_init_val + 0x0d + tmpval);
+
+        /* 25 */
+        rd[43].val = priv->reg25_init_val;
+
+        /* 00 */
+        rd[45].val = 0x92; /* TODO: correct value calculation */
+
+        dprintk("freq:%u 05:%02x 07:%02x 09:%02x 0a:%02x 0b:%02x " \
+                "1a:%02x 11:%02x 12:%02x 22:%02x 05:%02x 1f:%02x " \
+                "20:%02x 25:%02x 00:%02x", \
+                freq, rd[2].val, rd[4].val, rd[6].val, rd[7].val, rd[8].val, \
+                rd[10].val, rd[13].val, rd[14].val, rd[15].val, rd[35].val, \
+                rd[40].val, rd[41].val, rd[43].val, rd[45].val);
+
+        for (i = 0; i < ARRAY_SIZE(rd); i++) {
+                if (rd[i].oper == QT1010_WR) {
+                        err = qt1010_writereg(priv, rd[i].reg, rd[i].val);
+                } else { /* read is required to proper locking */
+                        err = qt1010_readreg(priv, rd[i].reg, &tmpval);
+                }
+                if (err) return err;
+        }
+
+        if (debug)
+                qt1010_dump_regs(priv);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
+        return 0;
+}
+
+static int qt1010_init_meas1(struct qt1010_priv *priv,
+                             u8 oper, u8 reg, u8 reg_init_val, u8 *retval)
+{
+        u8 i, val1, val2;
+        int err;
+
+        qt1010_i2c_oper_t i2c_data[] = {
+                { QT1010_WR, reg, reg_init_val },
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x1e, oper },
+                { QT1010_RD, reg, 0xff }
+        };
+
+        for (i = 0; i < ARRAY_SIZE(i2c_data); i++) {
+                if (i2c_data[i].oper == QT1010_WR) {
+                        err = qt1010_writereg(priv, i2c_data[i].reg,
+                                              i2c_data[i].val);
+                } else {
+                        err = qt1010_readreg(priv, i2c_data[i].reg, &val2);
+                }
+                if (err) return err;
+        }
+
+        do {
+                val1 = val2;
+                err = qt1010_readreg(priv, reg, &val2);
+                if (err) return err;
+                dprintk("compare reg:%02x %02x %02x", reg, val1, val2);
+        } while (val1 != val2);
+        *retval = val1;
+
+        return qt1010_writereg(priv, 0x1e, 0x00);
+}
+
+static u8 qt1010_init_meas2(struct qt1010_priv *priv,
+                            u8 reg_init_val, u8 *retval)
+{
+        u8 i, val;
+        int err;
+        qt1010_i2c_oper_t i2c_data[] = {
+                { QT1010_WR, 0x07, reg_init_val },
+                { QT1010_WR, 0x22, 0xd0 },
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x1e, 0xd0 },
+                { QT1010_RD, 0x22, 0xff },
+                { QT1010_WR, 0x1e, 0x00 },
+                { QT1010_WR, 0x22, 0xff }
+        };
+        for (i = 0; i < ARRAY_SIZE(i2c_data); i++) {
+                if (i2c_data[i].oper == QT1010_WR) {
+                        err = qt1010_writereg(priv, i2c_data[i].reg,
+                                              i2c_data[i].val);
+                } else {
+                        err = qt1010_readreg(priv, i2c_data[i].reg, &val);
+                }
+                if (err) return err;
+        }
+        *retval = val;
+        return 0;
+}
+
+static int qt1010_init(struct dvb_frontend *fe)
+{
+        struct qt1010_priv *priv = fe->tuner_priv;
+        struct dvb_frontend_parameters params;
+        int err = 0;
+        u8 i, tmpval, *valptr = NULL;
+
+        qt1010_i2c_oper_t i2c_data[] = {
+                { QT1010_WR, 0x01, 0x80 },
+                { QT1010_WR, 0x0d, 0x84 },
+                { QT1010_WR, 0x0e, 0xb7 },
+                { QT1010_WR, 0x2a, 0x23 },
+                { QT1010_WR, 0x2c, 0xdc },
+                { QT1010_M1, 0x25, 0x40 }, /* get reg 25 init value */
+                { QT1010_M1, 0x81, 0xff }, /* get reg 25 init value */
+                { QT1010_WR, 0x2b, 0x70 },
+                { QT1010_WR, 0x2a, 0x23 },
+                { QT1010_M1, 0x26, 0x08 },
+                { QT1010_M1, 0x82, 0xff },
+                { QT1010_WR, 0x05, 0x14 },
+                { QT1010_WR, 0x06, 0x44 },
+                { QT1010_WR, 0x07, 0x28 },
+                { QT1010_WR, 0x08, 0x0b },
+                { QT1010_WR, 0x11, 0xfd },
+                { QT1010_M1, 0x22, 0x0d },
+                { QT1010_M1, 0xd0, 0xff },
+                { QT1010_WR, 0x06, 0x40 },
+                { QT1010_WR, 0x16, 0xf0 },
+                { QT1010_WR, 0x02, 0x38 },
+                { QT1010_WR, 0x03, 0x18 },
+                { QT1010_WR, 0x20, 0xe0 },
+                { QT1010_M1, 0x1f, 0x20 }, /* get reg 1f init value */
+                { QT1010_M1, 0x84, 0xff }, /* get reg 1f init value */
+                { QT1010_RD, 0x20, 0x20 }, /* get reg 20 init value */
+                { QT1010_WR, 0x03, 0x19 },
+                { QT1010_WR, 0x02, 0x3f },
+                { QT1010_WR, 0x21, 0x53 },
+                { QT1010_RD, 0x21, 0xff },
+                { QT1010_WR, 0x11, 0xfd },
+                { QT1010_WR, 0x05, 0x34 },
+                { QT1010_WR, 0x06, 0x44 },
+                { QT1010_WR, 0x08, 0x08 }
+        };
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
+        for (i = 0; i < ARRAY_SIZE(i2c_data); i++) {
+                switch (i2c_data[i].oper) {
+                case QT1010_WR:
+                        err = qt1010_writereg(priv, i2c_data[i].reg,
+                                              i2c_data[i].val);
+                        break;
+                case QT1010_RD:
+                        if (i2c_data[i].val == 0x20)
+                                valptr = &priv->reg20_init_val;
+                        else
+                                valptr = &tmpval;
+                        err = qt1010_readreg(priv, i2c_data[i].reg, valptr);
+                        break;
+                case QT1010_M1:
+                        if (i2c_data[i].val == 0x25)
+                                valptr = &priv->reg25_init_val;
+                        else if (i2c_data[i].val == 0x1f)
+                                valptr = &priv->reg1f_init_val;
+                        else
+                                valptr = &tmpval;
+                        err = qt1010_init_meas1(priv, i2c_data[i+1].reg,
+                                                i2c_data[i].reg,
+                                                i2c_data[i].val, valptr);
+                        i++;
+                        break;
+                }
+                if (err) return err;
+        }
+
+        for (i = 0x31; i < 0x3a; i++) /* 0x31 - 0x39 */
+                if ((err = qt1010_init_meas2(priv, i, &tmpval)))
+                        return err;
+
+        params.frequency = 545000000; /* Sigmatek DVB-110 545000000 */
+                                      /* MSI Megasky 580 GL861 533000000 */
+        return qt1010_set_params(fe, &params);
+}
+
+static int qt1010_release(struct dvb_frontend *fe)
+{
+        kfree(fe->tuner_priv);
+        fe->tuner_priv = NULL;
+        return 0;
+}
+
+static int qt1010_get_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct qt1010_priv *priv = fe->tuner_priv;
+        *frequency = priv->frequency;
+        return 0;
+}
+
+static int qt1010_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
+{
+        struct qt1010_priv *priv = fe->tuner_priv;
+        *bandwidth = priv->bandwidth;
+        return 0;
+}
+
+static const struct dvb_tuner_ops qt1010_tuner_ops = {
+        .info = {
+                .name           = "Quantek QT1010",
+                .frequency_min  = QT1010_MIN_FREQ,
+                .frequency_max  = QT1010_MAX_FREQ,
+                .frequency_step = QT1010_STEP,
+        },
+
+        .release       = qt1010_release,
+        .init          = qt1010_init,
+        /* TODO: implement sleep */
+
+        .set_params    = qt1010_set_params,
+        .get_frequency = qt1010_get_frequency,
+        .get_bandwidth = qt1010_get_bandwidth
+};
+
+struct dvb_frontend * qt1010_attach(struct dvb_frontend *fe,
+                                    struct i2c_adapter *i2c,
+                                    struct qt1010_config *cfg)
+{
+        struct qt1010_priv *priv = NULL;
+        u8 id;
+
+        priv = kzalloc(sizeof(struct qt1010_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return NULL;
+
+        priv->cfg = cfg;
+        priv->i2c = i2c;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
+
+        /* Try to detect tuner chip. Probably this is not correct register. */
+        if (qt1010_readreg(priv, 0x29, &id) != 0 || (id != 0x39)) {
+                kfree(priv);
+                return NULL;
+        }
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
+        printk(KERN_INFO "Quantek QT1010 successfully identified.\n");
+        memcpy(&fe->ops.tuner_ops, &qt1010_tuner_ops,
+               sizeof(struct dvb_tuner_ops));
+
+        fe->tuner_priv = priv;
+        return fe;
+}
+EXPORT_SYMBOL(qt1010_attach);
+
+MODULE_DESCRIPTION("Quantek QT1010 silicon tuner driver");
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
+MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/qt1010.h b/drivers/media/dvb/frontends/qt1010.h
new file mode 100644
index 000000000000..3ab4aa045c36
--- /dev/null
+++ b/drivers/media/dvb/frontends/qt1010.h
@@ -0,0 +1,53 @@
+/*
+ *  Driver for Quantek QT1010 silicon tuner
+ *
+ *  Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
+ *                     Aapo Tahkola <aet@rasterburn.org>
+ *
+ *  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 QT1010_H
+#define QT1010_H
+
+#include "dvb_frontend.h"
+
+struct qt1010_config {
+        u8 i2c_address;
+};
+
+/**
+ * Attach a qt1010 tuner to the supplied frontend structure.
+ *
+ * @param fe   frontend to attach to
+ * @param i2c  i2c adapter to use
+ * @param cfg  tuner hw based configuration
+ * @return fe  pointer on success, NULL on failure
+ */
+#if defined(CONFIG_DVB_TUNER_QT1010) || (defined(CONFIG_DVB_TUNER_QT1010_MODULE) && defined(MODULE))
+extern struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe,
+                                          struct i2c_adapter *i2c,
+                                          struct qt1010_config *cfg);
+#else
+static inline struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe,
+                                                 struct i2c_adapter *i2c,
+                                                 struct qt1010_config *cfg)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif // CONFIG_DVB_TUNER_QT1010
+
+#endif
diff --git a/drivers/media/dvb/frontends/qt1010_priv.h b/drivers/media/dvb/frontends/qt1010_priv.h
new file mode 100644
index 000000000000..090cf475f099
--- /dev/null
+++ b/drivers/media/dvb/frontends/qt1010_priv.h
@@ -0,0 +1,105 @@
+/*
+ *  Driver for Quantek QT1010 silicon tuner
+ *
+ *  Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
+ *                     Aapo Tahkola <aet@rasterburn.org>
+ *
+ *  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 QT1010_PRIV_H
+#define QT1010_PRIV_H
+
+/*
+reg def meaning
+=== === =======
+00  00  ?
+01  a0  ? operation start/stop; start=80, stop=00
+02  00  ?
+03  19  ?
+04  00  ?
+05  00  ? maybe band selection
+06  00  ?
+07  2b  set frequency: 32 MHz scale, n*32 MHz
+08  0b  ?
+09  10  ? changes every 8/24 MHz; values 1d/1c
+0a  08  set frequency: 4 MHz scale, n*4 MHz
+0b  41  ? changes every 2/2 MHz; values 45/45
+0c  e1  ?
+0d  94  ?
+0e  b6  ?
+0f  2c  ?
+10  10  ?
+11  f1  ? maybe device specified adjustment
+12  11  ? maybe device specified adjustment
+13  3f  ?
+14  1f  ?
+15  3f  ?
+16  ff  ?
+17  ff  ?
+18  f7  ?
+19  80  ?
+1a  d0  set frequency: 125 kHz scale, n*125 kHz
+1b  00  ?
+1c  89  ?
+1d  00  ?
+1e  00  ? looks like operation register; write cmd here, read result from 1f-26
+1f  20  ? chip initialization
+20  e0  ? chip initialization
+21  20  ?
+22  d0  ?
+23  d0  ?
+24  d0  ?
+25  40  ? chip initialization
+26  08  ?
+27  29  ?
+28  55  ?
+29  39  ?
+2a  13  ?
+2b  01  ?
+2c  ea  ?
+2d  00  ?
+2e  00  ? not used?
+2f  00  ? not used?
+*/
+
+#define QT1010_STEP         125000 /*  125 kHz used by Windows drivers,
+                                      hw could be more precise but we don't
+                                      know how to use */
+#define QT1010_MIN_FREQ   48000000 /*   48 MHz */
+#define QT1010_MAX_FREQ  860000000 /*  860 MHz */
+#define QT1010_OFFSET   1246000000 /* 1246 MHz */
+
+#define QT1010_WR 0
+#define QT1010_RD 1
+#define QT1010_M1 3
+
+typedef struct {
+        u8 oper, reg, val;
+} qt1010_i2c_oper_t;
+
+struct qt1010_priv {
+        struct qt1010_config *cfg;
+        struct i2c_adapter   *i2c;
+
+        u8 reg1f_init_val;
+        u8 reg20_init_val;
+        u8 reg25_init_val;
+
+        u32 frequency;
+        u32 bandwidth;
+};
+
+#endif
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 1ca64249010c..9a343972ff50 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -35,6 +35,7 @@ struct stv0297_state {
         const struct stv0297_config *config;
         struct dvb_frontend frontend;
 
+        unsigned long last_ber;
         unsigned long base_freq;
 };
 
@@ -310,6 +311,8 @@ static int stv0297_init(struct dvb_frontend *fe)
                 stv0297_writereg(state, state->config->inittab[i], state->config->inittab[i+1]);
         msleep(200);
 
+        state->last_ber = 0;
+
         return 0;
 }
 
@@ -340,11 +343,13 @@ static int stv0297_read_ber(struct dvb_frontend *fe, u32 * ber)
         struct stv0297_state *state = fe->demodulator_priv;
         u8 BER[3];
 
-        stv0297_writereg(state, 0xA0, 0x80);    // Start Counting bit errors for 4096 Bytes
-        mdelay(25);             // Hopefully got 4096 Bytes
         stv0297_readregs(state, 0xA0, BER, 3);
-        mdelay(25);
-        *ber = (BER[2] << 8 | BER[1]) / (8 * 4096);
+        if (!(BER[0] & 0x80)) {
+                state->last_ber = BER[2] << 8 | BER[1];
+                stv0297_writereg_mask(state, 0xA0, 0x80, 0x80);
+        }
+
+        *ber = state->last_ber;
 
         return 0;
 }
@@ -376,9 +381,14 @@ static int stv0297_read_ucblocks(struct dvb_frontend *fe, u32 * ucblocks)
 {
         struct stv0297_state *state = fe->demodulator_priv;
 
+        stv0297_writereg_mask(state, 0xDF, 0x03, 0x03); /* freeze the counters */
+
         *ucblocks = (stv0297_readreg(state, 0xD5) << 8)
                 | stv0297_readreg(state, 0xD4);
 
+        stv0297_writereg_mask(state, 0xDF, 0x03, 0x02); /* clear the counters */
+        stv0297_writereg_mask(state, 0xDF, 0x03, 0x01); /* re-enable the counters */
+
         return 0;
 }
 
@@ -648,6 +658,7 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
+        state->last_ber = 0;
         state->base_freq = 0;
 
         /* check if the demod is there */
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 93483769eca8..18768d2f6d40 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -92,7 +92,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data)
         return (ret != 1) ? -EREMOTEIO : 0;
 }
 
-int stv0299_write(struct dvb_frontend* fe, u8 *buf, int len)
+static int stv0299_write(struct dvb_frontend* fe, u8 *buf, int len)
 {
         struct stv0299_state* state = fe->demodulator_priv;
 
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index dca89171be1f..5b9c5bb29b23 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -201,7 +201,7 @@ static int tda10021_set_symbolrate (struct tda10021_state* state, u32 symbolrate
         return 0;
 }
 
-int tda10021_write(struct dvb_frontend* fe, u8 *buf, int len)
+static int tda10021_write(struct dvb_frontend* fe, u8 *buf, int len)
 {
         struct tda10021_state* state = fe->demodulator_priv;
 
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 00e4bcd9f1a4..f4a9cf9d26d0 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -579,7 +579,7 @@ static int tda1004x_decode_fec(int tdafec)
         return -1;
 }
 
-int tda1004x_write(struct dvb_frontend* fe, u8 *buf, int len)
+static int tda1004x_write(struct dvb_frontend* fe, u8 *buf, int len)
 {
         struct tda1004x_state* state = fe->demodulator_priv;
 
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 0e9b59af271e..245f9b7dddfa 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -38,6 +38,12 @@ struct zl10353_state {
         struct zl10353_config config;
 };
 
+static int debug;
+#define dprintk(args...) \
+        do { \
+                if (debug) printk(KERN_DEBUG "zl10353: " args); \
+        } while (0)
+
 static int debug_regs = 0;
 
 static int zl10353_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
@@ -54,7 +60,7 @@ static int zl10353_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
         return 0;
 }
 
-int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen)
+static int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen)
 {
         int err, i;
         for (i = 0; i < ilen - 1; i++)
@@ -113,6 +119,36 @@ static void zl10353_dump_regs(struct dvb_frontend *fe)
         printk(KERN_DEBUG "%s\n", buf);
 }
 
+static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
+                                      enum fe_bandwidth bandwidth,
+                                      u16 *nominal_rate)
+{
+        u32 adc_clock = 22528; /* 20.480 MHz on the board(!?) */
+        u8 bw;
+        struct zl10353_state *state = fe->demodulator_priv;
+
+        if (state->config.adc_clock)
+                adc_clock = state->config.adc_clock;
+
+        switch (bandwidth) {
+        case BANDWIDTH_6_MHZ:
+                bw = 6;
+                break;
+        case BANDWIDTH_7_MHZ:
+                bw = 7;
+                break;
+        case BANDWIDTH_8_MHZ:
+        default:
+                bw = 8;
+                break;
+        }
+
+        *nominal_rate = (64 * bw * (1<<16) / (7 * 8) * 4000 / adc_clock + 2) / 4;
+
+        dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
+                __FUNCTION__, bw, adc_clock, *nominal_rate);
+}
+
 static int zl10353_sleep(struct dvb_frontend *fe)
 {
         static u8 zl10353_softdown[] = { 0x50, 0x0C, 0x44 };
@@ -125,7 +161,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
                                   struct dvb_frontend_parameters *param)
 {
         struct zl10353_state *state = fe->demodulator_priv;
-
+        u16 nominal_rate;
         u8 pllbuf[6] = { 0x67 };
 
         /* These settings set "auto-everything" and start the FSM. */
@@ -138,18 +174,23 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
         zl10353_single_write(fe, 0x56, 0x28);
         zl10353_single_write(fe, 0x89, 0x20);
         zl10353_single_write(fe, 0x5E, 0x00);
-        zl10353_single_write(fe, 0x65, 0x5A);
-        zl10353_single_write(fe, 0x66, 0xE9);
+
+        zl10353_calc_nominal_rate(fe, param->u.ofdm.bandwidth, &nominal_rate);
+        zl10353_single_write(fe, TRL_NOMINAL_RATE_1, msb(nominal_rate));
+        zl10353_single_write(fe, TRL_NOMINAL_RATE_0, lsb(nominal_rate));
+
         zl10353_single_write(fe, 0x6C, 0xCD);
         zl10353_single_write(fe, 0x6D, 0x7E);
-        zl10353_single_write(fe, 0x62, 0x0A);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
 
         // if there is no attached secondary tuner, we call set_params to program
         // a potential tuner attached somewhere else
         if (state->config.no_tuner) {
                 if (fe->ops.tuner_ops.set_params) {
                         fe->ops.tuner_ops.set_params(fe, param);
-                        if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+                        if (fe->ops.i2c_gate_ctrl)
+                                fe->ops.i2c_gate_ctrl(fe, 0);
                 }
         }
 
@@ -213,6 +254,29 @@ static int zl10353_read_status(struct dvb_frontend *fe, fe_status_t *status)
         return 0;
 }
 
+static int zl10353_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct zl10353_state *state = fe->demodulator_priv;
+
+        *ber = zl10353_read_register(state, RS_ERR_CNT_2) << 16 |
+               zl10353_read_register(state, RS_ERR_CNT_1) << 8 |
+               zl10353_read_register(state, RS_ERR_CNT_0);
+
+        return 0;
+}
+
+static int zl10353_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
+{
+        struct zl10353_state *state = fe->demodulator_priv;
+
+        u16 signal = zl10353_read_register(state, AGC_GAIN_1) << 10 |
+                     zl10353_read_register(state, AGC_GAIN_0) << 2 | 3;
+
+        *strength = ~signal;
+
+        return 0;
+}
+
 static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
         struct zl10353_state *state = fe->demodulator_priv;
@@ -227,6 +291,16 @@ static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr)
         return 0;
 }
 
+static int zl10353_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        struct zl10353_state *state = fe->demodulator_priv;
+
+        *ucblocks = zl10353_read_register(state, RS_UBC_1) << 8 |
+                    zl10353_read_register(state, RS_UBC_0);
+
+        return 0;
+}
+
 static int zl10353_get_tune_settings(struct dvb_frontend *fe,
                                      struct dvb_frontend_tune_settings
                                          *fe_tune_settings)
@@ -261,6 +335,16 @@ static int zl10353_init(struct dvb_frontend *fe)
         return 0;
 }
 
+static int zl10353_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+{
+        u8 val = 0x0a;
+
+        if (enable)
+                val |= 0x10;
+
+        return zl10353_single_write(fe, 0x62, val);
+}
+
 static void zl10353_release(struct dvb_frontend *fe)
 {
         struct zl10353_state *state = fe->demodulator_priv;
@@ -319,15 +403,22 @@ static struct dvb_frontend_ops zl10353_ops = {
 
         .init = zl10353_init,
         .sleep = zl10353_sleep,
+        .i2c_gate_ctrl = zl10353_i2c_gate_ctrl,
         .write = zl10353_write,
 
         .set_frontend = zl10353_set_parameters,
         .get_tune_settings = zl10353_get_tune_settings,
 
         .read_status = zl10353_read_status,
+        .read_ber = zl10353_read_ber,
+        .read_signal_strength = zl10353_read_signal_strength,
         .read_snr = zl10353_read_snr,
+        .read_ucblocks = zl10353_read_ucblocks,
 };
 
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
 module_param(debug_regs, int, 0644);
 MODULE_PARM_DESC(debug_regs, "Turn on/off frontend register dumps (default:off).");
 
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index 0bc0109737f1..cb274dc12b82 100644
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -29,6 +29,9 @@ struct zl10353_config
         /* demodulator's I2C address */
         u8 demod_address;
 
+        /* frequencies in kHz */
+        int adc_clock;  // default: 22528
+
         /* set if no pll is connected to the secondary i2c bus */
         int no_tuner;
 
diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
index b72224bd7dde..4962434b35e7 100644
--- a/drivers/media/dvb/frontends/zl10353_priv.h
+++ b/drivers/media/dvb/frontends/zl10353_priv.h
@@ -24,19 +24,31 @@
 
 #define ID_ZL10353      0x14
 
+#define msb(x) (((x) >> 8) & 0xff)
+#define lsb(x) ((x) & 0xff)
+
 enum zl10353_reg_addr {
-        INTERRUPT_0     = 0x00,
-        INTERRUPT_1     = 0x01,
-        INTERRUPT_2     = 0x02,
-        INTERRUPT_3     = 0x03,
-        INTERRUPT_4     = 0x04,
-        INTERRUPT_5     = 0x05,
-        STATUS_6        = 0x06,
-        STATUS_7        = 0x07,
-        STATUS_8        = 0x08,
-        STATUS_9        = 0x09,
-        SNR             = 0x10,
-        CHIP_ID         = 0x7F,
+        INTERRUPT_0        = 0x00,
+        INTERRUPT_1        = 0x01,
+        INTERRUPT_2        = 0x02,
+        INTERRUPT_3        = 0x03,
+        INTERRUPT_4        = 0x04,
+        INTERRUPT_5        = 0x05,
+        STATUS_6           = 0x06,
+        STATUS_7           = 0x07,
+        STATUS_8           = 0x08,
+        STATUS_9           = 0x09,
+        AGC_GAIN_1         = 0x0A,
+        AGC_GAIN_0         = 0x0B,
+        SNR                = 0x10,
+        RS_ERR_CNT_2       = 0x11,
+        RS_ERR_CNT_1       = 0x12,
+        RS_ERR_CNT_0       = 0x13,
+        RS_UBC_1           = 0x14,
+        RS_UBC_0           = 0x15,
+        TRL_NOMINAL_RATE_1 = 0x65,
+        TRL_NOMINAL_RATE_0 = 0x66,
+        CHIP_ID            = 0x7F,
 };
 
 #endif                          /* _ZL10353_PRIV_ */
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 366c1371ee97..29ed532ba966 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -51,6 +51,7 @@
 #include <linux/firmware.h>
 #include <linux/crc32.h>
 #include <linux/i2c.h>
+#include <linux/kthread.h>
 
 #include <asm/system.h>
 
@@ -223,11 +224,10 @@ static void recover_arm(struct av7110 *av7110)
 
 static void av7110_arm_sync(struct av7110 *av7110)
 {
-        av7110->arm_rmmod = 1;
-        wake_up_interruptible(&av7110->arm_wait);
+        if (av7110->arm_thread)
+                kthread_stop(av7110->arm_thread);
 
-        while (av7110->arm_thread)
-                msleep(1);
+        av7110->arm_thread = NULL;
 }
 
 static int arm_thread(void *data)
@@ -238,17 +238,11 @@ static int arm_thread(void *data)
 
         dprintk(4, "%p\n",av7110);
 
-        lock_kernel();
-        daemonize("arm_mon");
-        sigfillset(&current->blocked);
-        unlock_kernel();
-
-        av7110->arm_thread = current;
-
         for (;;) {
                 timeout = wait_event_interruptible_timeout(av7110->arm_wait,
-                                                           av7110->arm_rmmod, 5 * HZ);
-                if (-ERESTARTSYS == timeout || av7110->arm_rmmod) {
+                        kthread_should_stop(), 5 * HZ);
+
+                if (-ERESTARTSYS == timeout || kthread_should_stop()) {
                         /* got signal or told to quit*/
                         break;
                 }
@@ -276,7 +270,6 @@ static int arm_thread(void *data)
                 av7110->arm_errors = 0;
         }
 
-        av7110->arm_thread = NULL;
         return 0;
 }
 
@@ -695,8 +688,8 @@ static void gpioirq(unsigned long data)
 static int dvb_osd_ioctl(struct inode *inode, struct file *file,
                          unsigned int cmd, void *parg)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
 
         dprintk(4, "%p\n", av7110);
 
@@ -786,7 +779,7 @@ int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
 static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 {
         struct dvb_demux_feed *dvbdmxfeed = dvbdmxfilter->feed;
-        struct av7110 *av7110 = (struct av7110 *) dvbdmxfeed->demux->priv;
+        struct av7110 *av7110 = dvbdmxfeed->demux->priv;
         u16 buf[20];
         int ret, i;
         u16 handle;
@@ -835,7 +828,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 
 static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 {
-        struct av7110 *av7110 = (struct av7110 *) dvbdmxfilter->feed->demux->priv;
+        struct av7110 *av7110 = dvbdmxfilter->feed->demux->priv;
         u16 buf[3];
         u16 answ[2];
         int ret;
@@ -871,7 +864,7 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
 {
         struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
-        struct av7110 *av7110 = (struct av7110 *) dvbdmx->priv;
+        struct av7110 *av7110 = dvbdmx->priv;
         u16 *pid = dvbdmx->pids, npids[5];
         int i;
         int ret = 0;
@@ -914,7 +907,7 @@ static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
 static int dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
 {
         struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
-        struct av7110 *av7110 = (struct av7110 *) dvbdmx->priv;
+        struct av7110 *av7110 = dvbdmx->priv;
         u16 *pid = dvbdmx->pids, npids[5];
         int i;
 
@@ -1103,9 +1096,9 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
 
         /* pointer casting paranoia... */
         BUG_ON(!demux);
-        dvbdemux = (struct dvb_demux *) demux->priv;
+        dvbdemux = demux->priv;
         BUG_ON(!dvbdemux);
-        av7110 = (struct av7110 *) dvbdemux->priv;
+        av7110 = dvbdemux->priv;
 
         dprintk(4, "%p\n", av7110);
 
@@ -1137,7 +1130,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
 
 static int av7110_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        struct av7110* av7110 = fe->dvb->priv;
 
         switch (tone) {
         case SEC_TONE_ON:
@@ -1197,7 +1190,7 @@ static int start_ts_capture(struct av7110 *budget)
 static int budget_start_feed(struct dvb_demux_feed *feed)
 {
         struct dvb_demux *demux = feed->demux;
-        struct av7110 *budget = (struct av7110 *) demux->priv;
+        struct av7110 *budget = demux->priv;
         int status;
 
         dprintk(2, "av7110: %p\n", budget);
@@ -1212,7 +1205,7 @@ static int budget_start_feed(struct dvb_demux_feed *feed)
 static int budget_stop_feed(struct dvb_demux_feed *feed)
 {
         struct dvb_demux *demux = feed->demux;
-        struct av7110 *budget = (struct av7110 *) demux->priv;
+        struct av7110 *budget = demux->priv;
         int status;
 
         dprintk(2, "budget: %p\n", budget);
@@ -1551,7 +1544,7 @@ static int get_firmware(struct av7110* av7110)
 
 static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
 {
-        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        struct av7110* av7110 = fe->dvb->priv;
         u8 pwr = 0;
         u8 buf[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
@@ -1702,7 +1695,7 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
 static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
 {
 #if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE)
-        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        struct av7110* av7110 = fe->dvb->priv;
 
         return request_firmware(fw, name, &av7110->dev->pci->dev);
 #else
@@ -1867,7 +1860,7 @@ static struct stv0297_config nexusca_stv0297_config = {
 
 static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
 {
-        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        struct av7110* av7110 = fe->dvb->priv;
         u32 div;
         u8 cfg, cpump, band_select;
         u8 data[4];
@@ -2338,6 +2331,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
         const int length = TS_WIDTH * TS_HEIGHT;
         struct pci_dev *pdev = dev->pci;
         struct av7110 *av7110;
+        struct task_struct *thread;
         int ret, count = 0;
 
         dprintk(4, "dev: %p\n", dev);
@@ -2622,9 +2616,12 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
                 printk ("dvb-ttpci: Warning, firmware version 0x%04x is too old. "
                         "System might be unstable!\n", FW_VERSION(av7110->arm_app));
 
-        ret = kernel_thread(arm_thread, (void *) av7110, 0);
-        if (ret < 0)
+        thread = kthread_run(arm_thread, (void *) av7110, "arm_mon");
+        if (IS_ERR(thread)) {
+                ret = PTR_ERR(thread);
                 goto err_stop_arm_9;
+        }
+        av7110->arm_thread = thread;
 
         /* set initial volume in mixer struct */
         av7110->mixer.volume_left  = volume;
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 9c79696da08a..b98bd453cade 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -35,7 +35,6 @@
 
 #define ANALOG_TUNER_VES1820 1
 #define ANALOG_TUNER_STV0297 2
-#define ANALOG_TUNER_VBI     0x100
 
 extern int av7110_debug;
 
@@ -205,7 +204,6 @@ struct av7110 {
         struct task_struct *arm_thread;
         wait_queue_head_t   arm_wait;
         u16                 arm_loops;
-        int                 arm_rmmod;
 
         void               *debi_virt;
         dma_addr_t          debi_bus;
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 795e6e95915c..e719af807685 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -880,8 +880,8 @@ static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event
 
 static unsigned int dvb_video_poll(struct file *file, poll_table *wait)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         unsigned int mask = 0;
 
         dprintk(2, "av7110:%p, \n", av7110);
@@ -908,8 +908,8 @@ static unsigned int dvb_video_poll(struct file *file, poll_table *wait)
 static ssize_t dvb_video_write(struct file *file, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
 
         dprintk(2, "av7110:%p, \n", av7110);
 
@@ -924,8 +924,8 @@ static ssize_t dvb_video_write(struct file *file, const char __user *buf,
 
 static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         unsigned int mask = 0;
 
         dprintk(2, "av7110:%p, \n", av7110);
@@ -944,8 +944,8 @@ static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
 static ssize_t dvb_audio_write(struct file *file, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
 
         dprintk(2, "av7110:%p, \n", av7110);
 
@@ -989,8 +989,8 @@ static int play_iframe(struct av7110 *av7110, u8 __user *buf, unsigned int len,
 static int dvb_video_ioctl(struct inode *inode, struct file *file,
                            unsigned int cmd, void *parg)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         unsigned long arg = (unsigned long) parg;
         int ret = 0;
 
@@ -1203,8 +1203,8 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
 static int dvb_audio_ioctl(struct inode *inode, struct file *file,
                            unsigned int cmd, void *parg)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         unsigned long arg = (unsigned long) parg;
         int ret = 0;
 
@@ -1349,8 +1349,8 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
 
 static int dvb_video_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         int err;
 
         dprintk(2, "av7110:%p, \n", av7110);
@@ -1374,8 +1374,8 @@ static int dvb_video_open(struct inode *inode, struct file *file)
 
 static int dvb_video_release(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
 
         dprintk(2, "av7110:%p, \n", av7110);
 
@@ -1388,9 +1388,9 @@ static int dvb_video_release(struct inode *inode, struct file *file)
 
 static int dvb_audio_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
-        int err=dvb_generic_open(inode, file);
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
+        int err = dvb_generic_open(inode, file);
 
         dprintk(2, "av7110:%p, \n", av7110);
 
@@ -1403,8 +1403,8 @@ static int dvb_audio_open(struct inode *inode, struct file *file)
 
 static int dvb_audio_release(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
 
         dprintk(2, "av7110:%p, \n", av7110);
 
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index 4251a97d420e..e9b4e88e7932 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -214,8 +214,8 @@ static ssize_t ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file,
 
 static int dvb_ca_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         int err = dvb_generic_open(inode, file);
 
         dprintk(8, "av7110:%p\n",av7110);
@@ -228,8 +228,8 @@ static int dvb_ca_open(struct inode *inode, struct file *file)
 
 static unsigned int dvb_ca_poll (struct file *file, poll_table *wait)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         struct dvb_ringbuffer *rbuf = &av7110->ci_rbuffer;
         struct dvb_ringbuffer *wbuf = &av7110->ci_wbuffer;
         unsigned int mask = 0;
@@ -251,8 +251,8 @@ static unsigned int dvb_ca_poll (struct file *file, poll_table *wait)
 static int dvb_ca_ioctl(struct inode *inode, struct file *file,
                  unsigned int cmd, void *parg)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
         unsigned long arg = (unsigned long) parg;
 
         dprintk(8, "av7110:%p\n",av7110);
@@ -329,8 +329,8 @@ static int dvb_ca_ioctl(struct inode *inode, struct file *file,
 static ssize_t dvb_ca_write(struct file *file, const char __user *buf,
                             size_t count, loff_t *ppos)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
 
         dprintk(8, "av7110:%p\n",av7110);
         return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos);
@@ -339,15 +339,13 @@ static ssize_t dvb_ca_write(struct file *file, const char __user *buf,
 static ssize_t dvb_ca_read(struct file *file, char __user *buf,
                            size_t count, loff_t *ppos)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct av7110 *av7110 = dvbdev->priv;
 
         dprintk(8, "av7110:%p\n",av7110);
         return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos);
 }
 
-
-
 static struct file_operations dvb_ca_fops = {
         .owner          = THIS_MODULE,
         .read           = dvb_ca_read,
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index e4544ea2b89b..f59465bb0af3 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -4,6 +4,7 @@
 #include <linux/moduleparam.h>
 #include <linux/input.h>
 #include <linux/proc_fs.h>
+#include <linux/kernel.h>
 #include <asm/bitops.h>
 
 #include "av7110.h"
@@ -16,6 +17,7 @@
 static int av_cnt;
 static struct av7110 *av_list[4];
 static struct input_dev *input_dev;
+static char input_phys[32];
 
 static u8 delay_timer_finished;
 
@@ -217,7 +219,7 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
         static struct proc_dir_entry *e;
         int err;
 
-        if (av_cnt >= sizeof av_list/sizeof av_list[0])
+        if (av_cnt >= ARRAY_SIZE(av_list))
                 return -ENOSPC;
 
         av7110_setup_irc_config(av7110, 0x0001);
@@ -231,8 +233,22 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
                 if (!input_dev)
                         return -ENOMEM;
 
+                snprintf(input_phys, sizeof(input_phys),
+                        "pci-%s/ir0", pci_name(av7110->dev->pci));
+
                 input_dev->name = "DVB on-card IR receiver";
 
+                input_dev->phys = input_phys;
+                input_dev->id.bustype = BUS_PCI;
+                input_dev->id.version = 1;
+                if (av7110->dev->pci->subsystem_vendor) {
+                        input_dev->id.vendor = av7110->dev->pci->subsystem_vendor;
+                        input_dev->id.product = av7110->dev->pci->subsystem_device;
+                } else {
+                        input_dev->id.vendor = av7110->dev->pci->vendor;
+                        input_dev->id.product = av7110->dev->pci->device;
+                }
+                input_dev->cdev.dev = &av7110->dev->pci->dev;
                 set_bit(EV_KEY, input_dev->evbit);
                 set_bit(EV_REP, input_dev->evbit);
                 input_register_keys();
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index dbfd5e7b4be0..cde5d3ae7ec7 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -140,17 +140,6 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
         return 0;
 }
 
-static int stv0297_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
-{
-        u8 buf [] = { reg, data };
-        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
-
-        if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
-                return -1;
-        return 0;
-}
-
-
 static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4])
 {
         struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 };
@@ -193,6 +182,7 @@ static int ves1820_set_tv_freq(struct saa7146_dev *dev, u32 freq)
 
 static int stv0297_set_tv_freq(struct saa7146_dev *dev, u32 freq)
 {
+        struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
         u32 div;
         u8 data[4];
 
@@ -213,8 +203,8 @@ static int stv0297_set_tv_freq(struct saa7146_dev *dev, u32 freq)
         else
                 return -EINVAL;
 
-        stv0297_writereg(dev, 0x1C, 0x87, 0x78);
-        stv0297_writereg(dev, 0x1C, 0x86, 0xc8);
+        if (av7110->fe->ops.i2c_gate_ctrl)
+                av7110->fe->ops.i2c_gate_ctrl(av7110->fe, 1);
         return tuner_write(dev, 0x63, data);
 }
 
@@ -817,20 +807,20 @@ int av7110_init_v4l(struct av7110 *av7110)
                 saa7146_vv_release(dev);
                 return -ENODEV;
         }
-        if (saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI)) {
+        if (saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI))
                 ERR(("cannot register vbi v4l2 device. skipping.\n"));
-        } else {
-                if (av7110->analog_tuner_flags)
-                        av7110->analog_tuner_flags |= ANALOG_TUNER_VBI;
-        }
         return 0;
 }
 
 int av7110_exit_v4l(struct av7110 *av7110)
 {
+        struct saa7146_dev* dev = av7110->dev;
+
         saa7146_unregister_device(&av7110->v4l_dev, av7110->dev);
-        if (av7110->analog_tuner_flags & ANALOG_TUNER_VBI)
-                saa7146_unregister_device(&av7110->vbi_dev, av7110->dev);
+        saa7146_unregister_device(&av7110->vbi_dev, av7110->dev);
+
+        saa7146_vv_release(dev);
+
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 89ab4b59155c..3035b224c7a3 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1089,6 +1089,8 @@ static int budget_av_detach(struct saa7146_dev *dev)
                 msleep(200);
 
                 saa7146_unregister_device(&budget_av->vd, dev);
+
+                saa7146_vv_release(dev);
         }
 
         if (budget_av->budget.ci_present)
@@ -1145,6 +1147,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
                 if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_GRABBER))) {
                         /* fixme: proper cleanup here */
                         ERR(("cannot register capture v4l2 device.\n"));
+                        saa7146_vv_release(dev);
                         return err;
                 }
 
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index f2066b47baee..464feaf1a9ad 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -29,8 +29,6 @@
  * the project's page is at http://www.linuxtv.org/dvb/
  */
 
-#include "budget.h"
-
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
@@ -39,6 +37,8 @@
 #include <linux/spinlock.h>
 #include <media/ir-common.h>
 
+#include "budget.h"
+
 #include "dvb_ca_en50221.h"
 #include "stv0299.h"
 #include "stv0297.h"
@@ -130,6 +130,7 @@ static void msp430_ir_interrupt(unsigned long data)
         int toggle;
         static int prev_toggle = -1;
         static u32 ir_key;
+        static int state = 0;
         u32 command = ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8;
 
         /*
@@ -138,21 +139,34 @@ static void msp430_ir_interrupt(unsigned long data)
          * type1: X1CCCCCC, C = command bits (0 - 63)
          * type2: X0TDDDDD, D = device bits (0 - 31), T = RC5 toggle bit
          *
-         * More than one command byte may be generated before the device byte
-         * Only when we have both, a correct keypress is generated
+         * Each signal from the remote control can generate one or more command
+         * bytes and one or more device bytes. For the repeated bytes, the
+         * highest bit (X) is set. The first command byte is always generated
+         * before the first device byte. Other than that, no specific order
+         * seems to apply.
+         *
+         * Only when we have a command and device byte, a keypress is
+         * generated.
          */
 
+        if (ir_debug)
+                printk("budget_ci: received byte 0x%02x\n", command);
+
+        /* Is this a repeated byte? */
+        if (command & 0x80)
+                return;
+
         /* Is this a RC5 command byte? */
         if (command & 0x40) {
-                if (ir_debug)
-                        printk("budget_ci: received command byte 0x%02x\n", command);
+                state = 1;
                 ir_key = command & 0x3f;
                 return;
         }
 
         /* It's a RC5 device byte */
-        if (ir_debug)
-                printk("budget_ci: received device byte 0x%02x\n", command);
+        if (!state)
+                return;
+        state = 0;
         device = command & 0x1f;
         toggle = command & 0x20;
 
@@ -223,7 +237,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         switch (budget_ci->budget.dev->pci->subsystem_device) {
         case 0x100c:
         case 0x100f:
-        case 0x1010:
         case 0x1011:
         case 0x1012:
         case 0x1017:
@@ -236,6 +249,16 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
                 else
                         budget_ci->ir.rc5_device = rc5_device;
                 break;
+        case 0x1010:
+                /* for the Technotrend 1500 bundled remote */
+                ir_input_init(input_dev, &budget_ci->ir.state,
+                              IR_TYPE_RC5, ir_codes_tt_1500);
+
+                if (rc5_device < 0)
+                        budget_ci->ir.rc5_device = IR_DEVICE_ANY;
+                else
+                        budget_ci->ir.rc5_device = rc5_device;
+                break;
         default:
                 /* unknown remote */
                 ir_input_init(input_dev, &budget_ci->ir.state,
@@ -869,6 +892,17 @@ static struct tda1004x_config philips_tdm1316l_config = {
         .request_firmware = philips_tdm1316l_request_firmware,
 };
 
+static struct tda1004x_config philips_tdm1316l_config_invert = {
+
+        .demod_address = 0x8,
+        .invert = 1,
+        .invert_oclk = 0,
+        .xtal_freq = TDA10046_XTAL_4M,
+        .agc_config = TDA10046_AGC_DEFAULT,
+        .if_freq = TDA10046_FREQ_3617,
+        .request_firmware = philips_tdm1316l_request_firmware,
+};
+
 static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
         struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
@@ -1092,9 +1126,8 @@ static void frontend_init(struct budget_ci *budget_ci)
 
         case 0x1012:            // TT DVB-T CI budget (tda10046/Philips tdm1316l(tda6651tt))
                 budget_ci->tuner_pll_address = 0x60;
-                philips_tdm1316l_config.invert = 1;
                 budget_ci->budget.dvb_frontend =
-                        dvb_attach(tda10046_attach, &philips_tdm1316l_config, &budget_ci->budget.i2c_adap);
+                        dvb_attach(tda10046_attach, &philips_tdm1316l_config_invert, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
                         budget_ci->budget.dvb_frontend->ops.tuner_ops.init = philips_tdm1316l_tuner_init;
                         budget_ci->budget.dvb_frontend->ops.tuner_ops.set_params = philips_tdm1316l_tuner_set_params;
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index bd6e7baae2ec..78c98b089975 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -20,8 +20,6 @@
  *
  */
 
-#include <linux/mutex.h>
-
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -35,6 +33,8 @@
 #include <linux/init.h>
 #include <linux/input.h>
 
+#include <linux/mutex.h>
+
 #include "dmxdev.h"
 #include "dvb_demux.h"
 #include "dvb_filter.h"
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 19d45cc940b5..9f1addae6928 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -180,136 +180,163 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)
         return 0;
 }
 
-static int az_do_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, void *arg)
+static int vidioc_querycap (struct file *file, void  *priv,
+                                        struct v4l2_capability *v)
+{
+        strlcpy(v->driver, "radio-aztech", sizeof (v->driver));
+        strlcpy(v->card, "Aztech Radio", sizeof (v->card));
+        sprintf(v->bus_info,"ISA");
+        v->version = RADIO_VERSION;
+        v->capabilities = V4L2_CAP_TUNER;
+        return 0;
+}
+
+static int vidioc_g_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *v)
 {
         struct video_device *dev = video_devdata(file);
         struct az_device *az = dev->priv;
 
-        switch(cmd)
-        {
-                case VIDIOC_QUERYCAP:
-                {
-                        struct v4l2_capability *v = arg;
-                        memset(v,0,sizeof(*v));
-                        strlcpy(v->driver, "radio-aztech", sizeof (v->driver));
-                        strlcpy(v->card, "Aztech Radio", sizeof (v->card));
-                        sprintf(v->bus_info,"ISA");
-                        v->version = RADIO_VERSION;
-                        v->capabilities = V4L2_CAP_TUNER;
+        if (v->index > 0)
+                return -EINVAL;
 
-                        return 0;
-                }
-                case VIDIOC_G_TUNER:
-                {
-                        struct v4l2_tuner *v = arg;
-
-                        if (v->index > 0)
-                                return -EINVAL;
-
-                        memset(v,0,sizeof(*v));
-                        strcpy(v->name, "FM");
-                        v->type = V4L2_TUNER_RADIO;
-
-                        v->rangelow=(87*16000);
-                        v->rangehigh=(108*16000);
-                        v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
-                        v->capability=V4L2_TUNER_CAP_LOW;
-                        if(az_getstereo(az))
-                                v->audmode = V4L2_TUNER_MODE_STEREO;
-                        else
-                                v->audmode = V4L2_TUNER_MODE_MONO;
-                        v->signal=0xFFFF*az_getsigstr(az);
+        strcpy(v->name, "FM");
+        v->type = V4L2_TUNER_RADIO;
 
-                        return 0;
-                }
-                case VIDIOC_S_TUNER:
-                {
-                        struct v4l2_tuner *v = arg;
+        v->rangelow=(87*16000);
+        v->rangehigh=(108*16000);
+        v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
+        v->capability=V4L2_TUNER_CAP_LOW;
+        if(az_getstereo(az))
+                v->audmode = V4L2_TUNER_MODE_STEREO;
+        else
+                v->audmode = V4L2_TUNER_MODE_MONO;
+        v->signal=0xFFFF*az_getsigstr(az);
 
-                        if (v->index > 0)
-                                return -EINVAL;
+        return 0;
+}
 
-                        return 0;
-                }
-                case VIDIOC_S_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
 
-                        az->curfreq = f->frequency;
-                        az_setfreq(az, az->curfreq);
-                        return 0;
-                }
-                case VIDIOC_G_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
+static int vidioc_s_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *v)
+{
+        if (v->index > 0)
+                return -EINVAL;
 
-                        f->type = V4L2_TUNER_RADIO;
-                        f->frequency = az->curfreq;
+        return 0;
+}
 
-                        return 0;
-                }
+static int vidioc_g_audio (struct file *file, void *priv,
+                           struct v4l2_audio *a)
+{
+        if (a->index > 1)
+                return -EINVAL;
 
-                case VIDIOC_QUERYCTRL:
-                {
-                        struct v4l2_queryctrl *qc = arg;
-                        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);
-                                }
-                        }
-                        return -EINVAL;
-                }
-                case VIDIOC_G_CTRL:
-                {
-                        struct v4l2_control *ctrl= arg;
-
-                        switch (ctrl->id) {
-                                case V4L2_CID_AUDIO_MUTE:
-                                        if (az->curvol==0)
-                                                ctrl->value=1;
-                                        else
-                                                ctrl->value=0;
-                                        return (0);
-                                case V4L2_CID_AUDIO_VOLUME:
-                                        ctrl->value=az->curvol * 6554;
-                                        return (0);
-                        }
-                        return -EINVAL;
-                }
-                case VIDIOC_S_CTRL:
-                {
-                        struct v4l2_control *ctrl= arg;
-
-                        switch (ctrl->id) {
-                                case V4L2_CID_AUDIO_MUTE:
-                                        if (ctrl->value) {
-                                                az_setvol(az,0);
-                                        } else {
-                                                az_setvol(az,az->curvol);
-                                        }
-                                        return (0);
-                                case V4L2_CID_AUDIO_VOLUME:
-                                        az_setvol(az,ctrl->value);
-                                        return (0);
-                        }
-                        return -EINVAL;
+        strcpy(a->name, "Radio");
+        a->capability = V4L2_AUDCAP_STEREO;
+        return 0;
+}
+
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+        *i = 0;
+        return 0;
+}
+
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+        if (i != 0)
+                return -EINVAL;
+        return 0;
+}
+
+
+static int vidioc_s_audio (struct file *file, void *priv,
+                           struct v4l2_audio *a)
+{
+        if (a->index != 0)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int vidioc_s_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct video_device *dev = video_devdata(file);
+        struct az_device *az = dev->priv;
+
+        az->curfreq = f->frequency;
+        az_setfreq(az, az->curfreq);
+        return 0;
+}
+
+static int vidioc_g_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct video_device *dev = video_devdata(file);
+        struct az_device *az = dev->priv;
+
+        f->type = V4L2_TUNER_RADIO;
+        f->frequency = az->curfreq;
+
+        return 0;
+}
+
+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);
                 }
+        }
+        return -EINVAL;
+}
+
+static int vidioc_g_ctrl (struct file *file, void *priv,
+                            struct v4l2_control *ctrl)
+{
+        struct video_device *dev = video_devdata(file);
+        struct az_device *az = dev->priv;
 
-                default:
-                        return v4l_compat_translate_ioctl(inode,file,cmd,arg,
-                                                          az_do_ioctl);
+        switch (ctrl->id) {
+                case V4L2_CID_AUDIO_MUTE:
+                        if (az->curvol==0)
+                                ctrl->value=1;
+                        else
+                                ctrl->value=0;
+                        return (0);
+                case V4L2_CID_AUDIO_VOLUME:
+                        ctrl->value=az->curvol * 6554;
+                        return (0);
         }
+        return -EINVAL;
 }
 
-static int az_ioctl(struct inode *inode, struct file *file,
-                    unsigned int cmd, unsigned long arg)
+static int vidioc_s_ctrl (struct file *file, void *priv,
+                            struct v4l2_control *ctrl)
 {
-        return video_usercopy(inode, file, cmd, arg, az_do_ioctl);
+        struct video_device *dev = video_devdata(file);
+        struct az_device *az = dev->priv;
+
+        switch (ctrl->id) {
+                case V4L2_CID_AUDIO_MUTE:
+                        if (ctrl->value) {
+                                az_setvol(az,0);
+                        } else {
+                                az_setvol(az,az->curvol);
+                        }
+                        return (0);
+                case V4L2_CID_AUDIO_VOLUME:
+                        az_setvol(az,ctrl->value);
+                        return (0);
+        }
+        return -EINVAL;
 }
 
 static struct az_device aztech_unit;
@@ -318,20 +345,35 @@ static const struct file_operations aztech_fops = {
         .owner          = THIS_MODULE,
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
-        .ioctl          = az_ioctl,
+        .ioctl          = video_ioctl2,
         .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
 static struct video_device aztech_radio=
 {
-        .owner          = THIS_MODULE,
-        .name           = "Aztech radio",
-        .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
-        .fops           = &aztech_fops,
+        .owner              = THIS_MODULE,
+        .name               = "Aztech radio",
+        .type               = VID_TYPE_TUNER,
+        .hardware           = 0,
+        .fops               = &aztech_fops,
+        .vidioc_querycap    = vidioc_querycap,
+        .vidioc_g_tuner     = vidioc_g_tuner,
+        .vidioc_s_tuner     = vidioc_s_tuner,
+        .vidioc_g_audio     = vidioc_g_audio,
+        .vidioc_s_audio     = vidioc_s_audio,
+        .vidioc_g_input     = vidioc_g_input,
+        .vidioc_s_input     = vidioc_s_input,
+        .vidioc_g_frequency = vidioc_g_frequency,
+        .vidioc_s_frequency = vidioc_s_frequency,
+        .vidioc_queryctrl   = vidioc_queryctrl,
+        .vidioc_g_ctrl      = vidioc_g_ctrl,
+        .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+module_param_named(debug,aztech_radio.debug, int, 0644);
+MODULE_PARM_DESC(debug,"activates debug info");
+
 static int __init aztech_init(void)
 {
         if(io==-1)
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 05e5aa77025f..74976cba869f 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -89,14 +89,6 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 #define GEMTEK_PCI_RANGE_HIGH (108*16000)
 #endif
 
-#ifndef TRUE
-#define TRUE (1)
-#endif
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
 struct gemtek_pci_card {
         struct video_device *videodev;
 
@@ -146,12 +138,12 @@ static void __gemtek_pci_cmd( u16 value, u32 port, u8 *last_byte, int keep )
 
 static inline void gemtek_pci_nil( u32 port, u8 *last_byte )
 {
-        __gemtek_pci_cmd( 0x00, port, last_byte, FALSE );
+        __gemtek_pci_cmd( 0x00, port, last_byte, false );
 }
 
 static inline void gemtek_pci_cmd( u16 cmd, u32 port, u8 *last_byte )
 {
-        __gemtek_pci_cmd( cmd, port, last_byte, TRUE );
+        __gemtek_pci_cmd( cmd, port, last_byte, true );
 }
 
 static void gemtek_pci_setfrequency( struct gemtek_pci_card *card, unsigned long frequency )
@@ -184,14 +176,14 @@ static void gemtek_pci_setfrequency( struct gemtek_pci_card *card, unsigned long
 static inline void gemtek_pci_mute( struct gemtek_pci_card *card )
 {
         outb( 0x1f, card->iobase );
-        card->mute = TRUE;
+        card->mute = true;
 }
 
 static inline void gemtek_pci_unmute( struct gemtek_pci_card *card )
 {
         if ( card->mute ) {
                 gemtek_pci_setfrequency( card, card->current_frequency );
-                card->mute = FALSE;
+                card->mute = false;
         }
 }
 
@@ -259,7 +251,7 @@ static int gemtek_pci_do_ioctl(struct inode *inode, struct file *file,
 
                         gemtek_pci_setfrequency( card, f->frequency );
                         card->current_frequency = f->frequency;
-                        card->mute = FALSE;
+                        card->mute = false;
                         return 0;
                 }
                 case VIDIOC_QUERYCTRL:
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 6beeb74004b1..8e184cfc1c94 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -27,7 +27,9 @@
  * BUGS:
  *   - card unmutes if you change frequency
  *
- * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
+ * (c) 2006, 2007 by Mauro Carvalho Chehab <mchehab@infradead.org>:
+ *      - Conversion to V4L2 API
+ *      - Uses video_ioctl2 for parsing and to add debug support
  */
 
 
@@ -43,10 +45,18 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 
-#define DRIVER_VERSION  "0.76"
+#define DRIVER_VERSION  "0.77"
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
-#define RADIO_VERSION KERNEL_VERSION(0,7,6)
+#define RADIO_VERSION KERNEL_VERSION(0,7,7)
+
+static struct video_device maxiradio_radio;
+
+#define dprintk(num, fmt, arg...)                                          \
+        do {                                                               \
+                if (maxiradio_radio.debug >= num)                          \
+                        printk(KERN_DEBUG "%s: " fmt,                      \
+                                maxiradio_radio.name, ## arg); } while (0)
 
 static struct v4l2_queryctrl radio_qctrl[] = {
         {
@@ -81,30 +91,21 @@ module_param(radio_nr, int, 0);
 #define FREQ_IF         171200 /* 10.7*16000   */
 #define FREQ_STEP       200    /* 12.5*16      */
 
-#define FREQ2BITS(x)    ((( (unsigned int)(x)+FREQ_IF+(FREQ_STEP<<1))\
-                        /(FREQ_STEP<<2))<<2) /* (x==fmhz*16*1000) -> bits */
+/* (x==fmhz*16*1000) -> bits */
+#define FREQ2BITS(x)    ((( (unsigned int)(x)+FREQ_IF+(FREQ_STEP<<1)) \
+                        /(FREQ_STEP<<2))<<2)
 
 #define BITS2FREQ(x)    ((x) * FREQ_STEP - FREQ_IF)
 
 
-static int radio_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg);
-
 static const struct file_operations maxiradio_fops = {
         .owner          = THIS_MODULE,
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
-        .ioctl          = radio_ioctl,
+        .ioctl          = video_ioctl2,
         .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
-static struct video_device maxiradio_radio =
-{
-        .owner          = THIS_MODULE,
-        .name           = "Maxi Radio FM2000 radio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &maxiradio_fops,
-};
 
 static struct radio_device
 {
@@ -116,12 +117,14 @@ static struct radio_device
         unsigned long freq;
 
         struct mutex lock;
-} radio_unit = {0, 0, 0, 0, };
-
+} radio_unit = {
+        .muted =1,
+        .freq = FREQ_LO,
+};
 
 static void outbit(unsigned long bit, __u16 io)
 {
-        if(bit != 0)
+        if (bit != 0)
                 {
                         outb(  power|wren|data     ,io); udelay(4);
                         outb(  power|wren|data|clk ,io); udelay(4);
@@ -137,14 +140,20 @@ static void outbit(unsigned long bit, __u16 io)
 
 static void turn_power(__u16 io, int p)
 {
-        if(p != 0) outb(power, io); else outb(0,io);
+        if (p != 0) {
+                dprintk(1, "Radio powered on\n");
+                outb(power, io);
+        } else {
+                dprintk(1, "Radio powered off\n");
+                outb(0,io);
+        }
 }
 
-
-static void set_freq(__u16 io, __u32 data)
+static void set_freq(__u16 io, __u32 freq)
 {
         unsigned long int si;
         int bl;
+        int data = FREQ2BITS(freq);
 
         /* TEA5757 shift register bits (see pdf) */
 
@@ -163,161 +172,225 @@ static void set_freq(__u16 io, __u32 data)
         outbit(0,io); // 16  search level
 
         si = 0x8000;
-        for(bl = 1; bl <= 16 ; bl++) { outbit(data & si,io); si >>=1; }
+        for (bl = 1; bl <= 16 ; bl++) {
+                outbit(data & si,io);
+                si >>=1;
+        }
 
-        outb(power,io);
+        dprintk(1, "Radio freq set to %d.%02d MHz\n",
+                                freq / 16000,
+                                freq % 16000 * 100 / 16000);
+
+        turn_power(io, 1);
 }
 
 static int get_stereo(__u16 io)
 {
-        outb(power,io); udelay(4);
+        outb(power,io);
+        udelay(4);
+
         return !(inb(io) & mo_st);
 }
 
 static int get_tune(__u16 io)
 {
-        outb(power+clk,io); udelay(4);
+        outb(power+clk,io);
+        udelay(4);
+
         return !(inb(io) & mo_st);
 }
 
 
-static inline int radio_function(struct inode *inode, struct file *file,
-                                 unsigned int cmd, void *arg)
+static int vidioc_querycap (struct file *file, void  *priv,
+                            struct v4l2_capability *v)
+{
+        strlcpy(v->driver, "radio-maxiradio", sizeof (v->driver));
+        strlcpy(v->card, "Maxi Radio FM2000 radio", sizeof (v->card));
+        sprintf(v->bus_info,"ISA");
+        v->version = RADIO_VERSION;
+        v->capabilities = V4L2_CAP_TUNER;
+
+        return 0;
+}
+
+static int vidioc_g_tuner (struct file *file, void *priv,
+                           struct v4l2_tuner *v)
 {
         struct video_device *dev = video_devdata(file);
         struct radio_device *card=dev->priv;
 
-        switch(cmd) {
-                case VIDIOC_QUERYCAP:
-                {
-                        struct v4l2_capability *v = arg;
-                        memset(v,0,sizeof(*v));
-                        strlcpy(v->driver, "radio-maxiradio", sizeof (v->driver));
-                        strlcpy(v->card, "Maxi Radio FM2000 radio", sizeof (v->card));
-                        sprintf(v->bus_info,"ISA");
-                        v->version = RADIO_VERSION;
-                        v->capabilities = V4L2_CAP_TUNER;
+        if (v->index > 0)
+                return -EINVAL;
 
-                        return 0;
-                }
-                case VIDIOC_G_TUNER:
-                {
-                        struct v4l2_tuner *v = arg;
+        memset(v,0,sizeof(*v));
+        strcpy(v->name, "FM");
+        v->type = V4L2_TUNER_RADIO;
 
-                        if (v->index > 0)
-                                return -EINVAL;
+        v->rangelow=FREQ_LO;
+        v->rangehigh=FREQ_HI;
+        v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
+        v->capability=V4L2_TUNER_CAP_LOW;
+        if(get_stereo(card->io))
+                v->audmode = V4L2_TUNER_MODE_STEREO;
+        else
+                v->audmode = V4L2_TUNER_MODE_MONO;
+        v->signal=0xffff*get_tune(card->io);
 
-                        memset(v,0,sizeof(*v));
-                        strcpy(v->name, "FM");
-                        v->type = V4L2_TUNER_RADIO;
+        return 0;
+}
 
-                        v->rangelow=FREQ_LO;
-                        v->rangehigh=FREQ_HI;
-                        v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
-                        v->capability=V4L2_TUNER_CAP_LOW;
-                        if(get_stereo(card->io))
-                                v->audmode = V4L2_TUNER_MODE_STEREO;
-                        else
-                                v->audmode = V4L2_TUNER_MODE_MONO;
-                        v->signal=0xffff*get_tune(card->io);
+static int vidioc_s_tuner (struct file *file, void *priv,
+                           struct v4l2_tuner *v)
+{
+        if (v->index > 0)
+                return -EINVAL;
 
-                        return 0;
-                }
-                case VIDIOC_S_TUNER:
-                {
-                        struct v4l2_tuner *v = arg;
+        return 0;
+}
 
-                        if (v->index > 0)
-                                return -EINVAL;
+static int vidioc_g_audio (struct file *file, void *priv,
+                           struct v4l2_audio *a)
+{
+        if (a->index > 1)
+                return -EINVAL;
 
-                        return 0;
-                }
-                case VIDIOC_S_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
+        strcpy(a->name, "FM");
+        a->capability = V4L2_AUDCAP_STEREO;
+        return 0;
+}
 
-                        if (f->frequency < FREQ_LO || f->frequency > FREQ_HI)
-                                return -EINVAL;
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+        *i = 0;
 
-                        card->freq = f->frequency;
-                        set_freq(card->io, FREQ2BITS(card->freq));
-                        msleep(125);
-                        return 0;
-                }
-                case VIDIOC_G_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
+        return 0;
+}
 
-                        f->type = V4L2_TUNER_RADIO;
-                        f->frequency = card->freq;
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+        if (i != 0)
+                return -EINVAL;
 
-                        return 0;
-                }
-                case VIDIOC_QUERYCTRL:
-                {
-                        struct v4l2_queryctrl *qc = arg;
-                        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);
-                                }
-                        }
-                        return -EINVAL;
-                }
-                case VIDIOC_G_CTRL:
-                {
-                        struct v4l2_control *ctrl= arg;
-
-                        switch (ctrl->id) {
-                                case V4L2_CID_AUDIO_MUTE:
-                                        ctrl->value=card->muted;
-                                        return (0);
-                        }
-                        return -EINVAL;
-                }
-                case VIDIOC_S_CTRL:
-                {
-                        struct v4l2_control *ctrl= arg;
-
-                        switch (ctrl->id) {
-                                case V4L2_CID_AUDIO_MUTE:
-                                        card->muted = ctrl->value;
-                                        if(card->muted)
-                                                turn_power(card->io, 0);
-                                        else
-                                                set_freq(card->io, FREQ2BITS(card->freq));
-                                        return 0;
-                        }
-                        return -EINVAL;
-                }
+        return 0;
+}
+
+
+static int vidioc_s_audio (struct file *file, void *priv,
+                           struct v4l2_audio *a)
+{
+        if (a->index != 0)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int vidioc_s_frequency (struct file *file, void *priv,
+                               struct v4l2_frequency *f)
+{
+        struct video_device *dev = video_devdata(file);
+        struct radio_device *card=dev->priv;
 
-                default:
-                        return v4l_compat_translate_ioctl(inode,file,cmd,arg,
-                                                          radio_function);
+        if (f->frequency < FREQ_LO || f->frequency > FREQ_HI) {
+                dprintk(1, "radio freq (%d.%02d MHz) out of range (%d-%d)\n",
+                                        f->frequency / 16000,
+                                        f->frequency % 16000 * 100 / 16000,
+                                        FREQ_LO / 16000, FREQ_HI / 16000);
 
+                return -EINVAL;
         }
+
+        card->freq = f->frequency;
+        set_freq(card->io, card->freq);
+        msleep(125);
+
+        return 0;
 }
 
-static int radio_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
+static int vidioc_g_frequency (struct file *file, void *priv,
+                               struct v4l2_frequency *f)
 {
         struct video_device *dev = video_devdata(file);
         struct radio_device *card=dev->priv;
-        int ret;
 
-        mutex_lock(&card->lock);
-        ret = video_usercopy(inode, file, cmd, arg, radio_function);
-        mutex_unlock(&card->lock);
-        return ret;
+        f->type = V4L2_TUNER_RADIO;
+        f->frequency = card->freq;
+
+        dprintk(4, "radio freq is %d.%02d MHz",
+                                f->frequency / 16000,
+                                f->frequency % 16000 * 100 / 16000);
+
+        return 0;
 }
 
-MODULE_AUTHOR("Dimitromanolakis Apostolos, apdim@grecian.net");
-MODULE_DESCRIPTION("Radio driver for the Guillemot Maxi Radio FM2000 radio.");
-MODULE_LICENSE("GPL");
+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);
+                }
+        }
+
+        return -EINVAL;
+}
+
+static int vidioc_g_ctrl (struct file *file, void *priv,
+                            struct v4l2_control *ctrl)
+{
+        struct video_device *dev = video_devdata(file);
+        struct radio_device *card=dev->priv;
+
+        switch (ctrl->id) {
+                case V4L2_CID_AUDIO_MUTE:
+                        ctrl->value=card->muted;
+                        return (0);
+        }
+
+        return -EINVAL;
+}
+
+static int vidioc_s_ctrl (struct file *file, void *priv,
+                          struct v4l2_control *ctrl)
+{
+        struct video_device *dev = video_devdata(file);
+        struct radio_device *card=dev->priv;
+
+        switch (ctrl->id) {
+                case V4L2_CID_AUDIO_MUTE:
+                        card->muted = ctrl->value;
+                        if(card->muted)
+                                turn_power(card->io, 0);
+                        else
+                                set_freq(card->io, card->freq);
+                        return 0;
+        }
+
+        return -EINVAL;
+}
+
+static struct video_device maxiradio_radio =
+{
+        .owner              = THIS_MODULE,
+        .name               = "Maxi Radio FM2000 radio",
+        .type               = VID_TYPE_TUNER,
+        .fops               = &maxiradio_fops,
+
+        .vidioc_querycap    = vidioc_querycap,
+        .vidioc_g_tuner     = vidioc_g_tuner,
+        .vidioc_s_tuner     = vidioc_s_tuner,
+        .vidioc_g_audio     = vidioc_g_audio,
+        .vidioc_s_audio     = vidioc_s_audio,
+        .vidioc_g_input     = vidioc_g_input,
+        .vidioc_s_input     = vidioc_s_input,
+        .vidioc_g_frequency = vidioc_g_frequency,
+        .vidioc_s_frequency = vidioc_s_frequency,
+        .vidioc_queryctrl   = vidioc_queryctrl,
+        .vidioc_g_ctrl      = vidioc_g_ctrl,
+        .vidioc_s_ctrl      = vidioc_s_ctrl,
+};
 
 static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -334,7 +407,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d
         mutex_init(&radio_unit.lock);
         maxiradio_radio.priv = &radio_unit;
 
-        if(video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
+        if (video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
                 printk("radio-maxiradio: can't register device!");
                 goto err_out_free_region;
         }
@@ -389,3 +462,10 @@ static void __exit maxiradio_radio_exit(void)
 
 module_init(maxiradio_radio_init);
 module_exit(maxiradio_radio_exit);
+
+MODULE_AUTHOR("Dimitromanolakis Apostolos, apdim@grecian.net");
+MODULE_DESCRIPTION("Radio driver for the Guillemot Maxi Radio FM2000 radio.");
+MODULE_LICENSE("GPL");
+
+module_param_named(debug,maxiradio_radio.debug, int, 0644);
+MODULE_PARM_DESC(debug,"activates debug info");
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 57357db31b8a..7a6105153f23 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -342,7 +342,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
-        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
+        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI
         select VIDEO_BUF
         default n
         ---help---
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 9b1f3f06bb7c..44ccaed40b49 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -113,4 +113,3 @@ obj-$(CONFIG_USB_QUICKCAM_MESSENGER)	+= usbvideo/
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 21ebe8f13815..6addc42df045 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -307,6 +307,7 @@ static struct CARD {
         { 0x07711461, BTTV_BOARD_AVDVBT_771,    "AVermedia AverTV DVB-T 771" },
         { 0x07611461, BTTV_BOARD_AVDVBT_761,    "AverMedia AverTV DVB-T 761" },
         { 0xdb1018ac, BTTV_BOARD_DVICO_DVBT_LITE,    "DViCO FusionHDTV DVB-T Lite" },
+        { 0xdb1118ac, BTTV_BOARD_DVICO_DVBT_LITE,    "Ultraview DVB-T Lite" },
         { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE,    "DViCO FusionHDTV 5 Lite" },
         { 0x00261822, BTTV_BOARD_TWINHAN_DST,   "DNTV Live! Mini "},
 
@@ -578,14 +579,9 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x01fe00,
                 .muxsel         = { 2, 3, 1, 1 },
-        #if 0
-                /* old */
-                .gpiomux        = { 0x01c000, 0, 0x018000, 0x014000, 0x002000 },
-        #else
                 /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
                 .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
                 .gpiomute       = 0x002000,
-        #endif
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -894,15 +890,10 @@ struct tvcard bttv_tvcards[] = {
                 .tuner          = 0,
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1, 1, 0 }, /* TV, CVid, SVid, CVid over SVid connector */
-        #if 0
-                .gpiomask       = 0xc33000,
-                .gpiomux        = { 0x422000,0x1000,0x0000,0x620000,0x800000 },
-        #else
                 /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
                 .gpiomask       = 0xb33000,
                 .gpiomux        = { 0x122000,0x1000,0x0000,0x620000 },
                 .gpiomute       = 0x800000,
-        #endif
                 /* Audio Routing for "WinFast 2000 XP" (no tv stereo !)
                         gpio23 -- hef4052:nEnable (0x800000)
                         gpio12 -- hef4052:A1
@@ -1937,11 +1928,6 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 4,
                 .audio_inputs   = 1,
                 .tuner          = -1,
-        #if 0 /* TODO ... */
-                .svhs           = OSPREY540_SVID_ANALOG,
-                .muxsel         = {       [OSPREY540_COMP_ANALOG] = 2,
-                                        [OSPREY540_SVID_ANALOG] = 3, },
-        #endif
                 .pll            = PLL_28,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -1949,10 +1935,6 @@ struct tvcard bttv_tvcards[] = {
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
-        #if 0 /* TODO ... */
-                .muxsel_hook    = osprey_540_muxsel,
-                .picture_hook   = osprey_540_set_picture,
-        #endif
         },
 
                 /* ---- card 0x5C ---------------------------------- */
@@ -2627,9 +2609,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_radio      = 0,
-        #if 0
-                .has_remote     = 1,
-        #endif
         },
         [BTTV_BOARD_SUPER_TV] = {
                 /* Rick C <cryptdragoon@gmail.com> */
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 41fd09d7d11e..5720b77ac9a7 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -9,6 +9,10 @@
     some v4l2 code lines are taken from Justin's bttv2 driver which is
     (c) 2000 Justin Schoeman <justin@suntiger.ee.up.ac.za>
 
+    Cropping and overscan support
+    Copyright (C) 2005, 2006 Michael H. Schimek <mschimek@gmx.at>
+    Sponsored by OPQ Systems AB
+
     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
@@ -64,6 +68,7 @@ static unsigned int radio[BTTV_MAX];
 static unsigned int irq_debug;
 static unsigned int gbuffers = 8;
 static unsigned int gbufsize = 0x208000;
+static unsigned int reset_crop = 1;
 
 static int video_nr = -1;
 static int radio_nr = -1;
@@ -103,6 +108,7 @@ module_param(radio_nr,          int, 0444);
 module_param(vbi_nr,            int, 0444);
 module_param(gbuffers,          int, 0444);
 module_param(gbufsize,          int, 0444);
+module_param(reset_crop,        int, 0444);
 
 module_param(v4l2,              int, 0644);
 module_param(bigendian,         int, 0644);
@@ -129,6 +135,8 @@ MODULE_PARM_DESC(bttv_debug,"debug messages, default is 0 (no)");
 MODULE_PARM_DESC(irq_debug,"irq handler debug messages, default is 0 (no)");
 MODULE_PARM_DESC(gbuffers,"number of capture buffers. range 2-32, default 8");
 MODULE_PARM_DESC(gbufsize,"size of the capture buffers, default is 0x208000");
+MODULE_PARM_DESC(reset_crop,"reset cropping parameters at open(), default "
+                 "is 1 (yes) for compatibility with older applications");
 MODULE_PARM_DESC(automute,"mute audio on bad/missing video signal, default is 1 (yes)");
 MODULE_PARM_DESC(chroma_agc,"enables the AGC of chroma signal, default is 0 (no)");
 MODULE_PARM_DESC(adc_crush,"enables the luminance ADC crush, default is 1 (yes)");
@@ -192,6 +200,33 @@ static u8 SRAM_Table[][60] =
         }
 };
 
+/* minhdelayx1  first video pixel we can capture on a line and
+   hdelayx1     start of active video, both relative to rising edge of
+                /HRESET pulse (0H) in 1 / fCLKx1.
+   swidth       width of active video and
+   totalwidth   total line width, both in 1 / fCLKx1.
+   sqwidth      total line width in square pixels.
+   vdelay       start of active video in 2 * field lines relative to
+                trailing edge of /VRESET pulse (VDELAY register).
+   sheight      height of active video in 2 * field lines.
+   videostart0  ITU-R frame line number of the line corresponding
+                to vdelay in the first field. */
+#define CROPCAP(minhdelayx1, hdelayx1, swidth, totalwidth, sqwidth,      \
+                vdelay, sheight, videostart0)                            \
+        .cropcap.bounds.left = minhdelayx1,                              \
+        /* * 2 because vertically we count field lines times two, */     \
+        /* e.g. 23 * 2 to 23 * 2 + 576 in PAL-BGHI defrect. */           \
+        .cropcap.bounds.top = (videostart0) * 2 - (vdelay) + MIN_VDELAY, \
+        /* 4 is a safety margin at the end of the line. */               \
+        .cropcap.bounds.width = (totalwidth) - (minhdelayx1) - 4,        \
+        .cropcap.bounds.height = (sheight) + (vdelay) - MIN_VDELAY,      \
+        .cropcap.defrect.left = hdelayx1,                                \
+        .cropcap.defrect.top = (videostart0) * 2,                        \
+        .cropcap.defrect.width = swidth,                                 \
+        .cropcap.defrect.height = sheight,                               \
+        .cropcap.pixelaspect.numerator = totalwidth,                     \
+        .cropcap.pixelaspect.denominator = sqwidth,
+
 const struct bttv_tvnorm bttv_tvnorms[] = {
         /* PAL-BDGHI */
         /* max. active video is actually 922, but 924 is divisible by 4 and 3! */
@@ -210,11 +245,26 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .hdelayx1       = 186,
                 .hactivex1      = 924,
                 .vdelay         = 0x20,
-                .vbipack        = 255,
+                .vbipack        = 255, /* min (2048 / 4, 0x1ff) & 0xff */
                 .sram           = 0,
                 /* ITU-R frame line number of the first VBI line
-                   we can capture, of the first and second field. */
-                .vbistart       = { 7,320 },
+                   we can capture, of the first and second field.
+                   The last line is determined by cropcap.bounds. */
+                .vbistart       = { 7, 320 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 186,
+                        /* Should be (768 * 1135 + 944 / 2) / 944.
+                           cropcap.defrect is used for image width
+                           checks, so we keep the old value 924. */
+                        /* swidth */ 924,
+                        /* totalwidth */ 1135,
+                        /* sqwidth */ 944,
+                        /* vdelay */ 0x20,
+                        /* sheight */ 576,
+                        /* videostart0 */ 23)
+                /* bt878 (and bt848?) can capture another
+                   line below active video. */
+                .cropcap.bounds.height = (576 + 2) + 0x20 - 2,
         },{
                 .v4l2_id        = V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_KR,
                 .name           = "NTSC",
@@ -229,9 +279,18 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .hdelayx1       = 128,
                 .hactivex1      = 910,
                 .vdelay         = 0x1a,
-                .vbipack        = 144,
+                .vbipack        = 144, /* min (1600 / 4, 0x1ff) & 0xff */
                 .sram           = 1,
                 .vbistart       = { 10, 273 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 128,
+                        /* Should be (640 * 910 + 780 / 2) / 780? */
+                        /* swidth */ 768,
+                        /* totalwidth */ 910,
+                        /* sqwidth */ 780,
+                        /* vdelay */ 0x1a,
+                        /* sheight */ 480,
+                        /* videostart0 */ 23)
         },{
                 .v4l2_id        = V4L2_STD_SECAM,
                 .name           = "SECAM",
@@ -249,6 +308,14 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .vbipack        = 255,
                 .sram           = 0, /* like PAL, correct? */
                 .vbistart       = { 7, 320 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 186,
+                        /* swidth */ 924,
+                        /* totalwidth */ 1135,
+                        /* sqwidth */ 944,
+                        /* vdelay */ 0x20,
+                        /* sheight */ 576,
+                        /* videostart0 */ 23)
         },{
                 .v4l2_id        = V4L2_STD_PAL_Nc,
                 .name           = "PAL-Nc",
@@ -266,6 +333,14 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .vbipack        = 144,
                 .sram           = -1,
                 .vbistart       = { 7, 320 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 130,
+                        /* swidth */ (640 * 910 + 780 / 2) / 780,
+                        /* totalwidth */ 910,
+                        /* sqwidth */ 780,
+                        /* vdelay */ 0x1a,
+                        /* sheight */ 576,
+                        /* videostart0 */ 23)
         },{
                 .v4l2_id        = V4L2_STD_PAL_M,
                 .name           = "PAL-M",
@@ -283,6 +358,14 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .vbipack        = 144,
                 .sram           = -1,
                 .vbistart       = { 10, 273 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 135,
+                        /* swidth */ (640 * 910 + 780 / 2) / 780,
+                        /* totalwidth */ 910,
+                        /* sqwidth */ 780,
+                        /* vdelay */ 0x1a,
+                        /* sheight */ 480,
+                        /* videostart0 */ 23)
         },{
                 .v4l2_id        = V4L2_STD_PAL_N,
                 .name           = "PAL-N",
@@ -299,7 +382,15 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .vdelay         = 0x20,
                 .vbipack        = 144,
                 .sram           = -1,
-                .vbistart       = { 7, 320},
+                .vbistart       = { 7, 320 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 186,
+                        /* swidth */ (768 * 1135 + 944 / 2) / 944,
+                        /* totalwidth */ 1135,
+                        /* sqwidth */ 944,
+                        /* vdelay */ 0x20,
+                        /* sheight */ 576,
+                        /* videostart0 */ 23)
         },{
                 .v4l2_id        = V4L2_STD_NTSC_M_JP,
                 .name           = "NTSC-JP",
@@ -316,7 +407,15 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .vdelay         = 0x16,
                 .vbipack        = 144,
                 .sram           = -1,
-                .vbistart       = {10, 273},
+                .vbistart       = { 10, 273 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 135,
+                        /* swidth */ (640 * 910 + 780 / 2) / 780,
+                        /* totalwidth */ 910,
+                        /* sqwidth */ 780,
+                        /* vdelay */ 0x16,
+                        /* sheight */ 480,
+                        /* videostart0 */ 23)
         },{
                 /* that one hopefully works with the strange timing
                  * which video recorders produce when playing a NTSC
@@ -338,6 +437,14 @@ const struct bttv_tvnorm bttv_tvnorms[] = {
                 .vtotal         = 524,
                 .sram           = -1,
                 .vbistart       = { 10, 273 },
+                CROPCAP(/* minhdelayx1 */ 68,
+                        /* hdelayx1 */ 186,
+                        /* swidth */ 924,
+                        /* totalwidth */ 1135,
+                        /* sqwidth */ 944,
+                        /* vdelay */ 0x1a,
+                        /* sheight */ 480,
+                        /* videostart0 */ 23)
         }
 };
 static const unsigned int BTTV_TVNORMS = ARRAY_SIZE(bttv_tvnorms);
@@ -678,25 +785,89 @@ static const int BTTV_CTLS = ARRAY_SIZE(bttv_ctls);
 /* ----------------------------------------------------------------------- */
 /* resource management                                                     */
 
+/*
+   RESOURCE_    allocated by                freed by
+
+   VIDEO_READ   bttv_read 1)                bttv_read 2)
+
+   VIDEO_STREAM VIDIOC_STREAMON             VIDIOC_STREAMOFF
+                 VIDIOC_QBUF 1)              bttv_release
+                 VIDIOCMCAPTURE 1)
+
+   OVERLAY       VIDIOCCAPTURE on            VIDIOCCAPTURE off
+                 VIDIOC_OVERLAY on           VIDIOC_OVERLAY off
+                 3)                          bttv_release
+
+   VBI           VIDIOC_STREAMON             VIDIOC_STREAMOFF
+                 VIDIOC_QBUF 1)              bttv_release
+                 bttv_read, bttv_poll 1) 4)
+
+   1) The resource must be allocated when we enter buffer prepare functions
+      and remain allocated while buffers are in the DMA queue.
+   2) This is a single frame read.
+   3) VIDIOC_S_FBUF and VIDIOC_S_FMT (OVERLAY) still work when
+      RESOURCE_OVERLAY is allocated.
+   4) This is a continuous read, implies VIDIOC_STREAMON.
+
+   Note this driver permits video input and standard changes regardless if
+   resources are allocated.
+*/
+
+#define VBI_RESOURCES (RESOURCE_VBI)
+#define VIDEO_RESOURCES (RESOURCE_VIDEO_READ | \
+                         RESOURCE_VIDEO_STREAM | \
+                         RESOURCE_OVERLAY)
+
 static
 int check_alloc_btres(struct bttv *btv, struct bttv_fh *fh, int bit)
 {
+        int xbits; /* mutual exclusive resources */
+
         if (fh->resources & bit)
                 /* have it already allocated */
                 return 1;
 
+        xbits = bit;
+        if (bit & (RESOURCE_VIDEO_READ | RESOURCE_VIDEO_STREAM))
+                xbits |= RESOURCE_VIDEO_READ | RESOURCE_VIDEO_STREAM;
+
         /* is it free? */
-        mutex_lock(&btv->reslock);
-        if (btv->resources & bit) {
+        mutex_lock(&btv->lock);
+        if (btv->resources & xbits) {
                 /* no, someone else uses it */
-                mutex_unlock(&btv->reslock);
-                return 0;
+                goto fail;
+        }
+
+        if ((bit & VIDEO_RESOURCES)
+            && 0 == (btv->resources & VIDEO_RESOURCES)) {
+                /* Do crop - use current, don't - use default parameters. */
+                __s32 top = btv->crop[!!fh->do_crop].rect.top;
+
+                if (btv->vbi_end > top)
+                        goto fail;
+
+                /* We cannot capture the same line as video and VBI data.
+                   Claim scan lines crop[].rect.top to bottom. */
+                btv->crop_start = top;
+        } else if (bit & VBI_RESOURCES) {
+                __s32 end = fh->vbi_fmt.end;
+
+                if (end > btv->crop_start)
+                        goto fail;
+
+                /* Claim scan lines above fh->vbi_fmt.end. */
+                btv->vbi_end = end;
         }
+
         /* it's free, grab it */
         fh->resources  |= bit;
         btv->resources |= bit;
-        mutex_unlock(&btv->reslock);
+        mutex_unlock(&btv->lock);
         return 1;
+
+ fail:
+        mutex_unlock(&btv->lock);
+        return 0;
 }
 
 static
@@ -711,6 +882,35 @@ int locked_btres(struct bttv *btv, int bit)
         return (btv->resources & bit);
 }
 
+/* Call with btv->lock down. */
+static void
+disclaim_vbi_lines(struct bttv *btv)
+{
+        btv->vbi_end = 0;
+}
+
+/* Call with btv->lock down. */
+static void
+disclaim_video_lines(struct bttv *btv)
+{
+        const struct bttv_tvnorm *tvnorm;
+        u8 crop;
+
+        tvnorm = &bttv_tvnorms[btv->tvnorm];
+        btv->crop_start = tvnorm->cropcap.bounds.top
+                + tvnorm->cropcap.bounds.height;
+
+        /* VBI capturing ends at VDELAY, start of video capturing, no
+           matter how many lines the VBI RISC program expects. When video
+           capturing is off, it shall no longer "preempt" VBI capturing,
+           so we set VDELAY to maximum. */
+        crop = btread(BT848_E_CROP) | 0xc0;
+        btwrite(crop, BT848_E_CROP);
+        btwrite(0xfe, BT848_E_VDELAY_LO);
+        btwrite(crop, BT848_O_CROP);
+        btwrite(0xfe, BT848_O_VDELAY_LO);
+}
+
 static
 void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits)
 {
@@ -718,10 +918,19 @@ void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits)
                 /* trying to free ressources not allocated by us ... */
                 printk("bttv: BUG! (btres)\n");
         }
-        mutex_lock(&btv->reslock);
+        mutex_lock(&btv->lock);
         fh->resources  &= ~bits;
         btv->resources &= ~bits;
-        mutex_unlock(&btv->reslock);
+
+        bits = btv->resources;
+
+        if (0 == (bits & VIDEO_RESOURCES))
+                disclaim_video_lines(btv);
+
+        if (0 == (bits & VBI_RESOURCES))
+                disclaim_vbi_lines(btv);
+
+        mutex_unlock(&btv->lock);
 }
 
 /* ----------------------------------------------------------------------- */
@@ -1030,6 +1239,36 @@ i2c_vidiocschan(struct bttv *btv)
                 bttv_tda9880_setnorm(btv,btv->tvnorm);
 }
 
+static void
+bttv_crop_calc_limits(struct bttv_crop *c)
+{
+        /* Scale factor min. 1:1, max. 16:1. Min. image size
+           48 x 32. Scaled width must be a multiple of 4. */
+
+        if (1) {
+                /* For bug compatibility with VIDIOCGCAP and image
+                   size checks in earlier driver versions. */
+                c->min_scaled_width = 48;
+                c->min_scaled_height = 32;
+        } else {
+                c->min_scaled_width =
+                        (max(48, c->rect.width >> 4) + 3) & ~3;
+                c->min_scaled_height =
+                        max(32, c->rect.height >> 4);
+        }
+
+        c->max_scaled_width  = c->rect.width & ~3;
+        c->max_scaled_height = c->rect.height;
+}
+
+static void
+bttv_crop_reset(struct bttv_crop *c, int norm)
+{
+        c->rect = bttv_tvnorms[norm].cropcap.defrect;
+        bttv_crop_calc_limits(c);
+}
+
+/* Call with btv->lock down. */
 static int
 set_tvnorm(struct bttv *btv, unsigned int norm)
 {
@@ -1038,9 +1277,24 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
         if (norm < 0 || norm >= BTTV_TVNORMS)
                 return -EINVAL;
 
-        btv->tvnorm = norm;
         tvnorm = &bttv_tvnorms[norm];
 
+        if (btv->tvnorm < 0 ||
+            btv->tvnorm >= BTTV_TVNORMS ||
+            0 != memcmp(&bttv_tvnorms[btv->tvnorm].cropcap,
+                        &tvnorm->cropcap,
+                        sizeof (tvnorm->cropcap))) {
+                bttv_crop_reset(&btv->crop[0], norm);
+                btv->crop[1] = btv->crop[0]; /* current = default */
+
+                if (0 == (btv->resources & VIDEO_RESOURCES)) {
+                        btv->crop_start = tvnorm->cropcap.bounds.top
+                                + tvnorm->cropcap.bounds.height;
+                }
+        }
+
+        btv->tvnorm = norm;
+
         btwrite(tvnorm->adelay, BT848_ADELAY);
         btwrite(tvnorm->bdelay, BT848_BDELAY);
         btaor(tvnorm->iform,~(BT848_IFORM_NORM|BT848_IFORM_XTBOTH),
@@ -1057,6 +1311,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
         return 0;
 }
 
+/* Call with btv->lock down. */
 static void
 set_input(struct bttv *btv, unsigned int input)
 {
@@ -1459,13 +1714,13 @@ bttv_switch_overlay(struct bttv *btv, struct bttv_fh *fh,
         btv->loop_irq |= 1;
         bttv_set_dma(btv, 0x03);
         spin_unlock_irqrestore(&btv->s_lock,flags);
-        if (NULL == new)
-                free_btres(btv,fh,RESOURCE_OVERLAY);
         if (NULL != old) {
                 dprintk("switch_overlay: old=%p state is %d\n",old,old->vb.state);
                 bttv_dma_free(&fh->cap,btv, old);
                 kfree(old);
         }
+        if (NULL == new)
+                free_btres(btv,fh,RESOURCE_OVERLAY);
         dprintk("switch_overlay: done\n");
         return retval;
 }
@@ -1479,7 +1734,10 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
                                unsigned int width, unsigned int height,
                                enum v4l2_field field)
 {
+        struct bttv_fh *fh = q->priv_data;
         int redo_dma_risc = 0;
+        struct bttv_crop c;
+        int norm;
         int rc;
 
         /* check settings */
@@ -1491,12 +1749,52 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
                 if (width*height > buf->vb.bsize)
                         return -EINVAL;
                 buf->vb.size = buf->vb.bsize;
+
+                /* Make sure tvnorm and vbi_end remain consistent
+                   until we're done. */
+                mutex_lock(&btv->lock);
+
+                norm = btv->tvnorm;
+
+                /* In this mode capturing always starts at defrect.top
+                   (default VDELAY), ignoring cropping parameters. */
+                if (btv->vbi_end > bttv_tvnorms[norm].cropcap.defrect.top) {
+                        mutex_unlock(&btv->lock);
+                        return -EINVAL;
+                }
+
+                mutex_unlock(&btv->lock);
+
+                c.rect = bttv_tvnorms[norm].cropcap.defrect;
         } else {
-                if (width  < 48 ||
-                    height < 32 ||
-                    width  > bttv_tvnorms[btv->tvnorm].swidth ||
-                    height > bttv_tvnorms[btv->tvnorm].sheight)
+                mutex_lock(&btv->lock);
+
+                norm = btv->tvnorm;
+                c = btv->crop[!!fh->do_crop];
+
+                mutex_unlock(&btv->lock);
+
+                if (width < c.min_scaled_width ||
+                    width > c.max_scaled_width ||
+                    height < c.min_scaled_height)
                         return -EINVAL;
+
+                switch (field) {
+                case V4L2_FIELD_TOP:
+                case V4L2_FIELD_BOTTOM:
+                case V4L2_FIELD_ALTERNATE:
+                        /* btv->crop counts frame lines. Max. scale
+                           factor is 16:1 for frames, 8:1 for fields. */
+                        if (height * 2 > c.max_scaled_height)
+                                return -EINVAL;
+                        break;
+
+                default:
+                        if (height > c.max_scaled_height)
+                                return -EINVAL;
+                        break;
+                }
+
                 buf->vb.size = (width * height * fmt->depth) >> 3;
                 if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
                         return -EINVAL;
@@ -1505,12 +1803,17 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
         /* alloc + fill struct bttv_buffer (if changed) */
         if (buf->vb.width != width || buf->vb.height != height ||
             buf->vb.field != field ||
-            buf->tvnorm != btv->tvnorm || buf->fmt != fmt) {
+            buf->tvnorm != norm || buf->fmt != fmt ||
+            buf->crop.top != c.rect.top ||
+            buf->crop.left != c.rect.left ||
+            buf->crop.width != c.rect.width ||
+            buf->crop.height != c.rect.height) {
                 buf->vb.width  = width;
                 buf->vb.height = height;
                 buf->vb.field  = field;
-                buf->tvnorm    = btv->tvnorm;
+                buf->tvnorm    = norm;
                 buf->fmt       = fmt;
+                buf->crop      = c.rect;
                 redo_dma_risc = 1;
         }
 
@@ -1577,7 +1880,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
         struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
         struct bttv_fh *fh = q->priv_data;
 
-        bttv_dma_free(&fh->cap,fh->btv,buf);
+        bttv_dma_free(q,fh->btv,buf);
 }
 
 static struct videobuf_queue_ops bttv_video_qops = {
@@ -1939,11 +2242,179 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int verify_window(const struct bttv_tvnorm *tvn,
-                         struct v4l2_window *win, int fixup)
+/* Given cropping boundaries b and the scaled width and height of a
+   single field or frame, which must not exceed hardware limits, this
+   function adjusts the cropping parameters c. */
+static void
+bttv_crop_adjust        (struct bttv_crop *             c,
+                         const struct v4l2_rect *       b,
+                         __s32                          width,
+                         __s32                          height,
+                         enum v4l2_field                field)
+{
+        __s32 frame_height = height << !V4L2_FIELD_HAS_BOTH(field);
+        __s32 max_left;
+        __s32 max_top;
+
+        if (width < c->min_scaled_width) {
+                /* Max. hor. scale factor 16:1. */
+                c->rect.width = width * 16;
+        } else if (width > c->max_scaled_width) {
+                /* Min. hor. scale factor 1:1. */
+                c->rect.width = width;
+
+                max_left = b->left + b->width - width;
+                max_left = min(max_left, (__s32) MAX_HDELAY);
+                if (c->rect.left > max_left)
+                        c->rect.left = max_left;
+        }
+
+        if (height < c->min_scaled_height) {
+                /* Max. vert. scale factor 16:1, single fields 8:1. */
+                c->rect.height = height * 16;
+        } else if (frame_height > c->max_scaled_height) {
+                /* Min. vert. scale factor 1:1.
+                   Top and height count field lines times two. */
+                c->rect.height = (frame_height + 1) & ~1;
+
+                max_top = b->top + b->height - c->rect.height;
+                if (c->rect.top > max_top)
+                        c->rect.top = max_top;
+        }
+
+        bttv_crop_calc_limits(c);
+}
+
+/* Returns an error if scaling to a frame or single field with the given
+   width and height is not possible with the current cropping parameters
+   and width aligned according to width_mask. If adjust_size is TRUE the
+   function may adjust the width and/or height instead, rounding width
+   to (width + width_bias) & width_mask. If adjust_crop is TRUE it may
+   also adjust the current cropping parameters to get closer to the
+   desired image size. */
+static int
+limit_scaled_size       (struct bttv_fh *               fh,
+                         __s32 *                        width,
+                         __s32 *                        height,
+                         enum v4l2_field                field,
+                         unsigned int                   width_mask,
+                         unsigned int                   width_bias,
+                         int                            adjust_size,
+                         int                            adjust_crop)
+{
+        struct bttv *btv = fh->btv;
+        const struct v4l2_rect *b;
+        struct bttv_crop *c;
+        __s32 min_width;
+        __s32 min_height;
+        __s32 max_width;
+        __s32 max_height;
+        int rc;
+
+        BUG_ON((int) width_mask >= 0 ||
+               width_bias >= (unsigned int) -width_mask);
+
+        /* Make sure tvnorm, vbi_end and the current cropping parameters
+           remain consistent until we're done. */
+        mutex_lock(&btv->lock);
+
+        b = &bttv_tvnorms[btv->tvnorm].cropcap.bounds;
+
+        /* Do crop - use current, don't - use default parameters. */
+        c = &btv->crop[!!fh->do_crop];
+
+        if (fh->do_crop
+            && adjust_size
+            && adjust_crop
+            && !locked_btres(btv, VIDEO_RESOURCES)) {
+                min_width = 48;
+                min_height = 32;
+
+                /* We cannot scale up. When the scaled image is larger
+                   than crop.rect we adjust the crop.rect as required
+                   by the V4L2 spec, hence cropcap.bounds are our limit. */
+                max_width = min(b->width, (__s32) MAX_HACTIVE);
+                max_height = b->height;
+
+                /* We cannot capture the same line as video and VBI data.
+                   Note btv->vbi_end is really a minimum, see
+                   bttv_vbi_try_fmt(). */
+                if (btv->vbi_end > b->top) {
+                        max_height -= btv->vbi_end - b->top;
+                        rc = -EBUSY;
+                        if (min_height > max_height)
+                                goto fail;
+                }
+        } else {
+                rc = -EBUSY;
+                if (btv->vbi_end > c->rect.top)
+                        goto fail;
+
+                min_width  = c->min_scaled_width;
+                min_height = c->min_scaled_height;
+                max_width  = c->max_scaled_width;
+                max_height = c->max_scaled_height;
+
+                adjust_crop = 0;
+        }
+
+        min_width = (min_width - width_mask - 1) & width_mask;
+        max_width = max_width & width_mask;
+
+        /* Max. scale factor is 16:1 for frames, 8:1 for fields. */
+        min_height = min_height;
+        /* Min. scale factor is 1:1. */
+        max_height >>= !V4L2_FIELD_HAS_BOTH(field);
+
+        if (adjust_size) {
+                *width = clamp(*width, min_width, max_width);
+                *height = clamp(*height, min_height, max_height);
+
+                /* Round after clamping to avoid overflow. */
+                *width = (*width + width_bias) & width_mask;
+
+                if (adjust_crop) {
+                        bttv_crop_adjust(c, b, *width, *height, field);
+
+                        if (btv->vbi_end > c->rect.top) {
+                                /* Move the crop window out of the way. */
+                                c->rect.top = btv->vbi_end;
+                        }
+                }
+        } else {
+                rc = -EINVAL;
+                if (*width  < min_width ||
+                    *height < min_height ||
+                    *width  > max_width ||
+                    *height > max_height ||
+                    0 != (*width & ~width_mask))
+                        goto fail;
+        }
+
+        rc = 0; /* success */
+
+ fail:
+        mutex_unlock(&btv->lock);
+
+        return rc;
+}
+
+/* Returns an error if the given overlay window dimensions are not
+   possible with the current cropping parameters. If adjust_size is
+   TRUE the function may adjust the window width and/or height
+   instead, however it always rounds the horizontal position and
+   width as btcx_align() does. If adjust_crop is TRUE the function
+   may also adjust the current cropping parameters to get closer
+   to the desired window size. */
+static int
+verify_window           (struct bttv_fh *               fh,
+                         struct v4l2_window *           win,
+                         int                            adjust_size,
+                         int                            adjust_crop)
 {
         enum v4l2_field field;
-        int maxw, maxh;
+        unsigned int width_mask;
+        int rc;
 
         if (win->w.width  < 48 || win->w.height < 32)
                 return -EINVAL;
@@ -1951,32 +2422,52 @@ static int verify_window(const struct bttv_tvnorm *tvn,
                 return -EINVAL;
 
         field = win->field;
-        maxw  = tvn->swidth;
-        maxh  = tvn->sheight;
 
         if (V4L2_FIELD_ANY == field) {
-                field = (win->w.height > maxh/2)
+                __s32 height2;
+
+                height2 = fh->btv->crop[!!fh->do_crop].rect.height >> 1;
+                field = (win->w.height > height2)
                         ? V4L2_FIELD_INTERLACED
                         : V4L2_FIELD_TOP;
         }
         switch (field) {
         case V4L2_FIELD_TOP:
         case V4L2_FIELD_BOTTOM:
-                maxh = maxh / 2;
-                break;
         case V4L2_FIELD_INTERLACED:
                 break;
         default:
                 return -EINVAL;
         }
 
-        if (!fixup && (win->w.width > maxw || win->w.height > maxh))
+        /* 4-byte alignment. */
+        if (NULL == fh->ovfmt)
                 return -EINVAL;
+        width_mask = ~0;
+        switch (fh->ovfmt->depth) {
+        case 8:
+        case 24:
+                width_mask = ~3;
+                break;
+        case 16:
+                width_mask = ~1;
+                break;
+        case 32:
+                break;
+        default:
+                BUG();
+        }
+
+        win->w.width -= win->w.left & ~width_mask;
+        win->w.left = (win->w.left - width_mask - 1) & width_mask;
+
+        rc = limit_scaled_size(fh, &win->w.width, &win->w.height,
+                               field, width_mask,
+                               /* width_bias: round down */ 0,
+                               adjust_size, adjust_crop);
+        if (0 != rc)
+                return rc;
 
-        if (win->w.width > maxw)
-                win->w.width = maxw;
-        if (win->w.height > maxh)
-                win->w.height = maxh;
         win->field = field;
         return 0;
 }
@@ -1991,7 +2482,9 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
                 return -EINVAL;
         if (!(fh->ovfmt->flags & FORMAT_FLAGS_PACKED))
                 return -EINVAL;
-        retval = verify_window(&bttv_tvnorms[btv->tvnorm],win,fixup);
+        retval = verify_window(fh, win,
+                               /* adjust_size */ fixup,
+                               /* adjust_crop */ fixup);
         if (0 != retval)
                 return retval;
 
@@ -2048,6 +2541,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
                 struct bttv_buffer *new;
 
                 new = videobuf_alloc(sizeof(*new));
+                new->crop = btv->crop[!!fh->do_crop].rect;
                 bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
                 retval = bttv_switch_overlay(btv,fh,new);
         }
@@ -2080,7 +2574,7 @@ static int bttv_resource(struct bttv_fh *fh)
 
         switch (fh->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                res = RESOURCE_VIDEO;
+                res = RESOURCE_VIDEO_STREAM;
                 break;
         case V4L2_BUF_TYPE_VBI_CAPTURE:
                 res = RESOURCE_VBI;
@@ -2138,7 +2632,7 @@ static int bttv_g_fmt(struct bttv_fh *fh, struct v4l2_format *f)
                 f->fmt.win.field = fh->ov.field;
                 return 0;
         case V4L2_BUF_TYPE_VBI_CAPTURE:
-                bttv_vbi_get_fmt(fh,f);
+                bttv_vbi_get_fmt(fh, &f->fmt.vbi);
                 return 0;
         default:
                 return -EINVAL;
@@ -2146,35 +2640,35 @@ static int bttv_g_fmt(struct bttv_fh *fh, struct v4l2_format *f)
 }
 
 static int bttv_try_fmt(struct bttv_fh *fh, struct bttv *btv,
-                        struct v4l2_format *f)
+                        struct v4l2_format *f, int adjust_crop)
 {
         switch (f->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
         {
                 const struct bttv_format *fmt;
                 enum v4l2_field field;
-                unsigned int maxw,maxh;
+                __s32 width, height;
+                int rc;
 
                 fmt = format_by_fourcc(f->fmt.pix.pixelformat);
                 if (NULL == fmt)
                         return -EINVAL;
 
-                /* fixup format */
-                maxw  = bttv_tvnorms[btv->tvnorm].swidth;
-                maxh  = bttv_tvnorms[btv->tvnorm].sheight;
                 field = f->fmt.pix.field;
-                if (V4L2_FIELD_ANY == field)
-                        field = (f->fmt.pix.height > maxh/2)
+                if (V4L2_FIELD_ANY == field) {
+                        __s32 height2;
+
+                        height2 = btv->crop[!!fh->do_crop].rect.height >> 1;
+                        field = (f->fmt.pix.height > height2)
                                 ? V4L2_FIELD_INTERLACED
                                 : V4L2_FIELD_BOTTOM;
+                }
                 if (V4L2_FIELD_SEQ_BT == field)
                         field = V4L2_FIELD_SEQ_TB;
                 switch (field) {
                 case V4L2_FIELD_TOP:
                 case V4L2_FIELD_BOTTOM:
                 case V4L2_FIELD_ALTERNATE:
-                        maxh = maxh/2;
-                        break;
                 case V4L2_FIELD_INTERLACED:
                         break;
                 case V4L2_FIELD_SEQ_TB:
@@ -2185,28 +2679,29 @@ static int bttv_try_fmt(struct bttv_fh *fh, struct bttv *btv,
                         return -EINVAL;
                 }
 
+                width = f->fmt.pix.width;
+                height = f->fmt.pix.height;
+
+                rc = limit_scaled_size(fh, &width, &height, field,
+                                       /* width_mask: 4 pixels */ ~3,
+                                       /* width_bias: nearest */ 2,
+                                       /* adjust_size */ 1,
+                                       adjust_crop);
+                if (0 != rc)
+                        return rc;
+
                 /* update data for the application */
                 f->fmt.pix.field = field;
-                if (f->fmt.pix.width  < 48)
-                        f->fmt.pix.width  = 48;
-                if (f->fmt.pix.height < 32)
-                        f->fmt.pix.height = 32;
-                if (f->fmt.pix.width  > maxw)
-                        f->fmt.pix.width = maxw;
-                if (f->fmt.pix.height > maxh)
-                        f->fmt.pix.height = maxh;
-                pix_format_set_size (&f->fmt.pix, fmt,
-                                     f->fmt.pix.width & ~3,
-                                     f->fmt.pix.height);
+                pix_format_set_size(&f->fmt.pix, fmt, width, height);
 
                 return 0;
         }
         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-                return verify_window(&bttv_tvnorms[btv->tvnorm],
-                                     &f->fmt.win, 1);
+                return verify_window(fh, &f->fmt.win,
+                                     /* adjust_size */ 1,
+                                     /* adjust_crop */ 0);
         case V4L2_BUF_TYPE_VBI_CAPTURE:
-                bttv_vbi_try_fmt(fh,f);
-                return 0;
+                return bttv_vbi_try_fmt(fh, &f->fmt.vbi);
         default:
                 return -EINVAL;
         }
@@ -2225,7 +2720,7 @@ static int bttv_s_fmt(struct bttv_fh *fh, struct bttv *btv,
                 retval = bttv_switch_type(fh,f->type);
                 if (0 != retval)
                         return retval;
-                retval = bttv_try_fmt(fh,btv,f);
+                retval = bttv_try_fmt(fh,btv,f, /* adjust_crop */ 1);
                 if (0 != retval)
                         return retval;
                 fmt = format_by_fourcc(f->fmt.pix.pixelformat);
@@ -2254,12 +2749,7 @@ static int bttv_s_fmt(struct bttv_fh *fh, struct bttv *btv,
                 retval = bttv_switch_type(fh,f->type);
                 if (0 != retval)
                         return retval;
-                if (locked_btres(fh->btv, RESOURCE_VBI))
-                        return -EBUSY;
-                bttv_vbi_try_fmt(fh,f);
-                bttv_vbi_setlines(fh,btv,f->fmt.vbi.count[0]);
-                bttv_vbi_get_fmt(fh,f);
-                return 0;
+                return bttv_vbi_set_fmt(fh, &f->fmt.vbi);
         default:
                 return -EINVAL;
         }
@@ -2517,6 +3007,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 if (*on) {
                         fh->ov.tvnorm = btv->tvnorm;
                         new = videobuf_alloc(sizeof(*new));
+                        new->crop = btv->crop[!!fh->do_crop].rect;
                         bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
                 } else {
                         new = NULL;
@@ -2551,10 +3042,16 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 struct video_mmap *vm = arg;
                 struct bttv_buffer *buf;
                 enum v4l2_field field;
+                __s32 height2;
+                int res;
 
                 if (vm->frame >= VIDEO_MAX_FRAME)
                         return -EINVAL;
 
+                res = bttv_resource(fh);
+                if (!check_alloc_btres(btv, fh, res))
+                        return -EBUSY;
+
                 mutex_lock(&fh->cap.lock);
                 retval = -EINVAL;
                 buf = (struct bttv_buffer *)fh->cap.bufs[vm->frame];
@@ -2566,7 +3063,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                     buf->vb.state == STATE_ACTIVE)
                         goto fh_unlock_and_return;
 
-                field = (vm->height > bttv_tvnorms[btv->tvnorm].sheight/2)
+                height2 = btv->crop[!!fh->do_crop].rect.height >> 1;
+                field = (vm->height > height2)
                         ? V4L2_FIELD_INTERLACED
                         : V4L2_FIELD_BOTTOM;
                 retval = bttv_prepare_buffer(&fh->cap,btv,buf,
@@ -2613,54 +3111,17 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
         }
 
         case VIDIOCGVBIFMT:
-        {
-                struct vbi_format *fmt = (void *) arg;
-                struct v4l2_format fmt2;
-
                 if (fh->type != V4L2_BUF_TYPE_VBI_CAPTURE) {
                         retval = bttv_switch_type(fh,V4L2_BUF_TYPE_VBI_CAPTURE);
                         if (0 != retval)
                                 return retval;
                 }
-                bttv_vbi_get_fmt(fh, &fmt2);
-
-                memset(fmt,0,sizeof(*fmt));
-                fmt->sampling_rate    = fmt2.fmt.vbi.sampling_rate;
-                fmt->samples_per_line = fmt2.fmt.vbi.samples_per_line;
-                fmt->sample_format    = VIDEO_PALETTE_RAW;
-                fmt->start[0]         = fmt2.fmt.vbi.start[0];
-                fmt->count[0]         = fmt2.fmt.vbi.count[0];
-                fmt->start[1]         = fmt2.fmt.vbi.start[1];
-                fmt->count[1]         = fmt2.fmt.vbi.count[1];
-                if (fmt2.fmt.vbi.flags & V4L2_VBI_UNSYNC)
-                        fmt->flags   |= VBI_UNSYNC;
-                if (fmt2.fmt.vbi.flags & V4L2_VBI_INTERLACED)
-                        fmt->flags   |= VBI_INTERLACED;
-                return 0;
-        }
-        case VIDIOCSVBIFMT:
-        {
-                struct vbi_format *fmt = (void *) arg;
-                struct v4l2_format fmt2;
 
-                retval = bttv_switch_type(fh,V4L2_BUF_TYPE_VBI_CAPTURE);
-                if (0 != retval)
-                        return retval;
-                bttv_vbi_get_fmt(fh, &fmt2);
-
-                if (fmt->sampling_rate    != fmt2.fmt.vbi.sampling_rate     ||
-                    fmt->samples_per_line != fmt2.fmt.vbi.samples_per_line  ||
-                    fmt->sample_format    != VIDEO_PALETTE_RAW              ||
-                    fmt->start[0]         != fmt2.fmt.vbi.start[0]          ||
-                    fmt->start[1]         != fmt2.fmt.vbi.start[1]          ||
-                    fmt->count[0]         != fmt->count[1]                  ||
-                    fmt->count[0]         <  1                              ||
-                    fmt->count[0]         >  32 /* VBI_MAXLINES */)
-                        return -EINVAL;
+                /* fall through */
 
-                bttv_vbi_setlines(fh,btv,fmt->count[0]);
-                return 0;
-        }
+        case VIDIOCSVBIFMT:
+                return v4l_compat_translate_ioctl(inode, file, cmd,
+                                                  arg, bttv_do_ioctl);
 
         case BTTV_VERSION:
         case VIDIOCGFREQ:
@@ -2753,7 +3214,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_TRY_FMT:
         {
                 struct v4l2_format *f = arg;
-                return bttv_try_fmt(fh,btv,f);
+                return bttv_try_fmt(fh,btv,f, /* adjust_crop */ 0);
         }
         case VIDIOC_G_FMT:
         {
@@ -2792,16 +3253,23 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 if (0 == (fmt->flags & FORMAT_FLAGS_PACKED))
                         return -EINVAL;
 
-                mutex_lock(&fh->cap.lock);
                 retval = -EINVAL;
                 if (fb->flags & V4L2_FBUF_FLAG_OVERLAY) {
-                        if (fb->fmt.width > bttv_tvnorms[btv->tvnorm].swidth)
-                                goto fh_unlock_and_return;
-                        if (fb->fmt.height > bttv_tvnorms[btv->tvnorm].sheight)
-                                goto fh_unlock_and_return;
+                        __s32 width = fb->fmt.width;
+                        __s32 height = fb->fmt.height;
+
+                        retval = limit_scaled_size(fh, &width, &height,
+                                                   V4L2_FIELD_INTERLACED,
+                                                   /* width_mask */ ~3,
+                                                   /* width_bias */ 2,
+                                                   /* adjust_size */ 0,
+                                                   /* adjust_crop */ 0);
+                        if (0 != retval)
+                                return retval;
                 }
 
                 /* ok, accept it */
+                mutex_lock(&fh->cap.lock);
                 btv->fbuf.base       = fb->base;
                 btv->fbuf.fmt.width  = fb->fmt.width;
                 btv->fbuf.fmt.height = fb->fmt.height;
@@ -2828,6 +3296,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                                 struct bttv_buffer *new;
 
                                 new = videobuf_alloc(sizeof(*new));
+                                new->crop = btv->crop[!!fh->do_crop].rect;
                                 bttv_overlay_risc(btv,&fh->ov,fh->ovfmt,new);
                                 retval = bttv_switch_overlay(btv,fh,new);
                         }
@@ -2843,7 +3312,13 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 return videobuf_querybuf(bttv_queue(fh),arg);
 
         case VIDIOC_QBUF:
+        {
+                int res = bttv_resource(fh);
+
+                if (!check_alloc_btres(btv, fh, res))
+                        return -EBUSY;
                 return videobuf_qbuf(bttv_queue(fh),arg);
+        }
 
         case VIDIOC_DQBUF:
                 return videobuf_dqbuf(bttv_queue(fh),arg,
@@ -2942,6 +3417,122 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 return v4l2_prio_change(&btv->prio, &fh->prio, *prio);
         }
 
+        case VIDIOC_CROPCAP:
+        {
+                struct v4l2_cropcap *cap = arg;
+                enum v4l2_buf_type type;
+
+                type = cap->type;
+
+                if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+                    type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
+                        return -EINVAL;
+
+                *cap = bttv_tvnorms[btv->tvnorm].cropcap;
+                cap->type = type;
+
+                return 0;
+        }
+        case VIDIOC_G_CROP:
+        {
+                struct v4l2_crop * crop = arg;
+
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+                    crop->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
+                        return -EINVAL;
+
+                /* No fh->do_crop = 1; because btv->crop[1] may be
+                   inconsistent with fh->width or fh->height and apps
+                   do not expect a change here. */
+
+                crop->c = btv->crop[!!fh->do_crop].rect;
+
+                return 0;
+        }
+        case VIDIOC_S_CROP:
+        {
+                struct v4l2_crop *crop = arg;
+                const struct v4l2_rect *b;
+                struct bttv_crop c;
+                __s32 b_left;
+                __s32 b_top;
+                __s32 b_right;
+                __s32 b_bottom;
+
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+                    crop->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
+                        return -EINVAL;
+
+                retval = v4l2_prio_check(&btv->prio,&fh->prio);
+                if (0 != retval)
+                        return retval;
+
+                /* Make sure tvnorm, vbi_end and the current cropping
+                   parameters remain consistent until we're done. Note
+                   read() may change vbi_end in check_alloc_btres(). */
+                mutex_lock(&btv->lock);
+
+                retval = -EBUSY;
+
+                if (locked_btres(fh->btv, VIDEO_RESOURCES))
+                        goto btv_unlock_and_return;
+
+                b = &bttv_tvnorms[btv->tvnorm].cropcap.bounds;
+
+                b_left = b->left;
+                b_right = b_left + b->width;
+                b_bottom = b->top + b->height;
+
+                b_top = max(b->top, btv->vbi_end);
+                if (b_top + 32 >= b_bottom)
+                        goto btv_unlock_and_return;
+
+                /* Min. scaled size 48 x 32. */
+                c.rect.left = clamp(crop->c.left, b_left, b_right - 48);
+                c.rect.left = min(c.rect.left, (__s32) MAX_HDELAY);
+
+                c.rect.width = clamp(crop->c.width,
+                                     48, b_right - c.rect.left);
+
+                c.rect.top = clamp(crop->c.top, b_top, b_bottom - 32);
+                /* Top and height must be a multiple of two. */
+                c.rect.top = (c.rect.top + 1) & ~1;
+
+                c.rect.height = clamp(crop->c.height,
+                                      32, b_bottom - c.rect.top);
+                c.rect.height = (c.rect.height + 1) & ~1;
+
+                bttv_crop_calc_limits(&c);
+
+                btv->crop[1] = c;
+
+                mutex_unlock(&btv->lock);
+
+                fh->do_crop = 1;
+
+                mutex_lock(&fh->cap.lock);
+
+                if (fh->width < c.min_scaled_width) {
+                        fh->width = c.min_scaled_width;
+                        btv->init.width = c.min_scaled_width;
+                } else if (fh->width > c.max_scaled_width) {
+                        fh->width = c.max_scaled_width;
+                        btv->init.width = c.max_scaled_width;
+                }
+
+                if (fh->height < c.min_scaled_height) {
+                        fh->height = c.min_scaled_height;
+                        btv->init.height = c.min_scaled_height;
+                } else if (fh->height > c.max_scaled_height) {
+                        fh->height = c.max_scaled_height;
+                        btv->init.height = c.max_scaled_height;
+                }
+
+                mutex_unlock(&fh->cap.lock);
+
+                return 0;
+        }
+
         case VIDIOC_ENUMSTD:
         case VIDIOC_G_STD:
         case VIDIOC_S_STD:
@@ -2963,6 +3554,10 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
  fh_unlock_and_return:
         mutex_unlock(&fh->cap.lock);
         return retval;
+
+ btv_unlock_and_return:
+        mutex_unlock(&btv->lock);
+        return retval;
 }
 
 static int bttv_ioctl(struct inode *inode, struct file *file,
@@ -2972,8 +3567,26 @@ static int bttv_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         case BTTV_VBISIZE:
+        {
+                const struct bttv_tvnorm *tvnorm;
+
+                tvnorm = fh->vbi_fmt.tvnorm;
+
+                if (fh->vbi_fmt.fmt.start[0] != tvnorm->vbistart[0] ||
+                    fh->vbi_fmt.fmt.start[1] != tvnorm->vbistart[1] ||
+                    fh->vbi_fmt.fmt.count[0] != fh->vbi_fmt.fmt.count[1]) {
+                        /* BTTV_VBISIZE cannot express these parameters,
+                           however open() resets the paramters to defaults
+                           and apps shouldn't call BTTV_VBISIZE after
+                           VIDIOC_S_FMT. */
+                        return -EINVAL;
+                }
+
                 bttv_switch_type(fh,V4L2_BUF_TYPE_VBI_CAPTURE);
-                return fh->lines * 2 * 2048;
+                return (fh->vbi_fmt.fmt.count[0] * 2
+                        * fh->vbi_fmt.fmt.samples_per_line);
+        }
+
         default:
                 return video_usercopy(inode, file, cmd, arg, bttv_do_ioctl);
         }
@@ -2992,10 +3605,14 @@ static ssize_t bttv_read(struct file *file, char __user *data,
 
         switch (fh->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                if (locked_btres(fh->btv,RESOURCE_VIDEO))
+                if (!check_alloc_btres(fh->btv, fh, RESOURCE_VIDEO_READ)) {
+                        /* VIDEO_READ in use by another fh,
+                           or VIDEO_STREAM by any fh. */
                         return -EBUSY;
+                }
                 retval = videobuf_read_one(&fh->cap, data, count, ppos,
                                            file->f_flags & O_NONBLOCK);
+                free_btres(fh->btv, fh, RESOURCE_VIDEO_READ);
                 break;
         case V4L2_BUF_TYPE_VBI_CAPTURE:
                 if (!check_alloc_btres(fh->btv,fh,RESOURCE_VBI))
@@ -3021,7 +3638,7 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
                 return videobuf_poll_stream(file, &fh->vbi, wait);
         }
 
-        if (check_btres(fh,RESOURCE_VIDEO)) {
+        if (check_btres(fh,RESOURCE_VIDEO_STREAM)) {
                 /* streaming capture */
                 if (list_empty(&fh->cap.stream))
                         return POLLERR;
@@ -3031,7 +3648,7 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
                 mutex_lock(&fh->cap.lock);
                 if (NULL == fh->cap.read_buf) {
                         /* need to capture a new frame */
-                        if (locked_btres(fh->btv,RESOURCE_VIDEO)) {
+                        if (locked_btres(fh->btv,RESOURCE_VIDEO_STREAM)) {
                                 mutex_unlock(&fh->cap.lock);
                                 return POLLERR;
                         }
@@ -3117,8 +3734,23 @@ static int bttv_open(struct inode *inode, struct file *file)
         i2c_vidiocschan(btv);
 
         btv->users++;
-        if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type)
-                bttv_vbi_setlines(fh,btv,16);
+
+        /* The V4L2 spec requires one global set of cropping parameters
+           which only change on request. These are stored in btv->crop[1].
+           However for compatibility with V4L apps and cropping unaware
+           V4L2 apps we now reset the cropping parameters as seen through
+           this fh, which is to say VIDIOC_G_CROP and scaling limit checks
+           will use btv->crop[0], the default cropping parameters for the
+           current video standard, and VIDIOC_S_FMT will not implicitely
+           change the cropping parameters until VIDIOC_S_CROP has been
+           called. */
+        fh->do_crop = !reset_crop; /* module parameter */
+
+        /* Likewise there should be one global set of VBI capture
+           parameters, but for compatibility with V4L apps and earlier
+           driver versions each fh has its own parameters. */
+        bttv_vbi_fmt_reset(&fh->vbi_fmt, btv->tvnorm);
+
         bttv_field_count(btv);
         return 0;
 }
@@ -3133,14 +3765,17 @@ static int bttv_release(struct inode *inode, struct file *file)
                 bttv_switch_overlay(btv,fh,NULL);
 
         /* stop video capture */
-        if (check_btres(fh, RESOURCE_VIDEO)) {
+        if (check_btres(fh, RESOURCE_VIDEO_STREAM)) {
                 videobuf_streamoff(&fh->cap);
-                free_btres(btv,fh,RESOURCE_VIDEO);
+                free_btres(btv,fh,RESOURCE_VIDEO_STREAM);
         }
         if (fh->cap.read_buf) {
                 buffer_release(&fh->cap,fh->cap.read_buf);
                 kfree(fh->cap.read_buf);
         }
+        if (check_btres(fh, RESOURCE_VIDEO_READ)) {
+                free_btres(btv, fh, RESOURCE_VIDEO_READ);
+        }
 
         /* stop vbi capture */
         if (check_btres(fh, RESOURCE_VBI)) {
@@ -3997,7 +4632,6 @@ static int __devinit bttv_probe(struct pci_dev *dev,
 
         /* initialize structs / fill in defaults */
         mutex_init(&btv->lock);
-        mutex_init(&btv->reslock);
         spin_lock_init(&btv->s_lock);
         spin_lock_init(&btv->gpio_lock);
         init_waitqueue_head(&btv->gpioq);
@@ -4095,7 +4729,6 @@ static int __devinit bttv_probe(struct pci_dev *dev,
         btv->init.fmt         = format_by_palette(VIDEO_PALETTE_RGB24);
         btv->init.width       = 320;
         btv->init.height      = 240;
-        btv->init.lines       = 16;
         btv->input = 0;
 
         /* initialize hardware */
@@ -4130,6 +4763,10 @@ static int __devinit bttv_probe(struct pci_dev *dev,
                 bt848_sat(btv,32768);
                 audio_mute(btv, 1);
                 set_input(btv,0);
+                bttv_crop_reset(&btv->crop[0], btv->tvnorm);
+                btv->crop[1] = btv->crop[0]; /* current = default */
+                disclaim_vbi_lines(btv);
+                disclaim_video_lines(btv);
         }
 
         /* add subdevices */
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index cbc012f71f52..6f74c8042bc3 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -36,13 +36,18 @@ module_param(repeat_delay, int, 0644);
 static int repeat_period = 33;
 module_param(repeat_period, int, 0644);
 
+static int ir_rc5_remote_gap = 885;
+module_param(ir_rc5_remote_gap, int, 0644);
+static int ir_rc5_key_timeout = 200;
+module_param(ir_rc5_key_timeout, int, 0644);
+
 #define DEVNAME "bttv-input"
 
 /* ---------------------------------------------------------------------- */
 
 static void ir_handle_key(struct bttv *btv)
 {
-        struct bttv_ir *ir = btv->remote;
+        struct card_ir *ir = btv->remote;
         u32 gpio,data;
 
         /* read gpio value */
@@ -72,7 +77,7 @@ static void ir_handle_key(struct bttv *btv)
 
 void bttv_input_irq(struct bttv *btv)
 {
-        struct bttv_ir *ir = btv->remote;
+        struct card_ir *ir = btv->remote;
 
         if (!ir->polling)
                 ir_handle_key(btv);
@@ -81,65 +86,21 @@ void bttv_input_irq(struct bttv *btv)
 static void bttv_input_timer(unsigned long data)
 {
         struct bttv *btv = (struct bttv*)data;
-        struct bttv_ir *ir = btv->remote;
-        unsigned long timeout;
+        struct card_ir *ir = btv->remote;
 
         ir_handle_key(btv);
-        timeout = jiffies + (ir->polling * HZ / 1000);
-        mod_timer(&ir->timer, timeout);
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
 /* ---------------------------------------------------------------*/
 
-static int rc5_remote_gap = 885;
-module_param(rc5_remote_gap, int, 0644);
-static int rc5_key_timeout = 200;
-module_param(rc5_key_timeout, int, 0644);
-
-#define RC5_START(x)    (((x)>>12)&3)
-#define RC5_TOGGLE(x)   (((x)>>11)&1)
-#define RC5_ADDR(x)     (((x)>>6)&31)
-#define RC5_INSTR(x)    ((x)&63)
-
-/* decode raw bit pattern to RC5 code */
-static u32 rc5_decode(unsigned int code)
-{
-        unsigned int org_code = code;
-        unsigned int pair;
-        unsigned int rc5 = 0;
-        int i;
-
-        code = (code << 1) | 1;
-        for (i = 0; i < 14; ++i) {
-                pair = code & 0x3;
-                code >>= 2;
-
-                rc5 <<= 1;
-                switch (pair) {
-                case 0:
-                case 2:
-                        break;
-                case 1:
-                        rc5 |= 1;
-                        break;
-                case 3:
-                        dprintk(KERN_WARNING "bad code: %x\n", org_code);
-                        return 0;
-                }
-        }
-        dprintk(KERN_WARNING "code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
-                "instr=%x\n", rc5, org_code, RC5_START(rc5),
-                RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
-        return rc5;
-}
-
 static int bttv_rc5_irq(struct bttv *btv)
 {
-        struct bttv_ir *ir = btv->remote;
+        struct card_ir *ir = btv->remote;
         struct timeval tv;
         u32 gpio;
         u32 gap;
-        unsigned long current_jiffies, timeout;
+        unsigned long current_jiffies;
 
         /* read gpio port */
         gpio = bttv_gpio_read(&btv->c);
@@ -165,8 +126,8 @@ static int bttv_rc5_irq(struct bttv *btv)
                 /* only if in the code (otherwise spurious IRQ or timer
                    late) */
                 if (ir->last_bit < 28) {
-                        ir->last_bit = (gap - rc5_remote_gap / 2) /
-                            rc5_remote_gap;
+                        ir->last_bit = (gap - ir_rc5_remote_gap / 2) /
+                            ir_rc5_remote_gap;
                         ir->code |= 1 << ir->last_bit;
                 }
                 /* starting new code */
@@ -176,8 +137,8 @@ static int bttv_rc5_irq(struct bttv *btv)
                 ir->base_time = tv;
                 ir->last_bit = 0;
 
-                timeout = current_jiffies + (500 + 30 * HZ) / 1000;
-                mod_timer(&ir->timer_end, timeout);
+                mod_timer(&ir->timer_end,
+                          current_jiffies + msecs_to_jiffies(30));
         }
 
         /* toggle GPIO pin 4 to reset the irq */
@@ -186,96 +147,28 @@ static int bttv_rc5_irq(struct bttv *btv)
         return 1;
 }
 
-
-static void bttv_rc5_timer_end(unsigned long data)
-{
-        struct bttv_ir *ir = (struct bttv_ir *)data;
-        struct timeval tv;
-        unsigned long current_jiffies, timeout;
-        u32 gap;
-
-        /* get time */
-        current_jiffies = jiffies;
-        do_gettimeofday(&tv);
-
-        /* avoid overflow with gap >1s */
-        if (tv.tv_sec - ir->base_time.tv_sec > 1) {
-                gap = 200000;
-        } else {
-                gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
-                    tv.tv_usec - ir->base_time.tv_usec;
-        }
-
-        /* Allow some timmer jitter (RC5 is ~24ms anyway so this is ok) */
-        if (gap < 28000) {
-                dprintk(KERN_WARNING "spurious timer_end\n");
-                return;
-        }
-
-        ir->active = 0;
-        if (ir->last_bit < 20) {
-                /* ignore spurious codes (caused by light/other remotes) */
-                dprintk(KERN_WARNING "short code: %x\n", ir->code);
-        } else {
-                u32 rc5 = rc5_decode(ir->code);
-
-                /* two start bits? */
-                if (RC5_START(rc5) != 3) {
-                        dprintk(KERN_WARNING "rc5 start bits invalid: %u\n", RC5_START(rc5));
-
-                        /* right address? */
-                } else if (RC5_ADDR(rc5) == 0x0) {
-                        u32 toggle = RC5_TOGGLE(rc5);
-                        u32 instr = RC5_INSTR(rc5);
-
-                        /* Good code, decide if repeat/repress */
-                        if (toggle != RC5_TOGGLE(ir->last_rc5) ||
-                            instr != RC5_INSTR(ir->last_rc5)) {
-                                dprintk(KERN_WARNING "instruction %x, toggle %x\n", instr,
-                                        toggle);
-                                ir_input_nokey(ir->dev, &ir->ir);
-                                ir_input_keydown(ir->dev, &ir->ir, instr,
-                                                 instr);
-                        }
-
-                        /* Set/reset key-up timer */
-                        timeout = current_jiffies + (500 + rc5_key_timeout
-                                                     * HZ) / 1000;
-                        mod_timer(&ir->timer_keyup, timeout);
-
-                        /* Save code for repeat test */
-                        ir->last_rc5 = rc5;
-                }
-        }
-}
-
-static void bttv_rc5_timer_keyup(unsigned long data)
-{
-        struct bttv_ir *ir = (struct bttv_ir *)data;
-
-        dprintk(KERN_DEBUG "key released\n");
-        ir_input_nokey(ir->dev, &ir->ir);
-}
-
 /* ---------------------------------------------------------------------- */
 
-static void bttv_ir_start(struct bttv *btv, struct bttv_ir *ir)
+static void bttv_ir_start(struct bttv *btv, struct card_ir *ir)
 {
         if (ir->polling) {
-                init_timer(&ir->timer);
-                ir->timer.function = bttv_input_timer;
-                ir->timer.data     = (unsigned long)btv;
+                setup_timer(&ir->timer, bttv_input_timer, (unsigned long)btv);
                 ir->timer.expires  = jiffies + HZ;
                 add_timer(&ir->timer);
         } else if (ir->rc5_gpio) {
                 /* set timer_end for code completion */
                 init_timer(&ir->timer_end);
-                ir->timer_end.function = bttv_rc5_timer_end;
+                ir->timer_end.function = ir_rc5_timer_end;
                 ir->timer_end.data = (unsigned long)ir;
 
                 init_timer(&ir->timer_keyup);
-                ir->timer_keyup.function = bttv_rc5_timer_keyup;
+                ir->timer_keyup.function = ir_rc5_timer_keyup;
                 ir->timer_keyup.data = (unsigned long)ir;
+                ir->shift_by = 1;
+                ir->start = 3;
+                ir->addr = 0x0;
+                ir->rc5_key_timeout = ir_rc5_key_timeout;
+                ir->rc5_remote_gap = ir_rc5_remote_gap;
         }
 }
 
@@ -299,7 +192,7 @@ static void bttv_ir_stop(struct bttv *btv)
 
 int bttv_input_init(struct bttv *btv)
 {
-        struct bttv_ir *ir;
+        struct card_ir *ir;
         IR_KEYTAB_TYPE *ir_codes = NULL;
         struct input_dev *input_dev;
         int ir_type = IR_TYPE_OTHER;
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index afcfe71e3792..e7104d9cb4bd 100644
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -43,7 +43,8 @@ int
 bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
                  struct scatterlist *sglist,
                  unsigned int offset, unsigned int bpl,
-                 unsigned int padding, unsigned int lines)
+                 unsigned int padding, unsigned int skip_lines,
+                 unsigned int store_lines)
 {
         u32 instructions,line,todo;
         struct scatterlist *sg;
@@ -54,9 +55,11 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
            one write per scan line + sync + jump (all 2 dwords).  padding
            can cause next bpl to start close to a page border.  First DMA
            region may be smaller than PAGE_SIZE */
-        instructions  = 1 + ((bpl + padding) * lines) / PAGE_SIZE + lines;
-        instructions += 2;
-        if ((rc = btcx_riscmem_alloc(btv->c.pci,risc,instructions*8)) < 0)
+        instructions  = skip_lines * 4;
+        instructions += (1 + ((bpl + padding) * store_lines)
+                         / PAGE_SIZE + store_lines) * 8;
+        instructions += 2 * 8;
+        if ((rc = btcx_riscmem_alloc(btv->c.pci,risc,instructions)) < 0)
                 return rc;
 
         /* sync instruction */
@@ -64,11 +67,16 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
         *(rp++) = cpu_to_le32(BT848_RISC_SYNC|BT848_FIFO_STATUS_FM1);
         *(rp++) = cpu_to_le32(0);
 
+        while (skip_lines-- > 0) {
+                *(rp++) = cpu_to_le32(BT848_RISC_SKIP | BT848_RISC_SOL |
+                                      BT848_RISC_EOL | bpl);
+        }
+
         /* scan lines */
         sg = sglist;
-        for (line = 0; line < lines; line++) {
+        for (line = 0; line < store_lines; line++) {
                 if ((btv->opt_vcr_hack) &&
-                    (line >= (lines - VCR_HACK_LINES)))
+                    (line >= (store_lines - VCR_HACK_LINES)))
                         continue;
                 while (offset && offset >= sg_dma_len(sg)) {
                         offset -= sg_dma_len(sg);
@@ -130,7 +138,8 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
         /* estimate risc mem: worst case is one write per page border +
            one write per scan line (5 dwords)
            plus sync + jump (2 dwords) */
-        instructions  = (ybpl * ylines * 2) / PAGE_SIZE + ylines;
+        instructions  = ((3 + (ybpl + ypadding) * ylines * 2)
+                         / PAGE_SIZE) + ylines;
         instructions += 2;
         if ((rc = btcx_riscmem_alloc(btv->c.pci,risc,instructions*4*5)) < 0)
                 return rc;
@@ -317,10 +326,10 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc,
 /* ---------------------------------------------------------- */
 
 static void
-bttv_calc_geo(struct bttv *btv, struct bttv_geometry *geo,
-              int width, int height, int interleaved, int norm)
+bttv_calc_geo_old(struct bttv *btv, struct bttv_geometry *geo,
+                  int width, int height, int interleaved,
+                  const struct bttv_tvnorm *tvnorm)
 {
-        const struct bttv_tvnorm *tvnorm = &bttv_tvnorms[norm];
         u32 xsf, sr;
         int vdelay;
 
@@ -361,6 +370,62 @@ bttv_calc_geo(struct bttv *btv, struct bttv_geometry *geo,
 }
 
 static void
+bttv_calc_geo           (struct bttv *                  btv,
+                         struct bttv_geometry *         geo,
+                         unsigned int                   width,
+                         unsigned int                   height,
+                         int                            both_fields,
+                         const struct bttv_tvnorm *     tvnorm,
+                         const struct v4l2_rect *       crop)
+{
+        unsigned int c_width;
+        unsigned int c_height;
+        u32 sr;
+
+        if ((crop->left == tvnorm->cropcap.defrect.left
+             && crop->top == tvnorm->cropcap.defrect.top
+             && crop->width == tvnorm->cropcap.defrect.width
+             && crop->height == tvnorm->cropcap.defrect.height
+             && width <= tvnorm->swidth /* see PAL-Nc et al */)
+            || bttv_tvcards[btv->c.type].muxsel[btv->input] < 0) {
+                bttv_calc_geo_old(btv, geo, width, height,
+                                  both_fields, tvnorm);
+                return;
+        }
+
+        /* For bug compatibility the image size checks permit scale
+           factors > 16. See bttv_crop_calc_limits(). */
+        c_width = min((unsigned int) crop->width, width * 16);
+        c_height = min((unsigned int) crop->height, height * 16);
+
+        geo->width = width;
+        geo->hscale = (c_width * 4096U + (width >> 1)) / width - 4096;
+        /* Even to store Cb first, odd for Cr. */
+        geo->hdelay = ((crop->left * width + c_width) / c_width) & ~1;
+
+        geo->sheight = c_height;
+        geo->vdelay = crop->top - tvnorm->cropcap.bounds.top + MIN_VDELAY;
+        sr = c_height >> !both_fields;
+        sr = (sr * 512U + (height >> 1)) / height - 512;
+        geo->vscale = (0x10000UL - sr) & 0x1fff;
+        geo->vscale |= both_fields ? (BT848_VSCALE_INT << 8) : 0;
+        geo->vtotal = tvnorm->vtotal;
+
+        geo->crop = (((geo->width   >> 8) & 0x03) |
+                     ((geo->hdelay  >> 6) & 0x0c) |
+                     ((geo->sheight >> 4) & 0x30) |
+                     ((geo->vdelay  >> 2) & 0xc0));
+
+        if (btv->opt_combfilter) {
+                geo->vtc  = (width < 193) ? 2 : ((width < 385) ? 1 : 0);
+                geo->comb = (width < 769) ? 1 : 0;
+        } else {
+                geo->vtc  = 0;
+                geo->comb = 0;
+        }
+}
+
+static void
 bttv_apply_geo(struct bttv *btv, struct bttv_geometry *geo, int odd)
 {
         int off = odd ? 0x80 : 0x00;
@@ -522,16 +587,51 @@ int
 bttv_buffer_activate_vbi(struct bttv *btv,
                          struct bttv_buffer *vbi)
 {
-        /* vbi capture */
+        struct btcx_riscmem *top;
+        struct btcx_riscmem *bottom;
+        int top_irq_flags;
+        int bottom_irq_flags;
+
+        top = NULL;
+        bottom = NULL;
+        top_irq_flags = 0;
+        bottom_irq_flags = 0;
+
         if (vbi) {
+                unsigned int crop, vdelay;
+
                 vbi->vb.state = STATE_ACTIVE;
                 list_del(&vbi->vb.queue);
-                bttv_risc_hook(btv, RISC_SLOT_O_VBI, &vbi->top,    0);
-                bttv_risc_hook(btv, RISC_SLOT_E_VBI, &vbi->bottom, 4);
-        } else {
-                bttv_risc_hook(btv, RISC_SLOT_O_VBI, NULL, 0);
-                bttv_risc_hook(btv, RISC_SLOT_E_VBI, NULL, 0);
+
+                /* VDELAY is start of video, end of VBI capturing. */
+                crop = btread(BT848_E_CROP);
+                vdelay = btread(BT848_E_VDELAY_LO) + ((crop & 0xc0) << 2);
+
+                if (vbi->geo.vdelay > vdelay) {
+                        vdelay = vbi->geo.vdelay & 0xfe;
+                        crop = (crop & 0x3f) | ((vbi->geo.vdelay >> 2) & 0xc0);
+
+                        btwrite(vdelay, BT848_E_VDELAY_LO);
+                        btwrite(crop,   BT848_E_CROP);
+                        btwrite(vdelay, BT848_O_VDELAY_LO);
+                        btwrite(crop,   BT848_O_CROP);
+                }
+
+                if (vbi->vbi_count[0] > 0) {
+                        top = &vbi->top;
+                        top_irq_flags = 4;
+                }
+
+                if (vbi->vbi_count[1] > 0) {
+                        top_irq_flags = 0;
+                        bottom = &vbi->bottom;
+                        bottom_irq_flags = 4;
+                }
         }
+
+        bttv_risc_hook(btv, RISC_SLOT_O_VBI, top, top_irq_flags);
+        bttv_risc_hook(btv, RISC_SLOT_E_VBI, bottom, bottom_irq_flags);
+
         return 0;
 }
 
@@ -611,28 +711,31 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                 int bpf = bpl * (buf->vb.height >> 1);
 
                 bttv_calc_geo(btv,&buf->geo,buf->vb.width,buf->vb.height,
-                              V4L2_FIELD_HAS_BOTH(buf->vb.field),buf->tvnorm);
+                              V4L2_FIELD_HAS_BOTH(buf->vb.field),
+                              tvnorm,&buf->crop);
 
                 switch (buf->vb.field) {
                 case V4L2_FIELD_TOP:
                         bttv_risc_packed(btv,&buf->top,buf->vb.dma.sglist,
-                                         0,bpl,0,buf->vb.height);
+                                         /* offset */ 0,bpl,
+                                         /* padding */ 0,/* skip_lines */ 0,
+                                         buf->vb.height);
                         break;
                 case V4L2_FIELD_BOTTOM:
                         bttv_risc_packed(btv,&buf->bottom,buf->vb.dma.sglist,
-                                         0,bpl,0,buf->vb.height);
+                                         0,bpl,0,0,buf->vb.height);
                         break;
                 case V4L2_FIELD_INTERLACED:
                         bttv_risc_packed(btv,&buf->top,buf->vb.dma.sglist,
-                                         0,bpl,bpl,buf->vb.height >> 1);
+                                         0,bpl,bpl,0,buf->vb.height >> 1);
                         bttv_risc_packed(btv,&buf->bottom,buf->vb.dma.sglist,
-                                         bpl,bpl,bpl,buf->vb.height >> 1);
+                                         bpl,bpl,bpl,0,buf->vb.height >> 1);
                         break;
                 case V4L2_FIELD_SEQ_TB:
                         bttv_risc_packed(btv,&buf->top,buf->vb.dma.sglist,
-                                         0,bpl,0,buf->vb.height >> 1);
+                                         0,bpl,0,0,buf->vb.height >> 1);
                         bttv_risc_packed(btv,&buf->bottom,buf->vb.dma.sglist,
-                                         bpf,bpl,0,buf->vb.height >> 1);
+                                         bpf,bpl,0,0,buf->vb.height >> 1);
                         break;
                 default:
                         BUG();
@@ -662,7 +765,8 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                 switch (buf->vb.field) {
                 case V4L2_FIELD_TOP:
                         bttv_calc_geo(btv,&buf->geo,buf->vb.width,
-                                      buf->vb.height,0,buf->tvnorm);
+                                      buf->vb.height,/* both_fields */ 0,
+                                      tvnorm,&buf->crop);
                         bttv_risc_planar(btv, &buf->top, buf->vb.dma.sglist,
                                          0,buf->vb.width,0,buf->vb.height,
                                          uoffset,voffset,buf->fmt->hshift,
@@ -670,7 +774,8 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                         break;
                 case V4L2_FIELD_BOTTOM:
                         bttv_calc_geo(btv,&buf->geo,buf->vb.width,
-                                      buf->vb.height,0,buf->tvnorm);
+                                      buf->vb.height,0,
+                                      tvnorm,&buf->crop);
                         bttv_risc_planar(btv, &buf->bottom, buf->vb.dma.sglist,
                                          0,buf->vb.width,0,buf->vb.height,
                                          uoffset,voffset,buf->fmt->hshift,
@@ -678,7 +783,8 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                         break;
                 case V4L2_FIELD_INTERLACED:
                         bttv_calc_geo(btv,&buf->geo,buf->vb.width,
-                                      buf->vb.height,1,buf->tvnorm);
+                                      buf->vb.height,1,
+                                      tvnorm,&buf->crop);
                         lines    = buf->vb.height >> 1;
                         ypadding = buf->vb.width;
                         cpadding = buf->vb.width >> buf->fmt->hshift;
@@ -700,7 +806,8 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                         break;
                 case V4L2_FIELD_SEQ_TB:
                         bttv_calc_geo(btv,&buf->geo,buf->vb.width,
-                                      buf->vb.height,1,buf->tvnorm);
+                                      buf->vb.height,1,
+                                      tvnorm,&buf->crop);
                         lines    = buf->vb.height >> 1;
                         ypadding = buf->vb.width;
                         cpadding = buf->vb.width >> buf->fmt->hshift;
@@ -731,11 +838,12 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                 /* build risc code */
                 buf->vb.field = V4L2_FIELD_SEQ_TB;
                 bttv_calc_geo(btv,&buf->geo,tvnorm->swidth,tvnorm->sheight,
-                              1,buf->tvnorm);
+                              1,tvnorm,&buf->crop);
                 bttv_risc_packed(btv, &buf->top,  buf->vb.dma.sglist,
-                                 0, RAW_BPL, 0, RAW_LINES);
+                                 /* offset */ 0, RAW_BPL, /* padding */ 0,
+                                 /* skip_lines */ 0, RAW_LINES);
                 bttv_risc_packed(btv, &buf->bottom, buf->vb.dma.sglist,
-                                 buf->vb.size/2 , RAW_BPL, 0, RAW_LINES);
+                                 buf->vb.size/2 , RAW_BPL, 0, 0, RAW_LINES);
         }
 
         /* copy format info */
@@ -761,7 +869,8 @@ bttv_overlay_risc(struct bttv *btv,
 
         /* calculate geometry */
         bttv_calc_geo(btv,&buf->geo,ov->w.width,ov->w.height,
-                      V4L2_FIELD_HAS_BOTH(ov->field), ov->tvnorm);
+                      V4L2_FIELD_HAS_BOTH(ov->field),
+                      &bttv_tvnorms[ov->tvnorm],&buf->crop);
 
         /* build risc code */
         switch (ov->field) {
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 6fc6b0260056..93e35de5a181 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -5,6 +5,9 @@
 
     (c) 2002 Gerd Knorr <kraxel@bytesex.org>
 
+    Copyright (C) 2005, 2006 Michael H. Schimek <mschimek@gmx.at>
+    Sponsored by OPQ Systems AB
+
     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
@@ -41,8 +44,15 @@
    to be about 244.  */
 #define VBI_OFFSET 244
 
+/* 2048 for compatibility with earlier driver versions. The driver
+   really stores 1024 + tvnorm->vbipack * 4 samples per line in the
+   buffer. Note tvnorm->vbipack is <= 0xFF (limit of VBIPACK_LO + HI
+   is 0x1FF DWORDs) and VBI read()s store a frame counter in the last
+   four bytes of the VBI image. */
+#define VBI_BPL 2048
+
+/* Compatibility. */
 #define VBI_DEFLINES 16
-#define VBI_MAXLINES 32
 
 static unsigned int vbibufs = 4;
 static unsigned int vbi_debug = 0;
@@ -58,21 +68,12 @@ MODULE_PARM_DESC(vbi_debug,"vbi code debug messages, default is 0 (no)");
 #define dprintk(fmt, arg...)    if (vbi_debug) \
         printk(KERN_DEBUG "bttv%d/vbi: " fmt, btv->c.nr , ## arg)
 
+#define IMAGE_SIZE(fmt) \
+        (((fmt)->count[0] + (fmt)->count[1]) * (fmt)->samples_per_line)
+
 /* ----------------------------------------------------------------------- */
 /* vbi risc code + mm                                                      */
 
-static int
-vbi_buffer_risc(struct bttv *btv, struct bttv_buffer *buf, int lines)
-{
-        int bpl = 2048;
-
-        bttv_risc_packed(btv, &buf->top, buf->vb.dma.sglist,
-                         0, bpl-4, 4, lines);
-        bttv_risc_packed(btv, &buf->bottom, buf->vb.dma.sglist,
-                         lines * bpl, bpl-4, 4, lines);
-        return 0;
-}
-
 static int vbi_buffer_setup(struct videobuf_queue *q,
                             unsigned int *count, unsigned int *size)
 {
@@ -81,8 +82,16 @@ static int vbi_buffer_setup(struct videobuf_queue *q,
 
         if (0 == *count)
                 *count = vbibufs;
-        *size = fh->lines * 2 * 2048;
-        dprintk("setup: lines=%d\n",fh->lines);
+
+        *size = IMAGE_SIZE(&fh->vbi_fmt.fmt);
+
+        dprintk("setup: samples=%u start=%d,%d count=%u,%u\n",
+                fh->vbi_fmt.fmt.samples_per_line,
+                fh->vbi_fmt.fmt.start[0],
+                fh->vbi_fmt.fmt.start[1],
+                fh->vbi_fmt.fmt.count[0],
+                fh->vbi_fmt.fmt.count[1]);
+
         return 0;
 }
 
@@ -93,18 +102,93 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
         struct bttv_fh *fh = q->priv_data;
         struct bttv *btv = fh->btv;
         struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
+        const struct bttv_tvnorm *tvnorm;
+        unsigned int skip_lines0, skip_lines1, min_vdelay;
+        int redo_dma_risc;
         int rc;
 
-        buf->vb.size = fh->lines * 2 * 2048;
+        buf->vb.size = IMAGE_SIZE(&fh->vbi_fmt.fmt);
         if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
                 return -EINVAL;
 
+        tvnorm = fh->vbi_fmt.tvnorm;
+
+        /* There's no VBI_VDELAY register, RISC must skip the lines
+           we don't want. With default parameters we skip zero lines
+           as earlier driver versions did. The driver permits video
+           standard changes while capturing, so we use vbi_fmt.tvnorm
+           instead of btv->tvnorm to skip zero lines after video
+           standard changes as well. */
+
+        skip_lines0 = 0;
+        skip_lines1 = 0;
+
+        if (fh->vbi_fmt.fmt.count[0] > 0)
+                skip_lines0 = max(0, (fh->vbi_fmt.fmt.start[0]
+                                      - tvnorm->vbistart[0]));
+        if (fh->vbi_fmt.fmt.count[1] > 0)
+                skip_lines1 = max(0, (fh->vbi_fmt.fmt.start[1]
+                                      - tvnorm->vbistart[1]));
+
+        redo_dma_risc = 0;
+
+        if (buf->vbi_skip[0] != skip_lines0 ||
+            buf->vbi_skip[1] != skip_lines1 ||
+            buf->vbi_count[0] != fh->vbi_fmt.fmt.count[0] ||
+            buf->vbi_count[1] != fh->vbi_fmt.fmt.count[1]) {
+                buf->vbi_skip[0] = skip_lines0;
+                buf->vbi_skip[1] = skip_lines1;
+                buf->vbi_count[0] = fh->vbi_fmt.fmt.count[0];
+                buf->vbi_count[1] = fh->vbi_fmt.fmt.count[1];
+                redo_dma_risc = 1;
+        }
+
         if (STATE_NEEDS_INIT == buf->vb.state) {
+                redo_dma_risc = 1;
                 if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL)))
                         goto fail;
-                if (0 != (rc = vbi_buffer_risc(btv,buf,fh->lines)))
-                        goto fail;
         }
+
+        if (redo_dma_risc) {
+                unsigned int bpl, padding, offset;
+
+                bpl = 2044; /* max. vbipack */
+                padding = VBI_BPL - bpl;
+
+                if (fh->vbi_fmt.fmt.count[0] > 0) {
+                        rc = bttv_risc_packed(btv, &buf->top,
+                                              buf->vb.dma.sglist,
+                                              /* offset */ 0, bpl,
+                                              padding, skip_lines0,
+                                              fh->vbi_fmt.fmt.count[0]);
+                        if (0 != rc)
+                                goto fail;
+                }
+
+                if (fh->vbi_fmt.fmt.count[1] > 0) {
+                        offset = fh->vbi_fmt.fmt.count[0] * VBI_BPL;
+
+                        rc = bttv_risc_packed(btv, &buf->bottom,
+                                              buf->vb.dma.sglist,
+                                              offset, bpl,
+                                              padding, skip_lines1,
+                                              fh->vbi_fmt.fmt.count[1]);
+                        if (0 != rc)
+                                goto fail;
+                }
+        }
+
+        /* VBI capturing ends at VDELAY, start of video capturing,
+           no matter where the RISC program ends. VDELAY minimum is 2,
+           bounds.top is the corresponding first field line number
+           times two. VDELAY counts half field lines. */
+        min_vdelay = MIN_VDELAY;
+        if (fh->vbi_fmt.end >= tvnorm->cropcap.bounds.top)
+                min_vdelay += fh->vbi_fmt.end - tvnorm->cropcap.bounds.top;
+
+        /* For bttv_buffer_activate_vbi(). */
+        buf->geo.vdelay = min_vdelay;
+
         buf->vb.state = STATE_PREPARED;
         buf->vb.field = field;
         dprintk("buf prepare %p: top=%p bottom=%p field=%s\n",
@@ -140,7 +224,7 @@ static void vbi_buffer_release(struct videobuf_queue *q, struct videobuf_buffer
         struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
 
         dprintk("free %p\n",vb);
-        bttv_dma_free(&fh->cap,fh->btv,buf);
+        bttv_dma_free(q,fh->btv,buf);
 }
 
 struct videobuf_queue_ops bttv_vbi_qops = {
@@ -152,69 +236,215 @@ struct videobuf_queue_ops bttv_vbi_qops = {
 
 /* ----------------------------------------------------------------------- */
 
-void bttv_vbi_setlines(struct bttv_fh *fh, struct bttv *btv, int lines)
+static int
+try_fmt                 (struct v4l2_vbi_format *       f,
+                         const struct bttv_tvnorm *     tvnorm,
+                         __s32                          crop_start)
 {
-        int vdelay;
-
-        if (lines < 1)
-                lines = 1;
-        if (lines > VBI_MAXLINES)
-                lines = VBI_MAXLINES;
-        fh->lines = lines;
-
-        vdelay = btread(BT848_E_VDELAY_LO);
-        if (vdelay < lines*2) {
-                vdelay = lines*2;
-                btwrite(vdelay,BT848_E_VDELAY_LO);
-                btwrite(vdelay,BT848_O_VDELAY_LO);
+        __s32 min_start, max_start, max_end, f2_offset;
+        unsigned int i;
+
+        /* For compatibility with earlier driver versions we must pretend
+           the VBI and video capture window may overlap. In reality RISC
+           magic aborts VBI capturing at the first line of video capturing,
+           leaving the rest of the buffer unchanged, usually all zero.
+           VBI capturing must always start before video capturing. >> 1
+           because cropping counts field lines times two. */
+        min_start = tvnorm->vbistart[0];
+        max_start = (crop_start >> 1) - 1;
+        max_end = (tvnorm->cropcap.bounds.top
+                   + tvnorm->cropcap.bounds.height) >> 1;
+
+        if (min_start > max_start)
+                return -EBUSY;
+
+        BUG_ON(max_start >= max_end);
+
+        f->sampling_rate    = tvnorm->Fsc;
+        f->samples_per_line = VBI_BPL;
+        f->sample_format    = V4L2_PIX_FMT_GREY;
+        f->offset           = VBI_OFFSET;
+
+        f2_offset = tvnorm->vbistart[1] - tvnorm->vbistart[0];
+
+        for (i = 0; i < 2; ++i) {
+                if (0 == f->count[i]) {
+                        /* No data from this field. We leave f->start[i]
+                           alone because VIDIOCSVBIFMT is w/o and EINVALs
+                           when a driver does not support exactly the
+                           requested parameters. */
+                } else {
+                        s64 start, count;
+
+                        start = clamp(f->start[i], min_start, max_start);
+                        /* s64 to prevent overflow. */
+                        count = (s64) f->start[i] + f->count[i] - start;
+                        f->start[i] = start;
+                        f->count[i] = clamp(count, (s64) 1,
+                                            max_end - start);
+                }
+
+                min_start += f2_offset;
+                max_start += f2_offset;
+                max_end += f2_offset;
         }
+
+        if (0 == (f->count[0] | f->count[1])) {
+                /* As in earlier driver versions. */
+                f->start[0] = tvnorm->vbistart[0];
+                f->start[1] = tvnorm->vbistart[1];
+                f->count[0] = 1;
+                f->count[1] = 1;
+        }
+
+        f->flags = 0;
+
+        f->reserved[0] = 0;
+        f->reserved[1] = 0;
+
+        return 0;
 }
 
-void bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_format *f)
+int
+bttv_vbi_try_fmt        (struct bttv_fh *               fh,
+                         struct v4l2_vbi_format *       f)
 {
+        struct bttv *btv = fh->btv;
         const struct bttv_tvnorm *tvnorm;
-        s64 count0,count1,count;
+        __s32 crop_start;
 
-        tvnorm = &bttv_tvnorms[fh->btv->tvnorm];
-        f->type = V4L2_BUF_TYPE_VBI_CAPTURE;
-        f->fmt.vbi.sampling_rate    = tvnorm->Fsc;
-        f->fmt.vbi.samples_per_line = 2048;
-        f->fmt.vbi.sample_format    = V4L2_PIX_FMT_GREY;
-        f->fmt.vbi.offset           = VBI_OFFSET;
-        f->fmt.vbi.flags            = 0;
-
-        /* s64 to prevent overflow. */
-        count0 = (s64) f->fmt.vbi.start[0] + f->fmt.vbi.count[0]
-                - tvnorm->vbistart[0];
-        count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1]
-                - tvnorm->vbistart[1];
-        count  = clamp (max (count0, count1), (s64) 1, (s64) VBI_MAXLINES);
-
-        f->fmt.vbi.start[0] = tvnorm->vbistart[0];
-        f->fmt.vbi.start[1] = tvnorm->vbistart[1];
-        f->fmt.vbi.count[0] = count;
-        f->fmt.vbi.count[1] = count;
-
-        f->fmt.vbi.reserved[0] = 0;
-        f->fmt.vbi.reserved[1] = 0;
+        mutex_lock(&btv->lock);
+
+        tvnorm = &bttv_tvnorms[btv->tvnorm];
+        crop_start = btv->crop_start;
+
+        mutex_unlock(&btv->lock);
+
+        return try_fmt(f, tvnorm, crop_start);
 }
 
-void bttv_vbi_get_fmt(struct bttv_fh *fh, struct v4l2_format *f)
+int
+bttv_vbi_set_fmt        (struct bttv_fh *               fh,
+                         struct v4l2_vbi_format *       f)
 {
+        struct bttv *btv = fh->btv;
         const struct bttv_tvnorm *tvnorm;
+        __s32 start1, end;
+        int rc;
+
+        mutex_lock(&btv->lock);
+
+        rc = -EBUSY;
+        if (fh->resources & RESOURCE_VBI)
+                goto fail;
+
+        tvnorm = &bttv_tvnorms[btv->tvnorm];
+
+        rc = try_fmt(f, tvnorm, btv->crop_start);
+        if (0 != rc)
+                goto fail;
+
+        start1 = f->start[1] - tvnorm->vbistart[1] + tvnorm->vbistart[0];
+
+        /* First possible line of video capturing. Should be
+           max(f->start[0] + f->count[0], start1 + f->count[1]) * 2
+           when capturing both fields. But for compatibility we must
+           pretend the VBI and video capture window may overlap,
+           so end = start + 1, the lowest possible value, times two
+           because vbi_fmt.end counts field lines times two. */
+        end = max(f->start[0], start1) * 2 + 2;
+
+        mutex_lock(&fh->vbi.lock);
+
+        fh->vbi_fmt.fmt    = *f;
+        fh->vbi_fmt.tvnorm = tvnorm;
+        fh->vbi_fmt.end    = end;
+
+        mutex_unlock(&fh->vbi.lock);
+
+        rc = 0;
+
+ fail:
+        mutex_unlock(&btv->lock);
+
+        return rc;
+}
+
+void
+bttv_vbi_get_fmt        (struct bttv_fh *               fh,
+                         struct v4l2_vbi_format *       f)
+{
+        const struct bttv_tvnorm *tvnorm;
+
+        *f = fh->vbi_fmt.fmt;
 
         tvnorm = &bttv_tvnorms[fh->btv->tvnorm];
-        memset(f,0,sizeof(*f));
-        f->type = V4L2_BUF_TYPE_VBI_CAPTURE;
-        f->fmt.vbi.sampling_rate    = tvnorm->Fsc;
-        f->fmt.vbi.samples_per_line = 2048;
-        f->fmt.vbi.sample_format    = V4L2_PIX_FMT_GREY;
-        f->fmt.vbi.offset           = VBI_OFFSET;
-        f->fmt.vbi.start[0]         = tvnorm->vbistart[0];
-        f->fmt.vbi.start[1]         = tvnorm->vbistart[1];
-        f->fmt.vbi.count[0]         = fh->lines;
-        f->fmt.vbi.count[1]         = fh->lines;
-        f->fmt.vbi.flags            = 0;
+
+        if (tvnorm != fh->vbi_fmt.tvnorm) {
+                __s32 max_end;
+                unsigned int i;
+
+                /* As in vbi_buffer_prepare() this imitates the
+                   behaviour of earlier driver versions after video
+                   standard changes, with default parameters anyway. */
+
+                max_end = (tvnorm->cropcap.bounds.top
+                           + tvnorm->cropcap.bounds.height) >> 1;
+
+                f->sampling_rate = tvnorm->Fsc;
+
+                for (i = 0; i < 2; ++i) {
+                        __s32 new_start;
+
+                        new_start = f->start[i]
+                                + tvnorm->vbistart[i]
+                                - fh->vbi_fmt.tvnorm->vbistart[i];
+
+                        f->start[i] = min(new_start, max_end - 1);
+                        f->count[i] = min((__s32) f->count[i],
+                                          max_end - f->start[i]);
+
+                        max_end += tvnorm->vbistart[1]
+                                - tvnorm->vbistart[0];
+                }
+        }
+}
+
+void
+bttv_vbi_fmt_reset      (struct bttv_vbi_fmt *          f,
+                         int                            norm)
+{
+        const struct bttv_tvnorm *tvnorm;
+        unsigned int real_samples_per_line;
+        unsigned int real_count;
+
+        tvnorm = &bttv_tvnorms[norm];
+
+        f->fmt.sampling_rate    = tvnorm->Fsc;
+        f->fmt.samples_per_line = VBI_BPL;
+        f->fmt.sample_format    = V4L2_PIX_FMT_GREY;
+        f->fmt.offset           = VBI_OFFSET;
+        f->fmt.start[0]         = tvnorm->vbistart[0];
+        f->fmt.start[1]         = tvnorm->vbistart[1];
+        f->fmt.count[0]         = VBI_DEFLINES;
+        f->fmt.count[1]         = VBI_DEFLINES;
+        f->fmt.flags            = 0;
+        f->fmt.reserved[0]      = 0;
+        f->fmt.reserved[1]      = 0;
+
+        /* For compatibility the buffer size must be 2 * VBI_DEFLINES *
+           VBI_BPL regardless of the current video standard. */
+        real_samples_per_line   = 1024 + tvnorm->vbipack * 4;
+        real_count              = ((tvnorm->cropcap.defrect.top >> 1)
+                                   - tvnorm->vbistart[0]);
+
+        BUG_ON(real_samples_per_line > VBI_BPL);
+        BUG_ON(real_count > VBI_DEFLINES);
+
+        f->tvnorm               = tvnorm;
+
+        /* See bttv_vbi_fmt_set(). */
+        f->end                  = tvnorm->vbistart[0] * 2 + 2;
 }
 
 /* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index f9c9e3c4d111..5491acbdaf63 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -197,33 +197,6 @@ struct bttv_core {
 struct bttv;
 
 
-struct bttv_ir {
-        struct input_dev        *dev;
-        struct ir_input_state   ir;
-        char                    name[32];
-        char                    phys[32];
-
-        /* Usual gpio signalling */
-
-        u32                     mask_keycode;
-        u32                     mask_keydown;
-        u32                     mask_keyup;
-        u32                     polling;
-        u32                     last_gpio;
-        struct work_struct      work;
-        struct timer_list       timer;
-
-        /* RC5 gpio */
-        u32 rc5_gpio;
-        struct timer_list timer_end;    /* timer_end for code completion */
-        struct timer_list timer_keyup;  /* timer_end for key release */
-        u32 last_rc5;                   /* last good rc5 code */
-        u32 last_bit;                   /* last raw bit seen */
-        u32 code;                       /* raw code under construction */
-        struct timeval base_time;       /* time of last seen code */
-        int active;                     /* building raw code */
-};
-
 struct tvcard
 {
         char *name;
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 311c4c541e01..ad79b8d53430 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,16)
+#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,17)
 
 #include <linux/types.h>
 #include <linux/wait.h>
@@ -66,14 +66,22 @@
 #define RISC_SLOT_LOOP        14
 
 #define RESOURCE_OVERLAY       1
-#define RESOURCE_VIDEO         2
+#define RESOURCE_VIDEO_STREAM  2
 #define RESOURCE_VBI           4
+#define RESOURCE_VIDEO_READ    8
 
 #define RAW_LINES            640
 #define RAW_BPL             1024
 
 #define UNSET (-1U)
 
+/* Min. value in VDELAY register. */
+#define MIN_VDELAY 2
+/* Even to get Cb first, odd for Cr. */
+#define MAX_HDELAY (0x3FF & -2)
+/* Limits scaled width, which must be a multiple of 4. */
+#define MAX_HACTIVE (0x3FF & -4)
+
 #define clamp(x, low, high) min (max (low, x), high)
 
 /* ---------------------------------------------------------- */
@@ -92,8 +100,13 @@ struct bttv_tvnorm {
         u16   vtotal;
         int   sram;
         /* ITU-R frame line number of the first VBI line we can
-           capture, of the first and second field. */
+           capture, of the first and second field. The last possible line
+           is determined by cropcap.bounds. */
         u16   vbistart[2];
+        /* Horizontally this counts fCLKx1 samples following the leading
+           edge of the horizontal sync pulse, vertically ITU-R frame line
+           numbers of the first field times two (2, 4, 6, ... 524 or 624). */
+        struct v4l2_cropcap cropcap;
 };
 extern const struct bttv_tvnorm bttv_tvnorms[];
 
@@ -128,6 +141,9 @@ struct bttv_buffer {
         struct bttv_geometry       geo;
         struct btcx_riscmem        top;
         struct btcx_riscmem        bottom;
+        struct v4l2_rect           crop;
+        unsigned int               vbi_skip[2];
+        unsigned int               vbi_count[2];
 };
 
 struct bttv_buffer_set {
@@ -146,6 +162,34 @@ struct bttv_overlay {
         int                    setup_ok;
 };
 
+struct bttv_vbi_fmt {
+        struct v4l2_vbi_format fmt;
+
+        /* fmt.start[] and count[] refer to this video standard. */
+        const struct bttv_tvnorm *tvnorm;
+
+        /* Earliest possible start of video capturing with this
+           v4l2_vbi_format, in struct bttv_crop.rect units. */
+        __s32                  end;
+};
+
+/* bttv-vbi.c */
+void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, int norm);
+
+struct bttv_crop {
+        /* A cropping rectangle in struct bttv_tvnorm.cropcap units. */
+        struct v4l2_rect       rect;
+
+        /* Scaled image size limits with this crop rect. Divide
+           max_height, but not min_height, by two when capturing
+           single fields. See also bttv_crop_reset() and
+           bttv_crop_adjust() in bttv-driver.c. */
+        __s32                  min_scaled_width;
+        __s32                  min_scaled_height;
+        __s32                  max_scaled_width;
+        __s32                  max_scaled_height;
+};
+
 struct bttv_fh {
         struct bttv              *btv;
         int resources;
@@ -160,13 +204,19 @@ struct bttv_fh {
         int                      width;
         int                      height;
 
-        /* current settings */
+        /* video overlay */
         const struct bttv_format *ovfmt;
         struct bttv_overlay      ov;
 
-        /* video overlay */
+        /* Application called VIDIOC_S_CROP. */
+        int                      do_crop;
+
+        /* vbi capture */
         struct videobuf_queue    vbi;
-        int                      lines;
+        /* Current VBI capture window as seen through this fh (cannot
+           be global for compatibility with earlier drivers). Protected
+           by struct bttv.lock and struct bttv_fh.vbi.lock. */
+        struct bttv_vbi_fmt      vbi_fmt;
 };
 
 /* ---------------------------------------------------------- */
@@ -176,7 +226,8 @@ struct bttv_fh {
 int bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
                      struct scatterlist *sglist,
                      unsigned int offset, unsigned int bpl,
-                     unsigned int pitch, unsigned int lines);
+                     unsigned int pitch, unsigned int skip_lines,
+                     unsigned int store_lines);
 
 /* control dma register + risc main loop */
 void bttv_set_dma(struct bttv *btv, int override);
@@ -202,9 +253,9 @@ int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
 /* ---------------------------------------------------------- */
 /* bttv-vbi.c                                                 */
 
-void bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_format *f);
-void bttv_vbi_get_fmt(struct bttv_fh *fh, struct v4l2_format *f);
-void bttv_vbi_setlines(struct bttv_fh *fh, struct bttv *btv, int lines);
+int bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_vbi_format *f);
+void bttv_vbi_get_fmt(struct bttv_fh *fh, struct v4l2_vbi_format *f);
+int bttv_vbi_set_fmt(struct bttv_fh *fh, struct v4l2_vbi_format *f);
 
 extern struct videobuf_queue_ops bttv_vbi_qops;
 
@@ -233,7 +284,6 @@ extern int fini_bttv_i2c(struct bttv *btv);
 #define d2printk if (bttv_debug >= 2) printk
 
 #define BTTV_MAX_FBUF   0x208000
-#define VBIBUF_SIZE     (2048*VBI_MAXLINES*2)
 #define BTTV_TIMEOUT    (HZ/2) /* 0.5 seconds */
 #define BTTV_FREE_IDLE  (HZ)   /* one second */
 
@@ -308,13 +358,12 @@ struct bttv {
 
         /* infrared remote */
         int has_remote;
-        struct bttv_ir *remote;
+        struct card_ir *remote;
 
         /* locking */
         spinlock_t s_lock;
         struct mutex lock;
         int resources;
-        struct mutex reslock;
 #ifdef VIDIOC_G_PRIORITY
         struct v4l2_prio_state prio;
 #endif
@@ -384,6 +433,21 @@ struct bttv {
 
         unsigned int users;
         struct bttv_fh init;
+
+        /* Default (0) and current (1) video capturing and overlay
+           cropping parameters in bttv_tvnorm.cropcap units. Protected
+           by bttv.lock. */
+        struct bttv_crop crop[2];
+
+        /* Earliest possible start of video capturing in
+           bttv_tvnorm.cropcap line units. Set by check_alloc_btres()
+           and free_btres(). Protected by bttv.lock. */
+        __s32                   vbi_end;
+
+        /* Latest possible end of VBI capturing (= crop[x].rect.top when
+           VIDEO_RESOURCES are locked). Set by check_alloc_btres()
+           and free_btres(). Protected by bttv.lock. */
+        __s32                   crop_start;
 };
 
 /* our devices */
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 4dae8925667f..682dc7ce48d9 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1195,7 +1195,7 @@ static int cafe_vidioc_reqbufs(struct file *filp, void *priv,
                 struct v4l2_requestbuffers *req)
 {
         struct cafe_camera *cam = filp->private_data;
-        int ret;
+        int ret = 0;  /* Silence warning */
 
         /*
          * Make sure it's something we can do.  User pointers could be
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 7e8d5ef58b61..78c9699eafbb 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -1350,13 +1350,13 @@ out:
 
 static void create_proc_cpia_cam(struct cam_data *cam)
 {
-        char name[7];
+        char name[5 + 1 + 10 + 1];
         struct proc_dir_entry *ent;
 
         if (!cpia_proc_root || !cam)
                 return;
 
-        sprintf(name, "video%d", cam->vdev.minor);
+        snprintf(name, sizeof(name), "video%d", cam->vdev.minor);
 
         ent = create_proc_entry(name, S_IFREG|S_IRUGO|S_IWUSR, cpia_proc_root);
         if (!ent)
@@ -1376,12 +1376,12 @@ static void create_proc_cpia_cam(struct cam_data *cam)
 
 static void destroy_proc_cpia_cam(struct cam_data *cam)
 {
-        char name[7];
+        char name[5 + 1 + 10 + 1];
 
         if (!cam || !cam->proc_entry)
                 return;
 
-        sprintf(name, "video%d", cam->vdev.minor);
+        snprintf(name, sizeof(name), "video%d", cam->vdev.minor);
         remove_proc_entry(name, cpia_proc_root);
         cam->proc_entry = NULL;
 }
@@ -3153,8 +3153,7 @@ static int reset_camera(struct cam_data *cam)
 
 static void put_cam(struct cpia_camera_ops* ops)
 {
-        if (ops->owner)
-                module_put(ops->owner);
+        module_put(ops->owner);
 }
 
 /* ------------------------- V4L interface --------------------- */
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index 2f5ca71e0261..d60cd5ecf821 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -56,7 +56,6 @@ const u32 cx2341x_mpeg_ctrls[] = {
         V4L2_CID_MPEG_VIDEO_B_FRAMES,
         V4L2_CID_MPEG_VIDEO_GOP_SIZE,
         V4L2_CID_MPEG_VIDEO_GOP_CLOSURE,
-        V4L2_CID_MPEG_VIDEO_PULLDOWN,
         V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
         V4L2_CID_MPEG_VIDEO_BITRATE,
         V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
@@ -118,9 +117,6 @@ static int cx2341x_get_ctrl(struct cx2341x_mpeg_params *params,
         case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
                 ctrl->value = params->video_gop_closure;
                 break;
-        case V4L2_CID_MPEG_VIDEO_PULLDOWN:
-                ctrl->value = params->video_pulldown;
-                break;
         case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
                 ctrl->value = params->video_bitrate_mode;
                 break;
@@ -231,9 +227,6 @@ static int cx2341x_set_ctrl(struct cx2341x_mpeg_params *params,
         case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
                 params->video_gop_closure = ctrl->value;
                 break;
-        case V4L2_CID_MPEG_VIDEO_PULLDOWN:
-                params->video_pulldown = ctrl->value;
-                break;
         case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
                 /* MPEG-1 only allows CBR */
                 if (params->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1 &&
@@ -679,7 +672,6 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p)
         .video_b_frames = 2,
         .video_gop_size = 12,
         .video_gop_closure = 1,
-        .video_pulldown = 0,
         .video_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
         .video_bitrate = 6000000,
         .video_bitrate_peak = 8000000,
@@ -783,10 +775,6 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func,
                 err = cx2341x_api(priv, func, CX2341X_ENC_SET_GOP_CLOSURE, 1, new->video_gop_closure);
                 if (err) return err;
         }
-        if (old == NULL || old->video_pulldown != new->video_pulldown) {
-                err = cx2341x_api(priv, func, CX2341X_ENC_SET_3_2_PULLDOWN, 1, new->video_pulldown);
-                if (err) return err;
-        }
         if (old == NULL || old->audio_properties != new->audio_properties) {
                 err = cx2341x_api(priv, func, CX2341X_ENC_SET_AUDIO_PROPERTIES, 1, new->audio_properties);
                 if (err) return err;
@@ -888,11 +876,10 @@ void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix)
                 printk(", Peak %d", p->video_bitrate_peak);
         }
         printk("\n");
-        printk(KERN_INFO "%s: Video:  GOP Size %d, %d B-Frames, %sGOP Closure, %s3:2 Pulldown\n",
+        printk(KERN_INFO "%s: Video:  GOP Size %d, %d B-Frames, %sGOP Closure\n",
                 prefix,
                 p->video_gop_size, p->video_b_frames,
-                p->video_gop_closure ? "" : "No ",
-                p->video_pulldown ? "" : "No ");
+                p->video_gop_closure ? "" : "No ");
         if (p->video_temporal_decimation) {
                 printk(KERN_INFO "%s: Video: Temporal Decimation %d\n",
                         prefix, p->video_temporal_decimation);
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 7bb7589a07c3..cc535ca713d2 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -628,17 +628,8 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         /* ioctls to allow direct access to the
          * cx25840 registers for testing */
-        case VIDIOC_INT_G_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
-
-                if (reg->i2c_id != I2C_DRIVERID_CX25840)
-                        return -EINVAL;
-                reg->val = cx25840_read(client, reg->reg & 0x0fff);
-                break;
-        }
-
-        case VIDIOC_INT_S_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
         {
                 struct v4l2_register *reg = arg;
 
@@ -646,7 +637,10 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                cx25840_write(client, reg->reg & 0x0fff, reg->val & 0xff);
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = cx25840_read(client, reg->reg & 0x0fff);
+                else
+                        cx25840_write(client, reg->reg & 0x0fff, reg->val & 0xff);
                 break;
         }
 #endif
@@ -893,9 +887,11 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
                 return 0;
         }
 
+        /* Note: revision '(device_id & 0x0f) == 2' was never built. The
+           marking skips from 0x1 == 22 to 0x3 == 23. */
         v4l_info(client, "cx25%3x-2%x found @ 0x%x (%s)\n",
                     (device_id & 0xfff0) >> 4,
-                    (device_id & 0x0f) < 3 ? (device_id & 0x0f) + 1 : 3,
+                    (device_id & 0x0f) < 3 ? (device_id & 0x0f) + 1 : (device_id & 0x0f),
                     address << 1, adapter->name);
 
         i2c_set_clientdata(client, state);
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index 639c3b659d0e..532cee35eb3c 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -12,8 +12,3 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
 EXTRA_CFLAGS += -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
-
-extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
-extra-cflags-$(CONFIG_VIDEO_CX88_VP3054)+= -DHAVE_VP3054_I2C=1
-
-EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 9a7a2996f20f..a1be1e279df4 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -6,6 +6,9 @@
  *    (c) 2004 Jelle Foks <jelle@foks.8m.com>
  *    (c) 2004 Gerd Knorr <kraxel@bytesex.org>
  *
+ *    (c) 2005-2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ *        - video_ioctl2 conversion
+ *
  *  Includes parts from the ivtv driver( http://ivtv.sourceforge.net/),
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -520,7 +523,7 @@ static void blackbird_codec_settings(struct cx8802_dev *dev)
 
         dev->params.width = dev->width;
         dev->params.height = dev->height;
-        dev->params.is_50hz = (dev->core->tvnorm->id & V4L2_STD_625_50) != 0;
+        dev->params.is_50hz = (dev->core->tvnorm & V4L2_STD_625_50) != 0;
 
         cx2341x_update(dev, blackbird_mbox_func, NULL, &dev->params);
 }
@@ -710,8 +713,13 @@ static int blackbird_queryctrl(struct cx8802_dev *dev, struct v4l2_queryctrl *qc
         return 0;
 }
 
-static int blackbird_querymenu(struct cx8802_dev *dev, struct v4l2_querymenu *qmenu)
+/* ------------------------------------------------------------------ */
+/* IOCTL Handlers                                                     */
+
+static int vidioc_querymenu (struct file *file, void *priv,
+                                struct v4l2_querymenu *qmenu)
 {
+        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
         struct v4l2_queryctrl qctrl;
 
         qctrl.id = qmenu->id;
@@ -719,221 +727,347 @@ static int blackbird_querymenu(struct cx8802_dev *dev, struct v4l2_querymenu *qm
         return v4l2_ctrl_query_menu(qmenu, &qctrl, cx2341x_ctrl_get_menu(qmenu->id));
 }
 
-/* ------------------------------------------------------------------ */
+static int vidioc_querycap (struct file *file, void  *priv,
+                                        struct v4l2_capability *cap)
+{
+        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
+        struct cx88_core  *core = dev->core;
 
-static int mpeg_do_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, void *arg)
+        strcpy(cap->driver, "cx88_blackbird");
+        strlcpy(cap->card, cx88_boards[core->board].name,sizeof(cap->card));
+        sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
+        cap->version = CX88_VERSION_CODE;
+        cap->capabilities =
+                V4L2_CAP_VIDEO_CAPTURE |
+                V4L2_CAP_READWRITE     |
+                V4L2_CAP_STREAMING;
+        if (UNSET != core->tuner_type)
+                cap->capabilities |= V4L2_CAP_TUNER;
+        return 0;
+}
+
+static int vidioc_enum_fmt_cap (struct file *file, void  *priv,
+                                        struct v4l2_fmtdesc *f)
 {
-        struct cx8802_fh  *fh  = file->private_data;
-        struct cx8802_dev *dev = fh->dev;
+        if (f->index != 0)
+                return -EINVAL;
+
+        strlcpy(f->description, "MPEG", sizeof(f->description));
+        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        f->pixelformat = V4L2_PIX_FMT_MPEG;
+        return 0;
+}
+
+static int vidioc_g_fmt_cap (struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct cx8802_fh  *fh   = priv;
+        struct cx8802_dev *dev  = fh->dev;
+
+        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+        f->fmt.pix.bytesperline = 0;
+        f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */
+        f->fmt.pix.colorspace   = 0;
+        f->fmt.pix.width        = dev->width;
+        f->fmt.pix.height       = dev->height;
+        f->fmt.pix.field        = fh->mpegq.field;
+        dprintk(0,"VIDIOC_G_FMT: w: %d, h: %d, f: %d\n",
+                dev->width, dev->height, fh->mpegq.field );
+        return 0;
+}
+
+static int vidioc_try_fmt_cap (struct file *file, void *priv,
+                        struct v4l2_format *f)
+{
+        struct cx8802_fh  *fh   = priv;
+        struct cx8802_dev *dev  = fh->dev;
+
+        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+        f->fmt.pix.bytesperline = 0;
+        f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */;
+        f->fmt.pix.colorspace   = 0;
+        dprintk(0,"VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n",
+                dev->width, dev->height, fh->mpegq.field );
+        return 0;
+}
+
+static int vidioc_s_fmt_cap (struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct cx8802_fh  *fh   = priv;
+        struct cx8802_dev *dev  = fh->dev;
         struct cx88_core  *core = dev->core;
 
-        if (debug > 1)
-                v4l_print_ioctl(core->name,cmd);
-
-        switch (cmd) {
-
-        /* --- capabilities ------------------------------------------ */
-        case VIDIOC_QUERYCAP:
-        {
-                struct v4l2_capability *cap = arg;
-
-                memset(cap,0,sizeof(*cap));
-                strcpy(cap->driver, "cx88_blackbird");
-                strlcpy(cap->card, cx88_boards[core->board].name,sizeof(cap->card));
-                sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
-                cap->version = CX88_VERSION_CODE;
-                cap->capabilities =
-                        V4L2_CAP_VIDEO_CAPTURE |
-                        V4L2_CAP_READWRITE     |
-                        V4L2_CAP_STREAMING     |
-                        0;
-                if (UNSET != core->tuner_type)
-                        cap->capabilities |= V4L2_CAP_TUNER;
+        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+        f->fmt.pix.bytesperline = 0;
+        f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */;
+        f->fmt.pix.colorspace   = 0;
+        dev->width              = f->fmt.pix.width;
+        dev->height             = f->fmt.pix.height;
+        fh->mpegq.field         = f->fmt.pix.field;
+        cx88_set_scale(core, f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field);
+        blackbird_api_cmd(dev, CX2341X_ENC_SET_FRAME_SIZE, 2, 0,
+                                f->fmt.pix.height, f->fmt.pix.width);
+        dprintk(0,"VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
+                f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field );
+        return 0;
+}
 
-                return 0;
-        }
+static int vidioc_reqbufs (struct file *file, void *priv, struct v4l2_requestbuffers *p)
+{
+        struct cx8802_fh  *fh   = priv;
+        return (videobuf_reqbufs(&fh->mpegq, p));
+}
 
-        /* --- capture ioctls ---------------------------------------- */
-        case VIDIOC_ENUM_FMT:
-        {
-                struct v4l2_fmtdesc *f = arg;
-                int index;
-
-                index = f->index;
-                if (index != 0)
-                        return -EINVAL;
-
-                memset(f,0,sizeof(*f));
-                f->index = index;
-                strlcpy(f->description, "MPEG", sizeof(f->description));
-                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                f->pixelformat = V4L2_PIX_FMT_MPEG;
-                return 0;
-        }
-        case VIDIOC_G_FMT:
-        {
-                struct v4l2_format *f = arg;
-
-                memset(f,0,sizeof(*f));
-                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
-                f->fmt.pix.bytesperline = 0;
-                f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */
-                f->fmt.pix.colorspace   = 0;
-                f->fmt.pix.width        = dev->width;
-                f->fmt.pix.height       = dev->height;
-                f->fmt.pix.field        = fh->mpegq.field;
-                dprintk(0,"VIDIOC_G_FMT: w: %d, h: %d, f: %d\n",
-                        dev->width, dev->height, fh->mpegq.field );
-                return 0;
-        }
-        case VIDIOC_TRY_FMT:
-        {
-                struct v4l2_format *f = arg;
-
-                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
-                f->fmt.pix.bytesperline = 0;
-                f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */;
-                f->fmt.pix.colorspace   = 0;
-                dprintk(0,"VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n",
-                        dev->width, dev->height, fh->mpegq.field );
-                return 0;
-        }
-        case VIDIOC_S_FMT:
-        {
-                struct v4l2_format *f = arg;
-
-                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
-                f->fmt.pix.bytesperline = 0;
-                f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count; /* 188 * 4 * 1024; */;
-                f->fmt.pix.colorspace   = 0;
-                dprintk(0,"VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
-                        f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field );
-                return 0;
-        }
+static int vidioc_querybuf (struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct cx8802_fh  *fh   = priv;
+        return (videobuf_querybuf(&fh->mpegq, p));
+}
 
-        /* --- streaming capture ------------------------------------- */
-        case VIDIOC_REQBUFS:
-                return videobuf_reqbufs(&fh->mpegq, arg);
+static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct cx8802_fh  *fh   = priv;
+        return (videobuf_qbuf(&fh->mpegq, p));
+}
 
-        case VIDIOC_QUERYBUF:
-                return videobuf_querybuf(&fh->mpegq, arg);
+static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct cx8802_fh  *fh   = priv;
+        return (videobuf_dqbuf(&fh->mpegq, p,
+                                file->f_flags & O_NONBLOCK));
+}
 
-        case VIDIOC_QBUF:
-                return videobuf_qbuf(&fh->mpegq, arg);
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+        struct cx8802_fh  *fh   = priv;
+        return videobuf_streamon(&fh->mpegq);
+}
 
-        case VIDIOC_DQBUF:
-                return videobuf_dqbuf(&fh->mpegq, arg,
-                                      file->f_flags & O_NONBLOCK);
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+        struct cx8802_fh  *fh   = priv;
+        return videobuf_streamoff(&fh->mpegq);
+}
 
-        case VIDIOC_STREAMON:
-                return videobuf_streamon(&fh->mpegq);
+static int vidioc_g_mpegcomp (struct file *file, void *fh,
+                              struct v4l2_mpeg_compression *f)
+{
+        printk(KERN_WARNING "VIDIOC_G_MPEGCOMP is obsolete. "
+                                "Replace with VIDIOC_G_EXT_CTRLS!");
+        memcpy(f,&default_mpeg_params,sizeof(*f));
+        return 0;
+}
 
-        case VIDIOC_STREAMOFF:
-                return videobuf_streamoff(&fh->mpegq);
+static int vidioc_s_mpegcomp (struct file *file, void *fh,
+                              struct v4l2_mpeg_compression *f)
+{
+        printk(KERN_WARNING "VIDIOC_S_MPEGCOMP is obsolete. "
+                                "Replace with VIDIOC_S_EXT_CTRLS!");
+        return 0;
+}
 
-        /* --- mpeg compression -------------------------------------- */
-        case VIDIOC_G_MPEGCOMP:
-        {
-                struct v4l2_mpeg_compression *f = arg;
+static int vidioc_g_ext_ctrls (struct file *file, void *priv,
+                               struct v4l2_ext_controls *f)
+{
+        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
 
-                printk(KERN_WARNING "VIDIOC_G_MPEGCOMP is obsolete. "
-                                    "Replace with VIDIOC_G_EXT_CTRLS!");
-                memcpy(f,&default_mpeg_params,sizeof(*f));
-                return 0;
-        }
-        case VIDIOC_S_MPEGCOMP:
-                printk(KERN_WARNING "VIDIOC_S_MPEGCOMP is obsolete. "
-                                    "Replace with VIDIOC_S_EXT_CTRLS!");
-                return 0;
-        case VIDIOC_G_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *f = arg;
+        if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
+                return -EINVAL;
+        return cx2341x_ext_ctrls(&dev->params, f, VIDIOC_G_EXT_CTRLS);
+}
 
-                if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
-                        return -EINVAL;
-                return cx2341x_ext_ctrls(&dev->params, f, cmd);
-        }
-        case VIDIOC_S_EXT_CTRLS:
-        case VIDIOC_TRY_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *f = arg;
-                struct cx2341x_mpeg_params p;
-                int err;
-
-                if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
-                        return -EINVAL;
-                p = dev->params;
-                err = cx2341x_ext_ctrls(&p, f, cmd);
-                if (err == 0 && cmd == VIDIOC_S_EXT_CTRLS) {
-                        err = cx2341x_update(dev, blackbird_mbox_func, &dev->params, &p);
-                        dev->params = p;
-                }
-                return err;
-        }
-        case VIDIOC_S_FREQUENCY:
-        {
-                blackbird_api_cmd(fh->dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,
-                                  BLACKBIRD_END_NOW,
-                                  BLACKBIRD_MPEG_CAPTURE,
-                                  BLACKBIRD_RAW_BITS_NONE);
-
-                cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, cx88_ioctl_hook);
-
-                blackbird_initialize_codec(dev);
-                cx88_set_scale(dev->core, dev->width, dev->height,
-                               fh->mpegq.field);
-                return 0;
+static int vidioc_s_ext_ctrls (struct file *file, void *priv,
+                               struct v4l2_ext_controls *f)
+{
+        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
+        struct cx2341x_mpeg_params p;
+        int err;
+
+        if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
+                return -EINVAL;
+        p = dev->params;
+        err = cx2341x_ext_ctrls(&p, f, VIDIOC_S_EXT_CTRLS);
+        if (!err) {
+                err = cx2341x_update(dev, blackbird_mbox_func, &dev->params, &p);
+                dev->params = p;
         }
-        case VIDIOC_LOG_STATUS:
-        {
-                char name[32 + 2];
-
-                snprintf(name, sizeof(name), "%s/2", core->name);
-                printk("%s/2: ============  START LOG STATUS  ============\n",
-                       core->name);
-                cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, NULL);
-                cx2341x_log_status(&dev->params, name);
-                printk("%s/2: =============  END LOG STATUS  =============\n",
-                       core->name);
+        return err;
+}
+
+static int vidioc_try_ext_ctrls (struct file *file, void *priv,
+                               struct v4l2_ext_controls *f)
+{
+        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
+        struct cx2341x_mpeg_params p;
+        int err;
+
+        if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
+                return -EINVAL;
+        p = dev->params;
+        err = cx2341x_ext_ctrls(&p, f, VIDIOC_TRY_EXT_CTRLS);
+
+        return err;
+}
+
+static int vidioc_s_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct cx8802_fh  *fh   = priv;
+        struct cx8802_dev *dev  = fh->dev;
+        struct cx88_core  *core = dev->core;
+
+        blackbird_api_cmd(fh->dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,
+                                BLACKBIRD_END_NOW,
+                                BLACKBIRD_MPEG_CAPTURE,
+                                BLACKBIRD_RAW_BITS_NONE);
+        cx88_set_freq (core,f);
+        blackbird_initialize_codec(dev);
+        cx88_set_scale(dev->core, dev->width, dev->height,
+                        fh->mpegq.field);
+        return 0;
+}
+
+static int vidioc_log_status (struct file *file, void *priv)
+{
+        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
+        struct cx88_core  *core = dev->core;
+        char name[32 + 2];
+
+        snprintf(name, sizeof(name), "%s/2", core->name);
+        printk("%s/2: ============  START LOG STATUS  ============\n",
+                core->name);
+        cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, NULL);
+        cx2341x_log_status(&dev->params, name);
+        printk("%s/2: =============  END LOG STATUS  =============\n",
+                core->name);
+        return 0;
+}
+
+static int vidioc_queryctrl (struct file *file, void *priv,
+                                struct v4l2_queryctrl *qctrl)
+{
+        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
+
+        if (blackbird_queryctrl(dev, qctrl) == 0)
                 return 0;
-        }
-        case VIDIOC_QUERYMENU:
-                return blackbird_querymenu(dev, arg);
-        case VIDIOC_QUERYCTRL:
-        {
-                struct v4l2_queryctrl *c = arg;
 
-                if (blackbird_queryctrl(dev, c) == 0)
-                        return 0;
-                return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl);
-        }
+        qctrl->id = v4l2_ctrl_next(ctrl_classes, qctrl->id);
+        if (unlikely(qctrl->id == 0))
+                return -EINVAL;
+        return cx8800_ctrl_query(qctrl);
+}
 
-        default:
-                return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, cx88_ioctl_hook);
-        }
+static int vidioc_enum_input (struct file *file, void *priv,
+                                struct v4l2_input *i)
+{
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        return cx88_enum_input (core,i);
+}
+
+static int vidioc_g_ctrl (struct file *file, void *priv,
+                                struct v4l2_control *ctl)
+{
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        return
+                cx88_get_control(core,ctl);
+}
+
+static int vidioc_s_ctrl (struct file *file, void *priv,
+                                struct v4l2_control *ctl)
+{
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        return
+                cx88_set_control(core,ctl);
+}
+
+static int vidioc_g_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct cx8802_fh  *fh   = priv;
+        struct cx88_core  *core = fh->dev->core;
+
+        if (unlikely(UNSET == core->tuner_type))
+                return -EINVAL;
+
+        f->type = V4L2_TUNER_ANALOG_TV;
+        f->frequency = core->freq;
+        cx88_call_i2c_clients(core,VIDIOC_G_FREQUENCY,f);
+
+        return 0;
+}
+
+static int vidioc_g_input (struct file *file, void *priv, unsigned int *i)
+{
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+
+        *i = core->input;
+        return 0;
+}
+
+static int vidioc_s_input (struct file *file, void *priv, unsigned int i)
+{
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+
+        if (i >= 4)
+                return -EINVAL;
+
+        mutex_lock(&core->lock);
+        cx88_newstation(core);
+        cx88_video_mux(core,i);
+        mutex_unlock(&core->lock);
         return 0;
 }
 
-int (*cx88_ioctl_hook)(struct inode *inode, struct file *file,
-                        unsigned int cmd, void *arg);
-unsigned int (*cx88_ioctl_translator)(unsigned int cmd);
+static int vidioc_g_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *t)
+{
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        u32 reg;
+
+        if (unlikely(UNSET == core->tuner_type))
+                return -EINVAL;
+
+        strcpy(t->name, "Television");
+        t->type       = V4L2_TUNER_ANALOG_TV;
+        t->capability = V4L2_TUNER_CAP_NORM;
+        t->rangehigh  = 0xffffffffUL;
+
+        cx88_get_stereo(core ,t);
+        reg = cx_read(MO_DEVICE_STATUS);
+        t->signal = (reg & (1<<5)) ? 0xffff : 0x0000;
+        return 0;
+}
 
-static unsigned int mpeg_translate_ioctl(unsigned int cmd)
+static int vidioc_s_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *t)
 {
-        return cmd;
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+
+        if (UNSET == core->tuner_type)
+                return -EINVAL;
+        if (0 != t->index)
+                return -EINVAL;
+
+        cx88_set_stereo(core, t->audmode, 1);
+        return 0;
 }
 
-static int mpeg_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
+static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
 {
-        cmd = cx88_ioctl_translator( cmd );
-        return video_usercopy(inode, file, cmd, arg, cx88_ioctl_hook);
+        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+
+        mutex_lock(&core->lock);
+        cx88_set_tvnorm(core,*id);
+        mutex_unlock(&core->lock);
+        return 0;
 }
 
+/* FIXME: cx88_ioctl_hook not implemented */
+
 static int mpeg_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
@@ -1059,17 +1193,47 @@ static const struct file_operations mpeg_fops =
         .read          = mpeg_read,
         .poll          = mpeg_poll,
         .mmap          = mpeg_mmap,
-        .ioctl         = mpeg_ioctl,
+        .ioctl         = video_ioctl2,
         .llseek        = no_llseek,
 };
 
 static struct video_device cx8802_mpeg_template =
 {
-        .name          = "cx8802",
-        .type          = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES|VID_TYPE_MPEG_ENCODER,
-        .hardware      = 0,
-        .fops          = &mpeg_fops,
-        .minor         = -1,
+        .name                 = "cx8802",
+        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES|VID_TYPE_MPEG_ENCODER,
+        .fops                 = &mpeg_fops,
+        .minor                = -1,
+        .vidioc_querymenu     = vidioc_querymenu,
+        .vidioc_querycap      = vidioc_querycap,
+        .vidioc_enum_fmt_cap  = vidioc_enum_fmt_cap,
+        .vidioc_g_fmt_cap     = vidioc_g_fmt_cap,
+        .vidioc_try_fmt_cap   = vidioc_try_fmt_cap,
+        .vidioc_s_fmt_cap     = vidioc_s_fmt_cap,
+        .vidioc_reqbufs       = vidioc_reqbufs,
+        .vidioc_querybuf      = vidioc_querybuf,
+        .vidioc_qbuf          = vidioc_qbuf,
+        .vidioc_dqbuf         = vidioc_dqbuf,
+        .vidioc_streamon      = vidioc_streamon,
+        .vidioc_streamoff     = vidioc_streamoff,
+        .vidioc_g_mpegcomp    = vidioc_g_mpegcomp,
+        .vidioc_s_mpegcomp    = vidioc_s_mpegcomp,
+        .vidioc_g_ext_ctrls   = vidioc_g_ext_ctrls,
+        .vidioc_s_ext_ctrls   = vidioc_s_ext_ctrls,
+        .vidioc_try_ext_ctrls = vidioc_try_ext_ctrls,
+        .vidioc_s_frequency   = vidioc_s_frequency,
+        .vidioc_log_status    = vidioc_log_status,
+        .vidioc_queryctrl     = vidioc_queryctrl,
+        .vidioc_enum_input    = vidioc_enum_input,
+        .vidioc_g_ctrl        = vidioc_g_ctrl,
+        .vidioc_s_ctrl        = vidioc_s_ctrl,
+        .vidioc_g_frequency   = vidioc_g_frequency,
+        .vidioc_g_input       = vidioc_g_input,
+        .vidioc_s_input       = vidioc_s_input,
+        .vidioc_g_tuner       = vidioc_g_tuner,
+        .vidioc_s_tuner       = vidioc_s_tuner,
+        .vidioc_s_std         = vidioc_s_std,
+        .tvnorms              = CX88_NORMS,
+       .current_norm         = V4L2_STD_NTSC_M,
 };
 
 /* ------------------------------------------------------------------ */
@@ -1164,7 +1328,9 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
         cx2341x_fill_defaults(&dev->params);
         dev->params.port = CX2341X_PORT_STREAMING;
 
-        if (core->tvnorm->id & V4L2_STD_525_60) {
+        cx8802_mpeg_template.current_norm = core->tvnorm;
+
+        if (core->tvnorm & V4L2_STD_525_60) {
                 dev->height = 480;
         } else {
                 dev->height = 576;
@@ -1178,6 +1344,11 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
         blackbird_register_video(dev);
 
         /* initial device configuration: needed ? */
+        mutex_lock(&dev->core->lock);
+//      init_controls(core);
+        cx88_set_tvnorm(core,core->tvnorm);
+        cx88_video_mux(core,0);
+        mutex_unlock(&dev->core->lock);
 
         return 0;
 
@@ -1212,8 +1383,6 @@ static int blackbird_init(void)
         printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
                SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
 #endif
-        cx88_ioctl_hook = mpeg_do_ioctl;
-        cx88_ioctl_translator = mpeg_translate_ioctl;
         return cx8802_register_driver(&cx8802_blackbird_driver);
 }
 
@@ -1225,8 +1394,8 @@ static void blackbird_fini(void)
 module_init(blackbird_init);
 module_exit(blackbird_fini);
 
-EXPORT_SYMBOL(cx88_ioctl_hook);
-EXPORT_SYMBOL(cx88_ioctl_translator);
+module_param_named(video_debug,cx8802_mpeg_template.debug, int, 0644);
+MODULE_PARM_DESC(debug,"enable debug messages [video]");
 
 /* ----------------------------------------------------------- */
 /*
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 434b78ab37d8..65e9d8096b74 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -764,6 +764,12 @@ struct cx88_board cx88_boards[] = {
                 .input          = {{
                         .type   = CX88_VMUX_DVB,
                         .vmux   = 0,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 2,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
                 }},
                 .mpeg           = CX88_MPEG_DVB,
         },
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 18997361c75a..d86813be56de 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -5,6 +5,11 @@
  *
  * (c) 2003 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
+ * (c) 2005-2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ *     - Multituner support
+ *     - video_ioctl2 conversion
+ *     - PAL/M fixes
+ *
  *  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
@@ -631,30 +636,30 @@ int cx88_reset(struct cx88_core *core)
 
 /* ------------------------------------------------------------------ */
 
-static unsigned int inline norm_swidth(struct cx88_tvnorm *norm)
+static unsigned int inline norm_swidth(v4l2_std_id norm)
 {
-        return (norm->id & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 754 : 922;
+        return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 754 : 922;
 }
 
-static unsigned int inline norm_hdelay(struct cx88_tvnorm *norm)
+static unsigned int inline norm_hdelay(v4l2_std_id norm)
 {
-        return (norm->id & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 135 : 186;
+        return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 135 : 186;
 }
 
-static unsigned int inline norm_vdelay(struct cx88_tvnorm *norm)
+static unsigned int inline norm_vdelay(v4l2_std_id norm)
 {
-        return (norm->id & V4L2_STD_625_50) ? 0x24 : 0x18;
+        return (norm & V4L2_STD_625_50) ? 0x24 : 0x18;
 }
 
-static unsigned int inline norm_fsc8(struct cx88_tvnorm *norm)
+static unsigned int inline norm_fsc8(v4l2_std_id norm)
 {
-        if (norm->id & V4L2_STD_PAL_M)
+        if (norm & V4L2_STD_PAL_M)
                 return 28604892;      // 3.575611 MHz
 
-        if (norm->id & (V4L2_STD_PAL_Nc))
+        if (norm & (V4L2_STD_PAL_Nc))
                 return 28656448;      // 3.582056 MHz
 
-        if (norm->id & V4L2_STD_NTSC) // All NTSC/M and variants
+        if (norm & V4L2_STD_NTSC) // All NTSC/M and variants
                 return 28636360;      // 3.57954545 MHz +/- 10 Hz
 
         /* SECAM have also different sub carrier for chroma,
@@ -666,20 +671,20 @@ static unsigned int inline norm_fsc8(struct cx88_tvnorm *norm)
         return 35468950;      // 4.43361875 MHz +/- 5 Hz
 }
 
-static unsigned int inline norm_htotal(struct cx88_tvnorm *norm)
+static unsigned int inline norm_htotal(v4l2_std_id norm)
 {
 
         unsigned int fsc4=norm_fsc8(norm)/2;
 
         /* returns 4*FSC / vtotal / frames per seconds */
-        return (norm->id & V4L2_STD_625_50) ?
+        return (norm & V4L2_STD_625_50) ?
                                 ((fsc4+312)/625+12)/25 :
                                 ((fsc4+262)/525*1001+15000)/30000;
 }
 
-static unsigned int inline norm_vbipack(struct cx88_tvnorm *norm)
+static unsigned int inline norm_vbipack(v4l2_std_id norm)
 {
-        return (norm->id & V4L2_STD_625_50) ? 511 : 400;
+        return (norm & V4L2_STD_625_50) ? 511 : 400;
 }
 
 int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height,
@@ -692,7 +697,7 @@ int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int heig
         dprintk(1,"set_scale: %dx%d [%s%s,%s]\n", width, height,
                 V4L2_FIELD_HAS_TOP(field)    ? "T" : "",
                 V4L2_FIELD_HAS_BOTTOM(field) ? "B" : "",
-                core->tvnorm->name);
+                v4l2_norm_to_name(core->tvnorm));
         if (!V4L2_FIELD_HAS_BOTH(field))
                 height *= 2;
 
@@ -729,7 +734,7 @@ int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int heig
         // setup filters
         value = 0;
         value |= (1 << 19);        // CFILT (default)
-        if (core->tvnorm->id & V4L2_STD_SECAM) {
+        if (core->tvnorm & V4L2_STD_SECAM) {
                 value |= (1 << 15);
                 value |= (1 << 16);
         }
@@ -826,36 +831,36 @@ int cx88_stop_audio_dma(struct cx88_core *core)
 
 static int set_tvaudio(struct cx88_core *core)
 {
-        struct cx88_tvnorm *norm = core->tvnorm;
+        v4l2_std_id norm = core->tvnorm;
 
         if (CX88_VMUX_TELEVISION != INPUT(core->input)->type)
                 return 0;
 
-        if (V4L2_STD_PAL_BG & norm->id) {
+        if (V4L2_STD_PAL_BG & norm) {
                 core->tvaudio = WW_BG;
 
-        } else if (V4L2_STD_PAL_DK & norm->id) {
+        } else if (V4L2_STD_PAL_DK & norm) {
                 core->tvaudio = WW_DK;
 
-        } else if (V4L2_STD_PAL_I & norm->id) {
+        } else if (V4L2_STD_PAL_I & norm) {
                 core->tvaudio = WW_I;
 
-        } else if (V4L2_STD_SECAM_L & norm->id) {
+        } else if (V4L2_STD_SECAM_L & norm) {
                 core->tvaudio = WW_L;
 
-        } else if (V4L2_STD_SECAM_DK & norm->id) {
+        } else if (V4L2_STD_SECAM_DK & norm) {
                 core->tvaudio = WW_DK;
 
-        } else if ((V4L2_STD_NTSC_M & norm->id) ||
-                   (V4L2_STD_PAL_M  & norm->id)) {
+        } else if ((V4L2_STD_NTSC_M & norm) ||
+                   (V4L2_STD_PAL_M  & norm)) {
                 core->tvaudio = WW_BTSC;
 
-        } else if (V4L2_STD_NTSC_M_JP & norm->id) {
+        } else if (V4L2_STD_NTSC_M_JP & norm) {
                 core->tvaudio = WW_EIAJ;
 
         } else {
                 printk("%s/0: tvaudio support needs work for this tv norm [%s], sorry\n",
-                       core->name, norm->name);
+                       core->name, v4l2_norm_to_name(core->tvnorm));
                 core->tvaudio = 0;
                 return 0;
         }
@@ -874,7 +879,7 @@ static int set_tvaudio(struct cx88_core *core)
 
 
 
-int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm)
+int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm)
 {
         u32 fsc8;
         u32 adc_clock;
@@ -882,6 +887,7 @@ int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm)
         u32 step_db,step_dr;
         u64 tmp64;
         u32 bdelay,agcdelay,htotal;
+        u32 cxiformat, cxoformat;
 
         core->tvnorm = norm;
         fsc8       = norm_fsc8(norm);
@@ -890,23 +896,51 @@ int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm)
         step_db    = fsc8;
         step_dr    = fsc8;
 
-        if (norm->id & V4L2_STD_SECAM) {
+        if (norm & V4L2_STD_NTSC_M_JP) {
+                cxiformat = VideoFormatNTSCJapan;
+                cxoformat = 0x181f0008;
+        } else if (norm & V4L2_STD_NTSC_443) {
+                cxiformat = VideoFormatNTSC443;
+                cxoformat = 0x181f0008;
+        } else if (norm & V4L2_STD_PAL_M) {
+                cxiformat = VideoFormatPALM;
+                cxoformat = 0x1c1f0008;
+        } else if (norm & V4L2_STD_PAL_N) {
+                cxiformat = VideoFormatPALN;
+                cxoformat = 0x1c1f0008;
+        } else if (norm & V4L2_STD_PAL_Nc) {
+                cxiformat = VideoFormatPALNC;
+                cxoformat = 0x1c1f0008;
+        } else if (norm & V4L2_STD_PAL_60) {
+                cxiformat = VideoFormatPAL60;
+                cxoformat = 0x181f0008;
+        } else if (norm & V4L2_STD_NTSC) {
+                cxiformat = VideoFormatNTSC;
+                cxoformat = 0x181f0008;
+        } else if (norm & V4L2_STD_SECAM) {
                 step_db = 4250000 * 8;
                 step_dr = 4406250 * 8;
+
+                cxiformat = VideoFormatSECAM;
+                cxoformat = 0x181f0008;
+        } else { /* PAL */
+                cxiformat = VideoFormatPAL;
+                cxoformat = 0x181f0008;
         }
 
         dprintk(1,"set_tvnorm: \"%s\" fsc8=%d adc=%d vdec=%d db/dr=%d/%d\n",
-                norm->name, fsc8, adc_clock, vdec_clock, step_db, step_dr);
+                v4l2_norm_to_name(core->tvnorm), fsc8, adc_clock, vdec_clock,
+                step_db, step_dr);
         set_pll(core,2,vdec_clock);
 
         dprintk(1,"set_tvnorm: MO_INPUT_FORMAT  0x%08x [old=0x%08x]\n",
-                norm->cxiformat, cx_read(MO_INPUT_FORMAT) & 0x0f);
-        cx_andor(MO_INPUT_FORMAT, 0xf, norm->cxiformat);
+                cxiformat, cx_read(MO_INPUT_FORMAT) & 0x0f);
+        cx_andor(MO_INPUT_FORMAT, 0xf, cxiformat);
 
         // FIXME: as-is from DScaler
         dprintk(1,"set_tvnorm: MO_OUTPUT_FORMAT 0x%08x [old=0x%08x]\n",
-                norm->cxoformat, cx_read(MO_OUTPUT_FORMAT));
-        cx_write(MO_OUTPUT_FORMAT, norm->cxoformat);
+                cxoformat, cx_read(MO_OUTPUT_FORMAT));
+        cx_write(MO_OUTPUT_FORMAT, cxoformat);
 
         // MO_SCONV_REG = adc clock / video dec clock * 2^17
         tmp64  = adc_clock * (u64)(1 << 17);
@@ -955,7 +989,7 @@ int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm)
         set_tvaudio(core);
 
         // tell i2c chips
-        cx88_call_i2c_clients(core,VIDIOC_S_STD,&norm->id);
+        cx88_call_i2c_clients(core,VIDIOC_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 8b203354fccd..4f5560285770 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -35,7 +35,7 @@
 
 #include "mt352.h"
 #include "mt352_priv.h"
-#ifdef HAVE_VP3054_I2C
+#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
 # include "cx88-vp3054-i2c.h"
 #endif
 #include "zl10353.h"
@@ -200,7 +200,7 @@ static struct mt352_config dvico_fusionhdtv_dual = {
         .demod_init    = dvico_dual_demod_init,
 };
 
-#ifdef HAVE_VP3054_I2C
+#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
 static int dntv_live_dvbt_pro_demod_init(struct dvb_frontend* fe)
 {
         static u8 clock_config []  = { 0x89, 0x38, 0x38 };
@@ -543,7 +543,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 }
                 break;
         case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
-#ifdef HAVE_VP3054_I2C
+#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
                 dev->core->pll_addr = 0x61;
                 dev->core->pll_desc = &dvb_pll_fmd1216me;
                 dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,
@@ -793,7 +793,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
         if (!(cx88_boards[core->board].mpeg & CX88_MPEG_DVB))
                 goto fail_core;
 
-#ifdef HAVE_VP3054_I2C
+#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
         err = vp3054_i2c_probe(dev);
         if (0 != err)
                 goto fail_core;
@@ -822,7 +822,7 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv)
         /* dvb */
         videobuf_dvb_unregister(&dev->dvb);
 
-#ifdef HAVE_VP3054_I2C
+#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
         vp3054_i2c_remove(dev);
 #endif
 
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 88af23a93870..9830d5c43921 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -145,6 +145,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
         if (0 != core->i2c_rc)
                 return;
 
+#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
         if ( (core->dvbdev) && (core->dvbdev->dvb.frontend) ) {
                 if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)
                         core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
@@ -154,6 +155,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
                 if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)
                         core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
         } else
+#endif
                 i2c_clients_command(&core->i2c_adap, cmd, arg);
 }
 
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 063df03dcf2e..97ef421dd093 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -797,55 +797,6 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
        Add some code here later.
 */
 
-# if 0
-        t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP |
-            V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
-        t->rxsubchans = V4L2_TUNER_SUB_MONO;
-        t->audmode = V4L2_TUNER_MODE_MONO;
-
-        switch (core->tvaudio) {
-        case WW_BTSC:
-                t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP;
-                t->rxsubchans = V4L2_TUNER_SUB_STEREO;
-                if (1 == pilot) {
-                        /* SAP */
-                        t->rxsubchans |= V4L2_TUNER_SUB_SAP;
-                }
-                break;
-        case WW_A2_BG:
-        case WW_A2_DK:
-        case WW_A2_M:
-                if (1 == pilot) {
-                        /* stereo */
-                        t->rxsubchans =
-                            V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-                        if (0 == mode)
-                                t->audmode = V4L2_TUNER_MODE_STEREO;
-                }
-                if (2 == pilot) {
-                        /* dual language -- FIXME */
-                        t->rxsubchans =
-                            V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
-                        t->audmode = V4L2_TUNER_MODE_LANG1;
-                }
-                break;
-        case WW_NICAM_BGDKL:
-                if (0 == mode) {
-                        t->audmode = V4L2_TUNER_MODE_STEREO;
-                        t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
-                }
-                break;
-        case WW_SYSTEM_L_AM:
-                if (0x0 == mode && !(cx_read(AUD_INIT) & 0x04)) {
-                        t->audmode = V4L2_TUNER_MODE_STEREO;
-                        t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
-                }
-                break;
-        default:
-                /* nothing */
-                break;
-        }
-# endif
         return;
 }
 
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index aa2a69770098..86c1cf8334bc 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -21,9 +21,11 @@ MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]");
 
 /* ------------------------------------------------------------------ */
 
-void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
+int cx8800_vbi_fmt (struct file *file, void *priv,
+                                        struct v4l2_format *f)
 {
-        memset(&f->fmt.vbi,0,sizeof(f->fmt.vbi));
+        struct cx8800_fh  *fh   = priv;
+        struct cx8800_dev *dev  = fh->dev;
 
         f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
         f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
@@ -31,18 +33,19 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
         f->fmt.vbi.count[0] = VBI_LINE_COUNT;
         f->fmt.vbi.count[1] = VBI_LINE_COUNT;
 
-        if (dev->core->tvnorm->id & V4L2_STD_525_60) {
+        if (dev->core->tvnorm & V4L2_STD_525_60) {
                 /* ntsc */
                 f->fmt.vbi.sampling_rate = 28636363;
                 f->fmt.vbi.start[0] = 10;
                 f->fmt.vbi.start[1] = 273;
 
-        } else if (dev->core->tvnorm->id & V4L2_STD_625_50) {
+        } else if (dev->core->tvnorm & V4L2_STD_625_50) {
                 /* pal */
                 f->fmt.vbi.sampling_rate = 35468950;
                 f->fmt.vbi.start[0] = 7 -1;
                 f->fmt.vbi.start[1] = 319 -1;
         }
+        return 0;
 }
 
 static int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index c86a7e06235b..a97be1bdc31d 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1,3 +1,4 @@
+
 /*
  *
  * device driver for Conexant 2388x based TV cards
@@ -5,6 +6,11 @@
  *
  * (c) 2003-04 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
+ * (c) 2005-2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ *      - Multituner support
+ *      - video_ioctl2 conversion
+ *      - PAL/M fixes
+ *
  *  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
@@ -80,65 +86,6 @@ static LIST_HEAD(cx8800_devlist);
 /* ------------------------------------------------------------------- */
 /* static data                                                         */
 
-static struct cx88_tvnorm tvnorms[] = {
-        {
-                .name      = "NTSC-M",
-                .id        = V4L2_STD_NTSC_M,
-                .cxiformat = VideoFormatNTSC,
-                .cxoformat = 0x181f0008,
-        },{
-                .name      = "NTSC-JP",
-                .id        = V4L2_STD_NTSC_M_JP,
-                .cxiformat = VideoFormatNTSCJapan,
-                .cxoformat = 0x181f0008,
-        },{
-                .name      = "PAL-BG",
-                .id        = V4L2_STD_PAL_BG,
-                .cxiformat = VideoFormatPAL,
-                .cxoformat = 0x181f0008,
-        },{
-                .name      = "PAL-DK",
-                .id        = V4L2_STD_PAL_DK,
-                .cxiformat = VideoFormatPAL,
-                .cxoformat = 0x181f0008,
-        },{
-                .name      = "PAL-I",
-                .id        = V4L2_STD_PAL_I,
-                .cxiformat = VideoFormatPAL,
-                .cxoformat = 0x181f0008,
-        },{
-                .name      = "PAL-M",
-                .id        = V4L2_STD_PAL_M,
-                .cxiformat = VideoFormatPALM,
-                .cxoformat = 0x1c1f0008,
-        },{
-                .name      = "PAL-N",
-                .id        = V4L2_STD_PAL_N,
-                .cxiformat = VideoFormatPALN,
-                .cxoformat = 0x1c1f0008,
-        },{
-                .name      = "PAL-Nc",
-                .id        = V4L2_STD_PAL_Nc,
-                .cxiformat = VideoFormatPALNC,
-                .cxoformat = 0x1c1f0008,
-        },{
-                .name      = "PAL-60",
-                .id        = V4L2_STD_PAL_60,
-                .cxiformat = VideoFormatPAL60,
-                .cxoformat = 0x181f0008,
-        },{
-                .name      = "SECAM-L",
-                .id        = V4L2_STD_SECAM_L,
-                .cxiformat = VideoFormatSECAM,
-                .cxoformat = 0x181f0008,
-        },{
-                .name      = "SECAM-DK",
-                .id        = V4L2_STD_SECAM_DK,
-                .cxiformat = VideoFormatSECAM,
-                .cxoformat = 0x181f0008,
-        }
-};
-
 static struct cx8800_fmt formats[] = {
         {
                 .name     = "8 bpp, gray",
@@ -364,14 +311,6 @@ int cx8800_ctrl_query(struct v4l2_queryctrl *qctrl)
 }
 EXPORT_SYMBOL(cx8800_ctrl_query);
 
-static int cx88_queryctrl(struct v4l2_queryctrl *qctrl)
-{
-        qctrl->id = v4l2_ctrl_next(ctrl_classes, qctrl->id);
-        if (qctrl->id == 0)
-                return -EINVAL;
-        return cx8800_ctrl_query(qctrl);
-}
-
 /* ------------------------------------------------------------------- */
 /* resource management                                                 */
 
@@ -424,8 +363,7 @@ void res_free(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bits)
 
 /* ------------------------------------------------------------------ */
 
-/* static int video_mux(struct cx8800_dev *dev, unsigned int input) */
-static int video_mux(struct cx88_core *core, unsigned int input)
+int cx88_video_mux(struct cx88_core *core, unsigned int input)
 {
         /* struct cx88_core *core = dev->core; */
 
@@ -464,6 +402,7 @@ static int video_mux(struct cx88_core *core, unsigned int input)
         }
         return 0;
 }
+EXPORT_SYMBOL(cx88_video_mux);
 
 /* ------------------------------------------------------------------ */
 
@@ -944,19 +883,18 @@ video_mmap(struct file *file, struct vm_area_struct * vma)
 }
 
 /* ------------------------------------------------------------------ */
+/* VIDEO CTRL IOCTLS                                                  */
 
-/* static int get_control(struct cx8800_dev *dev, struct v4l2_control *ctl) */
-static int get_control(struct cx88_core *core, struct v4l2_control *ctl)
+int cx88_get_control (struct cx88_core  *core, struct v4l2_control *ctl)
 {
-        /* struct cx88_core *core = dev->core; */
-        struct cx88_ctrl *c = NULL;
+        struct cx88_ctrl  *c    = NULL;
         u32 value;
         int i;
 
         for (i = 0; i < CX8800_CTLS; i++)
                 if (cx8800_ctls[i].v.id == ctl->id)
                         c = &cx8800_ctls[i];
-        if (NULL == c)
+        if (unlikely(NULL == c))
                 return -EINVAL;
 
         value = c->sreg ? cx_sread(c->sreg) : cx_read(c->reg);
@@ -977,20 +915,20 @@ static int get_control(struct cx88_core *core, struct v4l2_control *ctl)
                                 value,c->mask, c->sreg ? " [shadowed]" : "");
         return 0;
 }
+EXPORT_SYMBOL(cx88_get_control);
 
-/* static int set_control(struct cx8800_dev *dev, struct v4l2_control *ctl) */
-static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
+int cx88_set_control(struct cx88_core *core, struct v4l2_control *ctl)
 {
-        /* struct cx88_core *core = dev->core; */
         struct cx88_ctrl *c = NULL;
         u32 value,mask;
         int i;
+
         for (i = 0; i < CX8800_CTLS; i++) {
                 if (cx8800_ctls[i].v.id == ctl->id) {
                         c = &cx8800_ctls[i];
                 }
         }
-        if (NULL == c)
+        if (unlikely(NULL == c))
                 return -EINVAL;
 
         if (ctl->value < c->v.minimum)
@@ -1010,7 +948,7 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
 
                 value = ((ctl->value - c->off) << c->shift) & c->mask;
 
-                if (core->tvnorm->id & V4L2_STD_SECAM) {
+                if (core->tvnorm & V4L2_STD_SECAM) {
                         /* For SECAM, both U and V sat should be equal */
                         value=value<<8|value;
                 } else {
@@ -1033,6 +971,7 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
         }
         return 0;
 }
+EXPORT_SYMBOL(cx88_set_control);
 
 static void init_controls(struct cx88_core *core)
 {
@@ -1042,648 +981,531 @@ static void init_controls(struct cx88_core *core)
         for (i = 0; i < CX8800_CTLS; i++) {
                 ctrl.id=cx8800_ctls[i].v.id;
                 ctrl.value=cx8800_ctls[i].v.default_value;
-                set_control(core, &ctrl);
+
+                cx88_set_control(core, &ctrl);
         }
 }
 
 /* ------------------------------------------------------------------ */
+/* VIDEO IOCTLS                                                       */
 
-static int cx8800_g_fmt(struct cx8800_dev *dev, struct cx8800_fh *fh,
+static int vidioc_g_fmt_cap (struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct cx8800_fh  *fh   = priv;
+
+        f->fmt.pix.width        = fh->width;
+        f->fmt.pix.height       = fh->height;
+        f->fmt.pix.field        = fh->vidq.field;
+        f->fmt.pix.pixelformat  = fh->fmt->fourcc;
+        f->fmt.pix.bytesperline =
+                (f->fmt.pix.width * fh->fmt->depth) >> 3;
+        f->fmt.pix.sizeimage =
+                f->fmt.pix.height * f->fmt.pix.bytesperline;
+        return 0;
+}
+
+static int vidioc_try_fmt_cap (struct file *file, void *priv,
                         struct v4l2_format *f)
 {
-        switch (f->type) {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                memset(&f->fmt.pix,0,sizeof(f->fmt.pix));
-                f->fmt.pix.width        = fh->width;
-                f->fmt.pix.height       = fh->height;
-                f->fmt.pix.field        = fh->vidq.field;
-                f->fmt.pix.pixelformat  = fh->fmt->fourcc;
-                f->fmt.pix.bytesperline =
-                        (f->fmt.pix.width * fh->fmt->depth) >> 3;
-                f->fmt.pix.sizeimage =
-                        f->fmt.pix.height * f->fmt.pix.bytesperline;
-                return 0;
-        case V4L2_BUF_TYPE_VBI_CAPTURE:
-                cx8800_vbi_fmt(dev, f);
-                return 0;
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_fmt *fmt;
+        enum v4l2_field   field;
+        unsigned int      maxw, maxh;
+
+        fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+        if (NULL == fmt)
+                return -EINVAL;
+
+        field = f->fmt.pix.field;
+        maxw  = norm_maxw(core->tvnorm);
+        maxh  = norm_maxh(core->tvnorm);
+
+        if (V4L2_FIELD_ANY == field) {
+                field = (f->fmt.pix.height > maxh/2)
+                        ? V4L2_FIELD_INTERLACED
+                        : V4L2_FIELD_BOTTOM;
+        }
+
+        switch (field) {
+        case V4L2_FIELD_TOP:
+        case V4L2_FIELD_BOTTOM:
+                maxh = maxh / 2;
+                break;
+        case V4L2_FIELD_INTERLACED:
+                break;
         default:
                 return -EINVAL;
         }
+
+        f->fmt.pix.field = field;
+        if (f->fmt.pix.height < 32)
+                f->fmt.pix.height = 32;
+        if (f->fmt.pix.height > maxh)
+                f->fmt.pix.height = maxh;
+        if (f->fmt.pix.width < 48)
+                f->fmt.pix.width = 48;
+        if (f->fmt.pix.width > maxw)
+                f->fmt.pix.width = maxw;
+        f->fmt.pix.width &= ~0x03;
+        f->fmt.pix.bytesperline =
+                (f->fmt.pix.width * fmt->depth) >> 3;
+        f->fmt.pix.sizeimage =
+                f->fmt.pix.height * f->fmt.pix.bytesperline;
+
+        return 0;
 }
 
-static int cx8800_try_fmt(struct cx8800_dev *dev, struct cx8800_fh *fh,
-                          struct v4l2_format *f)
+static int vidioc_s_fmt_cap (struct file *file, void *priv,
+                                        struct v4l2_format *f)
 {
-        struct cx88_core *core = dev->core;
+        struct cx8800_fh  *fh   = priv;
+        int err = vidioc_try_fmt_cap (file,priv,f);
 
-        switch (f->type) {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-        {
-                struct cx8800_fmt *fmt;
-                enum v4l2_field field;
-                unsigned int maxw, maxh;
-
-                fmt = format_by_fourcc(f->fmt.pix.pixelformat);
-                if (NULL == fmt)
-                        return -EINVAL;
-
-                field = f->fmt.pix.field;
-                maxw  = norm_maxw(core->tvnorm);
-                maxh  = norm_maxh(core->tvnorm);
-
-                if (V4L2_FIELD_ANY == field) {
-                        field = (f->fmt.pix.height > maxh/2)
-                                ? V4L2_FIELD_INTERLACED
-                                : V4L2_FIELD_BOTTOM;
-                }
+        if (0 != err)
+                return err;
+        fh->fmt        = format_by_fourcc(f->fmt.pix.pixelformat);
+        fh->width      = f->fmt.pix.width;
+        fh->height     = f->fmt.pix.height;
+        fh->vidq.field = f->fmt.pix.field;
+        return 0;
+}
 
-                switch (field) {
-                case V4L2_FIELD_TOP:
-                case V4L2_FIELD_BOTTOM:
-                        maxh = maxh / 2;
-                        break;
-                case V4L2_FIELD_INTERLACED:
-                        break;
-                default:
-                        return -EINVAL;
-                }
+static int vidioc_querycap (struct file *file, void  *priv,
+                                        struct v4l2_capability *cap)
+{
+        struct cx8800_dev *dev  = ((struct cx8800_fh *)priv)->dev;
+        struct cx88_core  *core = dev->core;
 
-                f->fmt.pix.field = field;
-                if (f->fmt.pix.height < 32)
-                        f->fmt.pix.height = 32;
-                if (f->fmt.pix.height > maxh)
-                        f->fmt.pix.height = maxh;
-                if (f->fmt.pix.width < 48)
-                        f->fmt.pix.width = 48;
-                if (f->fmt.pix.width > maxw)
-                        f->fmt.pix.width = maxw;
-                f->fmt.pix.width &= ~0x03;
-                f->fmt.pix.bytesperline =
-                        (f->fmt.pix.width * fmt->depth) >> 3;
-                f->fmt.pix.sizeimage =
-                        f->fmt.pix.height * f->fmt.pix.bytesperline;
+        strcpy(cap->driver, "cx8800");
+        strlcpy(cap->card, cx88_boards[core->board].name,
+                sizeof(cap->card));
+        sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
+        cap->version = CX88_VERSION_CODE;
+        cap->capabilities =
+                V4L2_CAP_VIDEO_CAPTURE |
+                V4L2_CAP_READWRITE     |
+                V4L2_CAP_STREAMING     |
+                V4L2_CAP_VBI_CAPTURE;
+        if (UNSET != core->tuner_type)
+                cap->capabilities |= V4L2_CAP_TUNER;
+        return 0;
+}
 
-                return 0;
-        }
-        case V4L2_BUF_TYPE_VBI_CAPTURE:
-                cx8800_vbi_fmt(dev, f);
-                return 0;
-        default:
+static int vidioc_enum_fmt_cap (struct file *file, void  *priv,
+                                        struct v4l2_fmtdesc *f)
+{
+        if (unlikely(f->index >= ARRAY_SIZE(formats)))
                 return -EINVAL;
-        }
+
+        strlcpy(f->description,formats[f->index].name,sizeof(f->description));
+        f->pixelformat = formats[f->index].fourcc;
+
+        return 0;
 }
 
-static int cx8800_s_fmt(struct cx8800_dev *dev, struct cx8800_fh *fh,
-                        struct v4l2_format *f)
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)
 {
+        struct cx8800_fh           *fh   = priv;
+        struct videobuf_queue      *q;
+        struct v4l2_requestbuffers req;
+        unsigned int i;
         int err;
 
-        switch (f->type) {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                err = cx8800_try_fmt(dev,fh,f);
-                if (0 != err)
-                        return err;
+        q = get_queue(fh);
+        memset(&req,0,sizeof(req));
+        req.type   = q->type;
+        req.count  = 8;
+        req.memory = V4L2_MEMORY_MMAP;
+        err = videobuf_reqbufs(q,&req);
+        if (err < 0)
+                return err;
 
-                fh->fmt        = format_by_fourcc(f->fmt.pix.pixelformat);
-                fh->width      = f->fmt.pix.width;
-                fh->height     = f->fmt.pix.height;
-                fh->vidq.field = f->fmt.pix.field;
-                return 0;
-        case V4L2_BUF_TYPE_VBI_CAPTURE:
-                cx8800_vbi_fmt(dev, f);
-                return 0;
-        default:
-                return -EINVAL;
+        mbuf->frames = req.count;
+        mbuf->size   = 0;
+        for (i = 0; i < mbuf->frames; i++) {
+                mbuf->offsets[i]  = q->bufs[i]->boff;
+                mbuf->size       += q->bufs[i]->bsize;
         }
+        return 0;
 }
+#endif
 
-/*
- * This function is _not_ called directly, but from
- * video_generic_ioctl (and maybe others).  userspace
- * copying is done already, arg is a kernel pointer.
- */
-static int video_do_ioctl(struct inode *inode, struct file *file,
-                          unsigned int cmd, void *arg)
+static int vidioc_reqbufs (struct file *file, void *priv, struct v4l2_requestbuffers *p)
+{
+        struct cx8800_fh  *fh   = priv;
+        return (videobuf_reqbufs(get_queue(fh), p));
+}
+
+static int vidioc_querybuf (struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct cx8800_fh  *fh   = priv;
+        return (videobuf_querybuf(get_queue(fh), p));
+}
+
+static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct cx8800_fh  *fh   = priv;
+        return (videobuf_qbuf(get_queue(fh), p));
+}
+
+static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct cx8800_fh  *fh   = priv;
+        return (videobuf_dqbuf(get_queue(fh), p,
+                                file->f_flags & O_NONBLOCK));
+}
+
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 {
-        struct cx8800_fh  *fh   = file->private_data;
+        struct cx8800_fh  *fh   = priv;
         struct cx8800_dev *dev  = fh->dev;
-        struct cx88_core  *core = dev->core;
-        int err;
 
-        if (video_debug > 1)
-                v4l_print_ioctl(core->name,cmd);
-        switch (cmd) {
+        if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
+                return -EINVAL;
+        if (unlikely(i != fh->type))
+                return -EINVAL;
 
-        /* --- capabilities ------------------------------------------ */
-        case VIDIOC_QUERYCAP:
-        {
-                struct v4l2_capability *cap = arg;
-
-                memset(cap,0,sizeof(*cap));
-                strcpy(cap->driver, "cx8800");
-                strlcpy(cap->card, cx88_boards[core->board].name,
-                        sizeof(cap->card));
-                sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
-                cap->version = CX88_VERSION_CODE;
-                cap->capabilities =
-                        V4L2_CAP_VIDEO_CAPTURE |
-                        V4L2_CAP_READWRITE     |
-                        V4L2_CAP_STREAMING     |
-                        V4L2_CAP_VBI_CAPTURE   |
-                        0;
-                if (UNSET != core->tuner_type)
-                        cap->capabilities |= V4L2_CAP_TUNER;
-                return 0;
-        }
+        if (unlikely(!res_get(dev,fh,get_ressource(fh))))
+                return -EBUSY;
+        return videobuf_streamon(get_queue(fh));
+}
 
-        /* --- capture ioctls ---------------------------------------- */
-        case VIDIOC_ENUM_FMT:
-        {
-                struct v4l2_fmtdesc *f = arg;
-                enum v4l2_buf_type type;
-                unsigned int index;
-
-                index = f->index;
-                type  = f->type;
-                switch (type) {
-                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                        if (index >= ARRAY_SIZE(formats))
-                                return -EINVAL;
-                        memset(f,0,sizeof(*f));
-                        f->index = index;
-                        f->type  = type;
-                        strlcpy(f->description,formats[index].name,sizeof(f->description));
-                        f->pixelformat = formats[index].fourcc;
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                return 0;
-        }
-        case VIDIOC_G_FMT:
-        {
-                struct v4l2_format *f = arg;
-                return cx8800_g_fmt(dev,fh,f);
-        }
-        case VIDIOC_S_FMT:
-        {
-                struct v4l2_format *f = arg;
-                return cx8800_s_fmt(dev,fh,f);
-        }
-        case VIDIOC_TRY_FMT:
-        {
-                struct v4l2_format *f = arg;
-                return cx8800_try_fmt(dev,fh,f);
-        }
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        /* --- streaming capture ------------------------------------- */
-        case VIDIOCGMBUF:
-        {
-                struct video_mbuf *mbuf = arg;
-                struct videobuf_queue *q;
-                struct v4l2_requestbuffers req;
-                unsigned int i;
-
-                q = get_queue(fh);
-                memset(&req,0,sizeof(req));
-                req.type   = q->type;
-                req.count  = 8;
-                req.memory = V4L2_MEMORY_MMAP;
-                err = videobuf_reqbufs(q,&req);
-                if (err < 0)
-                        return err;
-                memset(mbuf,0,sizeof(*mbuf));
-                mbuf->frames = req.count;
-                mbuf->size   = 0;
-                for (i = 0; i < mbuf->frames; i++) {
-                        mbuf->offsets[i]  = q->bufs[i]->boff;
-                        mbuf->size       += q->bufs[i]->bsize;
-                }
-                return 0;
-        }
-#endif
-        case VIDIOC_REQBUFS:
-                return videobuf_reqbufs(get_queue(fh), arg);
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+        struct cx8800_fh  *fh   = priv;
+        struct cx8800_dev *dev  = fh->dev;
+        int               err, res;
 
-        case VIDIOC_QUERYBUF:
-                return videobuf_querybuf(get_queue(fh), arg);
+        if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+        if (i != fh->type)
+                return -EINVAL;
 
-        case VIDIOC_QBUF:
-                return videobuf_qbuf(get_queue(fh), arg);
+        res = get_ressource(fh);
+        err = videobuf_streamoff(get_queue(fh));
+        if (err < 0)
+                return err;
+        res_free(dev,fh,res);
+        return 0;
+}
 
-        case VIDIOC_DQBUF:
-                return videobuf_dqbuf(get_queue(fh), arg,
-                                        file->f_flags & O_NONBLOCK);
+static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *tvnorms)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
 
-        case VIDIOC_STREAMON:
-        {
-                int res = get_ressource(fh);
+        mutex_lock(&core->lock);
+        cx88_set_tvnorm(core,*tvnorms);
+        mutex_unlock(&core->lock);
 
-                if (!res_get(dev,fh,res))
-                        return -EBUSY;
-                return videobuf_streamon(get_queue(fh));
-        }
-        case VIDIOC_STREAMOFF:
-        {
-                int res = get_ressource(fh);
+        return 0;
+}
 
-                err = videobuf_streamoff(get_queue(fh));
-                if (err < 0)
-                        return err;
-                res_free(dev,fh,res);
-                return 0;
-        }
-        default:
-                return cx88_do_ioctl( inode, file, fh->radio, core, cmd, arg, video_do_ioctl );
-        }
+/* only one input in this sample driver */
+int cx88_enum_input (struct cx88_core  *core,struct v4l2_input *i)
+{
+        static const char *iname[] = {
+                [ CX88_VMUX_COMPOSITE1 ] = "Composite1",
+                [ CX88_VMUX_COMPOSITE2 ] = "Composite2",
+                [ CX88_VMUX_COMPOSITE3 ] = "Composite3",
+                [ CX88_VMUX_COMPOSITE4 ] = "Composite4",
+                [ CX88_VMUX_SVIDEO     ] = "S-Video",
+                [ CX88_VMUX_TELEVISION ] = "Television",
+                [ CX88_VMUX_CABLE      ] = "Cable TV",
+                [ CX88_VMUX_DVB        ] = "DVB",
+                [ CX88_VMUX_DEBUG      ] = "for debug only",
+        };
+        unsigned int n;
+
+        n = i->index;
+        if (n >= 4)
+                return -EINVAL;
+        if (0 == INPUT(n)->type)
+                return -EINVAL;
+        memset(i,0,sizeof(*i));
+        i->index = n;
+        i->type  = V4L2_INPUT_TYPE_CAMERA;
+        strcpy(i->name,iname[INPUT(n)->type]);
+        if ((CX88_VMUX_TELEVISION == INPUT(n)->type) ||
+                (CX88_VMUX_CABLE      == INPUT(n)->type))
+                i->type = V4L2_INPUT_TYPE_TUNER;
+                i->std = CX88_NORMS;
         return 0;
 }
+EXPORT_SYMBOL(cx88_enum_input);
 
-int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
-                  struct cx88_core *core, unsigned int cmd, void *arg, v4l2_kioctl driver_ioctl)
+static int vidioc_enum_input (struct file *file, void *priv,
+                                struct v4l2_input *i)
 {
-        int err;
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        return cx88_enum_input (core,i);
+}
 
-       if (video_debug) {
-               if (video_debug > 1) {
-                       if (_IOC_DIR(cmd) & _IOC_WRITE)
-                               v4l_printk_ioctl_arg("cx88(w)",cmd, arg);
-                       else if (!_IOC_DIR(cmd) & _IOC_READ) {
-                               v4l_print_ioctl("cx88", cmd);
-                       }
-               } else
-                       v4l_print_ioctl(core->name,cmd);
-
-       }
-
-        switch (cmd) {
-        /* ---------- tv norms ---------- */
-        case VIDIOC_ENUMSTD:
-        {
-                struct v4l2_standard *e = arg;
-                unsigned int i;
-
-                i = e->index;
-                if (i >= ARRAY_SIZE(tvnorms))
-                        return -EINVAL;
-                err = v4l2_video_std_construct(e, tvnorms[e->index].id,
-                                               tvnorms[e->index].name);
-                e->index = i;
-                if (err < 0)
-                        return err;
-                return 0;
-        }
-        case VIDIOC_G_STD:
-        {
-                v4l2_std_id *id = arg;
+static int vidioc_g_input (struct file *file, void *priv, unsigned int *i)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
 
-                *id = core->tvnorm->id;
-                return 0;
-        }
-        case VIDIOC_S_STD:
-        {
-                v4l2_std_id *id = arg;
-                unsigned int i;
+        *i = core->input;
+        return 0;
+}
 
-                for(i = 0; i < ARRAY_SIZE(tvnorms); i++)
-                        if (*id & tvnorms[i].id)
-                                break;
-                if (i == ARRAY_SIZE(tvnorms))
-                        return -EINVAL;
+static int vidioc_s_input (struct file *file, void *priv, unsigned int i)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
 
-                mutex_lock(&core->lock);
-                cx88_set_tvnorm(core,&tvnorms[i]);
-                mutex_unlock(&core->lock);
-                return 0;
-        }
+        if (i >= 4)
+                return -EINVAL;
 
-        /* ------ input switching ---------- */
-        case VIDIOC_ENUMINPUT:
-        {
-                static const char *iname[] = {
-                        [ CX88_VMUX_COMPOSITE1 ] = "Composite1",
-                        [ CX88_VMUX_COMPOSITE2 ] = "Composite2",
-                        [ CX88_VMUX_COMPOSITE3 ] = "Composite3",
-                        [ CX88_VMUX_COMPOSITE4 ] = "Composite4",
-                        [ CX88_VMUX_SVIDEO     ] = "S-Video",
-                        [ CX88_VMUX_TELEVISION ] = "Television",
-                        [ CX88_VMUX_CABLE      ] = "Cable TV",
-                        [ CX88_VMUX_DVB        ] = "DVB",
-                        [ CX88_VMUX_DEBUG      ] = "for debug only",
-                };
-                struct v4l2_input *i = arg;
-                unsigned int n;
-
-                n = i->index;
-                if (n >= 4)
-                        return -EINVAL;
-                if (0 == INPUT(n)->type)
-                        return -EINVAL;
-                memset(i,0,sizeof(*i));
-                i->index = n;
-                i->type  = V4L2_INPUT_TYPE_CAMERA;
-                strcpy(i->name,iname[INPUT(n)->type]);
-                if ((CX88_VMUX_TELEVISION == INPUT(n)->type) ||
-                    (CX88_VMUX_CABLE      == INPUT(n)->type))
-                        i->type = V4L2_INPUT_TYPE_TUNER;
-                for (n = 0; n < ARRAY_SIZE(tvnorms); n++)
-                        i->std |= tvnorms[n].id;
-                return 0;
-        }
-        case VIDIOC_G_INPUT:
-        {
-                unsigned int *i = arg;
+        mutex_lock(&core->lock);
+        cx88_newstation(core);
+        cx88_video_mux(core,i);
+        mutex_unlock(&core->lock);
+        return 0;
+}
 
-                *i = core->input;
-                return 0;
-        }
-        case VIDIOC_S_INPUT:
-        {
-                unsigned int *i = arg;
 
-                if (*i >= 4)
-                        return -EINVAL;
-                mutex_lock(&core->lock);
-                cx88_newstation(core);
-                video_mux(core,*i);
-                mutex_unlock(&core->lock);
-                return 0;
-        }
 
+static int vidioc_queryctrl (struct file *file, void *priv,
+                                struct v4l2_queryctrl *qctrl)
+{
+        qctrl->id = v4l2_ctrl_next(ctrl_classes, qctrl->id);
+        if (unlikely(qctrl->id == 0))
+                return -EINVAL;
+        return cx8800_ctrl_query(qctrl);
+}
 
+static int vidioc_g_ctrl (struct file *file, void *priv,
+                                struct v4l2_control *ctl)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        return
+                cx88_get_control(core,ctl);
+}
 
-        /* --- controls ---------------------------------------------- */
-        case VIDIOC_QUERYCTRL:
-        {
-                struct v4l2_queryctrl *c = arg;
+static int vidioc_s_ctrl (struct file *file, void *priv,
+                                struct v4l2_control *ctl)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        return
+                cx88_set_control(core,ctl);
+}
 
-                return cx88_queryctrl(c);
-        }
-        case VIDIOC_G_CTRL:
-                return get_control(core,arg);
-        case VIDIOC_S_CTRL:
-                return set_control(core,arg);
+static int vidioc_g_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *t)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        u32 reg;
 
-        /* --- tuner ioctls ------------------------------------------ */
-        case VIDIOC_G_TUNER:
-        {
-                struct v4l2_tuner *t = arg;
-                u32 reg;
-
-                if (UNSET == core->tuner_type)
-                        return -EINVAL;
-                if (0 != t->index)
-                        return -EINVAL;
-
-                memset(t,0,sizeof(*t));
-                strcpy(t->name, "Television");
-                t->type       = V4L2_TUNER_ANALOG_TV;
-                t->capability = V4L2_TUNER_CAP_NORM;
-                t->rangehigh  = 0xffffffffUL;
-
-                cx88_get_stereo(core ,t);
-                reg = cx_read(MO_DEVICE_STATUS);
-                t->signal = (reg & (1<<5)) ? 0xffff : 0x0000;
-                return 0;
-        }
-        case VIDIOC_S_TUNER:
-        {
-                struct v4l2_tuner *t = arg;
+        if (unlikely(UNSET == core->tuner_type))
+                return -EINVAL;
+        if (0 != t->index)
+                return -EINVAL;
 
-                if (UNSET == core->tuner_type)
-                        return -EINVAL;
-                if (0 != t->index)
-                        return -EINVAL;
-                cx88_set_stereo(core, t->audmode, 1);
-                return 0;
-        }
-        case VIDIOC_G_FREQUENCY:
-        {
-                struct v4l2_frequency *f = arg;
+        strcpy(t->name, "Television");
+        t->type       = V4L2_TUNER_ANALOG_TV;
+        t->capability = V4L2_TUNER_CAP_NORM;
+        t->rangehigh  = 0xffffffffUL;
 
-                memset(f,0,sizeof(*f));
+        cx88_get_stereo(core ,t);
+        reg = cx_read(MO_DEVICE_STATUS);
+        t->signal = (reg & (1<<5)) ? 0xffff : 0x0000;
+        return 0;
+}
 
-                if (UNSET == core->tuner_type)
-                        return -EINVAL;
+static int vidioc_s_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *t)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
 
-                /* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */
-                f->type = radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
-                f->frequency = core->freq;
+        if (UNSET == core->tuner_type)
+                return -EINVAL;
+        if (0 != t->index)
+                return -EINVAL;
 
-                cx88_call_i2c_clients(core,VIDIOC_G_FREQUENCY,f);
+        cx88_set_stereo(core, t->audmode, 1);
+        return 0;
+}
 
-                return 0;
-        }
-        case VIDIOC_S_FREQUENCY:
-        {
-                struct v4l2_frequency *f = arg;
-
-                if (UNSET == core->tuner_type)
-                        return -EINVAL;
-                if (f->tuner != 0)
-                        return -EINVAL;
-                if (0 == radio && f->type != V4L2_TUNER_ANALOG_TV)
-                        return -EINVAL;
-                if (1 == radio && f->type != V4L2_TUNER_RADIO)
-                        return -EINVAL;
-                mutex_lock(&core->lock);
-                core->freq = f->frequency;
-                cx88_newstation(core);
-                cx88_call_i2c_clients(core,VIDIOC_S_FREQUENCY,f);
-
-                /* When changing channels it is required to reset TVAUDIO */
-                msleep (10);
-                cx88_set_tvaudio(core);
+static int vidioc_g_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct cx8800_fh  *fh   = priv;
+        struct cx88_core  *core = fh->dev->core;
 
-                mutex_unlock(&core->lock);
-                return 0;
-        }
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-        /* ioctls to allow direct acces to the cx2388x registers */
-        case VIDIOC_INT_G_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
+        if (unlikely(UNSET == core->tuner_type))
+                return -EINVAL;
 
-                if (reg->i2c_id != 0)
-                        return -EINVAL;
-                /* cx2388x has a 24-bit register space */
-                reg->val = cx_read(reg->reg&0xffffff);
-                return 0;
-        }
-        case VIDIOC_INT_S_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
+        /* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */
+        f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+        f->frequency = core->freq;
 
-                if (reg->i2c_id != 0)
-                        return -EINVAL;
-                if (!capable(CAP_SYS_ADMIN))
-                        return -EPERM;
-                cx_write(reg->reg&0xffffff, reg->val);
-                return 0;
-        }
-#endif
+        cx88_call_i2c_clients(core,VIDIOC_G_FREQUENCY,f);
 
-        default:
-                return v4l_compat_translate_ioctl(inode,file,cmd,arg,
-                                                  driver_ioctl);
-        }
         return 0;
 }
 
-static int video_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
+int cx88_set_freq (struct cx88_core  *core,
+                                struct v4l2_frequency *f)
 {
-       int retval;
+        if (unlikely(UNSET == core->tuner_type))
+                return -EINVAL;
+        if (unlikely(f->tuner != 0))
+                return -EINVAL;
 
-       retval=video_usercopy(inode, file, cmd, arg, video_do_ioctl);
+        mutex_lock(&core->lock);
+        core->freq = f->frequency;
+        cx88_newstation(core);
+        cx88_call_i2c_clients(core,VIDIOC_S_FREQUENCY,f);
+
+        /* When changing channels it is required to reset TVAUDIO */
+        msleep (10);
+        cx88_set_tvaudio(core);
 
-       if (video_debug > 1) {
-               if (retval < 0) {
-                       v4l_print_ioctl("cx88(err)", cmd);
-                       printk(KERN_DEBUG "cx88(err): errcode=%d\n",retval);
-               } else if (_IOC_DIR(cmd) & _IOC_READ)
-                       v4l_printk_ioctl_arg("cx88(r)",cmd, (void *)arg);
-       }
+        mutex_unlock(&core->lock);
+
+        return 0;
+}
+EXPORT_SYMBOL(cx88_set_freq);
+
+static int vidioc_s_frequency (struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct cx8800_fh  *fh   = priv;
+        struct cx88_core  *core = fh->dev->core;
 
-       return retval;
+        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;
+
+        return
+                cx88_set_freq (core,f);
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int vidioc_g_register (struct file *file, void *fh,
+                                struct v4l2_register *reg)
+{
+        struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
+
+        if (reg->i2c_id != 0)
+                return -EINVAL;
+        /* cx2388x has a 24-bit register space */
+        reg->val = cx_read(reg->reg&0xffffff);
+        return 0;
 }
 
+static int vidioc_s_register (struct file *file, void *fh,
+                                struct v4l2_register *reg)
+{
+        struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
+
+        if (reg->i2c_id != 0)
+                return -EINVAL;
+        cx_write(reg->reg&0xffffff, reg->val);
+        return 0;
+}
+#endif
+
+/* ----------------------------------------------------------- */
+/* RADIO ESPECIFIC IOCTLS                                      */
 /* ----------------------------------------------------------- */
 
-static int radio_do_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, void *arg)
+static int radio_querycap (struct file *file, void  *priv,
+                                        struct v4l2_capability *cap)
 {
-        struct cx8800_fh *fh    = file->private_data;
-        struct cx8800_dev *dev  = fh->dev;
+        struct cx8800_dev *dev  = ((struct cx8800_fh *)priv)->dev;
         struct cx88_core  *core = dev->core;
 
-        if (video_debug > 1)
-                v4l_print_ioctl(core->name,cmd);
-
-        switch (cmd) {
-        case VIDIOC_QUERYCAP:
-        {
-                struct v4l2_capability *cap = arg;
-
-                memset(cap,0,sizeof(*cap));
-                strcpy(cap->driver, "cx8800");
-                strlcpy(cap->card, cx88_boards[core->board].name,
-                        sizeof(cap->card));
-                sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
-                cap->version = CX88_VERSION_CODE;
-                cap->capabilities = V4L2_CAP_TUNER;
-                return 0;
-        }
-        case VIDIOC_G_TUNER:
-        {
-                struct v4l2_tuner *t = arg;
+        strcpy(cap->driver, "cx8800");
+        strlcpy(cap->card, cx88_boards[core->board].name,
+                sizeof(cap->card));
+        sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
+        cap->version = CX88_VERSION_CODE;
+        cap->capabilities = V4L2_CAP_TUNER;
+        return 0;
+}
 
-                if (t->index > 0)
-                        return -EINVAL;
+static int radio_g_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *t)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
 
-                memset(t,0,sizeof(*t));
-                strcpy(t->name, "Radio");
-                t->type = V4L2_TUNER_RADIO;
+        if (unlikely(t->index > 0))
+                return -EINVAL;
 
-                cx88_call_i2c_clients(core,VIDIOC_G_TUNER,t);
-                return 0;
-        }
-        case VIDIOC_ENUMINPUT:
-        {
-                struct v4l2_input *i = arg;
+        strcpy(t->name, "Radio");
+        t->type = V4L2_TUNER_RADIO;
 
-                if (i->index != 0)
-                        return -EINVAL;
-                strcpy(i->name,"Radio");
-                i->type = V4L2_INPUT_TYPE_TUNER;
-                return 0;
-        }
-        case VIDIOC_G_INPUT:
-        {
-                int *i = arg;
-                *i = 0;
-                return 0;
-        }
-        case VIDIOC_G_AUDIO:
-        {
-                struct v4l2_audio *a = arg;
+        cx88_call_i2c_clients(core,VIDIOC_G_TUNER,t);
+        return 0;
+}
 
-                memset(a,0,sizeof(*a));
-                strcpy(a->name,"Radio");
-                return 0;
-        }
-        case VIDIOC_G_STD:
-        {
-                v4l2_std_id *id = arg;
-                *id = 0;
-                return 0;
-        }
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        case VIDIOCSTUNER:
-        {
-                struct video_tuner *v = arg;
+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;
 
-                if (v->tuner) /* Only tuner 0 */
-                        return -EINVAL;
+        return 0;
+}
 
-                cx88_call_i2c_clients(core,VIDIOCSTUNER,v);
-                return 0;
-        }
-#endif
-        case VIDIOC_S_TUNER:
-        {
-                struct v4l2_tuner *t = arg;
+static int radio_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
+{
+        if (unlikely(a->index))
+                return -EINVAL;
 
-                if (0 != t->index)
-                        return -EINVAL;
+        memset(a,0,sizeof(*a));
+        strcpy(a->name,"Radio");
+        return 0;
+}
 
-                cx88_call_i2c_clients(core,VIDIOC_S_TUNER,t);
+/* FIXME: Should add a standard for radio */
 
-                return 0;
-        }
+static int radio_s_tuner (struct file *file, void *priv,
+                                struct v4l2_tuner *t)
+{
+        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
 
-        case VIDIOC_S_AUDIO:
-        case VIDIOC_S_INPUT:
-        case VIDIOC_S_STD:
-                return 0;
+        if (0 != t->index)
+                return -EINVAL;
 
-        case VIDIOC_QUERYCTRL:
-        {
-                struct v4l2_queryctrl *c = arg;
-                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 < CX8800_CTLS; i++)
-                                if (cx8800_ctls[i].v.id == c->id)
-                                        break;
-                        *c = cx8800_ctls[i].v;
-                } else
-                        *c = no_ctl;
-                return 0;
-        }
+        cx88_call_i2c_clients(core,VIDIOC_S_TUNER,t);
 
+        return 0;
+}
 
-        case VIDIOC_G_CTRL:
-        case VIDIOC_S_CTRL:
-        case VIDIOC_G_FREQUENCY:
-        case VIDIOC_S_FREQUENCY:
-                return video_do_ioctl(inode,file,cmd,arg);
+static int radio_s_audio (struct file *file, void *fh,
+                          struct v4l2_audio *a)
+{
+        return 0;
+}
 
-        default:
-                return v4l_compat_translate_ioctl(inode,file,cmd,arg,
-                                                  radio_do_ioctl);
-        }
+static int radio_s_input (struct file *file, void *fh, unsigned int i)
+{
         return 0;
-};
+}
 
-static int radio_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
+static int radio_queryctrl (struct file *file, void *priv,
+                            struct v4l2_queryctrl *c)
 {
-        return video_usercopy(inode, file, cmd, arg, radio_do_ioctl);
-};
+        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 < CX8800_CTLS; i++)
+                        if (cx8800_ctls[i].v.id == c->id)
+                                break;
+                *c = cx8800_ctls[i].v;
+        } else
+                *c = no_ctl;
+        return 0;
+}
 
 /* ----------------------------------------------------------- */
 
@@ -1816,27 +1638,52 @@ static const struct file_operations video_fops =
         .read          = video_read,
         .poll          = video_poll,
         .mmap          = video_mmap,
-        .ioctl         = video_ioctl,
+        .ioctl         = video_ioctl2,
         .compat_ioctl  = v4l_compat_ioctl32,
         .llseek        = no_llseek,
 };
 
+static struct video_device cx8800_vbi_template;
 static struct video_device cx8800_video_template =
 {
-        .name          = "cx8800-video",
-        .type          = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
-        .hardware      = 0,
-        .fops          = &video_fops,
-        .minor         = -1,
-};
-
-static struct video_device cx8800_vbi_template =
-{
-        .name          = "cx8800-vbi",
-        .type          = VID_TYPE_TELETEXT|VID_TYPE_TUNER,
-        .hardware      = 0,
-        .fops          = &video_fops,
-        .minor         = -1,
+        .name                 = "cx8800-video",
+        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
+        .fops                 = &video_fops,
+        .minor                = -1,
+        .vidioc_querycap      = vidioc_querycap,
+        .vidioc_enum_fmt_cap  = vidioc_enum_fmt_cap,
+        .vidioc_g_fmt_cap     = vidioc_g_fmt_cap,
+        .vidioc_try_fmt_cap   = vidioc_try_fmt_cap,
+        .vidioc_s_fmt_cap     = vidioc_s_fmt_cap,
+        .vidioc_g_fmt_vbi     = cx8800_vbi_fmt,
+        .vidioc_try_fmt_vbi   = cx8800_vbi_fmt,
+        .vidioc_s_fmt_vbi     = cx8800_vbi_fmt,
+        .vidioc_reqbufs       = vidioc_reqbufs,
+        .vidioc_querybuf      = vidioc_querybuf,
+        .vidioc_qbuf          = vidioc_qbuf,
+        .vidioc_dqbuf         = vidioc_dqbuf,
+        .vidioc_s_std         = vidioc_s_std,
+        .vidioc_enum_input    = vidioc_enum_input,
+        .vidioc_g_input       = vidioc_g_input,
+        .vidioc_s_input       = vidioc_s_input,
+        .vidioc_queryctrl     = vidioc_queryctrl,
+        .vidioc_g_ctrl        = vidioc_g_ctrl,
+        .vidioc_s_ctrl        = vidioc_s_ctrl,
+        .vidioc_streamon      = vidioc_streamon,
+        .vidioc_streamoff     = vidioc_streamoff,
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        .vidiocgmbuf          = vidiocgmbuf,
+#endif
+        .vidioc_g_tuner       = vidioc_g_tuner,
+        .vidioc_s_tuner       = vidioc_s_tuner,
+        .vidioc_g_frequency   = vidioc_g_frequency,
+        .vidioc_s_frequency   = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .vidioc_g_register    = vidioc_g_register,
+        .vidioc_s_register    = vidioc_s_register,
+#endif
+        .tvnorms              = CX88_NORMS,
+        .current_norm         = V4L2_STD_NTSC_M,
 };
 
 static const struct file_operations radio_fops =
@@ -1844,18 +1691,30 @@ static const struct file_operations radio_fops =
         .owner         = THIS_MODULE,
         .open          = video_open,
         .release       = video_release,
-        .ioctl         = radio_ioctl,
+        .ioctl         = video_ioctl2,
         .compat_ioctl  = v4l_compat_ioctl32,
         .llseek        = no_llseek,
 };
 
 static struct video_device cx8800_radio_template =
 {
-        .name          = "cx8800-radio",
-        .type          = VID_TYPE_TUNER,
-        .hardware      = 0,
-        .fops          = &radio_fops,
-        .minor         = -1,
+        .name                 = "cx8800-radio",
+        .type                 = VID_TYPE_TUNER,
+        .hardware             = 0,
+        .fops                 = &radio_fops,
+        .minor                = -1,
+        .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,
 };
 
 /* ----------------------------------------------------------- */
@@ -1890,6 +1749,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 {
         struct cx8800_dev *dev;
         struct cx88_core *core;
+
         int err;
 
         dev = kzalloc(sizeof(*dev),GFP_KERNEL);
@@ -1924,9 +1784,15 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                 goto fail_core;
         }
 
+        /* Initialize VBI template */
+        memcpy( &cx8800_vbi_template, &cx8800_video_template,
+                sizeof(cx8800_vbi_template) );
+        strcpy(cx8800_vbi_template.name,"cx8800-vbi");
+        cx8800_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
+
         /* initialize driver struct */
         spin_lock_init(&dev->slock);
-        core->tvnorm = tvnorms;
+        core->tvnorm = cx8800_video_template.current_norm;
 
         /* init video dma queues */
         INIT_LIST_HEAD(&dev->vidq.active);
@@ -2007,9 +1873,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 
         /* initial device configuration */
         mutex_lock(&core->lock);
-        cx88_set_tvnorm(core,tvnorms);
+        cx88_set_tvnorm(core,core->tvnorm);
         init_controls(core);
-        video_mux(core,0);
+        cx88_video_mux(core,0);
         mutex_unlock(&core->lock);
 
         /* start tvaudio thread */
@@ -2178,8 +2044,6 @@ static void cx8800_fini(void)
 module_init(cx8800_init);
 module_exit(cx8800_fini);
 
-EXPORT_SYMBOL(cx88_do_ioctl);
-
 /* ----------------------------------------------------------- */
 /*
  * Local variables:
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index a9575ad8ca27..d2ecfba9bb4d 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -31,7 +31,9 @@
 #include <media/video-buf.h>
 #include <media/cx2341x.h>
 #include <media/audiochip.h>
+#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
 #include <media/video-buf-dvb.h>
+#endif
 
 #include "btcx-risc.h"
 #include "cx88-reg.h"
@@ -50,6 +52,13 @@
 /* ----------------------------------------------------------- */
 /* defines and enums                                           */
 
+/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
+#define CX88_NORMS (\
+        V4L2_STD_NTSC_M|  V4L2_STD_NTSC_M_JP|  V4L2_STD_NTSC_443 | \
+        V4L2_STD_PAL_BG|  V4L2_STD_PAL_DK   |  V4L2_STD_PAL_I    | \
+        V4L2_STD_PAL_M |  V4L2_STD_PAL_N    |  V4L2_STD_PAL_Nc   | \
+        V4L2_STD_PAL_60|  V4L2_STD_SECAM_L  |  V4L2_STD_SECAM_DK )
+
 #define FORMAT_FLAGS_PACKED       0x01
 #define FORMAT_FLAGS_PLANAR       0x02
 
@@ -82,22 +91,15 @@ enum cx8802_board_access {
 /* ----------------------------------------------------------- */
 /* tv norms                                                    */
 
-struct cx88_tvnorm {
-        char                   *name;
-        v4l2_std_id            id;
-        u32                    cxiformat;
-        u32                    cxoformat;
-};
-
-static unsigned int inline norm_maxw(struct cx88_tvnorm *norm)
+static unsigned int inline norm_maxw(v4l2_std_id norm)
 {
-        return (norm->id & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;
+        return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;
 }
 
 
-static unsigned int inline norm_maxh(struct cx88_tvnorm *norm)
+static unsigned int inline norm_maxh(v4l2_std_id norm)
 {
-        return (norm->id & V4L2_STD_625_50) ? 576 : 480;
+        return (norm & V4L2_STD_625_50) ? 576 : 480;
 }
 
 /* ----------------------------------------------------------- */
@@ -313,13 +315,15 @@ struct cx88_core {
         unsigned int               tuner_formats;
 
         /* config info -- dvb */
+#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
         struct dvb_pll_desc        *pll_desc;
         unsigned int               pll_addr;
         int                        (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
+#endif
 
         /* state info */
         struct task_struct         *kthread;
-        struct cx88_tvnorm         *tvnorm;
+        v4l2_std_id                tvnorm;
         u32                        tvaudio;
         u32                        audiomode_manual;
         u32                        audiomode_current;
@@ -460,12 +464,14 @@ struct cx8802_dev {
         int                        width;
         int                        height;
 
+#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
         /* for dvb only */
         struct videobuf_dvb        dvb;
         void*                      fe_handle;
         int                        (*fe_release)(void *handle);
 
         void                       *card_priv;
+#endif
         /* for switching modulation types */
         unsigned char              ts_gen_cntrl;
 
@@ -536,7 +542,7 @@ extern void cx88_sram_channel_dump(struct cx88_core *core,
 
 extern int cx88_set_scale(struct cx88_core *core, unsigned int width,
                           unsigned int height, enum v4l2_field field);
-extern int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm);
+extern int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm);
 
 extern struct video_device *cx88_vdev_init(struct cx88_core *core,
                                            struct pci_dev *pci,
@@ -553,7 +559,10 @@ extern int cx88_stop_audio_dma(struct cx88_core *core);
 /* ----------------------------------------------------------- */
 /* cx88-vbi.c                                                  */
 
-void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f);
+/* Can be used as g_vbi_fmt, try_vbi_fmt and s_vbi_fmt */
+int cx8800_vbi_fmt (struct file *file, void *priv,
+                                        struct v4l2_format *f);
+
 /*
 int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
                          struct cx88_dmaqueue *q,
@@ -633,19 +642,14 @@ int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state);
 int cx8802_resume_common(struct pci_dev *pci_dev);
 
 /* ----------------------------------------------------------- */
-/* cx88-video.c                                                */
-extern int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
-                                struct cx88_core *core, unsigned int cmd,
-                                void *arg, v4l2_kioctl driver_ioctl);
+/* cx88-video.c*/
 extern const u32 cx88_user_ctrls[];
 extern int cx8800_ctrl_query(struct v4l2_queryctrl *qctrl);
-
-/* ----------------------------------------------------------- */
-/* cx88-blackbird.c                                            */
-/* used by cx88-ivtv ioctl emulation layer                     */
-extern int (*cx88_ioctl_hook)(struct inode *inode, struct file *file,
-                              unsigned int cmd, void *arg);
-extern unsigned int (*cx88_ioctl_translator)(unsigned int cmd);
+int cx88_enum_input (struct cx88_core  *core,struct v4l2_input *i);
+int cx88_set_freq (struct cx88_core  *core,struct v4l2_frequency *f);
+int cx88_get_control(struct cx88_core *core, struct v4l2_control *ctl);
+int cx88_set_control(struct cx88_core *core, struct v4l2_control *ctl);
+int cx88_video_mux(struct cx88_core *core, unsigned int input);
 
 /*
  * Local variables:
diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index 2e5ca4032489..262f98e12409 100644
--- a/drivers/media/video/et61x251/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -171,10 +171,7 @@ struct et61x251_device {
 struct et61x251_device*
 et61x251_match_id(struct et61x251_device* cam, const struct usb_device_id *id)
 {
-        if (usb_match_id(usb_ifnum_to_if(cam->usbdev, 0), id))
-                return cam;
-
-        return NULL;
+        return usb_match_id(usb_ifnum_to_if(cam->usbdev, 0), id) ? cam : NULL;
 }
 
 
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 49792ae8c61c..a6525513cd1e 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -1,7 +1,7 @@
 /***************************************************************************
  * V4L2 driver for ET61X[12]51 PC Camera Controllers                       *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -48,8 +48,8 @@
 #define ET61X251_MODULE_AUTHOR  "(C) 2006 Luca Risolia"
 #define ET61X251_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
 #define ET61X251_MODULE_LICENSE "GPL"
-#define ET61X251_MODULE_VERSION "1:1.02"
-#define ET61X251_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 2)
+#define ET61X251_MODULE_VERSION "1:1.04"
+#define ET61X251_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 4)
 
 /*****************************************************************************/
 
@@ -85,7 +85,7 @@ MODULE_PARM_DESC(force_munmap,
                  "\ndetected camera."
                  "\n 0 = do not force memory unmapping"
                  "\n 1 = force memory unmapping (save memory)"
-                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
+                 "\nDefault value is "__MODULE_STRING(ET61X251_FORCE_MUNMAP)"."
                  "\n");
 
 static unsigned int frame_timeout[] = {[0 ... ET61X251_MAX_DEVICES-1] =
@@ -133,7 +133,8 @@ et61x251_request_buffers(struct et61x251_device* cam, u32 count,
 
         cam->nbuffers = count;
         while (cam->nbuffers > 0) {
-                if ((buff = vmalloc_32(cam->nbuffers * PAGE_ALIGN(imagesize))))
+                if ((buff = vmalloc_32_user(cam->nbuffers *
+                                            PAGE_ALIGN(imagesize))))
                         break;
                 cam->nbuffers--;
         }
@@ -543,10 +544,11 @@ static int et61x251_start_transfer(struct et61x251_device* cam)
 {
         struct usb_device *udev = cam->usbdev;
         struct urb* urb;
-        const unsigned int wMaxPacketSize[] = {0, 256, 384, 512, 640, 768, 832,
-                                               864, 896, 920, 956, 980, 1000,
-                                               1022};
-        const unsigned int psz = wMaxPacketSize[ET61X251_ALTERNATE_SETTING];
+        struct usb_host_interface* altsetting = usb_altnum_to_altsetting(
+                                                   usb_ifnum_to_if(udev, 0),
+                                                   ET61X251_ALTERNATE_SETTING);
+        const unsigned int psz = le16_to_cpu(altsetting->
+                                             endpoint[0].desc.wMaxPacketSize);
         s8 i, j;
         int err = 0;
 
@@ -976,29 +978,31 @@ static CLASS_DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
 static int et61x251_create_sysfs(struct et61x251_device* cam)
 {
         struct video_device *v4ldev = cam->v4ldev;
-        int rc;
+        int err = 0;
+
+        if ((err = video_device_create_file(v4ldev, &class_device_attr_reg)))
+                goto err_out;
+        if ((err = video_device_create_file(v4ldev, &class_device_attr_val)))
+                goto err_reg;
 
-        rc = video_device_create_file(v4ldev, &class_device_attr_reg);
-        if (rc) goto err;
-        rc = video_device_create_file(v4ldev, &class_device_attr_val);
-        if (rc) goto err_reg;
         if (cam->sensor.sysfs_ops) {
-                rc = video_device_create_file(v4ldev, &class_device_attr_i2c_reg);
-                if (rc) goto err_val;
-                rc = video_device_create_file(v4ldev, &class_device_attr_i2c_val);
-                if (rc) goto err_i2c_reg;
+                if ((err = video_device_create_file(v4ldev,
+                                                  &class_device_attr_i2c_reg)))
+                        goto err_val;
+                if ((err = video_device_create_file(v4ldev,
+                                                  &class_device_attr_i2c_val)))
+                        goto err_i2c_reg;
         }
 
-        return 0;
-
 err_i2c_reg:
+        if (cam->sensor.sysfs_ops)
         video_device_remove_file(v4ldev, &class_device_attr_i2c_reg);
 err_val:
         video_device_remove_file(v4ldev, &class_device_attr_val);
 err_reg:
         video_device_remove_file(v4ldev, &class_device_attr_reg);
-err:
-        return rc;
+err_out:
+        return err;
 }
 #endif /* CONFIG_VIDEO_ADV_DEBUG */
 
@@ -1767,10 +1771,10 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
         rect->left = (s->_rect.left & 1L) ? rect->left | 1L : rect->left & ~1L;
         rect->top = (s->_rect.top & 1L) ? rect->top | 1L : rect->top & ~1L;
 
-        if (rect->width < 4)
-                rect->width = 4;
-        if (rect->height < 4)
-                rect->height = 4;
+        if (rect->width < 16)
+                rect->width = 16;
+        if (rect->height < 16)
+                rect->height = 16;
         if (rect->width > bounds->width)
                 rect->width = bounds->width;
         if (rect->height > bounds->height)
@@ -1784,8 +1788,8 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
         if (rect->top + rect->height > bounds->top + bounds->height)
                 rect->top = bounds->top+bounds->height - rect->height;
 
-        rect->width &= ~3L;
-        rect->height &= ~3L;
+        rect->width &= ~15L;
+        rect->height &= ~15L;
 
         if (ET61X251_PRESERVE_IMGSCALE) {
                 /* Calculate the actual scaling factor */
@@ -1846,6 +1850,35 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
 
 
 static int
+et61x251_vidioc_enum_framesizes(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_frmsizeenum frmsize;
+
+        if (copy_from_user(&frmsize, arg, sizeof(frmsize)))
+                return -EFAULT;
+
+        if (frmsize.index != 0)
+                return -EINVAL;
+
+        if (frmsize.pixel_format != V4L2_PIX_FMT_ET61X251 &&
+            frmsize.pixel_format != V4L2_PIX_FMT_SBGGR8)
+                return -EINVAL;
+
+        frmsize.type = V4L2_FRMSIZE_TYPE_STEPWISE;
+        frmsize.stepwise.min_width = frmsize.stepwise.step_width = 16;
+        frmsize.stepwise.min_height = frmsize.stepwise.step_height = 16;
+        frmsize.stepwise.max_width = cam->sensor.cropcap.bounds.width;
+        frmsize.stepwise.max_height = cam->sensor.cropcap.bounds.height;
+        memset(&frmsize.reserved, 0, sizeof(frmsize.reserved));
+
+        if (copy_to_user(arg, &frmsize, sizeof(frmsize)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
 et61x251_vidioc_enum_fmt(struct et61x251_device* cam, void __user * arg)
 {
         struct v4l2_fmtdesc fmtd;
@@ -1853,6 +1886,9 @@ et61x251_vidioc_enum_fmt(struct et61x251_device* cam, void __user * arg)
         if (copy_from_user(&fmtd, arg, sizeof(fmtd)))
                 return -EFAULT;
 
+        if (fmtd.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
         if (fmtd.index == 0) {
                 strcpy(fmtd.description, "bayer rgb");
                 fmtd.pixelformat = V4L2_PIX_FMT_SBGGR8;
@@ -1934,17 +1970,17 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
         rect.width = scale * pix->width;
         rect.height = scale * pix->height;
 
-        if (rect.width < 4)
-                rect.width = 4;
-        if (rect.height < 4)
-                rect.height = 4;
+        if (rect.width < 16)
+                rect.width = 16;
+        if (rect.height < 16)
+                rect.height = 16;
         if (rect.width > bounds->left + bounds->width - rect.left)
                 rect.width = bounds->left + bounds->width - rect.left;
         if (rect.height > bounds->top + bounds->height - rect.top)
                 rect.height = bounds->top + bounds->height - rect.top;
 
-        rect.width &= ~3L;
-        rect.height &= ~3L;
+        rect.width &= ~15L;
+        rect.height &= ~15L;
 
         { /* adjust the scaling factor */
                 u32 a, b;
@@ -2378,6 +2414,9 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
         case VIDIOC_S_FMT:
                 return et61x251_vidioc_try_s_fmt(cam, cmd, arg);
 
+        case VIDIOC_ENUM_FRAMESIZES:
+                return et61x251_vidioc_enum_framesizes(cam, arg);
+
         case VIDIOC_G_JPEGCOMP:
                 return et61x251_vidioc_g_jpegcomp(cam, arg);
 
@@ -2413,6 +2452,7 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
         case VIDIOC_QUERYSTD:
         case VIDIOC_ENUMSTD:
         case VIDIOC_QUERYMENU:
+        case VIDIOC_ENUM_FRAMEINTERVALS:
                 return -EINVAL;
 
         default:
@@ -2459,6 +2499,7 @@ static const struct file_operations et61x251_fops = {
         .open =    et61x251_open,
         .release = et61x251_release,
         .ioctl =   et61x251_ioctl,
+        .compat_ioctl = v4l_compat_ioctl32,
         .read =    et61x251_read,
         .poll =    et61x251_poll,
         .mmap =    et61x251_mmap,
@@ -2497,7 +2538,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         mutex_init(&cam->dev_mutex);
 
         DBG(2, "ET61X[12]51 PC Camera Controller detected "
-               "(vid/pid 0x%04X/0x%04X)",id->idVendor, id->idProduct);
+               "(vid/pid 0x%04X:0x%04X)",id->idVendor, id->idProduct);
 
         for  (i = 0; et61x251_sensor_table[i]; i++) {
                 err = et61x251_sensor_table[i](cam);
@@ -2550,9 +2591,14 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         err = et61x251_create_sysfs(cam);
-        if (err)
-                goto fail2;
-        DBG(2, "Optional device control through 'sysfs' interface ready");
+        if (!err)
+                DBG(2, "Optional device control through 'sysfs' "
+                       "interface ready");
+        else
+                DBG(2, "Failed to create 'sysfs' interface for optional "
+                       "device controlling. Error #%d", err);
+#else
+        DBG(2, "Optional device control through 'sysfs' interface disabled");
 #endif
 
         usb_set_intfdata(intf, cam);
@@ -2561,13 +2607,6 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
         return 0;
 
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-fail2:
-        video_nr[dev_nr] = -1;
-        dev_nr = (dev_nr < ET61X251_MAX_DEVICES-1) ? dev_nr+1 : 0;
-        mutex_unlock(&cam->dev_mutex);
-        video_unregister_device(cam->v4ldev);
-#endif
 fail:
         if (cam) {
                 kfree(cam->control_buffer);
diff --git a/drivers/media/video/et61x251/et61x251_sensor.h b/drivers/media/video/et61x251/et61x251_sensor.h
index 65edd08dc386..5fadb5de68bf 100644
--- a/drivers/media/video/et61x251/et61x251_sensor.h
+++ b/drivers/media/video/et61x251/et61x251_sensor.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  * API for image sensors connected to ET61X[12]51 PC Camera Controllers    *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -82,7 +82,7 @@ enum et61x251_i2c_rsta {
         ET61X251_I2C_RSTA_REPEAT = 0x01, /* repeat start */
 };
 
-#define ET61X251_MAX_CTRLS V4L2_CID_LASTP1-V4L2_CID_BASE+10
+#define ET61X251_MAX_CTRLS (V4L2_CID_LASTP1-V4L2_CID_BASE+10)
 
 struct et61x251_sensor {
         char name[32];
diff --git a/drivers/media/video/et61x251/et61x251_tas5130d1b.c b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
index a7d65b82b2fb..b06643409842 100644
--- a/drivers/media/video/et61x251/et61x251_tas5130d1b.c
+++ b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
@@ -2,7 +2,7 @@
  * Plug-in for TAS5130D1B image sensor connected to the ET61X[12]51        *
  * PC Camera Controllers                                                   *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index 122496f36845..379645e481c6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -31,7 +31,6 @@ struct pvr2_msp3400_handler {
         struct pvr2_hdw *hdw;
         struct pvr2_i2c_client *client;
         struct pvr2_i2c_handler i2c_handler;
-        struct pvr2_audio_stat astat;
         unsigned long stale_mask;
 };
 
@@ -44,13 +43,6 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt)
 
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo");
 
-        if (hdw->input_val == PVR2_CVAL_INPUT_TV) {
-                struct v4l2_tuner vt;
-                memset(&vt,0,sizeof(vt));
-                vt.audmode = hdw->audiomode_val;
-                pvr2_i2c_client_cmd(ctxt->client,VIDIOC_S_TUNER,&vt);
-        }
-
         route.input = MSP_INPUT_DEFAULT;
         route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
         switch (hdw->input_val) {
@@ -78,8 +70,7 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt)
 static int check_stereo(struct pvr2_msp3400_handler *ctxt)
 {
         struct pvr2_hdw *hdw = ctxt->hdw;
-        return (hdw->input_dirty ||
-                hdw->audiomode_dirty);
+        return hdw->input_dirty;
 }
 
 
@@ -99,8 +90,7 @@ static int msp3400_check(struct pvr2_msp3400_handler *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {
                 msk = 1 << idx;
                 if (ctxt->stale_mask & msk) continue;
                 if (msp3400_ops[idx].check(ctxt)) {
@@ -116,8 +106,7 @@ static void msp3400_update(struct pvr2_msp3400_handler *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {
                 msk = 1 << idx;
                 if (!(ctxt->stale_mask & msk)) continue;
                 ctxt->stale_mask &= ~msk;
@@ -126,27 +115,9 @@ static void msp3400_update(struct pvr2_msp3400_handler *ctxt)
 }
 
 
-/* This reads back the current signal type */
-static int get_audio_status(struct pvr2_msp3400_handler *ctxt)
-{
-        struct v4l2_tuner vt;
-        int stat;
-
-        memset(&vt,0,sizeof(vt));
-        stat = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt);
-        if (stat < 0) return stat;
-
-        ctxt->hdw->flag_stereo = (vt.audmode & V4L2_TUNER_MODE_STEREO) != 0;
-        ctxt->hdw->flag_bilingual =
-                (vt.audmode & V4L2_TUNER_MODE_LANG2) != 0;
-        return 0;
-}
-
-
 static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt)
 {
         ctxt->client->handler = NULL;
-        ctxt->hdw->audio_stat = NULL;
         kfree(ctxt);
 }
 
@@ -169,24 +140,17 @@ static const struct pvr2_i2c_handler_functions msp3400_funcs = {
 int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 {
         struct pvr2_msp3400_handler *ctxt;
-        if (hdw->audio_stat) return 0;
         if (cp->handler) return 0;
 
-        ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);
+        ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);
         if (!ctxt) return 0;
-        memset(ctxt,0,sizeof(*ctxt));
 
         ctxt->i2c_handler.func_data = ctxt;
         ctxt->i2c_handler.func_table = &msp3400_funcs;
         ctxt->client = cp;
         ctxt->hdw = hdw;
-        ctxt->astat.ctxt = ctxt;
-        ctxt->astat.status = (int (*)(void *))get_audio_status;
-        ctxt->astat.detach = (void (*)(void *))pvr2_msp3400_detach;
-        ctxt->stale_mask = (1 << (sizeof(msp3400_ops)/
-                                  sizeof(msp3400_ops[0]))) - 1;
+        ctxt->stale_mask = (1 << ARRAY_SIZE(msp3400_ops)) - 1;
         cp->handler = &ctxt->i2c_handler;
-        hdw->audio_stat = &ctxt->astat;
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L2 handler set up",
                    cp->client->addr);
         return !0;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c
index cf129746205d..6bbed88d7867 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -83,9 +83,8 @@ struct pvr2_context *pvr2_context_create(
         void (*setup_func)(struct pvr2_context *))
 {
         struct pvr2_context *mp = NULL;
-        mp = kmalloc(sizeof(*mp),GFP_KERNEL);
+        mp = kzalloc(sizeof(*mp),GFP_KERNEL);
         if (!mp) goto done;
-        memset(mp,0,sizeof(*mp));
         pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_main id=%p",mp);
         mp->setup_func = setup_func;
         mutex_init(&mp->mutex);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index c77de859cc8e..f569b00201dd 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -26,6 +26,27 @@
 #include <linux/mutex.h>
 
 
+static int pvr2_ctrl_range_check(struct pvr2_ctrl *cptr,int val)
+{
+        if (cptr->info->check_value) {
+                if (!cptr->info->check_value(cptr,val)) return -ERANGE;
+        } else {
+                int lim;
+                lim = cptr->info->def.type_int.min_value;
+                if (cptr->info->get_min_value) {
+                        cptr->info->get_min_value(cptr,&lim);
+                }
+                if (val < lim) return -ERANGE;
+                lim = cptr->info->def.type_int.max_value;
+                if (cptr->info->get_max_value) {
+                        cptr->info->get_max_value(cptr,&lim);
+                }
+                if (val > lim) return -ERANGE;
+        }
+        return 0;
+}
+
+
 /* Set the given control. */
 int pvr2_ctrl_set_value(struct pvr2_ctrl *cptr,int val)
 {
@@ -43,17 +64,8 @@ int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *cptr,int mask,int val)
                         if (cptr->info->type == pvr2_ctl_bitmask) {
                                 mask &= cptr->info->def.type_bitmask.valid_bits;
                         } else if (cptr->info->type == pvr2_ctl_int) {
-                                int lim;
-                                lim = cptr->info->def.type_int.min_value;
-                                if (cptr->info->get_min_value) {
-                                        cptr->info->get_min_value(cptr,&lim);
-                                }
-                                if (val < lim) break;
-                                lim = cptr->info->def.type_int.max_value;
-                                if (cptr->info->get_max_value) {
-                                        cptr->info->get_max_value(cptr,&lim);
-                                }
-                                if (val > lim) break;
+                                ret = pvr2_ctrl_range_check(cptr,val);
+                                if (ret < 0) break;
                         } else if (cptr->info->type == pvr2_ctl_enum) {
                                 if (val >= cptr->info->def.type_enum.count) {
                                         break;
@@ -498,16 +510,13 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
         LOCK_TAKE(cptr->hdw->big_lock); do {
                 if (cptr->info->type == pvr2_ctl_int) {
                         ret = parse_token(ptr,len,valptr,NULL,0);
-                        if ((ret >= 0) &&
-                            ((*valptr < cptr->info->def.type_int.min_value) ||
-                             (*valptr > cptr->info->def.type_int.max_value))) {
-                                ret = -ERANGE;
+                        if (ret >= 0) {
+                                ret = pvr2_ctrl_range_check(cptr,*valptr);
                         }
                         if (maskptr) *maskptr = ~0;
                 } else if (cptr->info->type == pvr2_ctl_bool) {
-                        ret = parse_token(
-                                ptr,len,valptr,boolNames,
-                                sizeof(boolNames)/sizeof(boolNames[0]));
+                        ret = parse_token(ptr,len,valptr,boolNames,
+                                          ARRAY_SIZE(boolNames));
                         if (ret == 1) {
                                 *valptr = *valptr ? !0 : 0;
                         } else if (ret == 0) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 8df969c4874c..e8a9252c7df6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -63,6 +63,7 @@ static void set_input(struct pvr2_v4l_cx2584x *ctxt)
                 vid_input = CX25840_COMPOSITE7;
                 aud_input = CX25840_AUDIO8;
                 break;
+        case PVR2_CVAL_INPUT_RADIO: // Treat same as composite
         case PVR2_CVAL_INPUT_COMPOSITE:
                 vid_input = CX25840_COMPOSITE3;
                 aud_input = CX25840_AUDIO_SERIAL;
@@ -71,7 +72,6 @@ static void set_input(struct pvr2_v4l_cx2584x *ctxt)
                 vid_input = CX25840_SVIDEO1;
                 aud_input = CX25840_AUDIO_SERIAL;
                 break;
-        case PVR2_CVAL_INPUT_RADIO:
         default:
                 // Just set it to be composite input for now...
                 vid_input = CX25840_COMPOSITE3;
@@ -150,8 +150,7 @@ static int decoder_check(struct pvr2_v4l_cx2584x *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
                 msk = 1 << idx;
                 if (ctxt->stale_mask & msk) continue;
                 if (decoder_ops[idx].check(ctxt)) {
@@ -167,8 +166,7 @@ static void decoder_update(struct pvr2_v4l_cx2584x *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
                 msk = 1 << idx;
                 if (!(ctxt->stale_mask & msk)) continue;
                 ctxt->stale_mask &= ~msk;
@@ -199,18 +197,6 @@ static int decoder_detect(struct pvr2_i2c_client *cp)
 }
 
 
-static int decoder_is_tuned(struct pvr2_v4l_cx2584x *ctxt)
-{
-        struct v4l2_tuner vt;
-        int ret;
-
-        memset(&vt,0,sizeof(vt));
-        ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt);
-        if (ret < 0) return -EINVAL;
-        return vt.signal ? 1 : 0;
-}
-
-
 static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt,
                                      char *buf,unsigned int cnt)
 {
@@ -243,21 +229,18 @@ int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw,
         if (cp->handler) return 0;
         if (!decoder_detect(cp)) return 0;
 
-        ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);
+        ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);
         if (!ctxt) return 0;
-        memset(ctxt,0,sizeof(*ctxt));
 
         ctxt->handler.func_data = ctxt;
         ctxt->handler.func_table = &hfuncs;
         ctxt->ctrl.ctxt = ctxt;
         ctxt->ctrl.detach = (void (*)(void *))decoder_detach;
         ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable;
-        ctxt->ctrl.tuned = (int (*)(void *))decoder_is_tuned;
         ctxt->ctrl.force_reset = (void (*)(void*))decoder_reset;
         ctxt->client = cp;
         ctxt->hdw = hdw;
-        ctxt->stale_mask = (1 << (sizeof(decoder_ops)/
-                                  sizeof(decoder_ops[0]))) - 1;
+        ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1;
         hdw->decoder_ctrl = &ctxt->ctrl;
         cp->handler = &ctxt->handler;
         {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index f985f00d885a..e9da9bb8f8de 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -152,7 +152,7 @@ static unsigned long debugifc_find_mask(const char *buf,unsigned int count)
 {
         struct debugifc_mask_item *mip;
         unsigned int idx;
-        for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {
                 mip = mask_items + idx;
                 if (debugifc_match_keyword(buf,count,mip->name)) {
                         return mip->msk;
@@ -169,7 +169,7 @@ static int debugifc_print_mask(char *buf,unsigned int sz,
         unsigned int idx;
         int bcnt = 0;
         int ccnt;
-        for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {
                 mip = mask_items + idx;
                 if (!(mip->msk & msk)) continue;
                 ccnt = scnprintf(buf,sz,"%s%c%s",
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index 6cff8e75f426..45cbca0143ca 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
@@ -102,9 +102,8 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw)
                 }
                 msg[1].len = pcnt;
                 msg[1].buf = eeprom+tcnt;
-                if ((ret = i2c_transfer(
-                             &hdw->i2c_adap,
-                             msg,sizeof(msg)/sizeof(msg[0]))) != 2) {
+                if ((ret = i2c_transfer(&hdw->i2c_adap,
+                                        msg,ARRAY_SIZE(msg))) != 2) {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "eeprom fetch set offs err=%d",ret);
                         kfree(eeprom);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index c94f97b79392..5786faf9b3b8 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -26,6 +26,7 @@
 #include "pvrusb2-encoder.h"
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
+#include "pvrusb2-fx2-cmd.h"
 
 
 
@@ -34,34 +35,41 @@
 #define IVTV_MBOX_DRIVER_DONE 0x00000002
 #define IVTV_MBOX_DRIVER_BUSY 0x00000001
 
+#define MBOX_BASE 0x44
+
 
 static int pvr2_encoder_write_words(struct pvr2_hdw *hdw,
+                                    unsigned int offs,
                                     const u32 *data, unsigned int dlen)
 {
-        unsigned int idx;
+        unsigned int idx,addr;
+        unsigned int bAddr;
         int ret;
-        unsigned int offs = 0;
         unsigned int chunkCnt;
 
         /*
 
         Format: First byte must be 0x01.  Remaining 32 bit words are
-        spread out into chunks of 7 bytes each, little-endian ordered,
-        offset at zero within each 2 blank bytes following and a
-        single byte that is 0x44 plus the offset of the word.  Repeat
-        request for additional words, with offset adjusted
-        accordingly.
+        spread out into chunks of 7 bytes each, with the first 4 bytes
+        being the data word (little endian), and the next 3 bytes
+        being the address where that data word is to be written (big
+        endian).  Repeat request for additional words, with offset
+        adjusted accordingly.
 
         */
         while (dlen) {
                 chunkCnt = 8;
                 if (chunkCnt > dlen) chunkCnt = dlen;
                 memset(hdw->cmd_buffer,0,sizeof(hdw->cmd_buffer));
-                hdw->cmd_buffer[0] = 0x01;
+                bAddr = 0;
+                hdw->cmd_buffer[bAddr++] = FX2CMD_MEM_WRITE_DWORD;
                 for (idx = 0; idx < chunkCnt; idx++) {
-                        hdw->cmd_buffer[1+(idx*7)+6] = 0x44 + idx + offs;
-                        PVR2_DECOMPOSE_LE(hdw->cmd_buffer, 1+(idx*7),
-                                          data[idx]);
+                        addr = idx + offs;
+                        hdw->cmd_buffer[bAddr+6] = (addr & 0xffu);
+                        hdw->cmd_buffer[bAddr+5] = ((addr>>8) & 0xffu);
+                        hdw->cmd_buffer[bAddr+4] = ((addr>>16) & 0xffu);
+                        PVR2_DECOMPOSE_LE(hdw->cmd_buffer, bAddr,data[idx]);
+                        bAddr += 7;
                 }
                 ret = pvr2_send_request(hdw,
                                         hdw->cmd_buffer,1+(chunkCnt*7),
@@ -76,33 +84,42 @@ static int pvr2_encoder_write_words(struct pvr2_hdw *hdw,
 }
 
 
-static int pvr2_encoder_read_words(struct pvr2_hdw *hdw,int statusFl,
+static int pvr2_encoder_read_words(struct pvr2_hdw *hdw,
+                                   unsigned int offs,
                                    u32 *data, unsigned int dlen)
 {
         unsigned int idx;
         int ret;
-        unsigned int offs = 0;
         unsigned int chunkCnt;
 
         /*
 
         Format: First byte must be 0x02 (status check) or 0x28 (read
         back block of 32 bit words).  Next 6 bytes must be zero,
-        followed by a single byte of 0x44+offset for portion to be
-        read.  Returned data is packed set of 32 bits words that were
-        read.
+        followed by a single byte of MBOX_BASE+offset for portion to
+        be read.  Returned data is packed set of 32 bits words that
+        were read.
 
         */
 
         while (dlen) {
                 chunkCnt = 16;
                 if (chunkCnt > dlen) chunkCnt = dlen;
-                memset(hdw->cmd_buffer,0,sizeof(hdw->cmd_buffer));
-                hdw->cmd_buffer[0] = statusFl ? 0x02 : 0x28;
-                hdw->cmd_buffer[7] = 0x44 + offs;
+                if (chunkCnt < 16) chunkCnt = 1;
+                hdw->cmd_buffer[0] =
+                        ((chunkCnt == 1) ?
+                         FX2CMD_MEM_READ_DWORD : FX2CMD_MEM_READ_64BYTES);
+                hdw->cmd_buffer[1] = 0;
+                hdw->cmd_buffer[2] = 0;
+                hdw->cmd_buffer[3] = 0;
+                hdw->cmd_buffer[4] = 0;
+                hdw->cmd_buffer[5] = ((offs>>16) & 0xffu);
+                hdw->cmd_buffer[6] = ((offs>>8) & 0xffu);
+                hdw->cmd_buffer[7] = (offs & 0xffu);
                 ret = pvr2_send_request(hdw,
                                         hdw->cmd_buffer,8,
-                                        hdw->cmd_buffer,chunkCnt * 4);
+                                        hdw->cmd_buffer,
+                                        (chunkCnt == 1 ? 4 : 16 * 4));
                 if (ret) return ret;
 
                 for (idx = 0; idx < chunkCnt; idx++) {
@@ -129,6 +146,8 @@ static int pvr2_encoder_cmd(void *ctxt,
                             u32 *argp)
 {
         unsigned int poll_count;
+        unsigned int try_count = 0;
+        int retry_flag;
         int ret = 0;
         unsigned int idx;
         /* These sizes look to be limited by the FX2 firmware implementation */
@@ -140,14 +159,15 @@ static int pvr2_encoder_cmd(void *ctxt,
         /*
 
         The encoder seems to speak entirely using blocks 32 bit words.
-        In ivtv driver terms, this is a mailbox which we populate with
-        data and watch what the hardware does with it.  The first word
-        is a set of flags used to control the transaction, the second
-        word is the command to execute, the third byte is zero (ivtv
-        driver suggests that this is some kind of return value), and
-        the fourth byte is a specified timeout (windows driver always
-        uses 0x00060000 except for one case when it is zero).  All
-        successive words are the argument words for the command.
+        In ivtv driver terms, this is a mailbox at MBOX_BASE which we
+        populate with data and watch what the hardware does with it.
+        The first word is a set of flags used to control the
+        transaction, the second word is the command to execute, the
+        third byte is zero (ivtv driver suggests that this is some
+        kind of return value), and the fourth byte is a specified
+        timeout (windows driver always uses 0x00060000 except for one
+        case when it is zero).  All successive words are the argument
+        words for the command.
 
         First, write out the entire set of words, with the first word
         being zero.
@@ -156,44 +176,42 @@ static int pvr2_encoder_cmd(void *ctxt,
         IVTV_MBOX_DRIVER_DONE | IVTV_DRIVER_BUSY this time (which
         probably means "go").
 
-        Next, read back 16 words as status.  Check the first word,
+        Next, read back the return count words.  Check the first word,
         which should have IVTV_MBOX_FIRMWARE_DONE set.  If however
         that bit is not set, then the command isn't done so repeat the
-        read.
-
-        Next, read back 32 words and compare with the original
-        arugments.  Hopefully they will match.
+        read until it is set.
 
         Finally, write out just the first word again, but set it to
         0x0 this time (which probably means "idle").
 
         */
 
-        if (arg_cnt_send > (sizeof(wrData)/sizeof(wrData[0]))-4) {
+        if (arg_cnt_send > (ARRAY_SIZE(wrData) - 4)) {
                 pvr2_trace(
                         PVR2_TRACE_ERROR_LEGS,
                         "Failed to write cx23416 command"
                         " - too many input arguments"
-                        " (was given %u limit %u)",
-                        arg_cnt_send,
-                        (unsigned int)(sizeof(wrData)/sizeof(wrData[0])) - 4);
+                        " (was given %u limit %lu)",
+                        arg_cnt_send, (long unsigned) ARRAY_SIZE(wrData) - 4);
                 return -EINVAL;
         }
 
-        if (arg_cnt_recv > (sizeof(rdData)/sizeof(rdData[0]))-4) {
+        if (arg_cnt_recv > (ARRAY_SIZE(rdData) - 4)) {
                 pvr2_trace(
                         PVR2_TRACE_ERROR_LEGS,
                         "Failed to write cx23416 command"
                         " - too many return arguments"
-                        " (was given %u limit %u)",
-                        arg_cnt_recv,
-                        (unsigned int)(sizeof(rdData)/sizeof(rdData[0])) - 4);
+                        " (was given %u limit %lu)",
+                        arg_cnt_recv, (long unsigned) ARRAY_SIZE(rdData) - 4);
                 return -EINVAL;
         }
 
 
         LOCK_TAKE(hdw->ctl_lock); do {
 
+                retry_flag = 0;
+                try_count++;
+                ret = 0;
                 wrData[0] = 0;
                 wrData[1] = cmd;
                 wrData[2] = 0;
@@ -201,59 +219,74 @@ static int pvr2_encoder_cmd(void *ctxt,
                 for (idx = 0; idx < arg_cnt_send; idx++) {
                         wrData[idx+4] = argp[idx];
                 }
-                for (; idx < (sizeof(wrData)/sizeof(wrData[0]))-4; idx++) {
+                for (; idx < ARRAY_SIZE(wrData) - 4; idx++) {
                         wrData[idx+4] = 0;
                 }
 
-                ret = pvr2_encoder_write_words(hdw,wrData,idx);
+                ret = pvr2_encoder_write_words(hdw,MBOX_BASE,wrData,idx);
                 if (ret) break;
                 wrData[0] = IVTV_MBOX_DRIVER_DONE|IVTV_MBOX_DRIVER_BUSY;
-                ret = pvr2_encoder_write_words(hdw,wrData,1);
+                ret = pvr2_encoder_write_words(hdw,MBOX_BASE,wrData,1);
                 if (ret) break;
                 poll_count = 0;
                 while (1) {
-                        if (poll_count < 10000000) poll_count++;
-                        ret = pvr2_encoder_read_words(hdw,!0,rdData,1);
-                        if (ret) break;
+                        poll_count++;
+                        ret = pvr2_encoder_read_words(hdw,MBOX_BASE,rdData,
+                                                      arg_cnt_recv+4);
+                        if (ret) {
+                                break;
+                        }
                         if (rdData[0] & IVTV_MBOX_FIRMWARE_DONE) {
                                 break;
                         }
-                        if (poll_count == 100) {
+                        if (rdData[0] && (poll_count < 1000)) continue;
+                        if (!rdData[0]) {
+                                retry_flag = !0;
                                 pvr2_trace(
                                         PVR2_TRACE_ERROR_LEGS,
-                                        "***WARNING*** device's encoder"
-                                        " appears to be stuck"
-                                        " (status=0%08x)",rdData[0]);
+                                        "Encoder timed out waiting for us"
+                                        "; arranging to retry");
+                        } else {
                                 pvr2_trace(
                                         PVR2_TRACE_ERROR_LEGS,
-                                        "Encoder command: 0x%02x",cmd);
-                                for (idx = 4; idx < arg_cnt_send; idx++) {
-                                        pvr2_trace(
-                                                PVR2_TRACE_ERROR_LEGS,
-                                                "Encoder arg%d: 0x%08x",
-                                                idx-3,wrData[idx]);
-                                }
+                                        "***WARNING*** device's encoder"
+                                        " appears to be stuck"
+                                        " (status=0x%08x)",rdData[0]);
+                        }
+                        pvr2_trace(
+                                PVR2_TRACE_ERROR_LEGS,
+                                "Encoder command: 0x%02x",cmd);
+                        for (idx = 4; idx < arg_cnt_send; idx++) {
                                 pvr2_trace(
                                         PVR2_TRACE_ERROR_LEGS,
-                                        "Giving up waiting."
-                                        "  It is likely that"
-                                        " this is a bad idea...");
-                                ret = -EBUSY;
-                                break;
+                                        "Encoder arg%d: 0x%08x",
+                                        idx-3,wrData[idx]);
                         }
+                        ret = -EBUSY;
+                        break;
+                }
+                if (retry_flag) {
+                        if (try_count < 20) continue;
+                        pvr2_trace(
+                                PVR2_TRACE_ERROR_LEGS,
+                                "Too many retries...");
+                        ret = -EBUSY;
+                }
+                if (ret) {
+                        pvr2_trace(
+                                PVR2_TRACE_ERROR_LEGS,
+                                "Giving up on command."
+                                "  It is likely that"
+                                " this is a bad idea...");
+                        break;
                 }
-                if (ret) break;
                 wrData[0] = 0x7;
-                ret = pvr2_encoder_read_words(
-                        hdw,0,rdData,
-                        sizeof(rdData)/sizeof(rdData[0]));
-                if (ret) break;
                 for (idx = 0; idx < arg_cnt_recv; idx++) {
                         argp[idx] = rdData[idx+4];
                 }
 
                 wrData[0] = 0x0;
-                ret = pvr2_encoder_write_words(hdw,wrData,1);
+                ret = pvr2_encoder_write_words(hdw,MBOX_BASE,wrData,1);
                 if (ret) break;
 
         } while(0); LOCK_GIVE(hdw->ctl_lock);
@@ -269,13 +302,13 @@ static int pvr2_encoder_vcmd(struct pvr2_hdw *hdw, int cmd,
         unsigned int idx;
         u32 data[12];
 
-        if (args > sizeof(data)/sizeof(data[0])) {
+        if (args > ARRAY_SIZE(data)) {
                 pvr2_trace(
                         PVR2_TRACE_ERROR_LEGS,
                         "Failed to write cx23416 command"
                         " - too many arguments"
-                        " (was given %u limit %u)",
-                        args,(unsigned int)(sizeof(data)/sizeof(data[0])));
+                        " (was given %u limit %lu)",
+                        args, (long unsigned) ARRAY_SIZE(data));
                 return -EINVAL;
         }
 
@@ -288,6 +321,73 @@ static int pvr2_encoder_vcmd(struct pvr2_hdw *hdw, int cmd,
         return pvr2_encoder_cmd(hdw,cmd,args,0,data);
 }
 
+
+/* This implements some extra setup for the encoder that seems to be
+   specific to the PVR USB2 hardware. */
+int pvr2_encoder_prep_config(struct pvr2_hdw *hdw)
+{
+        int ret = 0;
+        int encMisc3Arg = 0;
+
+#if 0
+        /* This inexplicable bit happens in the Hauppage windows
+           driver (for both 24xxx and 29xxx devices).  However I
+           currently see no difference in behavior with or without
+           this stuff.  Leave this here as a note of its existence,
+           but don't use it. */
+        LOCK_TAKE(hdw->ctl_lock); do {
+                u32 dat[1];
+                dat[0] = 0x80000640;
+                pvr2_encoder_write_words(hdw,0x01fe,dat,1);
+                pvr2_encoder_write_words(hdw,0x023e,dat,1);
+        } while(0); LOCK_GIVE(hdw->ctl_lock);
+#endif
+
+        /* Mike Isely <isely@pobox.com> 26-Jan-2006 The windows driver
+           sends the following list of ENC_MISC commands (for both
+           24xxx and 29xxx devices).  Meanings are not entirely clear,
+           however without the ENC_MISC(3,1) command then we risk
+           random perpetual video corruption whenever the video input
+           breaks up for a moment (like when switching channels). */
+
+
+#if 0
+        /* This ENC_MISC(5,0) command seems to hurt 29xxx sync
+           performance on channel changes, but is not a problem on
+           24xxx devices. */
+        ret |= pvr2_encoder_vcmd(hdw, CX2341X_ENC_MISC,4, 5,0,0,0);
+#endif
+
+        /* This ENC_MISC(3,encMisc3Arg) command is critical - without
+           it there will eventually be video corruption.  Also, the
+           29xxx case is strange - the Windows driver is passing 1
+           regardless of device type but if we have 1 for 29xxx device
+           the video turns sluggish.  */
+        switch (hdw->hdw_type) {
+        case PVR2_HDW_TYPE_24XXX: encMisc3Arg = 1; break;
+        case PVR2_HDW_TYPE_29XXX: encMisc3Arg = 0; break;
+        default: break;
+        }
+        ret |= pvr2_encoder_vcmd(hdw, CX2341X_ENC_MISC,4, 3,
+                                 encMisc3Arg,0,0);
+
+        ret |= pvr2_encoder_vcmd(hdw, CX2341X_ENC_MISC,4, 8,0,0,0);
+
+#if 0
+        /* This ENC_MISC(4,1) command is poisonous, so it is commented
+           out.  But I'm leaving it here anyway to document its
+           existence in the Windows driver.  The effect of this
+           command is that apps displaying the stream become sluggish
+           with stuttering video. */
+        ret |= pvr2_encoder_vcmd(hdw, CX2341X_ENC_MISC,4, 4,1,0,0);
+#endif
+
+        ret |= pvr2_encoder_vcmd(hdw, CX2341X_ENC_MISC,4, 0,3,0,0);
+        ret |= pvr2_encoder_vcmd(hdw, CX2341X_ENC_MISC,4,15,0,0,0);
+
+        return ret;
+}
+
 int pvr2_encoder_configure(struct pvr2_hdw *hdw)
 {
         int ret;
@@ -302,6 +402,8 @@ int pvr2_encoder_configure(struct pvr2_hdw *hdw)
 
         ret = 0;
 
+        ret |= pvr2_encoder_prep_config(hdw);
+
         if (!ret) ret = pvr2_encoder_vcmd(
                 hdw,CX2341X_ENC_SET_NUM_VSYNC_LINES, 2,
                 0xf0, 0xf0);
@@ -360,15 +462,22 @@ int pvr2_encoder_start(struct pvr2_hdw *hdw)
         pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000481);
         pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);
 
-        if (hdw->config == pvr2_config_vbi) {
+        pvr2_encoder_vcmd(hdw,CX2341X_ENC_MUTE_VIDEO,1,
+                          hdw->input_val == PVR2_CVAL_INPUT_RADIO ? 1 : 0);
+
+        switch (hdw->config) {
+        case pvr2_config_vbi:
                 status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,
                                            0x01,0x14);
-        } else if (hdw->config == pvr2_config_mpeg) {
+                break;
+        case pvr2_config_mpeg:
                 status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,
                                            0,0x13);
-        } else {
+                break;
+        default: /* Unhandled cases for now */
                 status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,
                                            0,0x13);
+                break;
         }
         if (!status) {
                 hdw->subsys_enabled_mask |= (1<<PVR2_SUBSYS_B_ENC_RUN);
@@ -383,15 +492,19 @@ int pvr2_encoder_stop(struct pvr2_hdw *hdw)
         /* mask all interrupts */
         pvr2_write_register(hdw, 0x0048, 0xffffffff);
 
-        if (hdw->config == pvr2_config_vbi) {
+        switch (hdw->config) {
+        case pvr2_config_vbi:
                 status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_STOP_CAPTURE,3,
                                            0x01,0x01,0x14);
-        } else if (hdw->config == pvr2_config_mpeg) {
+                break;
+        case pvr2_config_mpeg:
                 status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_STOP_CAPTURE,3,
                                            0x01,0,0x13);
-        } else {
+                break;
+        default: /* Unhandled cases for now */
                 status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_STOP_CAPTURE,3,
                                            0x01,0,0x13);
+                break;
         }
 
         /* change some GPIO data */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
new file mode 100644
index 000000000000..ffbc6d096108
--- /dev/null
+++ b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
@@ -0,0 +1,62 @@
+/*
+ *
+ *  $Id$
+ *
+ *  Copyright (C) 2007 Michael Krufky <mkrufky@linuxtv.org>
+ *
+ *  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
+ *
+ *  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
+ *
+ */
+
+#ifndef _PVRUSB2_FX2_CMD_H_
+#define _PVRUSB2_FX2_CMD_H_
+
+#define FX2CMD_MEM_WRITE_DWORD  0x01
+#define FX2CMD_MEM_READ_DWORD   0x02
+
+#define FX2CMD_MEM_READ_64BYTES 0x28
+
+#define FX2CMD_REG_WRITE        0x04
+#define FX2CMD_REG_READ         0x05
+#define FX2CMD_MEMSEL           0x06
+
+#define FX2CMD_I2C_WRITE        0x08
+#define FX2CMD_I2C_READ         0x09
+
+#define FX2CMD_GET_USB_SPEED    0x0b
+
+#define FX2CMD_STREAMING_ON     0x36
+#define FX2CMD_STREAMING_OFF    0x37
+
+#define FX2CMD_FWPOST1          0x52
+
+#define FX2CMD_POWER_OFF        0xdc
+#define FX2CMD_POWER_ON         0xde
+
+#define FX2CMD_DEEP_RESET       0xdd
+
+#define FX2CMD_GET_EEPROM_ADDR  0xeb
+#define FX2CMD_GET_IR_CODE      0xec
+
+#endif /* _PVRUSB2_FX2_CMD_H_ */
+
+/*
+  Stuff for Emacs to see, in order to encourage consistent editing style:
+  *** Local Variables: ***
+  *** mode: c ***
+  *** fill-column: 75 ***
+  *** tab-width: 8 ***
+  *** c-basic-offset: 8 ***
+  *** End: ***
+  */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 34b08fbcc6ea..16bd74199601 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -60,6 +60,7 @@ struct pvr2_decoder;
 
 typedef int (*pvr2_ctlf_is_dirty)(struct pvr2_ctrl *);
 typedef void (*pvr2_ctlf_clear_dirty)(struct pvr2_ctrl *);
+typedef int (*pvr2_ctlf_check_value)(struct pvr2_ctrl *,int);
 typedef int (*pvr2_ctlf_get_value)(struct pvr2_ctrl *,int *);
 typedef int (*pvr2_ctlf_set_value)(struct pvr2_ctrl *,int msk,int val);
 typedef int (*pvr2_ctlf_val_to_sym)(struct pvr2_ctrl *,int msk,int val,
@@ -83,6 +84,7 @@ struct pvr2_ctl_info {
         pvr2_ctlf_get_value get_min_value;  /* Get minimum allowed value */
         pvr2_ctlf_get_value get_max_value;  /* Get maximum allowed value */
         pvr2_ctlf_set_value set_value;      /* Set its value */
+        pvr2_ctlf_check_value check_value;  /* Check that value is valid */
         pvr2_ctlf_val_to_sym val_to_sym;    /* Custom convert value->symbol */
         pvr2_ctlf_sym_to_val sym_to_val;    /* Custom convert symbol->value */
         pvr2_ctlf_is_dirty is_dirty;        /* Return true if dirty */
@@ -135,17 +137,10 @@ struct pvr2_ctrl {
 };
 
 
-struct pvr2_audio_stat {
-        void *ctxt;
-        void (*detach)(void *);
-        int (*status)(void *);
-};
-
 struct pvr2_decoder_ctrl {
         void *ctxt;
         void (*detach)(void *);
         void (*enable)(void *,int);
-        int (*tuned)(void *);
         void (*force_reset)(void *);
 };
 
@@ -212,7 +207,6 @@ struct pvr2_hdw {
         /* Frequency table */
         unsigned int freqTable[FREQTABLE_SIZE];
         unsigned int freqProgSlot;
-        unsigned int freqSlot;
 
         /* Stuff for handling low level control interaction with device */
         struct mutex ctl_lock_mutex;
@@ -258,9 +252,17 @@ struct pvr2_hdw {
         /* Tuner / frequency control stuff */
         unsigned int tuner_type;
         int tuner_updated;
-        unsigned int freqVal;
+        unsigned int freqValTelevision;  /* Current freq for tv mode */
+        unsigned int freqValRadio;       /* Current freq for radio mode */
+        unsigned int freqSlotTelevision; /* Current slot for tv mode */
+        unsigned int freqSlotRadio;      /* Current slot for radio mode */
+        unsigned int freqSelector;       /* 0=radio 1=television */
         int freqDirty;
 
+        /* Current tuner info - this information is polled from the I2C bus */
+        struct v4l2_tuner tuner_signal_info;
+        int tuner_signal_stale;
+
         /* Video standard handling */
         v4l2_std_id std_mask_eeprom; // Hardware supported selections
         v4l2_std_id std_mask_avail;  // Which standards we may select from
@@ -281,20 +283,17 @@ struct pvr2_hdw {
         int unit_number;             /* ID for driver instance */
         unsigned long serial_number; /* ID for hardware itself */
 
-        /* Minor number used by v4l logic (yes, this is a hack, as there should
-           be no v4l junk here).  Probably a better way to do this. */
-        int v4l_minor_number;
+        /* Minor numbers used by v4l logic (yes, this is a hack, as there
+           should be no v4l junk here).  Probably a better way to do this. */
+        int v4l_minor_number_video;
+        int v4l_minor_number_vbi;
+        int v4l_minor_number_radio;
 
         /* Location of eeprom or a negative number if none */
         int eeprom_addr;
 
         enum pvr2_config config;
 
-        /* Information about what audio signal we're hearing */
-        int flag_stereo;
-        int flag_bilingual;
-        struct pvr2_audio_stat *audio_stat;
-
         /* Control state needed for cx2341x module */
         struct cx2341x_mpeg_params enc_cur_state;
         struct cx2341x_mpeg_params enc_ctl_state;
@@ -327,6 +326,9 @@ struct pvr2_hdw {
         unsigned int control_cnt;
 };
 
+/* This function gets the current frequency */
+unsigned long pvr2_hdw_get_cur_freq(struct pvr2_hdw *);
+
 #endif /* __PVRUSB2_HDW_INTERNAL_H */
 
 /*
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index d2004965187b..a1ca0f5007e0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -36,6 +36,10 @@
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-encoder.h"
 #include "pvrusb2-debug.h"
+#include "pvrusb2-fx2-cmd.h"
+
+#define TV_MIN_FREQ     55250000L
+#define TV_MAX_FREQ    850000000L
 
 struct usb_device_id pvr2_device_table[] = {
         [PVR2_HDW_TYPE_29XXX] = { USB_DEVICE(0x2040, 0x2900) },
@@ -71,12 +75,10 @@ static const char *pvr2_client_29xxx[] = {
 
 static struct pvr2_string_table pvr2_client_lists[] = {
         [PVR2_HDW_TYPE_29XXX] = {
-                pvr2_client_29xxx,
-                sizeof(pvr2_client_29xxx)/sizeof(pvr2_client_29xxx[0]),
+                pvr2_client_29xxx, ARRAY_SIZE(pvr2_client_29xxx)
         },
         [PVR2_HDW_TYPE_24XXX] = {
-                pvr2_client_24xxx,
-                sizeof(pvr2_client_24xxx)/sizeof(pvr2_client_24xxx[0]),
+                pvr2_client_24xxx, ARRAY_SIZE(pvr2_client_24xxx)
         },
 };
 
@@ -160,9 +162,6 @@ static const struct pvr2_mpeg_ids mpeg_ids[] = {
                 .strid = "video_gop_closure",
                 .id = V4L2_CID_MPEG_VIDEO_GOP_CLOSURE,
         },{
-                .strid = "video_pulldown",
-                .id = V4L2_CID_MPEG_VIDEO_PULLDOWN,
-        },{
                 .strid = "video_bitrate_mode",
                 .id = V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
         },{
@@ -212,7 +211,7 @@ static const struct pvr2_mpeg_ids mpeg_ids[] = {
                 .id = V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM,
         }
 };
-#define MPEGDEF_COUNT (sizeof(mpeg_ids)/sizeof(mpeg_ids[0]))
+#define MPEGDEF_COUNT ARRAY_SIZE(mpeg_ids)
 
 
 static const char *control_values_srate[] = {
@@ -255,10 +254,10 @@ static const char *control_values_subsystem[] = {
         [PVR2_SUBSYS_B_ENC_RUN] = "enc_run",
 };
 
+static void pvr2_hdw_set_cur_freq(struct pvr2_hdw *,unsigned long);
 static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl);
 static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw);
 static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw);
-static unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *hdw);
 static void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw);
 static void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw);
 static void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *hdw);
@@ -272,8 +271,6 @@ static int pvr2_send_request_ex(struct pvr2_hdw *hdw,
                                 unsigned int timeout,int probe_fl,
                                 void *write_data,unsigned int write_len,
                                 void *read_data,unsigned int read_len);
-static int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res);
-static int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res);
 
 static int ctrl_channelfreq_get(struct pvr2_ctrl *cptr,int *vp)
 {
@@ -289,8 +286,21 @@ static int ctrl_channelfreq_get(struct pvr2_ctrl *cptr,int *vp)
 static int ctrl_channelfreq_set(struct pvr2_ctrl *cptr,int m,int v)
 {
         struct pvr2_hdw *hdw = cptr->hdw;
-        if ((hdw->freqProgSlot > 0) && (hdw->freqProgSlot <= FREQTABLE_SIZE)) {
-                hdw->freqTable[hdw->freqProgSlot-1] = v;
+        unsigned int slotId = hdw->freqProgSlot;
+        if ((slotId > 0) && (slotId <= FREQTABLE_SIZE)) {
+                hdw->freqTable[slotId-1] = v;
+                /* Handle side effects correctly - if we're tuned to this
+                   slot, then forgot the slot id relation since the stored
+                   frequency has been changed. */
+                if (hdw->freqSelector) {
+                        if (hdw->freqSlotRadio == slotId) {
+                                hdw->freqSlotRadio = 0;
+                        }
+                } else {
+                        if (hdw->freqSlotTelevision == slotId) {
+                                hdw->freqSlotTelevision = 0;
+                        }
+                }
         }
         return 0;
 }
@@ -312,28 +322,32 @@ static int ctrl_channelprog_set(struct pvr2_ctrl *cptr,int m,int v)
 
 static int ctrl_channel_get(struct pvr2_ctrl *cptr,int *vp)
 {
-        *vp = cptr->hdw->freqSlot;
+        struct pvr2_hdw *hdw = cptr->hdw;
+        *vp = hdw->freqSelector ? hdw->freqSlotRadio : hdw->freqSlotTelevision;
         return 0;
 }
 
-static int ctrl_channel_set(struct pvr2_ctrl *cptr,int m,int v)
+static int ctrl_channel_set(struct pvr2_ctrl *cptr,int m,int slotId)
 {
         unsigned freq = 0;
         struct pvr2_hdw *hdw = cptr->hdw;
-        hdw->freqSlot = v;
-        if ((hdw->freqSlot > 0) && (hdw->freqSlot <= FREQTABLE_SIZE)) {
-                freq = hdw->freqTable[hdw->freqSlot-1];
-        }
-        if (freq && (freq != hdw->freqVal)) {
-                hdw->freqVal = freq;
-                hdw->freqDirty = !0;
+        if ((slotId < 0) || (slotId > FREQTABLE_SIZE)) return 0;
+        if (slotId > 0) {
+                freq = hdw->freqTable[slotId-1];
+                if (!freq) return 0;
+                pvr2_hdw_set_cur_freq(hdw,freq);
+        }
+        if (hdw->freqSelector) {
+                hdw->freqSlotRadio = slotId;
+        } else {
+                hdw->freqSlotTelevision = slotId;
         }
         return 0;
 }
 
 static int ctrl_freq_get(struct pvr2_ctrl *cptr,int *vp)
 {
-        *vp = cptr->hdw->freqVal;
+        *vp = pvr2_hdw_get_cur_freq(cptr->hdw);
         return 0;
 }
 
@@ -349,10 +363,7 @@ static void ctrl_freq_clear_dirty(struct pvr2_ctrl *cptr)
 
 static int ctrl_freq_set(struct pvr2_ctrl *cptr,int m,int v)
 {
-        struct pvr2_hdw *hdw = cptr->hdw;
-        hdw->freqVal = v;
-        hdw->freqDirty = !0;
-        hdw->freqSlot = 0;
+        pvr2_hdw_set_cur_freq(cptr->hdw,v);
         return 0;
 }
 
@@ -378,6 +389,89 @@ static int ctrl_vres_min_get(struct pvr2_ctrl *cptr,int *vp)
         return 0;
 }
 
+static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)
+{
+        *vp = cptr->hdw->input_val;
+        return 0;
+}
+
+static int ctrl_set_input(struct pvr2_ctrl *cptr,int m,int v)
+{
+        struct pvr2_hdw *hdw = cptr->hdw;
+
+        if (hdw->input_val != v) {
+                hdw->input_val = v;
+                hdw->input_dirty = !0;
+        }
+
+        /* Handle side effects - if we switch to a mode that needs the RF
+           tuner, then select the right frequency choice as well and mark
+           it dirty. */
+        if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {
+                hdw->freqSelector = 0;
+                hdw->freqDirty = !0;
+        } else if (hdw->input_val == PVR2_CVAL_INPUT_TV) {
+                hdw->freqSelector = 1;
+                hdw->freqDirty = !0;
+        }
+        return 0;
+}
+
+static int ctrl_isdirty_input(struct pvr2_ctrl *cptr)
+{
+        return cptr->hdw->input_dirty != 0;
+}
+
+static void ctrl_cleardirty_input(struct pvr2_ctrl *cptr)
+{
+        cptr->hdw->input_dirty = 0;
+}
+
+
+static int ctrl_freq_max_get(struct pvr2_ctrl *cptr, int *vp)
+{
+        unsigned long fv;
+        struct pvr2_hdw *hdw = cptr->hdw;
+        if (hdw->tuner_signal_stale) {
+                pvr2_i2c_core_status_poll(hdw);
+        }
+        fv = hdw->tuner_signal_info.rangehigh;
+        if (!fv) {
+                /* Safety fallback */
+                *vp = TV_MAX_FREQ;
+                return 0;
+        }
+        if (hdw->tuner_signal_info.capability & V4L2_TUNER_CAP_LOW) {
+                fv = (fv * 125) / 2;
+        } else {
+                fv = fv * 62500;
+        }
+        *vp = fv;
+        return 0;
+}
+
+static int ctrl_freq_min_get(struct pvr2_ctrl *cptr, int *vp)
+{
+        unsigned long fv;
+        struct pvr2_hdw *hdw = cptr->hdw;
+        if (hdw->tuner_signal_stale) {
+                pvr2_i2c_core_status_poll(hdw);
+        }
+        fv = hdw->tuner_signal_info.rangelow;
+        if (!fv) {
+                /* Safety fallback */
+                *vp = TV_MIN_FREQ;
+                return 0;
+        }
+        if (hdw->tuner_signal_info.capability & V4L2_TUNER_CAP_LOW) {
+                fv = (fv * 125) / 2;
+        } else {
+                fv = fv * 62500;
+        }
+        *vp = fv;
+        return 0;
+}
+
 static int ctrl_cx2341x_is_dirty(struct pvr2_ctrl *cptr)
 {
         return cptr->hdw->enc_stale != 0;
@@ -534,8 +628,32 @@ static void ctrl_stdcur_clear_dirty(struct pvr2_ctrl *cptr)
 
 static int ctrl_signal_get(struct pvr2_ctrl *cptr,int *vp)
 {
-        *vp = ((pvr2_hdw_get_signal_status_internal(cptr->hdw) &
-                PVR2_SIGNAL_OK) ? 1 : 0);
+        struct pvr2_hdw *hdw = cptr->hdw;
+        pvr2_i2c_core_status_poll(hdw);
+        *vp = hdw->tuner_signal_info.signal;
+        return 0;
+}
+
+static int ctrl_audio_modes_present_get(struct pvr2_ctrl *cptr,int *vp)
+{
+        int val = 0;
+        unsigned int subchan;
+        struct pvr2_hdw *hdw = cptr->hdw;
+        pvr2_i2c_core_status_poll(hdw);
+        subchan = hdw->tuner_signal_info.rxsubchans;
+        if (subchan & V4L2_TUNER_SUB_MONO) {
+                val |= (1 << V4L2_TUNER_MODE_MONO);
+        }
+        if (subchan & V4L2_TUNER_SUB_STEREO) {
+                val |= (1 << V4L2_TUNER_MODE_STEREO);
+        }
+        if (subchan & V4L2_TUNER_SUB_LANG1) {
+                val |= (1 << V4L2_TUNER_MODE_LANG1);
+        }
+        if (subchan & V4L2_TUNER_SUB_LANG2) {
+                val |= (1 << V4L2_TUNER_MODE_LANG2);
+        }
+        *vp = val;
         return 0;
 }
 
@@ -604,7 +722,7 @@ static void ctrl_stdenumcur_clear_dirty(struct pvr2_ctrl *cptr)
 
 #define DEFENUM(tab) \
         .type = pvr2_ctl_enum, \
-        .def.type_enum.count = (sizeof(tab)/sizeof((tab)[0])), \
+        .def.type_enum.count = ARRAY_SIZE(tab), \
         .def.type_enum.value_names = tab
 
 #define DEFBOOL \
@@ -641,15 +759,11 @@ VCREATE_FUNCS(balance)
 VCREATE_FUNCS(bass)
 VCREATE_FUNCS(treble)
 VCREATE_FUNCS(mute)
-VCREATE_FUNCS(input)
 VCREATE_FUNCS(audiomode)
 VCREATE_FUNCS(res_hor)
 VCREATE_FUNCS(res_ver)
 VCREATE_FUNCS(srate)
 
-#define MIN_FREQ 55250000L
-#define MAX_FREQ 850000000L
-
 /* Table definition of all controls which can be manipulated */
 static const struct pvr2_ctl_info control_defs[] = {
         {
@@ -684,7 +798,7 @@ static const struct pvr2_ctl_info control_defs[] = {
                 .v4l_id = V4L2_CID_AUDIO_VOLUME,
                 .desc = "Volume",
                 .name = "volume",
-                .default_value = 65535,
+                .default_value = 62000,
                 DEFREF(volume),
                 DEFINT(0,65535),
         },{
@@ -758,12 +872,16 @@ static const struct pvr2_ctl_info control_defs[] = {
                 .desc = "Tuner Frequency (Hz)",
                 .name = "frequency",
                 .internal_id = PVR2_CID_FREQUENCY,
-                .default_value = 175250000L,
+                .default_value = 0,
                 .set_value = ctrl_freq_set,
                 .get_value = ctrl_freq_get,
                 .is_dirty = ctrl_freq_is_dirty,
                 .clear_dirty = ctrl_freq_clear_dirty,
-                DEFINT(MIN_FREQ,MAX_FREQ),
+                DEFINT(0,0),
+                /* Hook in check for input value (tv/radio) and adjust
+                   max/min values accordingly */
+                .get_max_value = ctrl_freq_max_get,
+                .get_min_value = ctrl_freq_min_get,
         },{
                 .desc = "Channel",
                 .name = "channel",
@@ -775,7 +893,11 @@ static const struct pvr2_ctl_info control_defs[] = {
                 .name = "freq_table_value",
                 .set_value = ctrl_channelfreq_set,
                 .get_value = ctrl_channelfreq_get,
-                DEFINT(MIN_FREQ,MAX_FREQ),
+                DEFINT(0,0),
+                /* Hook in check for input value (tv/radio) and adjust
+                   max/min values accordingly */
+                .get_max_value = ctrl_freq_max_get,
+                .get_min_value = ctrl_freq_min_get,
         },{
                 .desc = "Channel Program ID",
                 .name = "freq_table_channel",
@@ -796,7 +918,20 @@ static const struct pvr2_ctl_info control_defs[] = {
                 .desc = "Signal Present",
                 .name = "signal_present",
                 .get_value = ctrl_signal_get,
-                DEFBOOL,
+                DEFINT(0,65535),
+        },{
+                .desc = "Audio Modes Present",
+                .name = "audio_modes_present",
+                .get_value = ctrl_audio_modes_present_get,
+                /* For this type we "borrow" the V4L2_TUNER_MODE enum from
+                   v4l.  Nothing outside of this module cares about this,
+                   but I reuse it in order to also reuse the
+                   control_values_audiomode string table. */
+                DEFMASK(((1 << V4L2_TUNER_MODE_MONO)|
+                         (1 << V4L2_TUNER_MODE_STEREO)|
+                         (1 << V4L2_TUNER_MODE_LANG1)|
+                         (1 << V4L2_TUNER_MODE_LANG2)),
+                        control_values_audiomode),
         },{
                 .desc = "Video Standards Available Mask",
                 .name = "video_standard_mask_available",
@@ -846,7 +981,7 @@ static const struct pvr2_ctl_info control_defs[] = {
         }
 };
 
-#define CTRLDEF_COUNT (sizeof(control_defs)/sizeof(control_defs[0]))
+#define CTRLDEF_COUNT ARRAY_SIZE(control_defs)
 
 
 const char *pvr2_config_get_name(enum pvr2_config cfg)
@@ -855,7 +990,8 @@ const char *pvr2_config_get_name(enum pvr2_config cfg)
         case pvr2_config_empty: return "empty";
         case pvr2_config_mpeg: return "mpeg";
         case pvr2_config_vbi: return "vbi";
-        case pvr2_config_radio: return "radio";
+        case pvr2_config_pcm: return "pcm";
+        case pvr2_config_rawvideo: return "raw video";
         }
         return "<unknown>";
 }
@@ -872,6 +1008,40 @@ unsigned long pvr2_hdw_get_sn(struct pvr2_hdw *hdw)
         return hdw->serial_number;
 }
 
+unsigned long pvr2_hdw_get_cur_freq(struct pvr2_hdw *hdw)
+{
+        return hdw->freqSelector ? hdw->freqValTelevision : hdw->freqValRadio;
+}
+
+/* Set the currently tuned frequency and account for all possible
+   driver-core side effects of this action. */
+void pvr2_hdw_set_cur_freq(struct pvr2_hdw *hdw,unsigned long val)
+{
+        if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {
+                if (hdw->freqSelector) {
+                        /* Swing over to radio frequency selection */
+                        hdw->freqSelector = 0;
+                        hdw->freqDirty = !0;
+                }
+                if (hdw->freqValRadio != val) {
+                        hdw->freqValRadio = val;
+                        hdw->freqSlotRadio = 0;
+                        hdw->freqDirty = !0;
+                }
+        } else {
+                if (!(hdw->freqSelector)) {
+                        /* Swing over to television frequency selection */
+                        hdw->freqSelector = 1;
+                        hdw->freqDirty = !0;
+                }
+                if (hdw->freqValTelevision != val) {
+                        hdw->freqValTelevision = val;
+                        hdw->freqSlotTelevision = 0;
+                        hdw->freqDirty = !0;
+                }
+        }
+}
+
 int pvr2_hdw_get_unit_number(struct pvr2_hdw *hdw)
 {
         return hdw->unit_number;
@@ -960,12 +1130,10 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
         };
         static const struct pvr2_string_table fw_file_defs[] = {
                 [PVR2_HDW_TYPE_29XXX] = {
-                        fw_files_29xxx,
-                        sizeof(fw_files_29xxx)/sizeof(fw_files_29xxx[0]),
+                        fw_files_29xxx, ARRAY_SIZE(fw_files_29xxx)
                 },
                 [PVR2_HDW_TYPE_24XXX] = {
-                        fw_files_24xxx,
-                        sizeof(fw_files_24xxx)/sizeof(fw_files_24xxx[0]),
+                        fw_files_24xxx, ARRAY_SIZE(fw_files_24xxx)
                 },
         };
         hdw->fw1_state = FW1_STATE_FAILED; // default result
@@ -1041,7 +1209,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
 {
         const struct firmware *fw_entry = NULL;
         void  *fw_ptr;
-        unsigned int pipe, fw_len, fw_done;
+        unsigned int pipe, fw_len, fw_done, bcnt, icnt;
         int actual_length;
         int ret = 0;
         int fwidx;
@@ -1052,8 +1220,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
         trace_firmware("pvr2_upload_firmware2");
 
         ret = pvr2_locate_firmware(hdw,&fw_entry,"encoder",
-                                   sizeof(fw_files)/sizeof(fw_files[0]),
-                                   fw_files);
+                                   ARRAY_SIZE(fw_files), fw_files);
         if (ret < 0) return ret;
         fwidx = ret;
         ret = 0;
@@ -1079,8 +1246,13 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
         ret |= pvr2_write_register(hdw, 0xaa04, 0x00057810); /*unknown*/
         ret |= pvr2_write_register(hdw, 0xaa10, 0x00148500); /*unknown*/
         ret |= pvr2_write_register(hdw, 0xaa18, 0x00840000); /*unknown*/
-        ret |= pvr2_write_u8(hdw, 0x52, 0);
-        ret |= pvr2_write_u16(hdw, 0x0600, 0);
+        LOCK_TAKE(hdw->ctl_lock); do {
+                hdw->cmd_buffer[0] = FX2CMD_FWPOST1;
+                ret |= pvr2_send_request(hdw,hdw->cmd_buffer,1,0,0);
+                hdw->cmd_buffer[0] = FX2CMD_MEMSEL;
+                hdw->cmd_buffer[1] = 0;
+                ret |= pvr2_send_request(hdw,hdw->cmd_buffer,2,0,0);
+        } while (0); LOCK_GIVE(hdw->ctl_lock);
 
         if (ret) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
@@ -1093,11 +1265,11 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
 
         fw_len = fw_entry->size;
 
-        if (fw_len % FIRMWARE_CHUNK_SIZE) {
+        if (fw_len % sizeof(u32)) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                            "size of %s firmware"
-                           " must be a multiple of 8192B",
-                           fw_files[fwidx]);
+                           " must be a multiple of %u bytes",
+                           fw_files[fwidx],sizeof(u32));
                 release_firmware(fw_entry);
                 return -1;
         }
@@ -1112,18 +1284,21 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
 
         pipe = usb_sndbulkpipe(hdw->usb_dev, PVR2_FIRMWARE_ENDPOINT);
 
-        for (fw_done = 0 ; (fw_done < fw_len) && !ret ;
-             fw_done += FIRMWARE_CHUNK_SIZE ) {
-                int i;
-                memcpy(fw_ptr, fw_entry->data + fw_done, FIRMWARE_CHUNK_SIZE);
-                /* Usbsnoop log  shows that we must swap bytes... */
-                for (i = 0; i < FIRMWARE_CHUNK_SIZE/4 ; i++)
-                        ((u32 *)fw_ptr)[i] = ___swab32(((u32 *)fw_ptr)[i]);
-
-                ret |= usb_bulk_msg(hdw->usb_dev, pipe, fw_ptr,
-                                    FIRMWARE_CHUNK_SIZE,
+        fw_done = 0;
+        for (fw_done = 0; fw_done < fw_len;) {
+                bcnt = fw_len - fw_done;
+                if (bcnt > FIRMWARE_CHUNK_SIZE) bcnt = FIRMWARE_CHUNK_SIZE;
+                memcpy(fw_ptr, fw_entry->data + fw_done, bcnt);
+                /* Usbsnoop log shows that we must swap bytes... */
+                for (icnt = 0; icnt < bcnt/4 ; icnt++)
+                        ((u32 *)fw_ptr)[icnt] =
+                                ___swab32(((u32 *)fw_ptr)[icnt]);
+
+                ret |= usb_bulk_msg(hdw->usb_dev, pipe, fw_ptr,bcnt,
                                     &actual_length, HZ);
-                ret |= (actual_length != FIRMWARE_CHUNK_SIZE);
+                ret |= (actual_length != bcnt);
+                if (ret) break;
+                fw_done += bcnt;
         }
 
         trace_firmware("upload of %s : %i / %i ",
@@ -1142,7 +1317,11 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
 
         ret |= pvr2_write_register(hdw, 0x9054, 0xffffffff); /*reset hw blocks*/
         ret |= pvr2_write_register(hdw, 0x9058, 0xffffffe8); /*VPU ctrl*/
-        ret |= pvr2_write_u16(hdw, 0x0600, 0);
+        LOCK_TAKE(hdw->ctl_lock); do {
+                hdw->cmd_buffer[0] = FX2CMD_MEMSEL;
+                hdw->cmd_buffer[1] = 0;
+                ret |= pvr2_send_request(hdw,hdw->cmd_buffer,2,0,0);
+        } while (0); LOCK_GIVE(hdw->ctl_lock);
 
         if (ret) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
@@ -1479,7 +1658,7 @@ static int pvr2_hdw_check_firmware(struct pvr2_hdw *hdw)
            firmware needs be loaded. */
         int result;
         LOCK_TAKE(hdw->ctl_lock); do {
-                hdw->cmd_buffer[0] = 0xeb;
+                hdw->cmd_buffer[0] = FX2CMD_GET_EEPROM_ADDR;
                 result = pvr2_send_request_ex(hdw,HZ*1,!0,
                                            hdw->cmd_buffer,1,
                                            hdw->cmd_buffer,1);
@@ -1611,6 +1790,16 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
                 cptr->info->set_value(cptr,~0,cptr->info->default_value);
         }
 
+        /* Set up special default values for the television and radio
+           frequencies here.  It's not really important what these defaults
+           are, but I set them to something usable in the Chicago area just
+           to make driver testing a little easier. */
+
+        /* US Broadcast channel 7 (175.25 MHz) */
+        hdw->freqValTelevision = 175250000L;
+        /* 104.3 MHz, a usable FM station for my area */
+        hdw->freqValRadio = 104300000L;
+
         // Do not use pvr2_reset_ctl_endpoints() here.  It is not
         // thread-safe against the normal pvr2_send_request() mechanism.
         // (We should make it thread safe).
@@ -1750,26 +1939,24 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         struct pvr2_ctl_info *ciptr;
 
         hdw_type = devid - pvr2_device_table;
-        if (hdw_type >=
-            sizeof(pvr2_device_names)/sizeof(pvr2_device_names[0])) {
+        if (hdw_type >= ARRAY_SIZE(pvr2_device_names)) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                            "Bogus device type of %u reported",hdw_type);
                 return NULL;
         }
 
-        hdw = kmalloc(sizeof(*hdw),GFP_KERNEL);
+        hdw = kzalloc(sizeof(*hdw),GFP_KERNEL);
         pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",
                    hdw,pvr2_device_names[hdw_type]);
         if (!hdw) goto fail;
-        memset(hdw,0,sizeof(*hdw));
+        hdw->tuner_signal_stale = !0;
         cx2341x_fill_defaults(&hdw->enc_ctl_state);
 
         hdw->control_cnt = CTRLDEF_COUNT;
         hdw->control_cnt += MPEGDEF_COUNT;
-        hdw->controls = kmalloc(sizeof(struct pvr2_ctrl) * hdw->control_cnt,
+        hdw->controls = kzalloc(sizeof(struct pvr2_ctrl) * hdw->control_cnt,
                                 GFP_KERNEL);
         if (!hdw->controls) goto fail;
-        memset(hdw->controls,0,sizeof(struct pvr2_ctrl) * hdw->control_cnt);
         hdw->hdw_type = hdw_type;
         for (idx = 0; idx < hdw->control_cnt; idx++) {
                 cptr = hdw->controls + idx;
@@ -1783,11 +1970,9 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                 cptr->info = control_defs+idx;
         }
         /* Define and configure additional controls from cx2341x module. */
-        hdw->mpeg_ctrl_info = kmalloc(
+        hdw->mpeg_ctrl_info = kzalloc(
                 sizeof(*(hdw->mpeg_ctrl_info)) * MPEGDEF_COUNT, GFP_KERNEL);
         if (!hdw->mpeg_ctrl_info) goto fail;
-        memset(hdw->mpeg_ctrl_info,0,
-               sizeof(*(hdw->mpeg_ctrl_info)) * MPEGDEF_COUNT);
         for (idx = 0; idx < MPEGDEF_COUNT; idx++) {
                 cptr = hdw->controls + idx + CTRLDEF_COUNT;
                 ciptr = &(hdw->mpeg_ctrl_info[idx].info);
@@ -1872,7 +2057,9 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 
         hdw->eeprom_addr = -1;
         hdw->unit_number = -1;
-        hdw->v4l_minor_number = -1;
+        hdw->v4l_minor_number_video = -1;
+        hdw->v4l_minor_number_vbi = -1;
+        hdw->v4l_minor_number_radio = -1;
         hdw->ctl_write_buffer = kmalloc(PVR2_CTL_BUFFSIZE,GFP_KERNEL);
         if (!hdw->ctl_write_buffer) goto fail;
         hdw->ctl_read_buffer = kmalloc(PVR2_CTL_BUFFSIZE,GFP_KERNEL);
@@ -1929,10 +2116,10 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         if (hdw) {
                 usb_free_urb(hdw->ctl_read_urb);
                 usb_free_urb(hdw->ctl_write_urb);
-                if (hdw->ctl_read_buffer) kfree(hdw->ctl_read_buffer);
-                if (hdw->ctl_write_buffer) kfree(hdw->ctl_write_buffer);
-                if (hdw->controls) kfree(hdw->controls);
-                if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info);
+                kfree(hdw->ctl_read_buffer);
+                kfree(hdw->ctl_write_buffer);
+                kfree(hdw->controls);
+                kfree(hdw->mpeg_ctrl_info);
                 kfree(hdw);
         }
         return NULL;
@@ -1982,9 +2169,6 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)
                 pvr2_stream_destroy(hdw->vid_stream);
                 hdw->vid_stream = NULL;
         }
-        if (hdw->audio_stat) {
-                hdw->audio_stat->detach(hdw->audio_stat->ctxt);
-        }
         if (hdw->decoder_ctrl) {
                 hdw->decoder_ctrl->detach(hdw->decoder_ctrl->ctxt);
         }
@@ -1997,10 +2181,10 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)
                         unit_pointers[hdw->unit_number] = NULL;
                 }
         } while (0); up(&pvr2_unit_sem);
-        if (hdw->controls) kfree(hdw->controls);
-        if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info);
-        if (hdw->std_defs) kfree(hdw->std_defs);
-        if (hdw->std_enum_names) kfree(hdw->std_enum_names);
+        kfree(hdw->controls);
+        kfree(hdw->mpeg_ctrl_info);
+        kfree(hdw->std_defs);
+        kfree(hdw->std_enum_names);
         kfree(hdw);
 }
 
@@ -2210,10 +2394,9 @@ static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw)
                 cptr = hdw->controls + idx;
                 if (cptr->info->is_dirty == 0) continue;
                 if (!cptr->info->is_dirty(cptr)) continue;
-                if (!commit_flag) {
-                        commit_flag = !0;
-                }
+                commit_flag = !0;
 
+                if (!(pvrusb2_debug & PVR2_TRACE_CTL)) continue;
                 bcnt = scnprintf(buf,sizeof(buf),"\"%s\" <-- ",
                                  cptr->info->name);
                 value = 0;
@@ -2263,6 +2446,13 @@ static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw)
                 stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_CFG);
         }
 
+        if (hdw->input_dirty) {
+                /* pk: If input changes to or from radio, then the encoder
+                   needs to be restarted (for ENC_MUTE_VIDEO to work) */
+                stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_RUN);
+        }
+
+
         if (hdw->srate_dirty) {
                 /* Write new sample rate into control structure since
                  * the master copy is stale.  We must track srate
@@ -2343,39 +2533,11 @@ const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *hdw)
 }
 
 
-/* Return bit mask indicating signal status */
-static unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *hdw)
-{
-        unsigned int msk = 0;
-        switch (hdw->input_val) {
-        case PVR2_CVAL_INPUT_TV:
-        case PVR2_CVAL_INPUT_RADIO:
-                if (hdw->decoder_ctrl &&
-                    hdw->decoder_ctrl->tuned(hdw->decoder_ctrl->ctxt)) {
-                        msk |= PVR2_SIGNAL_OK;
-                        if (hdw->audio_stat &&
-                            hdw->audio_stat->status(hdw->audio_stat->ctxt)) {
-                                if (hdw->flag_stereo) {
-                                        msk |= PVR2_SIGNAL_STEREO;
-                                }
-                                if (hdw->flag_bilingual) {
-                                        msk |= PVR2_SIGNAL_SAP;
-                                }
-                        }
-                }
-                break;
-        default:
-                msk |= PVR2_SIGNAL_OK | PVR2_SIGNAL_STEREO;
-        }
-        return msk;
-}
-
-
 int pvr2_hdw_is_hsm(struct pvr2_hdw *hdw)
 {
         int result;
         LOCK_TAKE(hdw->ctl_lock); do {
-                hdw->cmd_buffer[0] = 0x0b;
+                hdw->cmd_buffer[0] = FX2CMD_GET_USB_SPEED;
                 result = pvr2_send_request(hdw,
                                            hdw->cmd_buffer,1,
                                            hdw->cmd_buffer,1);
@@ -2386,14 +2548,25 @@ int pvr2_hdw_is_hsm(struct pvr2_hdw *hdw)
 }
 
 
-/* Return bit mask indicating signal status */
-unsigned int pvr2_hdw_get_signal_status(struct pvr2_hdw *hdw)
+/* Execute poll of tuner status */
+void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *hdw)
 {
-        unsigned int msk = 0;
         LOCK_TAKE(hdw->big_lock); do {
-                msk = pvr2_hdw_get_signal_status_internal(hdw);
+                pvr2_i2c_core_status_poll(hdw);
         } while (0); LOCK_GIVE(hdw->big_lock);
-        return msk;
+}
+
+
+/* Return information about the tuner */
+int pvr2_hdw_get_tuner_status(struct pvr2_hdw *hdw,struct v4l2_tuner *vtp)
+{
+        LOCK_TAKE(hdw->big_lock); do {
+                if (hdw->tuner_signal_stale) {
+                        pvr2_i2c_core_status_poll(hdw);
+                }
+                memcpy(vtp,&hdw->tuner_signal_info,sizeof(struct v4l2_tuner));
+        } while (0); LOCK_GIVE(hdw->big_lock);
+        return 0;
 }
 
 
@@ -2442,14 +2615,12 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw, int enable_flag)
                 pvr2_trace(PVR2_TRACE_FIRMWARE,
                            "Preparing to suck out CPU firmware");
                 hdw->fw_size = 0x2000;
-                hdw->fw_buffer = kmalloc(hdw->fw_size,GFP_KERNEL);
+                hdw->fw_buffer = kzalloc(hdw->fw_size,GFP_KERNEL);
                 if (!hdw->fw_buffer) {
                         hdw->fw_size = 0;
                         break;
                 }
 
-                memset(hdw->fw_buffer,0,hdw->fw_size);
-
                 /* We have to hold the CPU during firmware upload. */
                 pvr2_hdw_cpureset_assert(hdw,1);
 
@@ -2513,16 +2684,28 @@ int pvr2_hdw_cpufw_get(struct pvr2_hdw *hdw,unsigned int offs,
 }
 
 
-int pvr2_hdw_v4l_get_minor_number(struct pvr2_hdw *hdw)
+int pvr2_hdw_v4l_get_minor_number(struct pvr2_hdw *hdw,
+                                  enum pvr2_v4l_type index)
 {
-        return hdw->v4l_minor_number;
+        switch (index) {
+        case pvr2_v4l_type_video: return hdw->v4l_minor_number_video;
+        case pvr2_v4l_type_vbi: return hdw->v4l_minor_number_vbi;
+        case pvr2_v4l_type_radio: return hdw->v4l_minor_number_radio;
+        default: return -1;
+        }
 }
 
 
-/* Store the v4l minor device number */
-void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *hdw,int v)
+/* Store a v4l minor device number */
+void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *hdw,
+                                     enum pvr2_v4l_type index,int v)
 {
-        hdw->v4l_minor_number = v;
+        switch (index) {
+        case pvr2_v4l_type_video: hdw->v4l_minor_number_video = v;
+        case pvr2_v4l_type_vbi: hdw->v4l_minor_number_vbi = v;
+        case pvr2_v4l_type_radio: hdw->v4l_minor_number_radio = v;
+        default: break;
+        }
 }
 
 
@@ -2804,7 +2987,7 @@ int pvr2_write_register(struct pvr2_hdw *hdw, u16 reg, u32 data)
 
         LOCK_TAKE(hdw->ctl_lock);
 
-        hdw->cmd_buffer[0] = 0x04;  /* write register prefix */
+        hdw->cmd_buffer[0] = FX2CMD_REG_WRITE;  /* write register prefix */
         PVR2_DECOMPOSE_LE(hdw->cmd_buffer,1,data);
         hdw->cmd_buffer[5] = 0;
         hdw->cmd_buffer[6] = (reg >> 8) & 0xff;
@@ -2825,7 +3008,7 @@ static int pvr2_read_register(struct pvr2_hdw *hdw, u16 reg, u32 *data)
 
         LOCK_TAKE(hdw->ctl_lock);
 
-        hdw->cmd_buffer[0] = 0x05;  /* read register prefix */
+        hdw->cmd_buffer[0] = FX2CMD_REG_READ;  /* read register prefix */
         hdw->cmd_buffer[1] = 0;
         hdw->cmd_buffer[2] = 0;
         hdw->cmd_buffer[3] = 0;
@@ -2843,39 +3026,6 @@ static int pvr2_read_register(struct pvr2_hdw *hdw, u16 reg, u32 *data)
 }
 
 
-static int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res)
-{
-        int ret;
-
-        LOCK_TAKE(hdw->ctl_lock);
-
-        hdw->cmd_buffer[0] = (data >> 8) & 0xff;
-        hdw->cmd_buffer[1] = data & 0xff;
-
-        ret = pvr2_send_request(hdw, hdw->cmd_buffer, 2, hdw->cmd_buffer, res);
-
-        LOCK_GIVE(hdw->ctl_lock);
-
-        return ret;
-}
-
-
-static int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res)
-{
-        int ret;
-
-        LOCK_TAKE(hdw->ctl_lock);
-
-        hdw->cmd_buffer[0] = data;
-
-        ret = pvr2_send_request(hdw, hdw->cmd_buffer, 1, hdw->cmd_buffer, res);
-
-        LOCK_GIVE(hdw->ctl_lock);
-
-        return ret;
-}
-
-
 static void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *hdw)
 {
         if (!hdw->flag_ok) return;
@@ -2949,7 +3099,7 @@ int pvr2_hdw_cmd_deep_reset(struct pvr2_hdw *hdw)
         LOCK_TAKE(hdw->ctl_lock); do {
                 pvr2_trace(PVR2_TRACE_INIT,"Requesting uproc hard reset");
                 hdw->flag_ok = !0;
-                hdw->cmd_buffer[0] = 0xdd;
+                hdw->cmd_buffer[0] = FX2CMD_DEEP_RESET;
                 status = pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0);
         } while (0); LOCK_GIVE(hdw->ctl_lock);
         return status;
@@ -2961,7 +3111,7 @@ int pvr2_hdw_cmd_powerup(struct pvr2_hdw *hdw)
         int status;
         LOCK_TAKE(hdw->ctl_lock); do {
                 pvr2_trace(PVR2_TRACE_INIT,"Requesting powerup");
-                hdw->cmd_buffer[0] = 0xde;
+                hdw->cmd_buffer[0] = FX2CMD_POWER_ON;
                 status = pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0);
         } while (0); LOCK_GIVE(hdw->ctl_lock);
         return status;
@@ -2994,7 +3144,8 @@ static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl)
 {
         int status;
         LOCK_TAKE(hdw->ctl_lock); do {
-                hdw->cmd_buffer[0] = (runFl ? 0x36 : 0x37);
+                hdw->cmd_buffer[0] =
+                        (runFl ? FX2CMD_STREAMING_ON : FX2CMD_STREAMING_OFF);
                 status = pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0);
         } while (0); LOCK_GIVE(hdw->ctl_lock);
         if (!status) {
@@ -3093,7 +3244,7 @@ static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw)
 {
         int result;
         LOCK_TAKE(hdw->ctl_lock); do {
-                hdw->cmd_buffer[0] = 0xeb;
+                hdw->cmd_buffer[0] = FX2CMD_GET_EEPROM_ADDR;
                 result = pvr2_send_request(hdw,
                                            hdw->cmd_buffer,1,
                                            hdw->cmd_buffer,1);
@@ -3105,7 +3256,7 @@ static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw)
 
 
 int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
-                             u32 chip_id,unsigned long reg_id,
+                             u32 chip_id, u64 reg_id,
                              int setFl,u32 *val_ptr)
 {
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -3115,6 +3266,8 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
         int stat = 0;
         int okFl = 0;
 
+        if (!capable(CAP_SYS_ADMIN)) return -EPERM;
+
         req.i2c_id = chip_id;
         req.reg = reg_id;
         if (setFl) req.val = *val_ptr;
@@ -3123,8 +3276,8 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
                         cp = list_entry(item,struct pvr2_i2c_client,list);
                         if (cp->client->driver->id != chip_id) continue;
                         stat = pvr2_i2c_client_cmd(
-                                cp,(setFl ? VIDIOC_INT_S_REGISTER :
-                                    VIDIOC_INT_G_REGISTER),&req);
+                                cp,(setFl ? VIDIOC_DBG_S_REGISTER :
+                                    VIDIOC_DBG_G_REGISTER),&req);
                         if (!setFl) *val_ptr = req.val;
                         okFl = !0;
                         break;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 29979bb2a768..566a8ef7e121 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -44,12 +44,6 @@
 #define PVR2_CVAL_INPUT_COMPOSITE 2
 #define PVR2_CVAL_INPUT_RADIO 3
 
-/* Values that pvr2_hdw_get_signal_status() returns */
-#define PVR2_SIGNAL_OK     0x0001
-#define PVR2_SIGNAL_STEREO 0x0002
-#define PVR2_SIGNAL_SAP    0x0004
-
-
 /* Subsystem definitions - these are various pieces that can be
    independently stopped / started.  Usually you don't want to mess with
    this directly (let the driver handle things itself), but it is useful
@@ -72,10 +66,17 @@
         PVR2_SUBSYS_RUN_ALL )
 
 enum pvr2_config {
-        pvr2_config_empty,
-        pvr2_config_mpeg,
-        pvr2_config_vbi,
-        pvr2_config_radio,
+        pvr2_config_empty,    /* No configuration */
+        pvr2_config_mpeg,     /* Encoded / compressed video */
+        pvr2_config_vbi,      /* Standard vbi info */
+        pvr2_config_pcm,      /* Audio raw pcm stream */
+        pvr2_config_rawvideo, /* Video raw frames */
+};
+
+enum pvr2_v4l_type {
+        pvr2_v4l_type_video,
+        pvr2_v4l_type_vbi,
+        pvr2_v4l_type_radio,
 };
 
 const char *pvr2_config_get_name(enum pvr2_config);
@@ -148,8 +149,11 @@ int pvr2_hdw_commit_ctl(struct pvr2_hdw *);
 /* Return name for this driver instance */
 const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *);
 
-/* Return PVR2_SIGNAL_XXXX bit mask indicating signal status */
-unsigned int pvr2_hdw_get_signal_status(struct pvr2_hdw *);
+/* Mark tuner status stale so that it will be re-fetched */
+void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *);
+
+/* Return information about the tuner */
+int pvr2_hdw_get_tuner_status(struct pvr2_hdw *,struct v4l2_tuner *);
 
 /* Query device and see if it thinks it is on a high-speed USB link */
 int pvr2_hdw_is_hsm(struct pvr2_hdw *);
@@ -205,11 +209,12 @@ int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *);
 int pvr2_hdw_cpufw_get(struct pvr2_hdw *,unsigned int offs,
                        char *buf,unsigned int cnt);
 
-/* Retrieve previously stored v4l minor device number */
-int pvr2_hdw_v4l_get_minor_number(struct pvr2_hdw *);
+/* Retrieve a previously stored v4l minor device number */
+int pvr2_hdw_v4l_get_minor_number(struct pvr2_hdw *,enum pvr2_v4l_type index);
 
-/* Store the v4l minor device number */
-void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *,int);
+/* Store a v4l minor device number */
+void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *,
+                                     enum pvr2_v4l_type index,int);
 
 /* Direct read/write access to chip's registers:
    chip_id - unique id of chip (e.g. I2C_DRIVERD_xxxx)
@@ -217,7 +222,7 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *,int);
    setFl   - true to set the register, false to read it
    val_ptr - storage location for source / result. */
 int pvr2_hdw_register_access(struct pvr2_hdw *,
-                             u32 chip_id,unsigned long reg_id,
+                             u32 chip_id,u64 reg_id,
                              int setFl,u32 *val_ptr);
 
 /* The following entry points are all lower level things you normally don't
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 05121666b9ba..49773764383b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -33,15 +33,17 @@
 #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
 
 #define OP_STANDARD 0
-#define OP_BCSH 1
-#define OP_VOLUME 2
-#define OP_FREQ 3
-#define OP_AUDIORATE 4
-#define OP_SIZE 5
-#define OP_LOG 6
+#define OP_AUDIOMODE 1
+#define OP_BCSH 2
+#define OP_VOLUME 3
+#define OP_FREQ 4
+#define OP_AUDIORATE 5
+#define OP_SIZE 6
+#define OP_LOG 7
 
 static const struct pvr2_i2c_op * const ops[] = {
         [OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
+        [OP_AUDIOMODE] = &pvr2_i2c_op_v4l2_audiomode,
         [OP_BCSH] = &pvr2_i2c_op_v4l2_bcsh,
         [OP_VOLUME] = &pvr2_i2c_op_v4l2_volume,
         [OP_FREQ] = &pvr2_i2c_op_v4l2_frequency,
@@ -54,11 +56,13 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
         int id;
         id = cp->client->driver->id;
         cp->ctl_mask = ((1 << OP_STANDARD) |
+                        (1 << OP_AUDIOMODE) |
                         (1 << OP_BCSH) |
                         (1 << OP_VOLUME) |
                         (1 << OP_FREQ) |
                         (1 << OP_SIZE) |
                         (1 << OP_LOG));
+        cp->status_poll = pvr2_v4l2_cmd_status_poll;
 
         if (id == I2C_DRIVERID_MSP3400) {
                 if (pvr2_i2c_msp3400_setup(hdw,cp)) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 05ea17afe903..c650e02ccd00 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -24,22 +24,26 @@
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
 #include <linux/videodev2.h>
-
+#include <media/v4l2-common.h>
 
 static void set_standard(struct pvr2_hdw *hdw)
 {
-        v4l2_std_id vs;
-        vs = hdw->std_mask_cur;
-        pvr2_trace(PVR2_TRACE_CHIPS,
-                   "i2c v4l2 set_standard(0x%llx)",(long long unsigned)vs);
-
-        pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs);
+        pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_standard");
+
+        if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {
+                pvr2_i2c_core_cmd(hdw,AUDC_SET_RADIO,NULL);
+        } else {
+                v4l2_std_id vs;
+                vs = hdw->std_mask_cur;
+                pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs);
+        }
+        hdw->tuner_signal_stale = !0;
 }
 
 
 static int check_standard(struct pvr2_hdw *hdw)
 {
-        return hdw->std_dirty != 0;
+        return (hdw->input_dirty != 0) || (hdw->std_dirty != 0);
 }
 
 
@@ -136,16 +140,53 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume = {
 };
 
 
+static void set_audiomode(struct pvr2_hdw *hdw)
+{
+        struct v4l2_tuner vt;
+        memset(&vt,0,sizeof(vt));
+        vt.audmode = hdw->audiomode_val;
+        pvr2_i2c_core_cmd(hdw,VIDIOC_S_TUNER,&vt);
+}
+
+
+static int check_audiomode(struct pvr2_hdw *hdw)
+{
+        return (hdw->input_dirty ||
+                hdw->audiomode_dirty);
+}
+
+
+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_audiomode = {
+        .check = check_audiomode,
+        .update = set_audiomode,
+        .name = "v4l2_audiomode",
+};
+
+
 static void set_frequency(struct pvr2_hdw *hdw)
 {
         unsigned long fv;
         struct v4l2_frequency freq;
-        fv = hdw->freqVal;
+        fv = pvr2_hdw_get_cur_freq(hdw);
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_freq(%lu)",fv);
+        if (hdw->tuner_signal_stale) {
+                pvr2_i2c_core_status_poll(hdw);
+        }
         memset(&freq,0,sizeof(freq));
-        freq.frequency = fv / 62500;
+        if (hdw->tuner_signal_info.capability & V4L2_TUNER_CAP_LOW) {
+                // ((fv * 1000) / 62500)
+                freq.frequency = (fv * 2) / 125;
+        } else {
+                freq.frequency = fv / 62500;
+        }
+        /* tuner-core currently doesn't seem to care about this, but
+           let's set it anyway for completeness. */
+        if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {
+                freq.type = V4L2_TUNER_RADIO;
+        } else {
+                freq.type = V4L2_TUNER_ANALOG_TV;
+        }
         freq.tuner = 0;
-        freq.type = V4L2_TUNER_ANALOG_TV;
         pvr2_i2c_core_cmd(hdw,VIDIOC_S_FREQUENCY,&freq);
 }
 
@@ -221,6 +262,12 @@ void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl)
 }
 
 
+void pvr2_v4l2_cmd_status_poll(struct pvr2_i2c_client *cp)
+{
+        pvr2_i2c_client_cmd(cp,VIDIOC_G_TUNER,&cp->hdw->tuner_signal_info);
+}
+
+
 /*
   Stuff for Emacs to see, in order to encourage consistent editing style:
   *** Local Variables: ***
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index ecabddba1ec5..c838df6167f9 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
@@ -26,13 +26,16 @@
 #include "pvrusb2-i2c-core.h"
 
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard;
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size;
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_audiomode;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log;
 
 void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *,int);
+void pvr2_v4l2_cmd_status_poll(struct pvr2_i2c_client *);
 
 #endif /* __PVRUSB2_CMD_V4L2_H */
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 62a7cfca837d..58fc3c730fe1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -22,6 +22,7 @@
 #include "pvrusb2-i2c-core.h"
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
+#include "pvrusb2-fx2-cmd.h"
 
 #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
 
@@ -66,7 +67,7 @@ static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */
         memset(hdw->cmd_buffer, 0, sizeof(hdw->cmd_buffer));
 
         /* Set up command buffer for an I2C write */
-        hdw->cmd_buffer[0] = 0x08;      /* write prefix */
+        hdw->cmd_buffer[0] = FX2CMD_I2C_WRITE;      /* write prefix */
         hdw->cmd_buffer[1] = i2c_addr;  /* i2c addr of chip */
         hdw->cmd_buffer[2] = length;    /* length of what follows */
         if (length) memcpy(hdw->cmd_buffer + 3, data, length);
@@ -128,7 +129,7 @@ static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */
         memset(hdw->cmd_buffer, 0, sizeof(hdw->cmd_buffer));
 
         /* Set up command buffer for an I2C write followed by a read */
-        hdw->cmd_buffer[0] = 0x09;  /* read prefix */
+        hdw->cmd_buffer[0] = FX2CMD_I2C_READ;  /* read prefix */
         hdw->cmd_buffer[1] = dlen;  /* arg length */
         hdw->cmd_buffer[2] = rlen;  /* answer length. Device will send one
                                        more byte (status). */
@@ -221,7 +222,7 @@ static int i2c_24xxx_ir(struct pvr2_hdw *hdw,
 
         /* Issue a command to the FX2 to read the IR receiver. */
         LOCK_TAKE(hdw->ctl_lock); do {
-                hdw->cmd_buffer[0] = 0xec;
+                hdw->cmd_buffer[0] = FX2CMD_GET_IR_CODE;
                 stat = pvr2_send_request(hdw,
                                          hdw->cmd_buffer,1,
                                          hdw->cmd_buffer,4);
@@ -590,6 +591,33 @@ static int handler_check(struct pvr2_i2c_client *cp)
 
 #define BUFSIZE 500
 
+
+void pvr2_i2c_core_status_poll(struct pvr2_hdw *hdw)
+{
+        struct list_head *item;
+        struct pvr2_i2c_client *cp;
+        mutex_lock(&hdw->i2c_list_lock); do {
+                struct v4l2_tuner *vtp = &hdw->tuner_signal_info;
+                memset(vtp,0,sizeof(*vtp));
+                list_for_each(item,&hdw->i2c_clients) {
+                        cp = list_entry(item,struct pvr2_i2c_client,list);
+                        if (!cp->detected_flag) continue;
+                        if (!cp->status_poll) continue;
+                        cp->status_poll(cp);
+                }
+                hdw->tuner_signal_stale = 0;
+                pvr2_trace(PVR2_TRACE_CHIPS,"i2c status poll"
+                           " type=%u strength=%u audio=0x%x cap=0x%x"
+                           " low=%u hi=%u",
+                           vtp->type,
+                           vtp->signal,vtp->rxsubchans,vtp->capability,
+                           vtp->rangelow,vtp->rangehigh);
+        } while (0); mutex_unlock(&hdw->i2c_list_lock);
+}
+
+
+/* Issue various I2C operations to bring chip-level drivers into sync with
+   state stored in this driver. */
 void pvr2_i2c_core_sync(struct pvr2_hdw *hdw)
 {
         unsigned long msk;
@@ -870,12 +898,12 @@ static int pvr2_i2c_attach_inform(struct i2c_client *client)
         struct pvr2_hdw *hdw = (struct pvr2_hdw *)(client->adapter->algo_data);
         struct pvr2_i2c_client *cp;
         int fl = !(hdw->i2c_pend_types & PVR2_I2C_PEND_ALL);
-        cp = kmalloc(sizeof(*cp),GFP_KERNEL);
+        cp = kzalloc(sizeof(*cp),GFP_KERNEL);
         trace_i2c("i2c_attach [client=%s @ 0x%x ctxt=%p]",
                   client->name,
                   client->addr,cp);
         if (!cp) return -ENOMEM;
-        memset(cp,0,sizeof(*cp));
+        cp->hdw = hdw;
         INIT_LIST_HEAD(&cp->list);
         cp->client = client;
         mutex_lock(&hdw->i2c_list_lock); do {
@@ -948,8 +976,7 @@ static void do_i2c_scan(struct pvr2_hdw *hdw)
         printk("%s: i2c scan beginning\n",hdw->name);
         for (i = 0; i < 128; i++) {
                 msg[0].addr = i;
-                rc = i2c_transfer(&hdw->i2c_adap,msg,
-                                  sizeof(msg)/sizeof(msg[0]));
+                rc = i2c_transfer(&hdw->i2c_adap,msg, ARRAY_SIZE(msg));
                 if (rc != 1) continue;
                 printk("%s: i2c scan: found device @ 0x%x\n",hdw->name,i);
         }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
index 6d7e25247576..bd0807b905bb 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
@@ -35,10 +35,12 @@ struct pvr2_i2c_client {
         struct i2c_client *client;
         struct pvr2_i2c_handler *handler;
         struct list_head list;
+        struct pvr2_hdw *hdw;
         int detected_flag;
         int recv_enable;
         unsigned long pend_mask;
         unsigned long ctl_mask;
+        void (*status_poll)(struct pvr2_i2c_client *);
 };
 
 struct pvr2_i2c_handler {
@@ -67,6 +69,7 @@ int pvr2_i2c_core_cmd(struct pvr2_hdw *,unsigned int cmd,void *arg);
 
 int pvr2_i2c_core_check_stale(struct pvr2_hdw *);
 void pvr2_i2c_core_sync(struct pvr2_hdw *);
+void pvr2_i2c_core_status_poll(struct pvr2_hdw *);
 unsigned int pvr2_i2c_report(struct pvr2_hdw *,char *buf,unsigned int maxlen);
 #define PVR2_I2C_DETAIL_DEBUG   0x0001
 #define PVR2_I2C_DETAIL_HANDLER 0x0002
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index 57fb32033543..ce3c8982ffe0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -474,9 +474,8 @@ static void buffer_complete(struct urb *urb)
 struct pvr2_stream *pvr2_stream_create(void)
 {
         struct pvr2_stream *sp;
-        sp = kmalloc(sizeof(*sp),GFP_KERNEL);
+        sp = kzalloc(sizeof(*sp),GFP_KERNEL);
         if (!sp) return sp;
-        memset(sp,0,sizeof(*sp));
         pvr2_trace(PVR2_TRACE_INIT,"pvr2_stream_create: sp=%p",sp);
         pvr2_stream_init(sp);
         return sp;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
index b71f9a961f8a..f782418afa45 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
@@ -87,10 +87,9 @@ static void pvr2_ioread_done(struct pvr2_ioread *cp)
 struct pvr2_ioread *pvr2_ioread_create(void)
 {
         struct pvr2_ioread *cp;
-        cp = kmalloc(sizeof(*cp),GFP_KERNEL);
+        cp = kzalloc(sizeof(*cp),GFP_KERNEL);
         if (!cp) return NULL;
         pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_create id=%p",cp);
-        memset(cp,0,sizeof(*cp));
         if (pvr2_ioread_init(cp) < 0) {
                 kfree(cp);
                 return NULL;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c
index c08925557ed4..81de26ba41d9 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -141,10 +141,8 @@ int pvr2_std_str_to_id(v4l2_std_id *idPtr,const char *bufPtr,
                         cnt = 0;
                         while ((cnt < bufSize) && (bufPtr[cnt] != '-')) cnt++;
                         if (cnt >= bufSize) return 0; // No more characters
-                        sp = find_std_name(
-                                std_groups,
-                                sizeof(std_groups)/sizeof(std_groups[0]),
-                                bufPtr,cnt);
+                        sp = find_std_name(std_groups, ARRAY_SIZE(std_groups),
+                                           bufPtr,cnt);
                         if (!sp) return 0; // Illegal color system name
                         cnt++;
                         bufPtr += cnt;
@@ -163,8 +161,7 @@ int pvr2_std_str_to_id(v4l2_std_id *idPtr,const char *bufPtr,
                         if (ch == '/') break;
                         cnt++;
                 }
-                sp = find_std_name(std_items,
-                                   sizeof(std_items)/sizeof(std_items[0]),
+                sp = find_std_name(std_items, ARRAY_SIZE(std_items),
                                    bufPtr,cnt);
                 if (!sp) return 0; // Illegal modulation system ID
                 t = sp->id & cmsk;
@@ -189,14 +186,10 @@ unsigned int pvr2_std_id_to_str(char *bufPtr, unsigned int bufSize,
         unsigned int c1,c2;
         cfl = 0;
         c1 = 0;
-        for (idx1 = 0;
-             idx1 < sizeof(std_groups)/sizeof(std_groups[0]);
-             idx1++) {
+        for (idx1 = 0; idx1 < ARRAY_SIZE(std_groups); idx1++) {
                 gp = std_groups + idx1;
                 gfl = 0;
-                for (idx2 = 0;
-                     idx2 < sizeof(std_items)/sizeof(std_items[0]);
-                     idx2++) {
+                for (idx2 = 0; idx2 < ARRAY_SIZE(std_items); idx2++) {
                         ip = std_items + idx2;
                         if (!(gp->id & ip->id & id)) continue;
                         if (!gfl) {
@@ -279,7 +272,7 @@ static struct v4l2_standard generic_standards[] = {
         }
 };
 
-#define generic_standards_cnt (sizeof(generic_standards)/sizeof(generic_standards[0]))
+#define generic_standards_cnt ARRAY_SIZE(generic_standards)
 
 static struct v4l2_standard *match_std(v4l2_std_id id)
 {
@@ -348,7 +341,7 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
                 fmsk |= idmsk;
         }
 
-        for (idx2 = 0; idx2 < sizeof(std_mixes)/sizeof(std_mixes[0]); idx2++) {
+        for (idx2 = 0; idx2 < ARRAY_SIZE(std_mixes); idx2++) {
                 if ((id & std_mixes[idx2]) == std_mixes[idx2]) std_cnt++;
         }
 
@@ -366,16 +359,15 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
                    std_cnt);
         if (!std_cnt) return NULL; // paranoia
 
-        stddefs = kmalloc(sizeof(struct v4l2_standard) * std_cnt,
+        stddefs = kzalloc(sizeof(struct v4l2_standard) * std_cnt,
                           GFP_KERNEL);
-        memset(stddefs,0,sizeof(struct v4l2_standard) * std_cnt);
         for (idx = 0; idx < std_cnt; idx++) stddefs[idx].index = idx;
 
         idx = 0;
 
         /* Enumerate potential special cases */
-        for (idx2 = 0; ((idx2 < sizeof(std_mixes)/sizeof(std_mixes[0])) &&
-                        (idx < std_cnt)); idx2++) {
+        for (idx2 = 0; (idx2 < ARRAY_SIZE(std_mixes)) && (idx < std_cnt);
+             idx2++) {
                 if (!(id & std_mixes[idx2])) continue;
                 if (pvr2_std_fill(stddefs+idx,std_mixes[idx2])) idx++;
         }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index c294f46db9b9..91396fd573e4 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -40,8 +40,10 @@ struct pvr2_sysfs {
         struct pvr2_sysfs_ctl_item *item_first;
         struct pvr2_sysfs_ctl_item *item_last;
         struct class_device_attribute attr_v4l_minor_number;
+        struct class_device_attribute attr_v4l_radio_minor_number;
         struct class_device_attribute attr_unit_number;
         int v4l_minor_number_created_ok;
+        int v4l_radio_minor_number_created_ok;
         int unit_number_created_ok;
 };
 
@@ -491,7 +493,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         unsigned int cnt,acnt;
         int ret;
 
-        if ((ctl_id < 0) || (ctl_id >= (sizeof(funcs)/sizeof(funcs[0])))) {
+        if ((ctl_id < 0) || (ctl_id >= ARRAY_SIZE(funcs))) {
                 return;
         }
 
@@ -499,9 +501,8 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,ctl_id);
         if (!cptr) return;
 
-        cip = kmalloc(sizeof(*cip),GFP_KERNEL);
+        cip = kzalloc(sizeof(*cip),GFP_KERNEL);
         if (!cip) return;
-        memset(cip,0,sizeof(*cip));
         pvr2_sysfs_trace("Creating pvr2_sysfs_ctl_item id=%p",cip);
 
         cip->cptr = cptr;
@@ -611,9 +612,8 @@ static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
         struct pvr2_sysfs_debugifc *dip;
         int ret;
 
-        dip = kmalloc(sizeof(*dip),GFP_KERNEL);
+        dip = kzalloc(sizeof(*dip),GFP_KERNEL);
         if (!dip) return;
-        memset(dip,0,sizeof(*dip));
         dip->attr_debugcmd.attr.owner = THIS_MODULE;
         dip->attr_debugcmd.attr.name = "debugcmd";
         dip->attr_debugcmd.attr.mode = S_IRUGO|S_IWUSR|S_IWGRP;
@@ -709,6 +709,10 @@ static void class_dev_destroy(struct pvr2_sysfs *sfp)
                 class_device_remove_file(sfp->class_dev,
                                          &sfp->attr_v4l_minor_number);
         }
+        if (sfp->v4l_radio_minor_number_created_ok) {
+                class_device_remove_file(sfp->class_dev,
+                                         &sfp->attr_v4l_radio_minor_number);
+        }
         if (sfp->unit_number_created_ok) {
                 class_device_remove_file(sfp->class_dev,
                                          &sfp->attr_unit_number);
@@ -726,7 +730,20 @@ static ssize_t v4l_minor_number_show(struct class_device *class_dev,char *buf)
         sfp = (struct pvr2_sysfs *)class_dev->class_data;
         if (!sfp) return -EINVAL;
         return scnprintf(buf,PAGE_SIZE,"%d\n",
-                         pvr2_hdw_v4l_get_minor_number(sfp->channel.hdw));
+                         pvr2_hdw_v4l_get_minor_number(sfp->channel.hdw,
+                                                       pvr2_v4l_type_video));
+}
+
+
+static ssize_t v4l_radio_minor_number_show(struct class_device *class_dev,
+                                           char *buf)
+{
+        struct pvr2_sysfs *sfp;
+        sfp = (struct pvr2_sysfs *)class_dev->class_data;
+        if (!sfp) return -EINVAL;
+        return scnprintf(buf,PAGE_SIZE,"%d\n",
+                         pvr2_hdw_v4l_get_minor_number(sfp->channel.hdw,
+                                                       pvr2_v4l_type_radio));
 }
 
 
@@ -749,9 +766,8 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
 
         usb_dev = pvr2_hdw_get_dev(sfp->channel.hdw);
         if (!usb_dev) return;
-        class_dev = kmalloc(sizeof(*class_dev),GFP_KERNEL);
+        class_dev = kzalloc(sizeof(*class_dev),GFP_KERNEL);
         if (!class_dev) return;
-        memset(class_dev,0,sizeof(*class_dev));
 
         pvr2_sysfs_trace("Creating class_dev id=%p",class_dev);
 
@@ -793,6 +809,20 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->v4l_minor_number_created_ok = !0;
         }
 
+        sfp->attr_v4l_radio_minor_number.attr.owner = THIS_MODULE;
+        sfp->attr_v4l_radio_minor_number.attr.name = "v4l_radio_minor_number";
+        sfp->attr_v4l_radio_minor_number.attr.mode = S_IRUGO;
+        sfp->attr_v4l_radio_minor_number.show = v4l_radio_minor_number_show;
+        sfp->attr_v4l_radio_minor_number.store = NULL;
+        ret = class_device_create_file(sfp->class_dev,
+                                       &sfp->attr_v4l_radio_minor_number);
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: class_device_create_file error: %d\n",
+                       __FUNCTION__, ret);
+        } else {
+                sfp->v4l_radio_minor_number_created_ok = !0;
+        }
+
         sfp->attr_unit_number.attr.owner = THIS_MODULE;
         sfp->attr_unit_number.attr.name = "unit_number";
         sfp->attr_unit_number.attr.mode = S_IRUGO;
@@ -829,9 +859,8 @@ struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *mp,
                                      struct pvr2_sysfs_class *class_ptr)
 {
         struct pvr2_sysfs *sfp;
-        sfp = kmalloc(sizeof(*sfp),GFP_KERNEL);
+        sfp = kzalloc(sizeof(*sfp),GFP_KERNEL);
         if (!sfp) return sfp;
-        memset(sfp,0,sizeof(*sfp));
         pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr2_sysfs id=%p",sfp);
         pvr2_channel_init(&sfp->channel,mp);
         sfp->channel.check_func = pvr2_sysfs_internal_check;
@@ -852,9 +881,8 @@ static int pvr2_sysfs_hotplug(struct class_device *cd,char **envp,
 struct pvr2_sysfs_class *pvr2_sysfs_class_create(void)
 {
         struct pvr2_sysfs_class *clp;
-        clp = kmalloc(sizeof(*clp),GFP_KERNEL);
+        clp = kzalloc(sizeof(*clp),GFP_KERNEL);
         if (!clp) return clp;
-        memset(clp,0,sizeof(*clp));
         pvr2_sysfs_trace("Creating pvr2_sysfs_class id=%p",clp);
         clp->class.name = "pvrusb2";
         clp->class.class_release = pvr2_sysfs_class_release;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c
index bb17db3f6434..05e65ce2e3a9 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-tuner.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.c
@@ -93,9 +93,8 @@ int pvr2_i2c_tuner_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
         struct pvr2_tuner_handler *ctxt;
         if (cp->handler) return 0;
 
-        ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);
+        ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);
         if (!ctxt) return 0;
-        memset(ctxt,0,sizeof(*ctxt));
 
         ctxt->i2c_handler.func_data = ctxt;
         ctxt->i2c_handler.func_table = &tuner_funcs;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 6cf17080eb49..4fe4136204c7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -40,7 +40,10 @@ struct pvr2_v4l2_dev {
         struct video_device devbase; /* MUST be first! */
         struct pvr2_v4l2 *v4lp;
         struct pvr2_context_stream *stream;
-        enum pvr2_config config;
+        /* Information about this device: */
+        enum pvr2_config config; /* Expected stream format */
+        int v4l_type; /* V4L defined type for this device node */
+        enum pvr2_v4l_type minor_type; /* pvr2-understood minor device type */
 };
 
 struct pvr2_v4l2_fh {
@@ -54,6 +57,7 @@ struct pvr2_v4l2_fh {
         struct pvr2_v4l2_fh *vprev;
         wait_queue_head_t wait_data;
         int fw_mode_flag;
+        int prev_input_val;
 };
 
 struct pvr2_v4l2 {
@@ -63,13 +67,22 @@ struct pvr2_v4l2 {
 
         struct v4l2_prio_state prio;
 
-        /* streams */
-        struct pvr2_v4l2_dev *vdev;
+        /* streams - Note that these must be separately, individually,
+         * allocated pointers.  This is because the v4l core is going to
+         * manage their deletion - separately, individually...  */
+        struct pvr2_v4l2_dev *dev_video;
+        struct pvr2_v4l2_dev *dev_radio;
 };
 
 static int video_nr[PVR_NUM] = {[0 ... PVR_NUM-1] = -1};
 module_param_array(video_nr, int, NULL, 0444);
-MODULE_PARM_DESC(video_nr, "Offset for device's minor");
+MODULE_PARM_DESC(video_nr, "Offset for device's video dev minor");
+static int radio_nr[PVR_NUM] = {[0 ... PVR_NUM-1] = -1};
+module_param_array(radio_nr, int, NULL, 0444);
+MODULE_PARM_DESC(radio_nr, "Offset for device's radio dev minor");
+static int vbi_nr[PVR_NUM] = {[0 ... PVR_NUM-1] = -1};
+module_param_array(vbi_nr, int, NULL, 0444);
+MODULE_PARM_DESC(vbi_nr, "Offset for device's vbi dev minor");
 
 static struct v4l2_capability pvr_capability ={
         .driver         = "pvrusb2",
@@ -77,30 +90,11 @@ static struct v4l2_capability pvr_capability ={
         .bus_info       = "usb",
         .version        = KERNEL_VERSION(0,8,0),
         .capabilities   = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |
-                           V4L2_CAP_TUNER | V4L2_CAP_AUDIO |
+                           V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO |
                            V4L2_CAP_READWRITE),
         .reserved       = {0,0,0,0}
 };
 
-static struct v4l2_tuner pvr_v4l2_tuners[]= {
-        {
-                .index      = 0,
-                .name       = "TV Tuner",
-                .type           = V4L2_TUNER_ANALOG_TV,
-                .capability     = (V4L2_TUNER_CAP_NORM |
-                                   V4L2_TUNER_CAP_STEREO |
-                                   V4L2_TUNER_CAP_LANG1 |
-                                   V4L2_TUNER_CAP_LANG2),
-                .rangelow   = 0,
-                .rangehigh  = 0,
-                .rxsubchans     = V4L2_TUNER_SUB_STEREO,
-                .audmode        = V4L2_TUNER_MODE_STEREO,
-                .signal         = 0,
-                .afc            = 0,
-                .reserved       = {0,0,0,0}
-        }
-};
-
 static struct v4l2_fmtdesc pvr_fmtdesc [] = {
         {
                 .index          = 0,
@@ -154,6 +148,18 @@ static struct v4l2_format pvr_format [] = {
         }
 };
 
+
+static const char *get_v4l_name(int v4l_type)
+{
+        switch (v4l_type) {
+        case VFL_TYPE_GRABBER: return "video";
+        case VFL_TYPE_RADIO: return "radio";
+        case VFL_TYPE_VBI: return "vbi";
+        default: return "?";
+        }
+}
+
+
 /*
  * pvr_ioctl()
  *
@@ -315,13 +321,39 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
         case VIDIOC_ENUMAUDIO:
         {
+                /* pkt: FIXME: We are returning one "fake" input here
+                   which could very well be called "whatever_we_like".
+                   This is for apps that want to see an audio input
+                   just to feel comfortable, as well as to test if
+                   it can do stereo or sth. There is actually no guarantee
+                   that the actual audio input cannot change behind the app's
+                   back, but most applications should not mind that either.
+
+                   Hopefully, mplayer people will work with us on this (this
+                   whole mess is to support mplayer pvr://), or Hans will come
+                   up with a more standard way to say "we have inputs but we
+                   don 't want you to change them independent of video" which
+                   will sort this mess.
+                 */
+                struct v4l2_audio *vin = arg;
                 ret = -EINVAL;
+                if (vin->index > 0) break;
+                strncpy(vin->name, "PVRUSB2 Audio",14);
+                vin->capability = V4L2_AUDCAP_STEREO;
+                ret = 0;
+                break;
                 break;
         }
 
         case VIDIOC_G_AUDIO:
         {
-                ret = -EINVAL;
+                /* pkt: FIXME: see above comment (VIDIOC_ENUMAUDIO) */
+                struct v4l2_audio *vin = arg;
+                memset(vin,0,sizeof(*vin));
+                vin->index = 0;
+                strncpy(vin->name, "PVRUSB2 Audio",14);
+                vin->capability = V4L2_AUDCAP_STEREO;
+                ret = 0;
                 break;
         }
 
@@ -333,34 +365,11 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_G_TUNER:
         {
                 struct v4l2_tuner *vt = (struct v4l2_tuner *)arg;
-                unsigned int status_mask;
-                int val;
-                if (vt->index !=0) break;
 
-                status_mask = pvr2_hdw_get_signal_status(hdw);
+                if (vt->index != 0) break; /* Only answer for the 1st tuner */
 
-                memcpy(vt, &pvr_v4l2_tuners[vt->index],
-                       sizeof(struct v4l2_tuner));
-
-                vt->signal = 0;
-                if (status_mask & PVR2_SIGNAL_OK) {
-                        if (status_mask & PVR2_SIGNAL_STEREO) {
-                                vt->rxsubchans = V4L2_TUNER_SUB_STEREO;
-                        } else {
-                                vt->rxsubchans = V4L2_TUNER_SUB_MONO;
-                        }
-                        if (status_mask & PVR2_SIGNAL_SAP) {
-                                vt->rxsubchans |= (V4L2_TUNER_SUB_LANG1 |
-                                                   V4L2_TUNER_SUB_LANG2);
-                        }
-                        vt->signal = 65535;
-                }
-
-                val = 0;
-                ret = pvr2_ctrl_get_value(
-                        pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_AUDIOMODE),
-                        &val);
-                vt->audmode = val;
+                pvr2_hdw_execute_tuner_poll(hdw);
+                ret = pvr2_hdw_get_tuner_status(hdw,vt);
                 break;
         }
 
@@ -374,14 +383,40 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 ret = pvr2_ctrl_set_value(
                         pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_AUDIOMODE),
                         vt->audmode);
+                break;
         }
 
         case VIDIOC_S_FREQUENCY:
         {
                 const struct v4l2_frequency *vf = (struct v4l2_frequency *)arg;
+                unsigned long fv;
+                struct v4l2_tuner vt;
+                int cur_input;
+                struct pvr2_ctrl *ctrlp;
+                ret = pvr2_hdw_get_tuner_status(hdw,&vt);
+                if (ret != 0) break;
+                ctrlp = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_INPUT);
+                ret = pvr2_ctrl_get_value(ctrlp,&cur_input);
+                if (ret != 0) break;
+                if (vf->type == V4L2_TUNER_RADIO) {
+                        if (cur_input != PVR2_CVAL_INPUT_RADIO) {
+                                pvr2_ctrl_set_value(ctrlp,
+                                                    PVR2_CVAL_INPUT_RADIO);
+                        }
+                } else {
+                        if (cur_input == PVR2_CVAL_INPUT_RADIO) {
+                                pvr2_ctrl_set_value(ctrlp,
+                                                    PVR2_CVAL_INPUT_TV);
+                        }
+                }
+                fv = vf->frequency;
+                if (vt.capability & V4L2_TUNER_CAP_LOW) {
+                        fv = (fv * 125) / 2;
+                } else {
+                        fv = fv * 62500;
+                }
                 ret = pvr2_ctrl_set_value(
-                        pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_FREQUENCY),
-                        vf->frequency * 62500);
+                        pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_FREQUENCY),fv);
                 break;
         }
 
@@ -389,10 +424,27 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
         {
                 struct v4l2_frequency *vf = (struct v4l2_frequency *)arg;
                 int val = 0;
+                int cur_input;
+                struct v4l2_tuner vt;
+                ret = pvr2_hdw_get_tuner_status(hdw,&vt);
+                if (ret != 0) break;
                 ret = pvr2_ctrl_get_value(
                         pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_FREQUENCY),
                         &val);
-                val /= 62500;
+                if (ret != 0) break;
+                pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_INPUT),
+                        &cur_input);
+                if (cur_input == PVR2_CVAL_INPUT_RADIO) {
+                        vf->type = V4L2_TUNER_RADIO;
+                } else {
+                        vf->type = V4L2_TUNER_ANALOG_TV;
+                }
+                if (vt.capability & V4L2_TUNER_CAP_LOW) {
+                        val = (val * 2) / 125;
+                } else {
+                        val /= 62500;
+                }
                 vf->frequency = val;
                 break;
         }
@@ -449,7 +501,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 ret = 0;
                 switch(vf->type) {
                 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
-                        int lmin,lmax;
+                        int lmin,lmax,ldef;
                         struct pvr2_ctrl *hcp,*vcp;
                         int h = vf->fmt.pix.height;
                         int w = vf->fmt.pix.width;
@@ -458,14 +510,20 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
                         lmin = pvr2_ctrl_get_min(hcp);
                         lmax = pvr2_ctrl_get_max(hcp);
-                        if (w < lmin) {
+                        ldef = pvr2_ctrl_get_def(hcp);
+                        if (w == -1) {
+                                w = ldef;
+                        } else if (w < lmin) {
                                 w = lmin;
                         } else if (w > lmax) {
                                 w = lmax;
                         }
                         lmin = pvr2_ctrl_get_min(vcp);
                         lmax = pvr2_ctrl_get_max(vcp);
-                        if (h < lmin) {
+                        ldef = pvr2_ctrl_get_def(vcp);
+                        if (h == -1) {
+                                h = ldef;
+                        } else if (h < lmin) {
                                 h = lmin;
                         } else if (h > lmax) {
                                 h = lmax;
@@ -494,6 +552,13 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
         case VIDIOC_STREAMON:
         {
+                if (!fh->dev_info->stream) {
+                        /* No stream defined for this node.  This means
+                           that we're not currently allowed to stream from
+                           this node. */
+                        ret = -EPERM;
+                        break;
+                }
                 ret = pvr2_hdw_set_stream_type(hdw,dev_info->config);
                 if (ret < 0) return ret;
                 ret = pvr2_hdw_set_streaming(hdw,!0);
@@ -502,6 +567,13 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
         case VIDIOC_STREAMOFF:
         {
+                if (!fh->dev_info->stream) {
+                        /* No stream defined for this node.  This means
+                           that we're not currently allowed to stream from
+                           this node. */
+                        ret = -EPERM;
+                        break;
+                }
                 ret = pvr2_hdw_set_streaming(hdw,0);
                 break;
         }
@@ -599,6 +671,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_ext_control *ctrl;
                 unsigned int idx;
                 int val;
+                ret = 0;
                 for (idx = 0; idx < ctls->count; idx++) {
                         ctrl = ctls->controls + idx;
                         ret = pvr2_ctrl_get_value(
@@ -621,6 +694,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                         (struct v4l2_ext_controls *)arg;
                 struct v4l2_ext_control *ctrl;
                 unsigned int idx;
+                ret = 0;
                 for (idx = 0; idx < ctls->count; idx++) {
                         ctrl = ctls->controls + idx;
                         ret = pvr2_ctrl_set_value(
@@ -643,6 +717,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 unsigned int idx;
                 /* For the moment just validate that the requested control
                    actually exists. */
+                ret = 0;
                 for (idx = 0; idx < ctls->count; idx++) {
                         ctrl = ctls->controls + idx;
                         pctl = pvr2_hdw_get_ctrl_v4l(hdw,ctrl->id);
@@ -662,16 +737,16 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_INT_G_REGISTER:
-        case VIDIOC_INT_S_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
         {
                 u32 val;
                 struct v4l2_register *req = (struct v4l2_register *)arg;
-                if (cmd == VIDIOC_INT_S_REGISTER) val = req->val;
+                if (cmd == VIDIOC_DBG_S_REGISTER) val = req->val;
                 ret = pvr2_hdw_register_access(
                         hdw,req->i2c_id,req->reg,
-                        cmd == VIDIOC_INT_S_REGISTER,&val);
-                if (cmd == VIDIOC_INT_G_REGISTER) req->val = val;
+                        cmd == VIDIOC_DBG_S_REGISTER,&val);
+                if (cmd == VIDIOC_DBG_G_REGISTER) req->val = val;
                 break;
         }
 #endif
@@ -707,8 +782,12 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
 static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
 {
-        printk(KERN_INFO "pvrusb2: unregistering device video%d [%s]\n",
-               dip->devbase.minor,pvr2_config_get_name(dip->config));
+        int minor_id = dip->devbase.minor;
+        struct pvr2_hdw *hdw = dip->v4lp->channel.mc_head->hdw;
+        enum pvr2_config cfg = dip->config;
+        int v4l_type = dip->v4l_type;
+
+        pvr2_hdw_v4l_store_minor_number(hdw,dip->minor_type,-1);
 
         /* Paranoia */
         dip->v4lp = NULL;
@@ -717,13 +796,24 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
         /* Actual deallocation happens later when all internal references
            are gone. */
         video_unregister_device(&dip->devbase);
+
+        printk(KERN_INFO "pvrusb2: unregistered device %s%u [%s]\n",
+               get_v4l_name(v4l_type),minor_id & 0x1f,
+               pvr2_config_get_name(cfg));
+
 }
 
 
 static void pvr2_v4l2_destroy_no_lock(struct pvr2_v4l2 *vp)
 {
-        pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,-1);
-        pvr2_v4l2_dev_destroy(vp->vdev);
+        if (vp->dev_video) {
+                pvr2_v4l2_dev_destroy(vp->dev_video);
+                vp->dev_video = 0;
+        }
+        if (vp->dev_radio) {
+                pvr2_v4l2_dev_destroy(vp->dev_radio);
+                vp->dev_radio = 0;
+        }
 
         pvr2_trace(PVR2_TRACE_STRUCT,"Destroying pvr2_v4l2 id=%p",vp);
         pvr2_channel_done(&vp->channel);
@@ -766,23 +856,37 @@ static int pvr2_v4l2_release(struct inode *inode, struct file *file)
         struct pvr2_v4l2_fh *fhp = file->private_data;
         struct pvr2_v4l2 *vp = fhp->vhead;
         struct pvr2_context *mp = fhp->vhead->channel.mc_head;
+        struct pvr2_hdw *hdw = fhp->channel.mc_head->hdw;
 
         pvr2_trace(PVR2_TRACE_OPEN_CLOSE,"pvr2_v4l2_release");
 
         if (fhp->rhp) {
                 struct pvr2_stream *sp;
-                struct pvr2_hdw *hdw;
-                hdw = fhp->channel.mc_head->hdw;
                 pvr2_hdw_set_streaming(hdw,0);
                 sp = pvr2_ioread_get_stream(fhp->rhp);
                 if (sp) pvr2_stream_set_callback(sp,NULL,NULL);
                 pvr2_ioread_destroy(fhp->rhp);
                 fhp->rhp = NULL;
         }
+
         v4l2_prio_close(&vp->prio, &fhp->prio);
         file->private_data = NULL;
 
         pvr2_context_enter(mp); do {
+                /* Restore the previous input selection, if it makes sense
+                   to do so. */
+                if (fhp->dev_info->v4l_type == VFL_TYPE_RADIO) {
+                        struct pvr2_ctrl *cp;
+                        int pval;
+                        cp = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_INPUT);
+                        pvr2_ctrl_get_value(cp,&pval);
+                        /* Only restore if we're still selecting the radio */
+                        if (pval == PVR2_CVAL_INPUT_RADIO) {
+                                pvr2_ctrl_set_value(cp,fhp->prev_input_val);
+                                pvr2_hdw_commit_ctl(hdw);
+                        }
+                }
+
                 if (fhp->vnext) {
                         fhp->vnext->vprev = fhp->vprev;
                 } else {
@@ -828,11 +932,10 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
                 return -EIO;
         }
 
-        fhp = kmalloc(sizeof(*fhp),GFP_KERNEL);
+        fhp = kzalloc(sizeof(*fhp),GFP_KERNEL);
         if (!fhp) {
                 return -ENOMEM;
         }
-        memset(fhp,0,sizeof(*fhp));
 
         init_waitqueue_head(&fhp->wait_data);
         fhp->dev_info = dip;
@@ -840,6 +943,7 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
         pvr2_context_enter(vp->channel.mc_head); do {
                 pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_v4l2_fh id=%p",fhp);
                 pvr2_channel_init(&fhp->channel,vp->channel.mc_head);
+
                 fhp->vnext = NULL;
                 fhp->vprev = vp->vlast;
                 if (vp->vlast) {
@@ -849,6 +953,18 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
                 }
                 vp->vlast = fhp;
                 fhp->vhead = vp;
+
+                /* Opening the /dev/radioX device implies a mode switch.
+                   So execute that here.  Note that you can get the
+                   IDENTICAL effect merely by opening the normal video
+                   device and setting the input appropriately. */
+                if (dip->v4l_type == VFL_TYPE_RADIO) {
+                        struct pvr2_ctrl *cp;
+                        cp = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_INPUT);
+                        pvr2_ctrl_get_value(cp,&fhp->prev_input_val);
+                        pvr2_ctrl_set_value(cp,PVR2_CVAL_INPUT_RADIO);
+                        pvr2_hdw_commit_ctl(hdw);
+                }
         } while (0); pvr2_context_exit(vp->channel.mc_head);
 
         fhp->file = file;
@@ -873,6 +989,12 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)
         struct pvr2_hdw *hdw;
         if (fh->rhp) return 0;
 
+        if (!fh->dev_info->stream) {
+                /* No stream defined for this node.  This means that we're
+                   not currently allowed to stream from this node. */
+                return -EPERM;
+        }
+
         /* First read() attempt.  Try to claim the stream and start
            it... */
         if ((ret = pvr2_channel_claim_stream(&fh->channel,
@@ -1012,25 +1134,37 @@ static struct video_device vdev_template = {
 
 static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
                                struct pvr2_v4l2 *vp,
-                               enum pvr2_config cfg)
+                               int v4l_type)
 {
         int mindevnum;
         int unit_number;
-        int v4l_type;
+        int *nr_ptr = 0;
         dip->v4lp = vp;
-        dip->config = cfg;
 
 
-        switch (cfg) {
-        case pvr2_config_mpeg:
-                v4l_type = VFL_TYPE_GRABBER;
+        dip->v4l_type = v4l_type;
+        switch (v4l_type) {
+        case VFL_TYPE_GRABBER:
                 dip->stream = &vp->channel.mc_head->video_stream;
+                dip->config = pvr2_config_mpeg;
+                dip->minor_type = pvr2_v4l_type_video;
+                nr_ptr = video_nr;
+                if (!dip->stream) {
+                        err("Failed to set up pvrusb2 v4l video dev"
+                            " due to missing stream instance");
+                        return;
+                }
                 break;
-        case pvr2_config_vbi:
-                v4l_type = VFL_TYPE_VBI;
+        case VFL_TYPE_VBI:
+                dip->config = pvr2_config_vbi;
+                dip->minor_type = pvr2_v4l_type_vbi;
+                nr_ptr = vbi_nr;
                 break;
-        case pvr2_config_radio:
-                v4l_type = VFL_TYPE_RADIO;
+        case VFL_TYPE_RADIO:
+                dip->stream = &vp->channel.mc_head->video_stream;
+                dip->config = pvr2_config_mpeg;
+                dip->minor_type = pvr2_v4l_type_radio;
+                nr_ptr = radio_nr;
                 break;
         default:
                 /* Bail out (this should be impossible) */
@@ -1039,30 +1173,27 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
                 return;
         }
 
-        if (!dip->stream) {
-                err("Failed to set up pvrusb2 v4l dev"
-                    " due to missing stream instance");
-                return;
-        }
-
         memcpy(&dip->devbase,&vdev_template,sizeof(vdev_template));
         dip->devbase.release = pvr2_video_device_release;
 
         mindevnum = -1;
         unit_number = pvr2_hdw_get_unit_number(vp->channel.mc_head->hdw);
-        if ((unit_number >= 0) && (unit_number < PVR_NUM)) {
-                mindevnum = video_nr[unit_number];
+        if (nr_ptr && (unit_number >= 0) && (unit_number < PVR_NUM)) {
+                mindevnum = nr_ptr[unit_number];
         }
-        if ((video_register_device(&dip->devbase, v4l_type, mindevnum) < 0) &&
-            (video_register_device(&dip->devbase, v4l_type, -1) < 0)) {
-                err("Failed to register pvrusb2 v4l video device");
-        } else {
-                printk(KERN_INFO "pvrusb2: registered device video%d [%s]\n",
-                       dip->devbase.minor,pvr2_config_get_name(dip->config));
+        if ((video_register_device(&dip->devbase,
+                                   dip->v4l_type, mindevnum) < 0) &&
+            (video_register_device(&dip->devbase,
+                                   dip->v4l_type, -1) < 0)) {
+                err("Failed to register pvrusb2 v4l device");
         }
 
+        printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n",
+               get_v4l_name(dip->v4l_type),dip->devbase.minor & 0x1f,
+               pvr2_config_get_name(dip->config));
+
         pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
-                                        dip->devbase.minor);
+                                        dip->minor_type,dip->devbase.minor);
 }
 
 
@@ -1070,22 +1201,24 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *mnp)
 {
         struct pvr2_v4l2 *vp;
 
-        vp = kmalloc(sizeof(*vp),GFP_KERNEL);
+        vp = kzalloc(sizeof(*vp),GFP_KERNEL);
         if (!vp) return vp;
-        memset(vp,0,sizeof(*vp));
-        vp->vdev = kmalloc(sizeof(*vp->vdev),GFP_KERNEL);
-        if (!vp->vdev) {
+        vp->dev_video = kzalloc(sizeof(*vp->dev_video),GFP_KERNEL);
+        vp->dev_radio = kzalloc(sizeof(*vp->dev_radio),GFP_KERNEL);
+        if (!(vp->dev_video && vp->dev_radio)) {
+                kfree(vp->dev_video);
+                kfree(vp->dev_radio);
                 kfree(vp);
                 return NULL;
         }
-        memset(vp->vdev,0,sizeof(*vp->vdev));
         pvr2_channel_init(&vp->channel,mnp);
         pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr2_v4l2 id=%p",vp);
 
         vp->channel.check_func = pvr2_v4l2_internal_check;
 
         /* register streams */
-        pvr2_v4l2_dev_init(vp->vdev,vp,pvr2_config_mpeg);
+        pvr2_v4l2_dev_init(vp->dev_video,vp,VFL_TYPE_GRABBER);
+        pvr2_v4l2_dev_init(vp->dev_radio,vp,VFL_TYPE_RADIO);
 
         return vp;
 }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index 2a826464911a..61efa6f02200 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -66,7 +66,9 @@ static void set_input(struct pvr2_v4l_decoder *ctxt)
                 route.input = SAA7115_SVIDEO2;
                 break;
         case PVR2_CVAL_INPUT_RADIO:
-                // ????? No idea yet what to do here
+                // In radio mode, we mute the video, but point at one
+                // spot just to stay consistent
+                route.input = SAA7115_COMPOSITE5;
         default:
                 return;
         }
@@ -137,8 +139,7 @@ static int decoder_check(struct pvr2_v4l_decoder *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
                 msk = 1 << idx;
                 if (ctxt->stale_mask & msk) continue;
                 if (decoder_ops[idx].check(ctxt)) {
@@ -154,8 +155,7 @@ static void decoder_update(struct pvr2_v4l_decoder *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
                 msk = 1 << idx;
                 if (!(ctxt->stale_mask & msk)) continue;
                 ctxt->stale_mask &= ~msk;
@@ -183,18 +183,6 @@ static void decoder_enable(struct pvr2_v4l_decoder *ctxt,int fl)
 }
 
 
-static int decoder_is_tuned(struct pvr2_v4l_decoder *ctxt)
-{
-        struct v4l2_tuner vt;
-        int ret;
-
-        memset(&vt,0,sizeof(vt));
-        ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt);
-        if (ret < 0) return -EINVAL;
-        return vt.signal ? 1 : 0;
-}
-
-
 static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,unsigned int cnt)
 {
         return scnprintf(buf,cnt,"handler: pvrusb2-video-v4l");
@@ -218,20 +206,17 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw,
         if (cp->handler) return 0;
         if (!decoder_detect(cp)) return 0;
 
-        ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);
+        ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);
         if (!ctxt) return 0;
-        memset(ctxt,0,sizeof(*ctxt));
 
         ctxt->handler.func_data = ctxt;
         ctxt->handler.func_table = &hfuncs;
         ctxt->ctrl.ctxt = ctxt;
         ctxt->ctrl.detach = (void (*)(void *))decoder_detach;
         ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable;
-        ctxt->ctrl.tuned = (int (*)(void *))decoder_is_tuned;
         ctxt->client = cp;
         ctxt->hdw = hdw;
-        ctxt->stale_mask = (1 << (sizeof(decoder_ops)/
-                                  sizeof(decoder_ops[0]))) - 1;
+        ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1;
         hdw->decoder_ctrl = &ctxt->ctrl;
         cp->handler = &ctxt->handler;
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x saa711x V4L2 handler set up",
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
index 7794c34c355e..66b4d36ef765 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -50,15 +50,21 @@ static void set_input(struct pvr2_v4l_wm8775 *ctxt)
 {
         struct v4l2_routing route;
         struct pvr2_hdw *hdw = ctxt->hdw;
-        int msk = 0;
 
         memset(&route,0,sizeof(route));
 
-        pvr2_trace(PVR2_TRACE_CHIPS,"i2c wm8775 set_input(val=%d msk=0x%x)",
-                   hdw->input_val,msk);
+        switch(hdw->input_val) {
+        case PVR2_CVAL_INPUT_RADIO:
+                route.input = 1;
+                break;
+        default:
+                /* All other cases just use the second input */
+                route.input = 2;
+                break;
+        }
+        pvr2_trace(PVR2_TRACE_CHIPS,"i2c wm8775 set_input(val=%d route=0x%x)",
+                   hdw->input_val,route.input);
 
-        // Always point to input #1 no matter what
-        route.input = 2;
         pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route);
 }
 
@@ -99,8 +105,7 @@ static int wm8775_check(struct pvr2_v4l_wm8775 *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(wm8775_ops)/sizeof(wm8775_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(wm8775_ops); idx++) {
                 msk = 1 << idx;
                 if (ctxt->stale_mask & msk) continue;
                 if (wm8775_ops[idx].check(ctxt)) {
@@ -116,8 +121,7 @@ static void wm8775_update(struct pvr2_v4l_wm8775 *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(wm8775_ops)/sizeof(wm8775_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(wm8775_ops); idx++) {
                 msk = 1 << idx;
                 if (!(ctxt->stale_mask & msk)) continue;
                 ctxt->stale_mask &= ~msk;
@@ -140,16 +144,14 @@ int pvr2_i2c_wm8775_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 
         if (cp->handler) return 0;
 
-        ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);
+        ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);
         if (!ctxt) return 0;
-        memset(ctxt,0,sizeof(*ctxt));
 
         ctxt->handler.func_data = ctxt;
         ctxt->handler.func_table = &hfuncs;
         ctxt->client = cp;
         ctxt->hdw = hdw;
-        ctxt->stale_mask = (1 << (sizeof(wm8775_ops)/
-                                  sizeof(wm8775_ops[0]))) - 1;
+        ctxt->stale_mask = (1 << ARRAY_SIZE(wm8775_ops)) - 1;
         cp->handler = &ctxt->handler;
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x wm8775 V4L2 handler set up",
                    cp->client->addr);
diff --git a/drivers/media/video/pwc/Makefile b/drivers/media/video/pwc/Makefile
index 9db2260d10cc..f5c8ec261e87 100644
--- a/drivers/media/video/pwc/Makefile
+++ b/drivers/media/video/pwc/Makefile
@@ -2,11 +2,3 @@ pwc-objs	:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o
 pwc-objs        += pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o
 
 obj-$(CONFIG_USB_PWC) += pwc.o
-
-ifeq ($(CONFIG_USB_PWC_DEBUG),y)
-EXTRA_CFLAGS += -DCONFIG_PWC_DEBUG=1
-else
-EXTRA_CFLAGS += -DCONFIG_PWC_DEBUG=0
-endif
-
-
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 9825fd348108..27ed76986ca2 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -128,7 +128,7 @@ static int default_size = PSZ_QCIF;
 static int default_fps = 10;
 static int default_fbufs = 3;   /* Default number of frame buffers */
        int pwc_mbufs = 2;       /* Default number of mmap() buffers */
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
        int pwc_trace = PWC_DEBUG_LEVEL;
 #endif
 static int power_save = 0;
@@ -1051,7 +1051,7 @@ static void pwc_remove_sysfs_files(struct video_device *vdev)
         video_device_remove_file(vdev, &class_device_attr_button);
 }
 
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
 static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
 {
         switch(sensor_type) {
@@ -1835,7 +1835,7 @@ module_param(size, charp, 0444);
 module_param(fps, int, 0444);
 module_param(fbufs, int, 0444);
 module_param(mbufs, int, 0444);
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
 module_param_named(trace, pwc_trace, int, 0644);
 #endif
 module_param(power_save, int, 0444);
@@ -1908,7 +1908,7 @@ static int __init usb_pwc_init(void)
                 default_fbufs = fbufs;
                 PWC_DEBUG_MODULE("Number of frame buffers set to %d.\n", default_fbufs);
         }
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
         if (pwc_trace >= 0) {
                 PWC_DEBUG_MODULE("Trace options: 0x%04x\n", pwc_trace);
         }
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index b7eb3ce3b968..d5e6bc850643 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -350,7 +350,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
         if (pdev == NULL)
                 return -EFAULT;
 
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
         if (PWC_DEBUG_LEVEL_IOCTL & pwc_trace)
                 v4l_printk_ioctl(cmd);
 #endif
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index 7e9c4237d1e8..e778a2b8c280 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -39,11 +39,6 @@
 #include "pwc-uncompress.h"
 #include <media/pwc-ioctl.h>
 
-/* Turn some debugging options on/off */
-#ifndef CONFIG_PWC_DEBUG
-#define CONFIG_PWC_DEBUG 1
-#endif
-
 /* Version block */
 #define PWC_MAJOR       10
 #define PWC_MINOR       0
@@ -76,7 +71,7 @@
 #define PWC_DEBUG_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args)
 
 
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
 
 #define PWC_DEBUG_LEVEL (PWC_DEBUG_LEVEL_MODULE)
 
@@ -270,7 +265,7 @@ extern "C" {
 #endif
 
 /* Global variables */
-#if CONFIG_PWC_DEBUG
+#ifdef CONFIG_USB_PWC_DEBUG
 extern int pwc_trace;
 #endif
 extern int pwc_mbufs;
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 76f5f5d49dae..e20aa3612a7c 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -111,7 +111,7 @@ static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind)
         for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
         {
                 memset(t->pgbuf[pgbuf], ' ', sizeof(t->pgbuf[0]));
-                t->is_searching[pgbuf] = FALSE;
+                t->is_searching[pgbuf] = false;
         }
         vd->priv=t;
 
@@ -198,7 +198,7 @@ static int i2c_senddata(struct saa5246a_device *t, ...)
 
 /* Get count number of bytes from I²C-device at address adr, store them in buf.
  * Start & stop handshaking is done by this routine, ack will be sent after the
- * last byte to inhibit further sending of data. If uaccess is TRUE, data is
+ * last byte to inhibit further sending of data. If uaccess is 'true', data is
  * written to user-space with put_user. Returns -1 if I²C-device didn't send
  * acknowledge, 0 otherwise
  */
@@ -338,7 +338,7 @@ static int saa5246a_request_page(struct saa5246a_device *t,
                 return -EIO;
         }
 
-        t->is_searching[req->pgbuf] = TRUE;
+        t->is_searching[req->pgbuf] = true;
         return 0;
 }
 
@@ -452,7 +452,7 @@ static inline int saa5246a_get_status(struct saa5246a_device *t,
                 }
         }
         if (!info->hamming && !info->notfound)
-                t->is_searching[dau_no] = FALSE;
+                t->is_searching[dau_no] = false;
         return 0;
 }
 
@@ -564,7 +564,7 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t,
         {
                 return -EIO;
         }
-        t->is_searching[dau_no] = FALSE;
+        t->is_searching[dau_no] = false;
         return 0;
 }
 
diff --git a/drivers/media/video/saa5246a.h b/drivers/media/video/saa5246a.h
index 7b91112304e0..64394c036c60 100644
--- a/drivers/media/video/saa5246a.h
+++ b/drivers/media/video/saa5246a.h
@@ -41,23 +41,18 @@
 #define POS_HEADER_START 7
 #define POS_HEADER_END 31
 
-/* Returns TRUE if the part of the videotext page described with req contains
+/* Returns 'true' if the part of the videotext page described with req contains
    (at least parts of) the time field */
 #define REQ_CONTAINS_TIME(p_req) \
         ((p_req)->start <= POS_TIME_END && \
          (p_req)->end   >= POS_TIME_START)
 
-/* Returns TRUE if the part of the videotext page described with req contains
+/* Returns 'true' if the part of the videotext page described with req contains
    (at least parts of) the page header */
 #define REQ_CONTAINS_HEADER(p_req) \
         ((p_req)->start <= POS_HEADER_END && \
          (p_req)->end   >= POS_HEADER_START)
 
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
 /*****************************************************************************/
 /* Mode register numbers of the SAA5246A                                     */
 /*****************************************************************************/
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 3e84737878a8..f2a2f34cd626 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -124,11 +124,6 @@ struct saa5249_device
 
 /* General defines and debugging support */
 
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
 #define RESCHED do { cond_resched(); } while(0)
 
 static struct video_device saa_template;        /* Declared near bottom */
@@ -183,9 +178,9 @@ static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
                 memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
                 memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
                 t->vdau[pgbuf].expire = 0;
-                t->vdau[pgbuf].clrfound = TRUE;
-                t->vdau[pgbuf].stopped = TRUE;
-                t->is_searching[pgbuf] = FALSE;
+                t->vdau[pgbuf].clrfound = true;
+                t->vdau[pgbuf].stopped = true;
+                t->is_searching[pgbuf] = false;
         }
         vd->priv=t;
 
@@ -298,7 +293,7 @@ static int i2c_senddata(struct saa5249_device *t, ...)
 
 /* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop
  * handshaking is done by this routine, ack will be sent after the last byte to inhibit further
- * sending of data. If uaccess is TRUE, data is written to user-space with put_user.
+ * sending of data. If uaccess is 'true', data is written to user-space with put_user.
  * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise
  */
 
@@ -317,7 +312,7 @@ static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf)
 static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                             unsigned int cmd, void *arg)
 {
-        static int virtual_mode = FALSE;
+        static int virtual_mode = false;
         struct video_device *vd = video_devdata(file);
         struct saa5249_device *t=vd->priv;
 
@@ -340,7 +335,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
                                 return -EINVAL;
                         memset(t->vdau[req->pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
-                        t->vdau[req->pgbuf].clrfound = TRUE;
+                        t->vdau[req->pgbuf].clrfound = true;
                         return 0;
                 }
 
@@ -350,7 +345,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
 
                         if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
                                 return -EINVAL;
-                        t->vdau[req->pgbuf].clrfound = TRUE;
+                        t->vdau[req->pgbuf].clrfound = true;
                         return 0;
                 }
 
@@ -376,9 +371,9 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                         t->vdau[req->pgbuf].sregs[4] = (req->pagemask & HR_UNIT ? 0x10 : 0) | (req->hour & 0xf);
                         t->vdau[req->pgbuf].sregs[5] = (req->pagemask & MIN_TEN ? 0x10 : 0) | (req->minute / 0x10);
                         t->vdau[req->pgbuf].sregs[6] = (req->pagemask & MIN_UNIT ? 0x10 : 0) | (req->minute & 0xf);
-                        t->vdau[req->pgbuf].stopped = FALSE;
-                        t->vdau[req->pgbuf].clrfound = TRUE;
-                        t->is_searching[req->pgbuf] = TRUE;
+                        t->vdau[req->pgbuf].stopped = false;
+                        t->vdau[req->pgbuf].clrfound = true;
+                        t->is_searching[req->pgbuf] = true;
                         return 0;
                 }
 
@@ -430,7 +425,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                                                         i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 23 * 40))
                                                         return -EIO;
                                         }
-                                        t->vdau[req->pgbuf].clrfound = FALSE;
+                                        t->vdau[req->pgbuf].clrfound = false;
                                         memcpy(t->vdau[req->pgbuf].laststat, infobits, sizeof(infobits));
                                 }
                                 else
@@ -474,7 +469,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
                         if (!info.hamming && !info.notfound)
                         {
-                                t->is_searching[req->pgbuf] = FALSE;
+                                t->is_searching[req->pgbuf] = false;
                         }
                         return 0;
                 }
@@ -530,8 +525,8 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
 
                         if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
                                 return -EINVAL;
-                        t->vdau[req->pgbuf].stopped = TRUE;
-                        t->is_searching[req->pgbuf] = FALSE;
+                        t->vdau[req->pgbuf].stopped = true;
+                        t->is_searching[req->pgbuf] = false;
                         return 0;
                 }
 
@@ -660,11 +655,11 @@ static int saa5249_open(struct inode *inode, struct file *file)
                 memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
                 memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
                 t->vdau[pgbuf].expire = 0;
-                t->vdau[pgbuf].clrfound = TRUE;
-                t->vdau[pgbuf].stopped = TRUE;
-                t->is_searching[pgbuf] = FALSE;
+                t->vdau[pgbuf].clrfound = true;
+                t->vdau[pgbuf].stopped = true;
+                t->is_searching[pgbuf] = false;
         }
-        t->virtual_mode=FALSE;
+        t->virtual_mode = false;
         return 0;
 
  fail:
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index c2374ed7ba9f..c4f066d6668e 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -71,6 +71,7 @@ I2C_CLIENT_INSMOD;
 struct saa711x_state {
         v4l2_std_id std;
         int input;
+        int output;
         int enable;
         int radio;
         int bright;
@@ -1301,7 +1302,7 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
                 struct v4l2_routing *route = arg;
 
                 route->input = state->input;
-                route->output = 0;
+                route->output = state->output;
                 break;
         }
 
@@ -1309,7 +1310,7 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
         {
                 struct v4l2_routing *route = arg;
 
-                v4l_dbg(1, debug, client, "decoder set input %d\n", route->input);
+                v4l_dbg(1, debug, client, "decoder set input %d output %d\n", route->input, route->output);
                 /* saa7113 does not have these inputs */
                 if (state->ident == V4L2_IDENT_SAA7113 &&
                     (route->input == SAA7115_COMPOSITE4 ||
@@ -1318,10 +1319,12 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
                 }
                 if (route->input > SAA7115_SVIDEO3)
                         return -EINVAL;
-                if (state->input == route->input)
+                if (route->output > SAA7115_IPORT_ON)
+                        return -EINVAL;
+                if (state->input == route->input && state->output == route->output)
                         break;
-                v4l_dbg(1, debug, client, "now setting %s input\n",
-                        (route->input >= SAA7115_SVIDEO0) ? "S-Video" : "Composite");
+                v4l_dbg(1, debug, client, "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;
 
                 /* select mode */
@@ -1333,6 +1336,14 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
                 saa711x_write(client, R_09_LUMA_CNTL,
                               (saa711x_read(client, R_09_LUMA_CNTL) & 0x7f) |
                                (state->input >= SAA7115_SVIDEO0 ? 0x80 : 0x0));
+
+                state->output = route->output;
+                if (state->ident == V4L2_IDENT_SAA7114 ||
+                        state->ident == V4L2_IDENT_SAA7115) {
+                        saa711x_write(client, R_83_X_PORT_I_O_ENA_AND_OUT_CLK,
+                              (saa711x_read(client, R_83_X_PORT_I_O_ENA_AND_OUT_CLK) & 0xfe) |
+                               (state->output & 0x01));
+                }
                 break;
         }
 
@@ -1377,6 +1388,9 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
         {
                 struct v4l2_sliced_vbi_data *data = arg;
 
+                /* Note: the internal field ID is inverted for NTSC,
+                   so data->field 0 maps to the saa7115 even field,
+                   whereas for PAL it maps to the saa7115 odd field. */
                 switch (data->id) {
                 case V4L2_SLICED_WSS_625:
                         if (saa711x_read(client, 0x6b) & 0xc0)
@@ -1387,17 +1401,17 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
                 case V4L2_SLICED_CAPTION_525:
                         if (data->field == 0) {
                                 /* CC */
-                                if (saa711x_read(client, 0x66) & 0xc0)
+                                if (saa711x_read(client, 0x66) & 0x30)
                                         return -EIO;
-                                data->data[0] = saa711x_read(client, 0x67);
-                                data->data[1] = saa711x_read(client, 0x68);
+                                data->data[0] = saa711x_read(client, 0x69);
+                                data->data[1] = saa711x_read(client, 0x6a);
                                 return 0;
                         }
                         /* XDS */
-                        if (saa711x_read(client, 0x66) & 0x30)
+                        if (saa711x_read(client, 0x66) & 0xc0)
                                 return -EIO;
-                        data->data[0] = saa711x_read(client, 0x69);
-                        data->data[1] = saa711x_read(client, 0x6a);
+                        data->data[0] = saa711x_read(client, 0x67);
+                        data->data[1] = saa711x_read(client, 0x68);
                         return 0;
                 default:
                         return -EINVAL;
@@ -1406,17 +1420,8 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
         }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_INT_G_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
-
-                if (reg->i2c_id != I2C_DRIVERID_SAA711X)
-                        return -EINVAL;
-                reg->val = saa711x_read(client, reg->reg & 0xff);
-                break;
-        }
-
-        case VIDIOC_INT_S_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
         {
                 struct v4l2_register *reg = arg;
 
@@ -1424,7 +1429,10 @@ static int saa711x_command(struct i2c_client *client, unsigned int cmd, void *ar
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                saa711x_write(client, reg->reg & 0xff, reg->val & 0xff);
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = saa711x_read(client, reg->reg & 0xff);
+                else
+                        saa711x_write(client, reg->reg & 0xff, reg->val & 0xff);
                 break;
         }
 #endif
@@ -1492,6 +1500,7 @@ static int saa711x_attach(struct i2c_adapter *adapter, int address, int kind)
                 return -ENOMEM;
         }
         state->input = -1;
+        state->output = SAA7115_IPORT_ON;
         state->enable = 1;
         state->radio = 0;
         state->bright = 128;
@@ -1550,7 +1559,7 @@ static int saa711x_attach(struct i2c_adapter *adapter, int address, int kind)
 
 static int saa711x_probe(struct i2c_adapter *adapter)
 {
-        if (adapter->class & I2C_CLASS_TV_ANALOG)
+        if (adapter->class & I2C_CLASS_TV_ANALOG || adapter->class & I2C_CLASS_TV_DIGITAL)
                 return i2c_probe(adapter, &addr_data, &saa711x_attach);
         return 0;
 }
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index ad401bdefeaf..bd9c4f3ad02e 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -614,17 +614,8 @@ static int saa7127_command(struct i2c_client *client,
                 break;
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_INT_G_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
-
-                if (reg->i2c_id != I2C_DRIVERID_SAA7127)
-                        return -EINVAL;
-                reg->val = saa7127_read(client, reg->reg & 0xff);
-                break;
-        }
-
-        case VIDIOC_INT_S_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
         {
                 struct v4l2_register *reg = arg;
 
@@ -632,7 +623,10 @@ static int saa7127_command(struct i2c_client *client,
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                saa7127_write(client, reg->reg & 0xff, reg->val & 0xff);
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = saa7127_read(client, reg->reg & 0xff);
+                else
+                        saa7127_write(client, reg->reg & 0xff, reg->val & 0xff);
                 break;
         }
 #endif
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 89a1565b4256..c85c8a8ec361 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -14,7 +14,3 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 EXTRA_CFLAGS += -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
-
-extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
-
-EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index ae984bbe36b6..89f32107f46b 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2469,6 +2469,11 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = LINE2,
                         .gpio = 0x0200000,
                 },{
+                        .name = name_comp2,
+                        .vmux = 0,
+                        .amux = LINE2,
+                        .gpio = 0x0200000,
+                },{
                         .name = name_svideo,
                         .vmux = 8,
                         .amux = LINE2,
@@ -3183,6 +3188,107 @@ struct saa7134_board saa7134_boards[] = {
                         .amux   = LINE1,
                 }},
         },
+        [SAA7134_BOARD_ENCORE_ENLTV] = {
+        /* Steven Walter <stevenrwalter@gmail.com>
+           Juan Pablo Sormani <sorman@gmail.com> */
+                .name           = "Encore ENLTV",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_TNF_5335MF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = 3,
+                        .tv   = 1,
+                },{
+                        .name = name_tv_mono,
+                        .vmux = 7,
+                        .amux = 4,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = 2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 0,
+                        .amux = 2,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+/*                      .gpio = 0x00300001,*/
+                        .gpio = 0x20000,
+
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = 0,
+                },
+        },
+        [SAA7134_BOARD_ENCORE_ENLTV_FM] = {
+  /*    Juan Pablo Sormani <sorman@gmail.com> */
+                .name           = "Encore ENLTV-FM",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_PHILIPS_ATSC,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = 3,
+                        .tv   = 1,
+                },{
+                        .name = name_tv_mono,
+                        .vmux = 7,
+                        .amux = 4,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = 2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 0,
+                        .amux = 2,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+                        .gpio = 0x20000,
+
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = 0,
+                },
+        },
+        [SAA7134_BOARD_CINERGY_HT_PCI] = {
+                .name           = "Terratec Cinergy HT PCI",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 0,
+                        .amux   = LINE1,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 6,
+                        .amux   = LINE1,
+                }},
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3822,6 +3928,36 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x1172,
                 .driver_data  = SAA7134_BOARD_CINERGY_HT_PCMCIA,
         },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = PCI_VENDOR_ID_PHILIPS,
+                .subdevice    = 0x2342,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x1131,
+                .subdevice    = 0x2341,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x3016,
+                .subdevice    = 0x2344,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x1131,
+                .subdevice    = 0x230f,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x153b,
+                .subdevice    = 0x1175,
+                .driver_data  = SAA7134_BOARD_CINERGY_HT_PCI,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3926,9 +4062,12 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_KWORLD_TERMINATOR:
         case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
         case SAA7134_BOARD_FLYDVBT_LR301:
+        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
         case SAA7134_BOARD_FLYDVBTDUO:
         case SAA7134_BOARD_PROTEUS_2309:
         case SAA7134_BOARD_AVERMEDIA_A16AR:
+        case SAA7134_BOARD_ENCORE_ENLTV:
+        case SAA7134_BOARD_ENCORE_ENLTV_FM:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
@@ -4150,6 +4289,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_CINERGY_HT_PCMCIA:
+        case SAA7134_BOARD_CINERGY_HT_PCI:
                 /* make the tda10046 find its eeprom */
                 {
                 u8 data[] = { 0x3c, 0x33, 0x60};
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index c33f6a69a247..e3059fd33951 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1426,6 +1426,18 @@ static int dvb_init(struct saa7134_dev *dev)
 
                 }
                 break;
+        case SAA7134_BOARD_CINERGY_HT_PCI:
+                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                                               &cinergy_ht_config,
+                                               &dev->i2c_adap);
+                if (dev->dvb.frontend) {
+                        dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;
+                        dev->dvb.frontend->ops.tuner_ops.init = cinergy_ht_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = cinergy_ht_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = md8800_dvbt_pll_set;
+
+                }
+                break;
         default:
                 printk("%s: Huh? unknown DVB card?\n",dev->name);
                 break;
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 6f9fe86fed98..cce8da6a4f94 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -120,9 +120,9 @@ static inline int i2c_is_error(enum i2c_status status)
         case ARB_LOST:
         case SEQ_ERR:
         case ST_ERR:
-                return TRUE;
+                return true;
         default:
-                return FALSE;
+                return false;
         }
 }
 
@@ -131,9 +131,9 @@ static inline int i2c_is_idle(enum i2c_status status)
         switch (status) {
         case IDLE:
         case DONE_STOP:
-                return TRUE;
+                return true;
         default:
-                return FALSE;
+                return false;
         }
 }
 
@@ -141,9 +141,9 @@ static inline int i2c_is_busy(enum i2c_status status)
 {
         switch (status) {
         case BUSY:
-                return TRUE;
+                return true;
         default:
-                return FALSE;
+                return false;
         }
 }
 
@@ -159,8 +159,8 @@ static int i2c_is_busy_wait(struct saa7134_dev *dev)
                 saa_wait(I2C_WAIT_DELAY);
         }
         if (I2C_WAIT_RETRY == count)
-                return FALSE;
-        return TRUE;
+                return false;
+        return true;
 }
 
 static int i2c_reset(struct saa7134_dev *dev)
@@ -171,7 +171,7 @@ static int i2c_reset(struct saa7134_dev *dev)
         d2printk(KERN_DEBUG "%s: i2c reset\n",dev->name);
         status = i2c_get_status(dev);
         if (!i2c_is_error(status))
-                return TRUE;
+                return true;
         i2c_set_status(dev,status);
 
         for (count = 0; count < I2C_WAIT_RETRY; count++) {
@@ -181,13 +181,13 @@ static int i2c_reset(struct saa7134_dev *dev)
                 udelay(I2C_WAIT_DELAY);
         }
         if (I2C_WAIT_RETRY == count)
-                return FALSE;
+                return false;
 
         if (!i2c_is_idle(status))
-                return FALSE;
+                return false;
 
         i2c_set_attr(dev,NOP);
-        return TRUE;
+        return true;
 }
 
 static inline int i2c_send_byte(struct saa7134_dev *dev,
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index e4252683a597..46c583f1e788 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -40,16 +40,24 @@ static int pinnacle_remote = 0;
 module_param(pinnacle_remote, int, 0644);    /* Choose Pinnacle PCTV remote */
 MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");
 
+static int ir_rc5_remote_gap = 885;
+module_param(ir_rc5_remote_gap, int, 0644);
+static int ir_rc5_key_timeout = 115;
+module_param(ir_rc5_key_timeout, int, 0644);
+
 #define dprintk(fmt, arg...)    if (ir_debug) \
         printk(KERN_DEBUG "%s/ir: " fmt, dev->name , ## arg)
 #define i2cdprintk(fmt, arg...)    if (ir_debug) \
         printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
 
+/** rc5 functions */
+static int saa7134_rc5_irq(struct saa7134_dev *dev);
+
 /* -------------------- GPIO generic keycode builder -------------------- */
 
 static int build_key(struct saa7134_dev *dev)
 {
-        struct saa7134_ir *ir = dev->remote;
+        struct card_ir *ir = dev->remote;
         u32 gpio, data;
 
         /* rising SAA7134_GPIO_GPRESCAN reads the status */
@@ -134,16 +142,19 @@ static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 
 void saa7134_input_irq(struct saa7134_dev *dev)
 {
-        struct saa7134_ir *ir = dev->remote;
+        struct card_ir *ir = dev->remote;
 
-        if (!ir->polling)
+        if (!ir->polling && !ir->rc5_gpio) {
                 build_key(dev);
+        } else if (ir->rc5_gpio) {
+                saa7134_rc5_irq(dev);
+        }
 }
 
 static void saa7134_input_timer(unsigned long data)
 {
         struct saa7134_dev *dev = (struct saa7134_dev*)data;
-        struct saa7134_ir *ir = dev->remote;
+        struct card_ir *ir = dev->remote;
         unsigned long timeout;
 
         build_key(dev);
@@ -151,7 +162,7 @@ static void saa7134_input_timer(unsigned long data)
         mod_timer(&ir->timer, timeout);
 }
 
-static void saa7134_ir_start(struct saa7134_dev *dev, struct saa7134_ir *ir)
+static void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
 {
         if (ir->polling) {
                 init_timer(&ir->timer);
@@ -159,6 +170,19 @@ static void saa7134_ir_start(struct saa7134_dev *dev, struct saa7134_ir *ir)
                 ir->timer.data     = (unsigned long)dev;
                 ir->timer.expires  = jiffies + HZ;
                 add_timer(&ir->timer);
+        } else if (ir->rc5_gpio) {
+                /* set timer_end for code completion */
+                init_timer(&ir->timer_end);
+                ir->timer_end.function = ir_rc5_timer_end;
+                ir->timer_end.data = (unsigned long)ir;
+                init_timer(&ir->timer_keyup);
+                ir->timer_keyup.function = ir_rc5_timer_keyup;
+                ir->timer_keyup.data = (unsigned long)ir;
+                ir->shift_by = 2;
+                ir->start = 0x2;
+                ir->addr = 0x17;
+                ir->rc5_key_timeout = ir_rc5_key_timeout;
+                ir->rc5_remote_gap = ir_rc5_remote_gap;
         }
 }
 
@@ -170,13 +194,14 @@ static void saa7134_ir_stop(struct saa7134_dev *dev)
 
 int saa7134_input_init1(struct saa7134_dev *dev)
 {
-        struct saa7134_ir *ir;
+        struct card_ir *ir;
         struct input_dev *input_dev;
         IR_KEYTAB_TYPE *ir_codes = NULL;
         u32 mask_keycode = 0;
         u32 mask_keydown = 0;
         u32 mask_keyup   = 0;
         int polling      = 0;
+        int rc5_gpio     = 0;
         int ir_type      = IR_TYPE_OTHER;
         int err;
 
@@ -295,6 +320,18 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keycode = 0x0001F00;
                 mask_keydown = 0x0040000;
                 break;
+        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+                ir_codes     = ir_codes_asus_pc39;
+                mask_keydown = 0x0040000;
+                rc5_gpio = 1;
+                break;
+        case SAA7134_BOARD_ENCORE_ENLTV:
+        case SAA7134_BOARD_ENCORE_ENLTV_FM:
+                ir_codes     = ir_codes_encore_enltv;
+                mask_keycode = 0x00007f;
+                mask_keyup   = 0x040000;
+                polling      = 50; // ms
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -316,6 +353,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         ir->mask_keydown = mask_keydown;
         ir->mask_keyup   = mask_keyup;
         ir->polling      = polling;
+        ir->rc5_gpio     = rc5_gpio;
 
         /* init input device */
         snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
@@ -402,6 +440,49 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
         }
 
 }
+
+static int saa7134_rc5_irq(struct saa7134_dev *dev)
+{
+        struct card_ir *ir = dev->remote;
+        struct timeval tv;
+        u32 gap;
+        unsigned long current_jiffies, timeout;
+
+        /* get time of bit */
+        current_jiffies = jiffies;
+        do_gettimeofday(&tv);
+
+        /* avoid overflow with gap >1s */
+        if (tv.tv_sec - ir->base_time.tv_sec > 1) {
+                gap = 200000;
+        } else {
+                gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+                    tv.tv_usec - ir->base_time.tv_usec;
+        }
+
+        /* active code => add bit */
+        if (ir->active) {
+                /* only if in the code (otherwise spurious IRQ or timer
+                   late) */
+                if (ir->last_bit < 28) {
+                        ir->last_bit = (gap - ir_rc5_remote_gap / 2) /
+                            ir_rc5_remote_gap;
+                        ir->code |= 1 << ir->last_bit;
+                }
+                /* starting new code */
+        } else {
+                ir->active = 1;
+                ir->code = 0;
+                ir->base_time = tv;
+                ir->last_bit = 0;
+
+                timeout = current_jiffies + (500 + 30 * HZ) / 1000;
+                mod_timer(&ir->timer_end, timeout);
+        }
+
+        return 1;
+}
+
 /* ----------------------------------------------------------------------
  * Local variables:
  * c-basic-offset: 8
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 88cd1297df13..b3e3957c89b5 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -41,14 +41,10 @@
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
+#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
 #include <media/video-buf-dvb.h>
-
-#ifndef TRUE
-# define TRUE (1==1)
-#endif
-#ifndef FALSE
-# define FALSE (1==0)
 #endif
+
 #define UNSET (-1U)
 
 /* ----------------------------------------------------------- */
@@ -232,6 +228,9 @@ struct saa7134_format {
 #define SAA7134_BOARD_VIDEOMATE_DVBT_200A  103
 #define SAA7134_BOARD_HAUPPAUGE_HVR1110    104
 #define SAA7134_BOARD_CINERGY_HT_PCMCIA    105
+#define SAA7134_BOARD_ENCORE_ENLTV         106
+#define SAA7134_BOARD_ENCORE_ENLTV_FM      107
+#define SAA7134_BOARD_CINERGY_HT_PCI       108
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
@@ -411,20 +410,6 @@ struct saa7134_dmasound {
         struct snd_pcm_substream   *substream;
 };
 
-/* IR input */
-struct saa7134_ir {
-        struct input_dev           *dev;
-        struct ir_input_state      ir;
-        char                       name[32];
-        char                       phys[32];
-        u32                        mask_keycode;
-        u32                        mask_keydown;
-        u32                        mask_keyup;
-        int                        polling;
-        u32                        last_gpio;
-        struct timer_list          timer;
-};
-
 /* ts/mpeg status */
 struct saa7134_ts {
         /* TS capture */
@@ -463,7 +448,7 @@ struct saa7134_dev {
 
         /* infrared remote */
         int                        has_remote;
-        struct saa7134_ir          *remote;
+        struct card_ir             *remote;
 
         /* pci i/o */
         char                       name[32];
@@ -543,9 +528,11 @@ struct saa7134_dev {
         struct work_struct         empress_workqueue;
         int                        empress_started;
 
+#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
         /* SAA7134_MPEG_DVB only */
         struct videobuf_dvb        dvb;
         int (*original_demod_sleep)(struct dvb_frontend* fe);
+#endif
 };
 
 /* ----------------------------------------------------------- */
@@ -698,6 +685,7 @@ void saa7134_input_fini(struct saa7134_dev *dev);
 void saa7134_input_irq(struct saa7134_dev *dev);
 void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir);
 
+
 /*
  * Local variables:
  * c-basic-offset: 8
diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig
index cf552e6b8ecf..1a7ccb666ab0 100644
--- a/drivers/media/video/sn9c102/Kconfig
+++ b/drivers/media/video/sn9c102/Kconfig
@@ -1,9 +1,9 @@
 config USB_SN9C102
-        tristate "USB SN9C10x PC Camera Controller support"
+        tristate "USB SN9C1xx PC Camera Controller support"
         depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on SONiX SN9C101,
-          SN9C102 or SN9C103 PC Camera Controllers.
+          SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers.
 
           See <file:Documentation/video4linux/sn9c102.txt> for more info.
 
diff --git a/drivers/media/video/sn9c102/Makefile b/drivers/media/video/sn9c102/Makefile
index 536ad3098da4..30e3dfe537fe 100644
--- a/drivers/media/video/sn9c102/Makefile
+++ b/drivers/media/video/sn9c102/Makefile
@@ -1,5 +1,5 @@
 sn9c102-objs    := sn9c102_core.o sn9c102_hv7131d.o sn9c102_mi0343.o \
-                   sn9c102_ov7630.o sn9c102_pas106b.o sn9c102_pas202bca.o \
+                   sn9c102_ov7630.o sn9c102_ov7660.o sn9c102_pas106b.o \
                    sn9c102_pas202bcb.o sn9c102_tas5110c1b.o \
                    sn9c102_tas5130d1b.o
 
diff --git a/drivers/media/video/sn9c102/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h
index 2c6ff396dafc..5428f34e7c5b 100644
--- a/drivers/media/video/sn9c102/sn9c102.h
+++ b/drivers/media/video/sn9c102/sn9c102.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * V4L2 driver for SN9C10x PC Camera Controllers                           *
+ * V4L2 driver for SN9C1xx PC Camera Controllers                           *
  *                                                                         *
  * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
@@ -37,33 +37,10 @@
 #include <linux/string.h>
 #include <linux/stddef.h>
 
+#include "sn9c102_config.h"
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
-/*****************************************************************************/
-
-#define SN9C102_DEBUG
-#define SN9C102_DEBUG_LEVEL       2
-#define SN9C102_MAX_DEVICES       64
-#define SN9C102_PRESERVE_IMGSCALE 0
-#define SN9C102_FORCE_MUNMAP      0
-#define SN9C102_MAX_FRAMES        32
-#define SN9C102_URBS              2
-#define SN9C102_ISO_PACKETS       7
-#define SN9C102_ALTERNATE_SETTING 8
-#define SN9C102_URB_TIMEOUT       msecs_to_jiffies(2 * SN9C102_ISO_PACKETS)
-#define SN9C102_CTRL_TIMEOUT      300
-#define SN9C102_FRAME_TIMEOUT     2
-
-/*****************************************************************************/
-
-enum sn9c102_bridge {
-        BRIDGE_SN9C101 = 0x01,
-        BRIDGE_SN9C102 = 0x02,
-        BRIDGE_SN9C103 = 0x04,
-};
-
-SN9C102_ID_TABLE
-SN9C102_SENSOR_TABLE
 
 enum sn9c102_frame_state {
         F_UNUSED,
@@ -99,13 +76,11 @@ enum sn9c102_stream_state {
         STREAM_ON,
 };
 
-typedef char sn9c103_sof_header_t[18];
-typedef char sn9c102_sof_header_t[12];
-typedef char sn9c102_eof_header_t[4];
+typedef char sn9c102_sof_header_t[62];
 
 struct sn9c102_sysfs_attr {
         u8 reg, i2c_reg;
-        sn9c103_sof_header_t frame_header;
+        sn9c102_sof_header_t frame_header;
 };
 
 struct sn9c102_module_param {
@@ -137,8 +112,8 @@ struct sn9c102_device {
         struct v4l2_jpegcompression compression;
 
         struct sn9c102_sysfs_attr sysfs;
-        sn9c103_sof_header_t sof_header;
-        u16 reg[63];
+        sn9c102_sof_header_t sof_header;
+        u16 reg[384];
 
         struct sn9c102_module_param module_param;
 
@@ -155,10 +130,7 @@ struct sn9c102_device {
 struct sn9c102_device*
 sn9c102_match_id(struct sn9c102_device* cam, const struct usb_device_id *id)
 {
-        if (usb_match_id(usb_ifnum_to_if(cam->usbdev, 0), id))
-                return cam;
-
-        return NULL;
+        return usb_match_id(usb_ifnum_to_if(cam->usbdev, 0), id) ? cam : NULL;
 }
 
 
@@ -169,6 +141,19 @@ sn9c102_attach_sensor(struct sn9c102_device* cam,
         memcpy(&cam->sensor, sensor, sizeof(struct sn9c102_sensor));
 }
 
+
+enum sn9c102_bridge
+sn9c102_get_bridge(struct sn9c102_device* cam)
+{
+        return cam->bridge;
+}
+
+
+struct sn9c102_sensor* sn9c102_get_sensor(struct sn9c102_device* cam)
+{
+        return &cam->sensor;
+}
+
 /*****************************************************************************/
 
 #undef DBG
diff --git a/drivers/media/video/sn9c102/sn9c102_config.h b/drivers/media/video/sn9c102/sn9c102_config.h
new file mode 100644
index 000000000000..0f4e0378b071
--- /dev/null
+++ b/drivers/media/video/sn9c102/sn9c102_config.h
@@ -0,0 +1,86 @@
+/***************************************************************************
+ * Global parameters for the V4L2 driver for SN9C1xx PC Camera Controllers *
+ *                                                                         *
+ * Copyright (C) 2007 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ *                                                                         *
+ * 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 _SN9C102_CONFIG_H_
+#define _SN9C102_CONFIG_H_
+
+#include <linux/types.h>
+#include <linux/jiffies.h>
+
+#define SN9C102_DEBUG
+#define SN9C102_DEBUG_LEVEL       2
+#define SN9C102_MAX_DEVICES       64
+#define SN9C102_PRESERVE_IMGSCALE 0
+#define SN9C102_FORCE_MUNMAP      0
+#define SN9C102_MAX_FRAMES        32
+#define SN9C102_URBS              2
+#define SN9C102_ISO_PACKETS       7
+#define SN9C102_ALTERNATE_SETTING 8
+#define SN9C102_URB_TIMEOUT       msecs_to_jiffies(2 * SN9C102_ISO_PACKETS)
+#define SN9C102_CTRL_TIMEOUT      300
+#define SN9C102_FRAME_TIMEOUT     0
+
+/*****************************************************************************/
+
+static const u8 SN9C102_Y_QTABLE0[64] = {
+         8,   5,   5,   8,  12,  20,  25,  30,
+         6,   6,   7,   9,  13,  29,  30,  27,
+         7,   6,   8,  12,  20,  28,  34,  28,
+         7,   8,  11,  14,  25,  43,  40,  31,
+         9,  11,  18,  28,  34,  54,  51,  38,
+        12,  17,  27,  32,  40,  52,  56,  46,
+        24,  32,  39,  43,  51,  60,  60,  50,
+        36,  46,  47,  49,  56,  50,  51,  49
+};
+
+static const u8 SN9C102_UV_QTABLE0[64] = {
+         8,   9,  12,  23,  49,  49,  49,  49,
+         9,  10,  13,  33,  49,  49,  49,  49,
+        12,  13,  28,  49,  49,  49,  49,  49,
+        23,  33,  49,  49,  49,  49,  49,  49,
+        49,  49,  49,  49,  49,  49,  49,  49,
+        49,  49,  49,  49,  49,  49,  49,  49,
+        49,  49,  49,  49,  49,  49,  49,  49,
+        49,  49,  49,  49,  49,  49,  49,  49
+};
+
+static const u8 SN9C102_Y_QTABLE1[64] = {
+        16,  11,  10,  16,  24,  40,  51,  61,
+        12,  12,  14,  19,  26,  58,  60,  55,
+        14,  13,  16,  24,  40,  57,  69,  56,
+        14,  17,  22,  29,  51,  87,  80,  62,
+        18,  22,  37,  56,  68, 109, 103,  77,
+        24,  35,  55,  64,  81, 104, 113,  92,
+        49,  64,  78,  87, 103, 121, 120, 101,
+        72,  92,  95,  98, 112, 100, 103,  99
+};
+
+static const u8 SN9C102_UV_QTABLE1[64] = {
+        17,  18,  24,  47,  99,  99,  99,  99,
+        18,  21,  26,  66,  99,  99,  99,  99,
+        24,  26,  56,  99,  99,  99,  99,  99,
+        47,  66,  99,  99,  99,  99,  99,  99,
+        99,  99,  99,  99,  99,  99,  99,  99,
+        99,  99,  99,  99,  99,  99,  99,  99,
+        99,  99,  99,  99,  99,  99,  99,  99,
+        99,  99,  99,  99,  99,  99,  99,  99
+};
+
+#endif /* _SN9C102_CONFIG_H_ */
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 04d4c8f28b89..d0e2b40a7725 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -1,7 +1,7 @@
 /***************************************************************************
- * V4L2 driver for SN9C10x PC Camera Controllers                           *
+ * V4L2 driver for SN9C1xx PC Camera Controllers                           *
  *                                                                         *
- * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -43,12 +43,12 @@
 
 /*****************************************************************************/
 
-#define SN9C102_MODULE_NAME     "V4L2 driver for SN9C10x PC Camera Controllers"
+#define SN9C102_MODULE_NAME     "V4L2 driver for SN9C1xx PC Camera Controllers"
 #define SN9C102_MODULE_AUTHOR   "(C) 2004-2006 Luca Risolia"
 #define SN9C102_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
 #define SN9C102_MODULE_LICENSE  "GPL"
-#define SN9C102_MODULE_VERSION  "1:1.27"
-#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 27)
+#define SN9C102_MODULE_VERSION  "1:1.34"
+#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 34)
 
 /*****************************************************************************/
 
@@ -91,7 +91,8 @@ static unsigned int frame_timeout[] = {[0 ... SN9C102_MAX_DEVICES-1] =
                                        SN9C102_FRAME_TIMEOUT};
 module_param_array(frame_timeout, uint, NULL, 0644);
 MODULE_PARM_DESC(frame_timeout,
-                 "\n<n[,...]> Timeout for a video frame in seconds."
+                 "\n<0|n[,...]> Timeout for a video frame in seconds before"
+                 "\nreturning an I/O error; 0 for infinity."
                  "\nThis parameter is specific for each detected camera."
                  "\nDefault value is "__MODULE_STRING(SN9C102_FRAME_TIMEOUT)"."
                  "\n");
@@ -113,32 +114,13 @@ MODULE_PARM_DESC(debug,
 
 /*****************************************************************************/
 
-static sn9c102_sof_header_t sn9c102_sof_header[] = {
-        {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96, 0x00},
-        {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96, 0x01},
-};
-
-static sn9c103_sof_header_t sn9c103_sof_header[] = {
-        {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96, 0x20},
-};
-
-static sn9c102_eof_header_t sn9c102_eof_header[] = {
-        {0x00, 0x00, 0x00, 0x00},
-        {0x40, 0x00, 0x00, 0x00},
-        {0x80, 0x00, 0x00, 0x00},
-        {0xc0, 0x00, 0x00, 0x00},
-};
-
-/*****************************************************************************/
-
 static u32
 sn9c102_request_buffers(struct sn9c102_device* cam, u32 count,
                         enum sn9c102_io_method io)
 {
         struct v4l2_pix_format* p = &(cam->sensor.pix_format);
         struct v4l2_rect* r = &(cam->sensor.cropcap.bounds);
-        const size_t imagesize = cam->module_param.force_munmap ||
-                                 io == IO_READ ?
+        size_t imagesize = cam->module_param.force_munmap || io == IO_READ ?
                                  (p->width * p->height * p->priv) / 8 :
                                  (r->width * r->height * p->priv) / 8;
         void* buff = NULL;
@@ -147,9 +129,13 @@ sn9c102_request_buffers(struct sn9c102_device* cam, u32 count,
         if (count > SN9C102_MAX_FRAMES)
                 count = SN9C102_MAX_FRAMES;
 
+        if (cam->bridge == BRIDGE_SN9C105 || cam->bridge == BRIDGE_SN9C120)
+                imagesize += 589 + 2; /* length of JPEG header + EOI marker */
+
         cam->nbuffers = count;
         while (cam->nbuffers > 0) {
-                if ((buff = vmalloc_32(cam->nbuffers * PAGE_ALIGN(imagesize))))
+                if ((buff = vmalloc_32_user(cam->nbuffers *
+                                            PAGE_ALIGN(imagesize))))
                         break;
                 cam->nbuffers--;
         }
@@ -322,9 +308,21 @@ static int
 sn9c102_i2c_detect_read_error(struct sn9c102_device* cam,
                               struct sn9c102_sensor* sensor)
 {
-        int r;
+        int r , err = 0;
+
         r = sn9c102_read_reg(cam, 0x08);
-        return (r < 0 || (r >= 0 && !(r & 0x08))) ? -EIO : 0;
+        if (r < 0)
+                err += r;
+
+        if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102) {
+                if (!(r & 0x08))
+                        err += -1;
+        } else {
+                if (r & 0x08)
+                        err += -1;
+        }
+
+        return err ? -EIO : 0;
 }
 
 
@@ -415,7 +413,7 @@ sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
         data[4] = data3;
         data[5] = data4;
         data[6] = data5;
-        data[7] = 0x14;
+        data[7] = 0x17;
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
                               0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
         if (res < 0)
@@ -467,31 +465,35 @@ int sn9c102_i2c_write(struct sn9c102_device* cam, u8 address, u8 value)
 
 /*****************************************************************************/
 
-static void*
-sn9c102_find_sof_header(struct sn9c102_device* cam, void* mem, size_t len)
+static size_t sn9c102_sof_length(struct sn9c102_device* cam)
 {
-        size_t soflen = 0, i;
-        u8 j, n = 0;
-
         switch (cam->bridge) {
         case BRIDGE_SN9C101:
         case BRIDGE_SN9C102:
-                soflen = sizeof(sn9c102_sof_header_t);
-                n = sizeof(sn9c102_sof_header) / soflen;
-                break;
+                return 12;
         case BRIDGE_SN9C103:
-                soflen = sizeof(sn9c103_sof_header_t);
-                n = sizeof(sn9c103_sof_header) / soflen;
+                return 18;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                return 62;
         }
 
+        return 0;
+}
+
+
+static void*
+sn9c102_find_sof_header(struct sn9c102_device* cam, void* mem, size_t len)
+{
+        char sof_header[6] = {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96};
+        size_t soflen = 0, i;
+
+        soflen = sn9c102_sof_length(cam);
+
         for (i = 0; (len >= soflen) && (i <= len - soflen); i++)
-                for (j = 0; j < n; j++)
-                        /* The invariable part of the header is 6 bytes long */
-                        if ((cam->bridge != BRIDGE_SN9C103 &&
-                            !memcmp(mem + i, sn9c102_sof_header[j], 6)) ||
-                            (cam->bridge == BRIDGE_SN9C103 &&
-                            !memcmp(mem + i, sn9c103_sof_header[j], 6))) {
-                                memcpy(cam->sof_header, mem + i, soflen);
+                if (!memcmp(mem + i, sof_header, sizeof(sof_header))) {
+                        memcpy(cam->sof_header, mem + i,
+                               sizeof(sn9c102_sof_header_t));
                                 /* Skip the header */
                                 return mem + i + soflen;
                         }
@@ -503,21 +505,123 @@ sn9c102_find_sof_header(struct sn9c102_device* cam, void* mem, size_t len)
 static void*
 sn9c102_find_eof_header(struct sn9c102_device* cam, void* mem, size_t len)
 {
-        size_t eoflen = sizeof(sn9c102_eof_header_t), i;
-        unsigned j, n = sizeof(sn9c102_eof_header) / eoflen;
+        char eof_header[4][4] = {
+                {0x00, 0x00, 0x00, 0x00},
+                {0x40, 0x00, 0x00, 0x00},
+                {0x80, 0x00, 0x00, 0x00},
+                {0xc0, 0x00, 0x00, 0x00},
+        };
+        size_t i, j;
 
-        if (cam->sensor.pix_format.pixelformat == V4L2_PIX_FMT_SN9C10X)
+        if (cam->sensor.pix_format.pixelformat == V4L2_PIX_FMT_SN9C10X ||
+            cam->sensor.pix_format.pixelformat == V4L2_PIX_FMT_JPEG)
                 return NULL; /* EOF header does not exist in compressed data */
 
-        for (i = 0; (len >= eoflen) && (i <= len - eoflen); i++)
-                for (j = 0; j < n; j++)
-                        if (!memcmp(mem + i, sn9c102_eof_header[j], eoflen))
+        for (i = 0; (len >= 4) && (i <= len - 4); i++)
+                for (j = 0; j < ARRAY_SIZE(eof_header); j++)
+                        if (!memcmp(mem + i, eof_header[j], 4))
                                 return mem + i;
 
         return NULL;
 }
 
 
+static void
+sn9c102_write_jpegheader(struct sn9c102_device* cam, struct sn9c102_frame_t* f)
+{
+        static u8 jpeg_header[589] = {
+                0xff, 0xd8, 0xff, 0xdb, 0x00, 0x84, 0x00, 0x06, 0x04, 0x05,
+                0x06, 0x05, 0x04, 0x06, 0x06, 0x05, 0x06, 0x07, 0x07, 0x06,
+                0x08, 0x0a, 0x10, 0x0a, 0x0a, 0x09, 0x09, 0x0a, 0x14, 0x0e,
+                0x0f, 0x0c, 0x10, 0x17, 0x14, 0x18, 0x18, 0x17, 0x14, 0x16,
+                0x16, 0x1a, 0x1d, 0x25, 0x1f, 0x1a, 0x1b, 0x23, 0x1c, 0x16,
+                0x16, 0x20, 0x2c, 0x20, 0x23, 0x26, 0x27, 0x29, 0x2a, 0x29,
+                0x19, 0x1f, 0x2d, 0x30, 0x2d, 0x28, 0x30, 0x25, 0x28, 0x29,
+                0x28, 0x01, 0x07, 0x07, 0x07, 0x0a, 0x08, 0x0a, 0x13, 0x0a,
+                0x0a, 0x13, 0x28, 0x1a, 0x16, 0x1a, 0x28, 0x28, 0x28, 0x28,
+                0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+                0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+                0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+                0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+                0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0xff, 0xc4, 0x01, 0xa2,
+                0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02,
+                0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x01,
+                0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03,
+                0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x10, 0x00,
+                0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, 0x05, 0x05, 0x04,
+                0x04, 0x00, 0x00, 0x01, 0x7d, 0x01, 0x02, 0x03, 0x00, 0x04,
+                0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61,
+                0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, 0x23,
+                0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62,
+                0x72, 0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25,
+                0x26, 0x27, 0x28, 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38,
+                0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a,
+                0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x63, 0x64,
+                0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76,
+                0x77, 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
+                0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
+                0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa,
+                0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2,
+                0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3,
+                0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, 0xe3,
+                0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3,
+                0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0x11, 0x00, 0x02,
+                0x01, 0x02, 0x04, 0x04, 0x03, 0x04, 0x07, 0x05, 0x04, 0x04,
+                0x00, 0x01, 0x02, 0x77, 0x00, 0x01, 0x02, 0x03, 0x11, 0x04,
+                0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
+                0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xa1, 0xb1,
+                0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 0x15, 0x62, 0x72, 0xd1,
+                0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19,
+                0x1a, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
+                0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a,
+                0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x63, 0x64,
+                0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76,
+                0x77, 0x78, 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+                0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+                0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9,
+                0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
+                0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+                0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe2, 0xe3,
+                0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf2, 0xf3, 0xf4,
+                0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xff, 0xc0, 0x00, 0x11,
+                0x08, 0x01, 0xe0, 0x02, 0x80, 0x03, 0x01, 0x21, 0x00, 0x02,
+                0x11, 0x01, 0x03, 0x11, 0x01, 0xff, 0xda, 0x00, 0x0c, 0x03,
+                0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00
+        };
+        u8 *pos = f->bufmem;
+
+        memcpy(pos, jpeg_header, sizeof(jpeg_header));
+        *(pos + 6) = 0x00;
+        *(pos + 7 + 64) = 0x01;
+        if (cam->compression.quality == 0) {
+                memcpy(pos + 7, SN9C102_Y_QTABLE0, 64);
+                memcpy(pos + 8 + 64, SN9C102_UV_QTABLE0, 64);
+        } else if (cam->compression.quality == 1) {
+                memcpy(pos + 7, SN9C102_Y_QTABLE1, 64);
+                memcpy(pos + 8 + 64, SN9C102_UV_QTABLE1, 64);
+        }
+        *(pos + 564) = cam->sensor.pix_format.width & 0xFF;
+        *(pos + 563) = (cam->sensor.pix_format.width >> 8) & 0xFF;
+        *(pos + 562) = cam->sensor.pix_format.height & 0xFF;
+        *(pos + 561) = (cam->sensor.pix_format.height >> 8) & 0xFF;
+        *(pos + 567) = 0x21;
+
+        f->buf.bytesused += sizeof(jpeg_header);
+}
+
+
+static void
+sn9c102_write_eoimarker(struct sn9c102_device* cam, struct sn9c102_frame_t* f)
+{
+        static const u8 eoi_marker[2] = {0xff, 0xd9};
+
+        memcpy(f->bufmem + f->buf.bytesused, eoi_marker, sizeof(eoi_marker));
+        f->buf.bytesused += sizeof(eoi_marker);
+}
+
+
 static void sn9c102_urb_complete(struct urb *urb)
 {
         struct sn9c102_device* cam = urb->context;
@@ -535,7 +639,7 @@ static void sn9c102_urb_complete(struct urb *urb)
                 cam->stream = STREAM_OFF;
                 if ((*f))
                         (*f)->state = F_QUEUED;
-                DBG(3, "Stream interrupted");
+                DBG(3, "Stream interrupted by application");
                 wake_up(&cam->wait_stream);
         }
 
@@ -557,10 +661,9 @@ static void sn9c102_urb_complete(struct urb *urb)
         imagesize = (cam->sensor.pix_format.width *
                      cam->sensor.pix_format.height *
                      cam->sensor.pix_format.priv) / 8;
-
-        soflen = (cam->bridge) == BRIDGE_SN9C103 ?
-                                  sizeof(sn9c103_sof_header_t) :
-                                  sizeof(sn9c102_sof_header_t);
+        if (cam->sensor.pix_format.pixelformat == V4L2_PIX_FMT_JPEG)
+                imagesize += 589; /* length of jpeg header */
+        soflen = sn9c102_sof_length(cam);
 
         for (i = 0; i < urb->number_of_packets; i++) {
                 unsigned int img, len, status;
@@ -610,12 +713,21 @@ end_of_frame:
                                 (*f)->buf.bytesused += img;
 
                                 if ((*f)->buf.bytesused == imagesize ||
-                                    (cam->sensor.pix_format.pixelformat ==
-                                                V4L2_PIX_FMT_SN9C10X && eof)) {
+                                    ((cam->sensor.pix_format.pixelformat ==
+                                      V4L2_PIX_FMT_SN9C10X ||
+                                      cam->sensor.pix_format.pixelformat ==
+                                      V4L2_PIX_FMT_JPEG) && eof)) {
                                         u32 b;
+
+                                        if (cam->sensor.pix_format.pixelformat
+                                            == V4L2_PIX_FMT_JPEG)
+                                                sn9c102_write_eoimarker(cam,
+                                                                        (*f));
+
                                         b = (*f)->buf.bytesused;
                                         (*f)->state = F_DONE;
                                         (*f)->buf.sequence= ++cam->frame_count;
+
                                         spin_lock(&cam->queue_lock);
                                         list_move_tail(&(*f)->frame,
                                                        &cam->outqueue);
@@ -627,8 +739,10 @@ end_of_frame:
                                         else
                                                 (*f) = NULL;
                                         spin_unlock(&cam->queue_lock);
+
                                         memcpy(cam->sysfs.frame_header,
                                                cam->sof_header, soflen);
+
                                         DBG(3, "Video frame captured: %lu "
                                                "bytes", (unsigned long)(b));
 
@@ -661,6 +775,9 @@ start_of_frame:
                         (*f)->buf.bytesused = 0;
                         len -= (sof - pos);
                         pos = sof;
+                        if (cam->sensor.pix_format.pixelformat ==
+                            V4L2_PIX_FMT_JPEG)
+                                sn9c102_write_jpegheader(cam, (*f));
                         DBG(3, "SOF detected: new video frame");
                         if (len)
                                 goto redo;
@@ -671,7 +788,9 @@ start_of_frame:
                                 goto end_of_frame; /* (1) */
                         else {
                                 if (cam->sensor.pix_format.pixelformat ==
-                                    V4L2_PIX_FMT_SN9C10X) {
+                                    V4L2_PIX_FMT_SN9C10X ||
+                                    cam->sensor.pix_format.pixelformat ==
+                                    V4L2_PIX_FMT_JPEG) {
                                         eof = sof - soflen;
                                         goto end_of_frame;
                                 } else {
@@ -701,13 +820,11 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
 {
         struct usb_device *udev = cam->usbdev;
         struct urb* urb;
-        const unsigned int sn9c102_wMaxPacketSize[] = {0, 128, 256, 384, 512,
-                                                       680, 800, 900, 1023};
-        const unsigned int sn9c103_wMaxPacketSize[] = {0, 128, 256, 384, 512,
-                                                       680, 800, 900, 1003};
-        const unsigned int psz = (cam->bridge == BRIDGE_SN9C103) ?
-                            sn9c103_wMaxPacketSize[SN9C102_ALTERNATE_SETTING] :
-                            sn9c102_wMaxPacketSize[SN9C102_ALTERNATE_SETTING];
+        struct usb_host_interface* altsetting = usb_altnum_to_altsetting(
+                                                    usb_ifnum_to_if(udev, 0),
+                                                    SN9C102_ALTERNATE_SETTING);
+        const unsigned int psz = le16_to_cpu(altsetting->
+                                             endpoint[0].desc.wMaxPacketSize);
         s8 i, j;
         int err = 0;
 
@@ -775,7 +892,7 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
         return 0;
 
 free_urbs:
-        for (i = 0; i < SN9C102_URBS; i++)
+        for (i = 0; (i < SN9C102_URBS) && cam->urb[i]; i++)
                 usb_free_urb(cam->urb[i]);
 
 free_buffers:
@@ -834,29 +951,29 @@ static int sn9c102_stream_interrupt(struct sn9c102_device* cam)
 /*****************************************************************************/
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-static u8 sn9c102_strtou8(const char* buff, size_t len, ssize_t* count)
+static u16 sn9c102_strtou16(const char* buff, size_t len, ssize_t* count)
 {
-        char str[5];
+        char str[7];
         char* endp;
         unsigned long val;
 
-        if (len < 4) {
+        if (len < 6) {
                 strncpy(str, buff, len);
                 str[len+1] = '\0';
         } else {
                 strncpy(str, buff, 4);
-                str[4] = '\0';
+                str[6] = '\0';
         }
 
         val = simple_strtoul(str, &endp, 0);
 
         *count = 0;
-        if (val <= 0xff)
+        if (val <= 0xffff)
                 *count = (ssize_t)(endp - str);
         if ((*count) && (len == *count+1) && (buff[*count] == '\n'))
                 *count += 1;
 
-        return (u8)val;
+        return (u16)val;
 }
 
 /*
@@ -873,7 +990,8 @@ static ssize_t sn9c102_show_reg(struct class_device* cd, char* buf)
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -891,27 +1009,28 @@ static ssize_t
 sn9c102_store_reg(struct class_device* cd, const char* buf, size_t len)
 {
         struct sn9c102_device* cam;
-        u8 index;
+        u16 index;
         ssize_t count;
 
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
         }
 
-        index = sn9c102_strtou8(buf, len, &count);
-        if (index > 0x1f || !count) {
+        index = sn9c102_strtou16(buf, len, &count);
+        if (index >= ARRAY_SIZE(cam->reg) || !count) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -EINVAL;
         }
 
         cam->sysfs.reg = index;
 
-        DBG(2, "Moved SN9C10X register index to 0x%02X", cam->sysfs.reg);
+        DBG(2, "Moved SN9C1XX register index to 0x%02X", cam->sysfs.reg);
         DBG(3, "Written bytes: %zd", count);
 
         mutex_unlock(&sn9c102_sysfs_lock);
@@ -929,7 +1048,8 @@ static ssize_t sn9c102_show_val(struct class_device* cd, char* buf)
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -954,20 +1074,21 @@ static ssize_t
 sn9c102_store_val(struct class_device* cd, const char* buf, size_t len)
 {
         struct sn9c102_device* cam;
-        u8 value;
+        u16 value;
         ssize_t count;
         int err;
 
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
         }
 
-        value = sn9c102_strtou8(buf, len, &count);
+        value = sn9c102_strtou16(buf, len, &count);
         if (!count) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -EINVAL;
@@ -979,7 +1100,7 @@ sn9c102_store_val(struct class_device* cd, const char* buf, size_t len)
                 return -EIO;
         }
 
-        DBG(2, "Written SN9C10X reg. 0x%02X, val. 0x%02X",
+        DBG(2, "Written SN9C1XX reg. 0x%02X, val. 0x%02X",
             cam->sysfs.reg, value);
         DBG(3, "Written bytes: %zd", count);
 
@@ -997,7 +1118,8 @@ static ssize_t sn9c102_show_i2c_reg(struct class_device* cd, char* buf)
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1017,19 +1139,20 @@ static ssize_t
 sn9c102_store_i2c_reg(struct class_device* cd, const char* buf, size_t len)
 {
         struct sn9c102_device* cam;
-        u8 index;
+        u16 index;
         ssize_t count;
 
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
         }
 
-        index = sn9c102_strtou8(buf, len, &count);
+        index = sn9c102_strtou16(buf, len, &count);
         if (!count) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -EINVAL;
@@ -1055,7 +1178,8 @@ static ssize_t sn9c102_show_i2c_val(struct class_device* cd, char* buf)
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1085,14 +1209,15 @@ static ssize_t
 sn9c102_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
 {
         struct sn9c102_device* cam;
-        u8 value;
+        u16 value;
         ssize_t count;
         int err;
 
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1103,7 +1228,7 @@ sn9c102_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
                 return -ENOSYS;
         }
 
-        value = sn9c102_strtou8(buf, len, &count);
+        value = sn9c102_strtou16(buf, len, &count);
         if (!count) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -EINVAL;
@@ -1131,13 +1256,14 @@ sn9c102_store_green(struct class_device* cd, const char* buf, size_t len)
         struct sn9c102_device* cam;
         enum sn9c102_bridge bridge;
         ssize_t res = 0;
-        u8 value;
+        u16 value;
         ssize_t count;
 
         if (mutex_lock_interruptible(&sn9c102_sysfs_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam) {
                 mutex_unlock(&sn9c102_sysfs_lock);
                 return -ENODEV;
@@ -1147,7 +1273,7 @@ sn9c102_store_green(struct class_device* cd, const char* buf, size_t len)
 
         mutex_unlock(&sn9c102_sysfs_lock);
 
-        value = sn9c102_strtou8(buf, len, &count);
+        value = sn9c102_strtou16(buf, len, &count);
         if (!count)
                 return -EINVAL;
 
@@ -1160,9 +1286,11 @@ sn9c102_store_green(struct class_device* cd, const char* buf, size_t len)
                         res = sn9c102_store_val(cd, buf, len);
                 break;
         case BRIDGE_SN9C103:
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
                 if (value > 0x7f)
                         return -EINVAL;
-                if ((res = sn9c102_store_reg(cd, "0x04", 4)) >= 0)
+                if ((res = sn9c102_store_reg(cd, "0x07", 4)) >= 0)
                         res = sn9c102_store_val(cd, buf, len);
                 break;
         }
@@ -1175,10 +1303,10 @@ static ssize_t
 sn9c102_store_blue(struct class_device* cd, const char* buf, size_t len)
 {
         ssize_t res = 0;
-        u8 value;
+        u16 value;
         ssize_t count;
 
-        value = sn9c102_strtou8(buf, len, &count);
+        value = sn9c102_strtou16(buf, len, &count);
         if (!count || value > 0x7f)
                 return -EINVAL;
 
@@ -1193,10 +1321,10 @@ static ssize_t
 sn9c102_store_red(struct class_device* cd, const char* buf, size_t len)
 {
         ssize_t res = 0;
-        u8 value;
+        u16 value;
         ssize_t count;
 
-        value = sn9c102_strtou8(buf, len, &count);
+        value = sn9c102_strtou16(buf, len, &count);
         if (!count || value > 0x7f)
                 return -EINVAL;
 
@@ -1212,7 +1340,8 @@ static ssize_t sn9c102_show_frame_header(struct class_device* cd, char* buf)
         struct sn9c102_device* cam;
         ssize_t count;
 
-        cam = video_get_drvdata(to_video_device(cd));
+        cam = video_get_drvdata(container_of(cd, struct video_device,
+                                             class_dev));
         if (!cam)
                 return -ENODEV;
 
@@ -1243,30 +1372,36 @@ static CLASS_DEVICE_ATTR(frame_header, S_IRUGO,
 static int sn9c102_create_sysfs(struct sn9c102_device* cam)
 {
         struct video_device *v4ldev = cam->v4ldev;
-        int rc;
+        int err = 0;
 
-        rc = video_device_create_file(v4ldev, &class_device_attr_reg);
-        if (rc) goto err;
-        rc = video_device_create_file(v4ldev, &class_device_attr_val);
-        if (rc) goto err_reg;
-        rc = video_device_create_file(v4ldev, &class_device_attr_frame_header);
-        if (rc) goto err_val;
+        if ((err = video_device_create_file(v4ldev, &class_device_attr_reg)))
+                goto err_out;
+        if ((err = video_device_create_file(v4ldev, &class_device_attr_val)))
+                goto err_reg;
+        if ((err = video_device_create_file(v4ldev,
+                                            &class_device_attr_frame_header)))
+                goto err_val;
 
         if (cam->sensor.sysfs_ops) {
-                rc = video_device_create_file(v4ldev, &class_device_attr_i2c_reg);
-                if (rc) goto err_frhead;
-                rc = video_device_create_file(v4ldev, &class_device_attr_i2c_val);
-                if (rc) goto err_i2c_reg;
+                if ((err = video_device_create_file(v4ldev,
+                                                  &class_device_attr_i2c_reg)))
+                        goto err_frame_header;
+                if ((err = video_device_create_file(v4ldev,
+                                                  &class_device_attr_i2c_val)))
+                        goto err_i2c_reg;
         }
 
         if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102) {
-                rc = video_device_create_file(v4ldev, &class_device_attr_green);
-                if (rc) goto err_i2c_val;
-        } else if (cam->bridge == BRIDGE_SN9C103) {
-                rc = video_device_create_file(v4ldev, &class_device_attr_blue);
-                if (rc) goto err_i2c_val;
-                rc = video_device_create_file(v4ldev, &class_device_attr_red);
-                if (rc) goto err_blue;
+                if ((err = video_device_create_file(v4ldev,
+                                                    &class_device_attr_green)))
+                        goto err_i2c_val;
+        } else {
+                if ((err = video_device_create_file(v4ldev,
+                                                    &class_device_attr_blue)))
+                        goto err_i2c_val;
+                if ((err = video_device_create_file(v4ldev,
+                                                    &class_device_attr_red)))
+                        goto err_blue;
         }
 
         return 0;
@@ -1279,14 +1414,14 @@ err_i2c_val:
 err_i2c_reg:
         if (cam->sensor.sysfs_ops)
                 video_device_remove_file(v4ldev, &class_device_attr_i2c_reg);
-err_frhead:
+err_frame_header:
         video_device_remove_file(v4ldev, &class_device_attr_frame_header);
 err_val:
         video_device_remove_file(v4ldev, &class_device_attr_val);
 err_reg:
         video_device_remove_file(v4ldev, &class_device_attr_reg);
-err:
-        return rc;
+err_out:
+        return err;
 }
 #endif /* CONFIG_VIDEO_ADV_DEBUG */
 
@@ -1297,10 +1432,36 @@ sn9c102_set_pix_format(struct sn9c102_device* cam, struct v4l2_pix_format* pix)
 {
         int err = 0;
 
-        if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
-                err += sn9c102_write_reg(cam, cam->reg[0x18] | 0x80, 0x18);
-        else
-                err += sn9c102_write_reg(cam, cam->reg[0x18] & 0x7f, 0x18);
+        if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X ||
+            pix->pixelformat == V4L2_PIX_FMT_JPEG) {
+                switch (cam->bridge) {
+                case BRIDGE_SN9C101:
+                case BRIDGE_SN9C102:
+                case BRIDGE_SN9C103:
+                        err += sn9c102_write_reg(cam, cam->reg[0x18] | 0x80,
+                                                 0x18);
+                        break;
+                case BRIDGE_SN9C105:
+                case BRIDGE_SN9C120:
+                        err += sn9c102_write_reg(cam, cam->reg[0x18] & 0x7f,
+                                                 0x18);
+                        break;
+                }
+        } else {
+                switch (cam->bridge) {
+                case BRIDGE_SN9C101:
+                case BRIDGE_SN9C102:
+                case BRIDGE_SN9C103:
+                        err += sn9c102_write_reg(cam, cam->reg[0x18] & 0x7f,
+                                                 0x18);
+                        break;
+                case BRIDGE_SN9C105:
+                case BRIDGE_SN9C120:
+                        err += sn9c102_write_reg(cam, cam->reg[0x18] | 0x80,
+                                                 0x18);
+                        break;
+                }
+        }
 
         return err ? -EIO : 0;
 }
@@ -1310,12 +1471,46 @@ static int
 sn9c102_set_compression(struct sn9c102_device* cam,
                         struct v4l2_jpegcompression* compression)
 {
-        int err = 0;
+        int i, err = 0;
 
+        switch (cam->bridge) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+        case BRIDGE_SN9C103:
         if (compression->quality == 0)
-                err += sn9c102_write_reg(cam, cam->reg[0x17] | 0x01, 0x17);
+                        err += sn9c102_write_reg(cam, cam->reg[0x17] | 0x01,
+                                                 0x17);
         else if (compression->quality == 1)
-                err += sn9c102_write_reg(cam, cam->reg[0x17] & 0xfe, 0x17);
+                        err += sn9c102_write_reg(cam, cam->reg[0x17] & 0xfe,
+                                                 0x17);
+                break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                if (compression->quality == 0) {
+                        for (i = 0; i <= 63; i++) {
+                                err += sn9c102_write_reg(cam,
+                                                         SN9C102_Y_QTABLE0[i],
+                                                         0x100 + i);
+                                err += sn9c102_write_reg(cam,
+                                                         SN9C102_UV_QTABLE0[i],
+                                                         0x140 + i);
+                        }
+                        err += sn9c102_write_reg(cam, cam->reg[0x18] & 0xbf,
+                                                 0x18);
+                } else if (compression->quality == 1) {
+                        for (i = 0; i <= 63; i++) {
+                                err += sn9c102_write_reg(cam,
+                                                         SN9C102_Y_QTABLE1[i],
+                                                         0x100 + i);
+                                err += sn9c102_write_reg(cam,
+                                                         SN9C102_UV_QTABLE1[i],
+                                                         0x140 + i);
+                        }
+                        err += sn9c102_write_reg(cam, cam->reg[0x18] | 0x40,
+                                                 0x18);
+                }
+                break;
+        }
 
         return err ? -EIO : 0;
 }
@@ -1399,7 +1594,16 @@ static int sn9c102_init(struct sn9c102_device* cam)
         }
 
         if (!(cam->state & DEV_INITIALIZED))
-                cam->compression.quality =  cam->reg[0x17] & 0x01 ? 0 : 1;
+                if (cam->bridge == BRIDGE_SN9C101 ||
+                    cam->bridge == BRIDGE_SN9C102 ||
+                    cam->bridge == BRIDGE_SN9C103) {
+                        cam->compression.quality =  cam->reg[0x17] & 0x01 ?
+                                                    0 : 1;
+                } else {
+                        cam->compression.quality =  cam->reg[0x18] & 0x40 ?
+                                                    0 : 1;
+                        err += sn9c102_set_compression(cam, &cam->compression);
+                }
         else
                 err += sn9c102_set_compression(cam, &cam->compression);
         err += sn9c102_set_pix_format(cam, &s->pix_format);
@@ -1408,7 +1612,8 @@ static int sn9c102_init(struct sn9c102_device* cam)
         if (err)
                 return err;
 
-        if (s->pix_format.pixelformat == V4L2_PIX_FMT_SN9C10X)
+        if (s->pix_format.pixelformat == V4L2_PIX_FMT_SN9C10X ||
+            s->pix_format.pixelformat == V4L2_PIX_FMT_JPEG)
                 DBG(3, "Compressed video format is active, quality %d",
                     cam->compression.quality);
         else
@@ -1490,6 +1695,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
 
         if (cam->users) {
                 DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor);
+                DBG(3, "Simultaneous opens are not supported");
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
                         err = -EWOULDBLOCK;
@@ -1628,6 +1834,17 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                         mutex_unlock(&cam->fileop_mutex);
                         return -EAGAIN;
                 }
+                if (!cam->module_param.frame_timeout) {
+                        err = wait_event_interruptible
+                              ( cam->wait_frame,
+                                (!list_empty(&cam->outqueue)) ||
+                                (cam->state & DEV_DISCONNECTED) ||
+                                (cam->state & DEV_MISCONFIGURED) );
+                        if (err) {
+                                mutex_unlock(&cam->fileop_mutex);
+                                return err;
+                        }
+                } else {
                 timeout = wait_event_interruptible_timeout
                           ( cam->wait_frame,
                             (!list_empty(&cam->outqueue)) ||
@@ -1638,12 +1855,18 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                 if (timeout < 0) {
                         mutex_unlock(&cam->fileop_mutex);
                         return timeout;
+                        } else if (timeout == 0 &&
+                                   !(cam->state & DEV_DISCONNECTED)) {
+                                DBG(1, "Video frame timeout elapsed");
+                                mutex_unlock(&cam->fileop_mutex);
+                                return -EIO;
+                        }
                 }
                 if (cam->state & DEV_DISCONNECTED) {
                         mutex_unlock(&cam->fileop_mutex);
                         return -ENODEV;
                 }
-                if (!timeout || (cam->state & DEV_MISCONFIGURED)) {
+                if (cam->state & DEV_MISCONFIGURED) {
                         mutex_unlock(&cam->fileop_mutex);
                         return -EIO;
                 }
@@ -1940,6 +2163,9 @@ exit:
         if (copy_to_user(arg, &ctrl, sizeof(ctrl)))
                 return -EFAULT;
 
+        PDBGG("VIDIOC_G_CTRL: id %lu, value %lu",
+              (unsigned long)ctrl.id, (unsigned long)ctrl.value);
+
         return err;
 }
 
@@ -2127,6 +2353,45 @@ sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg)
 
 
 static int
+sn9c102_vidioc_enum_framesizes(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_frmsizeenum frmsize;
+
+        if (copy_from_user(&frmsize, arg, sizeof(frmsize)))
+                return -EFAULT;
+
+        if (frmsize.index != 0)
+                return -EINVAL;
+
+        switch (cam->bridge) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+        case BRIDGE_SN9C103:
+                if (frmsize.pixel_format != V4L2_PIX_FMT_SN9C10X &&
+                    frmsize.pixel_format != V4L2_PIX_FMT_SBGGR8)
+                        return -EINVAL;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                if (frmsize.pixel_format != V4L2_PIX_FMT_JPEG &&
+                    frmsize.pixel_format != V4L2_PIX_FMT_SBGGR8)
+                        return -EINVAL;
+        }
+
+        frmsize.type = V4L2_FRMSIZE_TYPE_STEPWISE;
+        frmsize.stepwise.min_width = frmsize.stepwise.step_width = 16;
+        frmsize.stepwise.min_height = frmsize.stepwise.step_height = 16;
+        frmsize.stepwise.max_width = cam->sensor.cropcap.bounds.width;
+        frmsize.stepwise.max_height = cam->sensor.cropcap.bounds.height;
+        memset(&frmsize.reserved, 0, sizeof(frmsize.reserved));
+
+        if (copy_to_user(arg, &frmsize, sizeof(frmsize)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
 sn9c102_vidioc_enum_fmt(struct sn9c102_device* cam, void __user * arg)
 {
         struct v4l2_fmtdesc fmtd;
@@ -2134,12 +2399,26 @@ sn9c102_vidioc_enum_fmt(struct sn9c102_device* cam, void __user * arg)
         if (copy_from_user(&fmtd, arg, sizeof(fmtd)))
                 return -EFAULT;
 
+        if (fmtd.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
         if (fmtd.index == 0) {
                 strcpy(fmtd.description, "bayer rgb");
                 fmtd.pixelformat = V4L2_PIX_FMT_SBGGR8;
         } else if (fmtd.index == 1) {
+                switch (cam->bridge) {
+                case BRIDGE_SN9C101:
+                case BRIDGE_SN9C102:
+                case BRIDGE_SN9C103:
                 strcpy(fmtd.description, "compressed");
                 fmtd.pixelformat = V4L2_PIX_FMT_SN9C10X;
+                        break;
+                case BRIDGE_SN9C105:
+                case BRIDGE_SN9C120:
+                        strcpy(fmtd.description, "JPEG");
+                        fmtd.pixelformat = V4L2_PIX_FMT_JPEG;
+                        break;
+                }
                 fmtd.flags = V4L2_FMT_FLAG_COMPRESSED;
         } else
                 return -EINVAL;
@@ -2166,7 +2445,8 @@ sn9c102_vidioc_g_fmt(struct sn9c102_device* cam, void __user * arg)
         if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
 
-        pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_SN9C10X)
+        pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_SN9C10X ||
+                              pfmt->pixelformat==V4L2_PIX_FMT_JPEG)
                              ? 0 : (pfmt->width * pfmt->priv) / 8;
         pfmt->sizeimage = pfmt->height * ((pfmt->width*pfmt->priv)/8);
         pfmt->field = V4L2_FIELD_NONE;
@@ -2237,12 +2517,25 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
         pix->width = rect.width / scale;
         pix->height = rect.height / scale;
 
+        switch (cam->bridge) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+        case BRIDGE_SN9C103:
         if (pix->pixelformat != V4L2_PIX_FMT_SN9C10X &&
             pix->pixelformat != V4L2_PIX_FMT_SBGGR8)
                 pix->pixelformat = pfmt->pixelformat;
+                break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                if (pix->pixelformat != V4L2_PIX_FMT_JPEG &&
+                    pix->pixelformat != V4L2_PIX_FMT_SBGGR8)
+                        pix->pixelformat = pfmt->pixelformat;
+                break;
+        }
         pix->priv = pfmt->priv; /* bpp */
         pix->colorspace = pfmt->colorspace;
-        pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
+        pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_SN9C10X ||
+                             pix->pixelformat == V4L2_PIX_FMT_JPEG)
                             ? 0 : (pix->width * pix->priv) / 8;
         pix->sizeimage = pix->height * ((pix->width * pix->priv) / 8);
         pix->field = V4L2_FIELD_NONE;
@@ -2315,8 +2608,7 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
 static int
 sn9c102_vidioc_g_jpegcomp(struct sn9c102_device* cam, void __user * arg)
 {
-        if (copy_to_user(arg, &cam->compression,
-                         sizeof(cam->compression)))
+        if (copy_to_user(arg, &cam->compression, sizeof(cam->compression)))
                 return -EFAULT;
 
         return 0;
@@ -2471,6 +2763,7 @@ sn9c102_vidioc_dqbuf(struct sn9c102_device* cam, struct file* filp,
         struct sn9c102_frame_t *f;
         unsigned long lock_flags;
         long timeout;
+        int err = 0;
 
         if (copy_from_user(&b, arg, sizeof(b)))
                 return -EFAULT;
@@ -2483,6 +2776,15 @@ sn9c102_vidioc_dqbuf(struct sn9c102_device* cam, struct file* filp,
                         return -EINVAL;
                 if (filp->f_flags & O_NONBLOCK)
                         return -EAGAIN;
+                if (!cam->module_param.frame_timeout) {
+                        err = wait_event_interruptible
+                              ( cam->wait_frame,
+                                (!list_empty(&cam->outqueue)) ||
+                                (cam->state & DEV_DISCONNECTED) ||
+                                (cam->state & DEV_MISCONFIGURED) );
+                        if (err)
+                                return err;
+                } else {
                 timeout = wait_event_interruptible_timeout
                           ( cam->wait_frame,
                             (!list_empty(&cam->outqueue)) ||
@@ -2492,9 +2794,15 @@ sn9c102_vidioc_dqbuf(struct sn9c102_device* cam, struct file* filp,
                             1000 * msecs_to_jiffies(1) );
                 if (timeout < 0)
                         return timeout;
+                        else if (timeout == 0 &&
+                                 !(cam->state & DEV_DISCONNECTED)) {
+                                DBG(1, "Video frame timeout elapsed");
+                                return -EIO;
+                        }
+                }
                 if (cam->state & DEV_DISCONNECTED)
                         return -ENODEV;
-                if (!timeout || (cam->state & DEV_MISCONFIGURED))
+                if (cam->state & DEV_MISCONFIGURED)
                         return -EIO;
         }
 
@@ -2612,6 +2920,70 @@ sn9c102_vidioc_s_parm(struct sn9c102_device* cam, void __user * arg)
 }
 
 
+static int
+sn9c102_vidioc_enumaudio(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_audio audio;
+
+        if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102)
+                return -EINVAL;
+
+        if (copy_from_user(&audio, arg, sizeof(audio)))
+                return -EFAULT;
+
+        if (audio.index != 0)
+                return -EINVAL;
+
+        strcpy(audio.name, "Microphone");
+        audio.capability = 0;
+        audio.mode = 0;
+
+        if (copy_to_user(arg, &audio, sizeof(audio)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+sn9c102_vidioc_g_audio(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_audio audio;
+
+        if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102)
+                return -EINVAL;
+
+        if (copy_from_user(&audio, arg, sizeof(audio)))
+                return -EFAULT;
+
+        memset(&audio, 0, sizeof(audio));
+        strcpy(audio.name, "Microphone");
+
+        if (copy_to_user(arg, &audio, sizeof(audio)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+sn9c102_vidioc_s_audio(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_audio audio;
+
+        if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102)
+                return -EINVAL;
+
+        if (copy_from_user(&audio, arg, sizeof(audio)))
+                return -EFAULT;
+
+        if (audio.index != 0)
+                return -EINVAL;
+
+        return 0;
+}
+
+
 static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
                               unsigned int cmd, void __user * arg)
 {
@@ -2649,6 +3021,9 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
         case VIDIOC_S_CROP:
                 return sn9c102_vidioc_s_crop(cam, arg);
 
+        case VIDIOC_ENUM_FRAMESIZES:
+                return sn9c102_vidioc_enum_framesizes(cam, arg);
+
         case VIDIOC_ENUM_FMT:
                 return sn9c102_vidioc_enum_fmt(cam, arg);
 
@@ -2689,11 +3064,21 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
         case VIDIOC_S_PARM:
                 return sn9c102_vidioc_s_parm(cam, arg);
 
+        case VIDIOC_ENUMAUDIO:
+                return sn9c102_vidioc_enumaudio(cam, arg);
+
+        case VIDIOC_G_AUDIO:
+                return sn9c102_vidioc_g_audio(cam, arg);
+
+        case VIDIOC_S_AUDIO:
+                return sn9c102_vidioc_s_audio(cam, arg);
+
         case VIDIOC_G_STD:
         case VIDIOC_S_STD:
         case VIDIOC_QUERYSTD:
         case VIDIOC_ENUMSTD:
         case VIDIOC_QUERYMENU:
+        case VIDIOC_ENUM_FRAMEINTERVALS:
                 return -EINVAL;
 
         default:
@@ -2741,6 +3126,7 @@ static const struct file_operations sn9c102_fops = {
         .open =    sn9c102_open,
         .release = sn9c102_release,
         .ioctl =   sn9c102_ioctl,
+        .compat_ioctl = v4l_compat_ioctl32,
         .read =    sn9c102_read,
         .poll =    sn9c102_poll,
         .mmap =    sn9c102_mmap,
@@ -2765,7 +3151,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->usbdev = udev;
 
         if (!(cam->control_buffer = kzalloc(8, GFP_KERNEL))) {
-                DBG(1, "kmalloc() failed");
+                DBG(1, "kzalloc() failed");
                 err = -ENOMEM;
                 goto fail;
         }
@@ -2779,24 +3165,31 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         mutex_init(&cam->dev_mutex);
 
         r = sn9c102_read_reg(cam, 0x00);
-        if (r < 0 || r != 0x10) {
-                DBG(1, "Sorry, this is not a SN9C10x based camera "
-                       "(vid/pid 0x%04X/0x%04X)", id->idVendor, id->idProduct);
+        if (r < 0 || (r != 0x10 && r != 0x11 && r != 0x12)) {
+                DBG(1, "Sorry, this is not a SN9C1xx based camera "
+                       "(vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
                 err = -ENODEV;
                 goto fail;
         }
 
-        cam->bridge = (id->idProduct & 0xffc0) == 0x6080 ?
-                      BRIDGE_SN9C103 : BRIDGE_SN9C102;
+        cam->bridge = id->driver_info;
         switch (cam->bridge) {
         case BRIDGE_SN9C101:
         case BRIDGE_SN9C102:
                 DBG(2, "SN9C10[12] PC Camera Controller detected "
-                       "(vid/pid 0x%04X/0x%04X)", id->idVendor, id->idProduct);
+                       "(vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
                 break;
         case BRIDGE_SN9C103:
                 DBG(2, "SN9C103 PC Camera Controller detected "
-                       "(vid/pid 0x%04X/0x%04X)", id->idVendor, id->idProduct);
+                       "(vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
+                break;
+        case BRIDGE_SN9C105:
+                DBG(2, "SN9C105 PC Camera Controller detected "
+                       "(vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
+                break;
+        case BRIDGE_SN9C120:
+                DBG(2, "SN9C120 PC Camera Controller detected "
+                       "(vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
                 break;
         }
 
@@ -2816,12 +3209,18 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
+        if (!(cam->bridge & cam->sensor.supported_bridge)) {
+                DBG(1, "Bridge not supported");
+                err = -ENODEV;
+                goto fail;
+        }
+
         if (sn9c102_init(cam)) {
                 DBG(1, "Initialization failed. I will retry on open().");
                 cam->state |= DEV_MISCONFIGURED;
         }
 
-        strcpy(cam->v4ldev->name, "SN9C10x PC Camera");
+        strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
         cam->v4ldev->owner = THIS_MODULE;
         cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->hardware = 0;
@@ -2838,7 +3237,10 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 DBG(1, "V4L2 device registration failed");
                 if (err == -ENFILE && video_nr[dev_nr] == -1)
                         DBG(1, "Free /dev/videoX node not found");
-                goto fail2;
+                video_nr[dev_nr] = -1;
+                dev_nr = (dev_nr < SN9C102_MAX_DEVICES-1) ? dev_nr+1 : 0;
+                mutex_unlock(&cam->dev_mutex);
+                goto fail;
         }
 
         DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor);
@@ -2850,9 +3252,14 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         err = sn9c102_create_sysfs(cam);
-        if (err)
-                goto fail3;
-        DBG(2, "Optional device control through 'sysfs' interface ready");
+        if (!err)
+                DBG(2, "Optional device control through 'sysfs' "
+                       "interface ready");
+        else
+                DBG(2, "Failed to create optional 'sysfs' interface for "
+                       "device controlling. Error #%d", err);
+#else
+        DBG(2, "Optional device control through 'sysfs' interface disabled");
 #endif
 
         usb_set_intfdata(intf, cam);
@@ -2861,14 +3268,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
         return 0;
 
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-fail3:
-        video_unregister_device(cam->v4ldev);
-#endif
-fail2:
-        video_nr[dev_nr] = -1;
-        dev_nr = (dev_nr < SN9C102_MAX_DEVICES-1) ? dev_nr+1 : 0;
-        mutex_unlock(&cam->dev_mutex);
 fail:
         if (cam) {
                 kfree(cam->control_buffer);
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h
new file mode 100644
index 000000000000..3a682eca6c65
--- /dev/null
+++ b/drivers/media/video/sn9c102/sn9c102_devtable.h
@@ -0,0 +1,142 @@
+/***************************************************************************
+ * Table of device identifiers of the SN9C1xx PC Camera Controllers        *
+ *                                                                         *
+ * Copyright (C) 2007 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ *                                                                         *
+ * 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 _SN9C102_DEVTABLE_H_
+#define _SN9C102_DEVTABLE_H_
+
+#include <linux/usb.h>
+
+struct sn9c102_device;
+
+/*
+   Each SN9C1xx camera has proper PID/VID identifiers.
+   SN9C103, SN9C105, SN9C120 support multiple interfaces, but we only have to
+   handle the video class interface.
+*/
+#define SN9C102_USB_DEVICE(vend, prod, bridge)                                \
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |                           \
+                       USB_DEVICE_ID_MATCH_INT_CLASS,                         \
+        .idVendor = (vend),                                                   \
+        .idProduct = (prod),                                                  \
+        .bInterfaceClass = 0xff,                                              \
+        .driver_info = (bridge)
+
+static const struct usb_device_id sn9c102_id_table[] = {
+        /* SN9C101 and SN9C102 */
+        { SN9C102_USB_DEVICE(0x0c45, 0x6001, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6028, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6029, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x602b, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x602c, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x603f, BRIDGE_SN9C102), },
+        /* SN9C103 */
+        { SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6082, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6083, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6088, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x608a, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x608b, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x608c, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x608f, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a0, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a2, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a3, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a8, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60aa, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ae, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60af, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b0, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b2, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b3, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b8, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ba, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60bb, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60bc, BRIDGE_SN9C103), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60be, BRIDGE_SN9C103), },
+        /* SN9C105 */
+        { SN9C102_USB_DEVICE(0x0471, 0x0327, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0471, 0x0328, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60c0, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60c8, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60cc, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ea, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ec, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60fa, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60fb, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60fc, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x60fe, BRIDGE_SN9C105), },
+        /* SN9C120 */
+        { SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x613e, BRIDGE_SN9C120), },
+        { }
+};
+
+/*
+   Probing functions: on success, you must attach the sensor to the camera
+   by calling sn9c102_attach_sensor().
+   To enable the I2C communication, you might need to perform a really basic
+   initialization of the SN9C1XX chip.
+   Functions must return 0 on success, the appropriate error otherwise.
+*/
+extern int sn9c102_probe_hv7131d(struct sn9c102_device* cam);
+extern int sn9c102_probe_mi0343(struct sn9c102_device* cam);
+extern int sn9c102_probe_ov7630(struct sn9c102_device* cam);
+extern int sn9c102_probe_ov7660(struct sn9c102_device* cam);
+extern int sn9c102_probe_pas106b(struct sn9c102_device* cam);
+extern int sn9c102_probe_pas202bcb(struct sn9c102_device* cam);
+extern int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam);
+extern int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam);
+
+/*
+   Add the above entries to this table. Be sure to add the entry in the right
+   place, since, on failure, the next probing routine is called according to
+   the order of the list below, from top to bottom.
+*/
+static int (*sn9c102_sensor_table[])(struct sn9c102_device*) = {
+        &sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_ov7630, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_ov7660, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */
+        &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */
+        NULL,
+};
+
+#endif /* _SN9C102_DEVTABLE_H_ */
diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131d.c b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
index c4117bf64b69..7ae368f60d89 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131d.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for HV7131D image sensor connected to the SN9C10x PC Camera     *
+ * Plug-in for HV7131D image sensor connected to the SN9C1xx PC Camera     *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -124,7 +124,7 @@ static int hv7131d_set_ctrl(struct sn9c102_device* cam,
 static int hv7131d_set_crop(struct sn9c102_device* cam,
                             const struct v4l2_rect* rect)
 {
-        struct sn9c102_sensor* s = &hv7131d;
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
         u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 2,
            v_start = (u8)(rect->top - s->cropcap.bounds.top) + 2;
@@ -153,6 +153,7 @@ static int hv7131d_set_pix_format(struct sn9c102_device* cam,
 static struct sn9c102_sensor hv7131d = {
         .name = "HV7131D",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
         .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
diff --git a/drivers/media/video/sn9c102/sn9c102_mi0343.c b/drivers/media/video/sn9c102/sn9c102_mi0343.c
index 4169ea4a2e20..a33d1bc10f90 100644
--- a/drivers/media/video/sn9c102/sn9c102_mi0343.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0343.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for MI-0343 image sensor connected to the SN9C10x PC Camera     *
+ * Plug-in for MI-0343 image sensor connected to the SN9C1xx PC Camera     *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -201,7 +201,7 @@ static int mi0343_set_ctrl(struct sn9c102_device* cam,
 static int mi0343_set_crop(struct sn9c102_device* cam,
                             const struct v4l2_rect* rect)
 {
-        struct sn9c102_sensor* s = &mi0343;
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
         u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 0,
            v_start = (u8)(rect->top - s->cropcap.bounds.top) + 2;
@@ -237,6 +237,7 @@ static int mi0343_set_pix_format(struct sn9c102_device* cam,
 static struct sn9c102_sensor mi0343 = {
         .name = "MI-0343",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
         .frequency = SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
         .i2c_slave_id = 0x5d,
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c
index 3da042021787..7df09ff38e63 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7630.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7630.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for OV7630 image sensor connected to the SN9C10x PC Camera      *
+ * Plug-in for OV7630 image sensor connected to the SN9C1xx PC Camera      *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2005-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -29,13 +29,17 @@ static int ov7630_init(struct sn9c102_device* cam)
 {
         int err = 0;
 
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
         err += sn9c102_write_reg(cam, 0x00, 0x14);
         err += sn9c102_write_reg(cam, 0x60, 0x17);
         err += sn9c102_write_reg(cam, 0x0f, 0x18);
         err += sn9c102_write_reg(cam, 0x50, 0x19);
 
-        err += sn9c102_i2c_write(cam, 0x12, 0x80);
-        err += sn9c102_i2c_write(cam, 0x11, 0x01);
+                err += sn9c102_i2c_write(cam, 0x12, 0x8d);
+                err += sn9c102_i2c_write(cam, 0x12, 0x0d);
+                err += sn9c102_i2c_write(cam, 0x11, 0x00);
         err += sn9c102_i2c_write(cam, 0x15, 0x34);
         err += sn9c102_i2c_write(cam, 0x16, 0x03);
         err += sn9c102_i2c_write(cam, 0x17, 0x1c);
@@ -43,14 +47,72 @@ static int ov7630_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x19, 0x06);
         err += sn9c102_i2c_write(cam, 0x1a, 0xf6);
         err += sn9c102_i2c_write(cam, 0x1b, 0x04);
-        err += sn9c102_i2c_write(cam, 0x20, 0xf6);
+                err += sn9c102_i2c_write(cam, 0x20, 0x44);
+                err += sn9c102_i2c_write(cam, 0x23, 0xee);
+                err += sn9c102_i2c_write(cam, 0x26, 0xa0);
+                err += sn9c102_i2c_write(cam, 0x27, 0x9a);
+                err += sn9c102_i2c_write(cam, 0x28, 0x20);
+                err += sn9c102_i2c_write(cam, 0x29, 0x30);
+                err += sn9c102_i2c_write(cam, 0x2f, 0x3d);
+                err += sn9c102_i2c_write(cam, 0x30, 0x24);
+                err += sn9c102_i2c_write(cam, 0x32, 0x86);
+                err += sn9c102_i2c_write(cam, 0x60, 0xa9);
+                err += sn9c102_i2c_write(cam, 0x61, 0x42);
+                err += sn9c102_i2c_write(cam, 0x65, 0x00);
+                err += sn9c102_i2c_write(cam, 0x69, 0x38);
+                err += sn9c102_i2c_write(cam, 0x6f, 0x88);
+                err += sn9c102_i2c_write(cam, 0x70, 0x0b);
+                err += sn9c102_i2c_write(cam, 0x71, 0x00);
+                err += sn9c102_i2c_write(cam, 0x74, 0x21);
+                err += sn9c102_i2c_write(cam, 0x7d, 0xf7);
+                break;
+        case BRIDGE_SN9C103:
+                err += sn9c102_write_reg(cam, 0x00, 0x02);
+                err += sn9c102_write_reg(cam, 0x00, 0x03);
+                err += sn9c102_write_reg(cam, 0x1a, 0x04);
+                err += sn9c102_write_reg(cam, 0x20, 0x05);
+                err += sn9c102_write_reg(cam, 0x20, 0x06);
+                err += sn9c102_write_reg(cam, 0x20, 0x07);
+                err += sn9c102_write_reg(cam, 0x03, 0x10);
+                err += sn9c102_write_reg(cam, 0x0a, 0x14);
+                err += sn9c102_write_reg(cam, 0x60, 0x17);
+                err += sn9c102_write_reg(cam, 0x0f, 0x18);
+                err += sn9c102_write_reg(cam, 0x50, 0x19);
+                err += sn9c102_write_reg(cam, 0x1d, 0x1a);
+                err += sn9c102_write_reg(cam, 0x10, 0x1b);
+                err += sn9c102_write_reg(cam, 0x02, 0x1c);
+                err += sn9c102_write_reg(cam, 0x03, 0x1d);
+                err += sn9c102_write_reg(cam, 0x0f, 0x1e);
+                err += sn9c102_write_reg(cam, 0x0c, 0x1f);
+                err += sn9c102_write_reg(cam, 0x00, 0x20);
+                err += sn9c102_write_reg(cam, 0x10, 0x21);
+                err += sn9c102_write_reg(cam, 0x20, 0x22);
+                err += sn9c102_write_reg(cam, 0x30, 0x23);
+                err += sn9c102_write_reg(cam, 0x40, 0x24);
+                err += sn9c102_write_reg(cam, 0x50, 0x25);
+                err += sn9c102_write_reg(cam, 0x60, 0x26);
+                err += sn9c102_write_reg(cam, 0x70, 0x27);
+                err += sn9c102_write_reg(cam, 0x80, 0x28);
+                err += sn9c102_write_reg(cam, 0x90, 0x29);
+                err += sn9c102_write_reg(cam, 0xa0, 0x2a);
+                err += sn9c102_write_reg(cam, 0xb0, 0x2b);
+                err += sn9c102_write_reg(cam, 0xc0, 0x2c);
+                err += sn9c102_write_reg(cam, 0xd0, 0x2d);
+                err += sn9c102_write_reg(cam, 0xe0, 0x2e);
+                err += sn9c102_write_reg(cam, 0xf0, 0x2f);
+                err += sn9c102_write_reg(cam, 0xff, 0x30);
+
+                err += sn9c102_i2c_write(cam, 0x12, 0x8d);
+                err += sn9c102_i2c_write(cam, 0x12, 0x0d);
+                err += sn9c102_i2c_write(cam, 0x15, 0x34);
+                err += sn9c102_i2c_write(cam, 0x11, 0x01);
+                err += sn9c102_i2c_write(cam, 0x1b, 0x04);
+                err += sn9c102_i2c_write(cam, 0x20, 0x44);
         err += sn9c102_i2c_write(cam, 0x23, 0xee);
         err += sn9c102_i2c_write(cam, 0x26, 0xa0);
         err += sn9c102_i2c_write(cam, 0x27, 0x9a);
-        err += sn9c102_i2c_write(cam, 0x28, 0xa0);
+                err += sn9c102_i2c_write(cam, 0x28, 0x20);
         err += sn9c102_i2c_write(cam, 0x29, 0x30);
-        err += sn9c102_i2c_write(cam, 0x2a, 0xa0);
-        err += sn9c102_i2c_write(cam, 0x2b, 0x1f);
         err += sn9c102_i2c_write(cam, 0x2f, 0x3d);
         err += sn9c102_i2c_write(cam, 0x30, 0x24);
         err += sn9c102_i2c_write(cam, 0x32, 0x86);
@@ -63,45 +125,97 @@ static int ov7630_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x71, 0x00);
         err += sn9c102_i2c_write(cam, 0x74, 0x21);
         err += sn9c102_i2c_write(cam, 0x7d, 0xf7);
+                break;
+        default:
+                break;
+        }
 
         return err;
 }
 
 
-static int ov7630_set_ctrl(struct sn9c102_device* cam,
-                           const struct v4l2_control* ctrl)
+static int ov7630_get_ctrl(struct sn9c102_device* cam,
+                           struct v4l2_control* ctrl)
 {
         int err = 0;
 
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
-                err += sn9c102_i2c_write(cam, 0x10, ctrl->value >> 2);
-                err += sn9c102_i2c_write(cam, 0x76, ctrl->value & 0x03);
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x10)) < 0)
+                        return -EIO;
                 break;
         case V4L2_CID_RED_BALANCE:
-                err += sn9c102_i2c_write(cam, 0x02, ctrl->value);
+                ctrl->value = sn9c102_pread_reg(cam, 0x07);
                 break;
         case V4L2_CID_BLUE_BALANCE:
-                err += sn9c102_i2c_write(cam, 0x01, ctrl->value);
+                ctrl->value = sn9c102_pread_reg(cam, 0x06);
+                break;
+        case SN9C102_V4L2_CID_GREEN_BALANCE:
+                ctrl->value = sn9c102_pread_reg(cam, 0x05);
                 break;
         case V4L2_CID_GAIN:
-                err += sn9c102_i2c_write(cam, 0x00, ctrl->value);
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x00)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x3f;
+                break;
+        case V4L2_CID_DO_WHITE_BALANCE:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x0c)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x3f;
+                break;
+        case V4L2_CID_WHITENESS:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x0d)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x3f;
+                break;
+        case V4L2_CID_AUTOGAIN:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x13)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x01;
+                break;
+        case V4L2_CID_VFLIP:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x75)) < 0)
+                        return -EIO;
+                ctrl->value = (ctrl->value & 0x80) ? 1 : 0;
+                break;
+        case SN9C102_V4L2_CID_GAMMA:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x14)) < 0)
+                        return -EIO;
+                ctrl->value = (ctrl->value & 0x02) ? 1 : 0;
+                break;
+        case SN9C102_V4L2_CID_BAND_FILTER:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x2d)) < 0)
+                        return -EIO;
+                ctrl->value = (ctrl->value & 0x02) ? 1 : 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return err ? -EIO : 0;
+}
+
+
+static int ov7630_set_ctrl(struct sn9c102_device* cam,
+                           const struct v4l2_control* ctrl)
+{
+        int err = 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_EXPOSURE:
+                err += sn9c102_i2c_write(cam, 0x10, ctrl->value);
                 break;
-        case V4L2_CID_CONTRAST:
-                err += ctrl->value ? sn9c102_i2c_write(cam, 0x05,
-                                                       (ctrl->value-1) | 0x20)
-                                   : sn9c102_i2c_write(cam, 0x05, 0x00);
+        case V4L2_CID_RED_BALANCE:
+                err += sn9c102_write_reg(cam, ctrl->value, 0x07);
                 break;
-        case V4L2_CID_BRIGHTNESS:
-                err += sn9c102_i2c_write(cam, 0x06, ctrl->value);
+        case V4L2_CID_BLUE_BALANCE:
+                err += sn9c102_write_reg(cam, ctrl->value, 0x06);
                 break;
-        case V4L2_CID_SATURATION:
-                err += sn9c102_i2c_write(cam, 0x03, ctrl->value << 4);
+        case SN9C102_V4L2_CID_GREEN_BALANCE:
+                err += sn9c102_write_reg(cam, ctrl->value, 0x05);
                 break;
-        case V4L2_CID_HUE:
-                err += ctrl->value ? sn9c102_i2c_write(cam, 0x04,
-                                                       (ctrl->value-1) | 0x20)
-                                   : sn9c102_i2c_write(cam, 0x04, 0x00);
+        case V4L2_CID_GAIN:
+                err += sn9c102_i2c_write(cam, 0x00, ctrl->value);
                 break;
         case V4L2_CID_DO_WHITE_BALANCE:
                 err += sn9c102_i2c_write(cam, 0x0c, ctrl->value);
@@ -109,23 +223,15 @@ static int ov7630_set_ctrl(struct sn9c102_device* cam,
         case V4L2_CID_WHITENESS:
                 err += sn9c102_i2c_write(cam, 0x0d, ctrl->value);
                 break;
-        case V4L2_CID_AUTO_WHITE_BALANCE:
-                err += sn9c102_i2c_write(cam, 0x12, (ctrl->value << 2) | 0x78);
-                break;
         case V4L2_CID_AUTOGAIN:
-                err += sn9c102_i2c_write(cam, 0x13, ctrl->value);
+                err += sn9c102_i2c_write(cam, 0x13, ctrl->value |
+                                                    (ctrl->value << 1));
                 break;
         case V4L2_CID_VFLIP:
                 err += sn9c102_i2c_write(cam, 0x75, 0x0e | (ctrl->value << 7));
                 break;
-        case V4L2_CID_BLACK_LEVEL:
-                err += sn9c102_i2c_write(cam, 0x25, ctrl->value);
-                break;
-        case SN9C102_V4L2_CID_BRIGHT_LEVEL:
-                err += sn9c102_i2c_write(cam, 0x24, ctrl->value);
-                break;
         case SN9C102_V4L2_CID_GAMMA:
-                err += sn9c102_i2c_write(cam, 0x14, (ctrl->value << 2) | 0x80);
+                err += sn9c102_i2c_write(cam, 0x14, ctrl->value << 2);
                 break;
         case SN9C102_V4L2_CID_BAND_FILTER:
                 err += sn9c102_i2c_write(cam, 0x2d, ctrl->value << 2);
@@ -141,10 +247,12 @@ static int ov7630_set_ctrl(struct sn9c102_device* cam,
 static int ov7630_set_crop(struct sn9c102_device* cam,
                            const struct v4l2_rect* rect)
 {
-        struct sn9c102_sensor* s = &ov7630;
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
-        u8 v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
+        u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 1,
+           v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
 
+        err += sn9c102_write_reg(cam, h_start, 0x12);
         err += sn9c102_write_reg(cam, v_start, 0x13);
 
         return err;
@@ -168,7 +276,8 @@ static int ov7630_set_pix_format(struct sn9c102_device* cam,
 static struct sn9c102_sensor ov7630 = {
         .name = "OV7630",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
-        .sysfs_ops = SN9C102_I2C_WRITE,
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
+        .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
         .i2c_slave_id = 0x21,
@@ -185,73 +294,23 @@ static struct sn9c102_sensor ov7630 = {
                         .flags = 0,
                 },
                 {
-                        .id = V4L2_CID_HUE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "hue",
-                        .minimum = 0x00,
-                        .maximum = 0x1f+1,
-                        .step = 0x01,
-                        .default_value = 0x00,
-                        .flags = 0,
-                },
-                {
-                        .id = V4L2_CID_SATURATION,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "saturation",
-                        .minimum = 0x00,
-                        .maximum = 0x0f,
-                        .step = 0x01,
-                        .default_value = 0x08,
-                        .flags = 0,
-                },
-                {
-                        .id = V4L2_CID_CONTRAST,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "contrast",
-                        .minimum = 0x00,
-                        .maximum = 0x1f+1,
-                        .step = 0x01,
-                        .default_value = 0x00,
-                        .flags = 0,
-                },
-                {
                         .id = V4L2_CID_EXPOSURE,
                         .type = V4L2_CTRL_TYPE_INTEGER,
                         .name = "exposure",
-                        .minimum = 0x000,
-                        .maximum = 0x3ff,
-                        .step = 0x001,
-                        .default_value = 0x83<<2,
-                        .flags = 0,
-                },
-                {
-                        .id = V4L2_CID_RED_BALANCE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "red balance",
-                        .minimum = 0x00,
-                        .maximum = 0xff,
-                        .step = 0x01,
-                        .default_value = 0x3a,
-                        .flags = 0,
-                },
-                {
-                        .id = V4L2_CID_BLUE_BALANCE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "blue balance",
                         .minimum = 0x00,
                         .maximum = 0xff,
                         .step = 0x01,
-                        .default_value = 0x77,
+                        .default_value = 0x60,
                         .flags = 0,
                 },
                 {
-                        .id = V4L2_CID_BRIGHTNESS,
+                        .id = V4L2_CID_WHITENESS,
                         .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "brightness",
+                        .name = "white balance background: red",
                         .minimum = 0x00,
-                        .maximum = 0xff,
+                        .maximum = 0x3f,
                         .step = 0x01,
-                        .default_value = 0xa0,
+                        .default_value = 0x20,
                         .flags = 0,
                 },
                 {
@@ -265,31 +324,31 @@ static struct sn9c102_sensor ov7630 = {
                         .flags = 0,
                 },
                 {
-                        .id = V4L2_CID_WHITENESS,
+                        .id = V4L2_CID_RED_BALANCE,
                         .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "white balance background: red",
+                        .name = "red balance",
                         .minimum = 0x00,
-                        .maximum = 0x3f,
+                        .maximum = 0x7f,
                         .step = 0x01,
                         .default_value = 0x20,
                         .flags = 0,
                 },
                 {
-                        .id = V4L2_CID_AUTO_WHITE_BALANCE,
-                        .type = V4L2_CTRL_TYPE_BOOLEAN,
-                        .name = "auto white balance",
+                        .id = V4L2_CID_BLUE_BALANCE,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "blue balance",
                         .minimum = 0x00,
-                        .maximum = 0x01,
+                        .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x01,
+                        .default_value = 0x20,
                         .flags = 0,
                 },
                 {
                         .id = V4L2_CID_AUTOGAIN,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "gain & exposure mode",
+                        .type = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name = "auto adjust",
                         .minimum = 0x00,
-                        .maximum = 0x03,
+                        .maximum = 0x01,
                         .step = 0x01,
                         .default_value = 0x00,
                         .flags = 0,
@@ -305,23 +364,13 @@ static struct sn9c102_sensor ov7630 = {
                         .flags = 0,
                 },
                 {
-                        .id = V4L2_CID_BLACK_LEVEL,
+                        .id = SN9C102_V4L2_CID_GREEN_BALANCE,
                         .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "black pixel ratio",
-                        .minimum = 0x01,
-                        .maximum = 0x9a,
-                        .step = 0x01,
-                        .default_value = 0x8a,
-                        .flags = 0,
-                },
-                {
-                        .id = SN9C102_V4L2_CID_BRIGHT_LEVEL,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "bright pixel ratio",
-                        .minimum = 0x01,
-                        .maximum = 0x9a,
+                        .name = "green balance",
+                        .minimum = 0x00,
+                        .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x10,
+                        .default_value = 0x20,
                         .flags = 0,
                 },
                 {
@@ -345,6 +394,7 @@ static struct sn9c102_sensor ov7630 = {
                         .flags = 0,
                 },
         },
+        .get_ctrl = &ov7630_get_ctrl,
         .set_ctrl = &ov7630_set_ctrl,
         .cropcap = {
                 .bounds = {
@@ -364,7 +414,7 @@ static struct sn9c102_sensor ov7630 = {
         .pix_format = {
                 .width = 640,
                 .height = 480,
-                .pixelformat = V4L2_PIX_FMT_SBGGR8,
+                .pixelformat = V4L2_PIX_FMT_SN9C10X,
                 .priv = 8,
         },
         .set_pix_format = &ov7630_set_pix_format
@@ -373,28 +423,36 @@ static struct sn9c102_sensor ov7630 = {
 
 int sn9c102_probe_ov7630(struct sn9c102_device* cam)
 {
-        const struct usb_device_id ov7630_id_table[] = {
-                { USB_DEVICE(0x0c45, 0x602c), },
-                { USB_DEVICE(0x0c45, 0x602d), },
-                { USB_DEVICE(0x0c45, 0x608f), },
-                { USB_DEVICE(0x0c45, 0x60b0), },
-                { }
-        };
-        int err = 0;
-
-        if (!sn9c102_match_id(cam, ov7630_id_table))
-                return -ENODEV;
+        int pid, ver, err = 0;
 
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
         err += sn9c102_write_reg(cam, 0x01, 0x01);
         err += sn9c102_write_reg(cam, 0x00, 0x01);
         err += sn9c102_write_reg(cam, 0x28, 0x17);
-        if (err)
-                return -EIO;
+                break;
+        case BRIDGE_SN9C103: /* do _not_ change anything! */
+                err += sn9c102_write_reg(cam, 0x09, 0x01);
+                err += sn9c102_write_reg(cam, 0x42, 0x01);
+                err += sn9c102_write_reg(cam, 0x28, 0x17);
+                err += sn9c102_write_reg(cam, 0x44, 0x02);
+                pid = sn9c102_i2c_try_read(cam, &ov7630, 0x0a);
+                if (err || pid < 0) { /* try a different initialization */
+                        err = sn9c102_write_reg(cam, 0x01, 0x01);
+                        err += sn9c102_write_reg(cam, 0x00, 0x01);
+                }
+                break;
+        default:
+                break;
+        }
 
-        err += sn9c102_i2c_try_write(cam, &ov7630, 0x0b, 0);
-        if (err)
+        pid = sn9c102_i2c_try_read(cam, &ov7630, 0x0a);
+        ver = sn9c102_i2c_try_read(cam, &ov7630, 0x0b);
+        if (err || pid < 0 || ver < 0)
+                return -EIO;
+        if (pid != 0x76 || ver != 0x31)
                 return -ENODEV;
-
         sn9c102_attach_sensor(cam, &ov7630);
 
         return 0;
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/video/sn9c102/sn9c102_ov7660.c
new file mode 100644
index 000000000000..d670c24d4435
--- /dev/null
+++ b/drivers/media/video/sn9c102/sn9c102_ov7660.c
@@ -0,0 +1,592 @@
+/***************************************************************************
+ * Plug-in for OV7660 image sensor connected to the SN9C1xx PC Camera      *
+ * Controllers                                                             *
+ *                                                                         *
+ * Copyright (C) 2007 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ *                                                                         *
+ * 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 "sn9c102_sensor.h"
+
+
+static struct sn9c102_sensor ov7660;
+
+
+static int ov7660_init(struct sn9c102_device* cam)
+{
+        int err = 0;
+
+        err += sn9c102_write_reg(cam, 0x40, 0x02);
+        err += sn9c102_write_reg(cam, 0x00, 0x03);
+        err += sn9c102_write_reg(cam, 0x1a, 0x04);
+        err += sn9c102_write_reg(cam, 0x03, 0x10);
+        err += sn9c102_write_reg(cam, 0x08, 0x14);
+        err += sn9c102_write_reg(cam, 0x20, 0x17);
+        err += sn9c102_write_reg(cam, 0x8b, 0x18);
+        err += sn9c102_write_reg(cam, 0x00, 0x19);
+        err += sn9c102_write_reg(cam, 0x1d, 0x1a);
+        err += sn9c102_write_reg(cam, 0x10, 0x1b);
+        err += sn9c102_write_reg(cam, 0x02, 0x1c);
+        err += sn9c102_write_reg(cam, 0x03, 0x1d);
+        err += sn9c102_write_reg(cam, 0x0f, 0x1e);
+        err += sn9c102_write_reg(cam, 0x0c, 0x1f);
+        err += sn9c102_write_reg(cam, 0x00, 0x20);
+        err += sn9c102_write_reg(cam, 0x29, 0x21);
+        err += sn9c102_write_reg(cam, 0x40, 0x22);
+        err += sn9c102_write_reg(cam, 0x54, 0x23);
+        err += sn9c102_write_reg(cam, 0x66, 0x24);
+        err += sn9c102_write_reg(cam, 0x76, 0x25);
+        err += sn9c102_write_reg(cam, 0x85, 0x26);
+        err += sn9c102_write_reg(cam, 0x94, 0x27);
+        err += sn9c102_write_reg(cam, 0xa1, 0x28);
+        err += sn9c102_write_reg(cam, 0xae, 0x29);
+        err += sn9c102_write_reg(cam, 0xbb, 0x2a);
+        err += sn9c102_write_reg(cam, 0xc7, 0x2b);
+        err += sn9c102_write_reg(cam, 0xd3, 0x2c);
+        err += sn9c102_write_reg(cam, 0xde, 0x2d);
+        err += sn9c102_write_reg(cam, 0xea, 0x2e);
+        err += sn9c102_write_reg(cam, 0xf4, 0x2f);
+        err += sn9c102_write_reg(cam, 0xff, 0x30);
+        err += sn9c102_write_reg(cam, 0x00, 0x3F);
+        err += sn9c102_write_reg(cam, 0xC7, 0x40);
+        err += sn9c102_write_reg(cam, 0x01, 0x41);
+        err += sn9c102_write_reg(cam, 0x44, 0x42);
+        err += sn9c102_write_reg(cam, 0x00, 0x43);
+        err += sn9c102_write_reg(cam, 0x44, 0x44);
+        err += sn9c102_write_reg(cam, 0x00, 0x45);
+        err += sn9c102_write_reg(cam, 0x44, 0x46);
+        err += sn9c102_write_reg(cam, 0x00, 0x47);
+        err += sn9c102_write_reg(cam, 0xC7, 0x48);
+        err += sn9c102_write_reg(cam, 0x01, 0x49);
+        err += sn9c102_write_reg(cam, 0xC7, 0x4A);
+        err += sn9c102_write_reg(cam, 0x01, 0x4B);
+        err += sn9c102_write_reg(cam, 0xC7, 0x4C);
+        err += sn9c102_write_reg(cam, 0x01, 0x4D);
+        err += sn9c102_write_reg(cam, 0x44, 0x4E);
+        err += sn9c102_write_reg(cam, 0x00, 0x4F);
+        err += sn9c102_write_reg(cam, 0x44, 0x50);
+        err += sn9c102_write_reg(cam, 0x00, 0x51);
+        err += sn9c102_write_reg(cam, 0x44, 0x52);
+        err += sn9c102_write_reg(cam, 0x00, 0x53);
+        err += sn9c102_write_reg(cam, 0xC7, 0x54);
+        err += sn9c102_write_reg(cam, 0x01, 0x55);
+        err += sn9c102_write_reg(cam, 0xC7, 0x56);
+        err += sn9c102_write_reg(cam, 0x01, 0x57);
+        err += sn9c102_write_reg(cam, 0xC7, 0x58);
+        err += sn9c102_write_reg(cam, 0x01, 0x59);
+        err += sn9c102_write_reg(cam, 0x44, 0x5A);
+        err += sn9c102_write_reg(cam, 0x00, 0x5B);
+        err += sn9c102_write_reg(cam, 0x44, 0x5C);
+        err += sn9c102_write_reg(cam, 0x00, 0x5D);
+        err += sn9c102_write_reg(cam, 0x44, 0x5E);
+        err += sn9c102_write_reg(cam, 0x00, 0x5F);
+        err += sn9c102_write_reg(cam, 0xC7, 0x60);
+        err += sn9c102_write_reg(cam, 0x01, 0x61);
+        err += sn9c102_write_reg(cam, 0xC7, 0x62);
+        err += sn9c102_write_reg(cam, 0x01, 0x63);
+        err += sn9c102_write_reg(cam, 0xC7, 0x64);
+        err += sn9c102_write_reg(cam, 0x01, 0x65);
+        err += sn9c102_write_reg(cam, 0x44, 0x66);
+        err += sn9c102_write_reg(cam, 0x00, 0x67);
+        err += sn9c102_write_reg(cam, 0x44, 0x68);
+        err += sn9c102_write_reg(cam, 0x00, 0x69);
+        err += sn9c102_write_reg(cam, 0x44, 0x6A);
+        err += sn9c102_write_reg(cam, 0x00, 0x6B);
+        err += sn9c102_write_reg(cam, 0xC7, 0x6C);
+        err += sn9c102_write_reg(cam, 0x01, 0x6D);
+        err += sn9c102_write_reg(cam, 0xC7, 0x6E);
+        err += sn9c102_write_reg(cam, 0x01, 0x6F);
+        err += sn9c102_write_reg(cam, 0xC7, 0x70);
+        err += sn9c102_write_reg(cam, 0x01, 0x71);
+        err += sn9c102_write_reg(cam, 0x44, 0x72);
+        err += sn9c102_write_reg(cam, 0x00, 0x73);
+        err += sn9c102_write_reg(cam, 0x44, 0x74);
+        err += sn9c102_write_reg(cam, 0x00, 0x75);
+        err += sn9c102_write_reg(cam, 0x44, 0x76);
+        err += sn9c102_write_reg(cam, 0x00, 0x77);
+        err += sn9c102_write_reg(cam, 0xC7, 0x78);
+        err += sn9c102_write_reg(cam, 0x01, 0x79);
+        err += sn9c102_write_reg(cam, 0xC7, 0x7A);
+        err += sn9c102_write_reg(cam, 0x01, 0x7B);
+        err += sn9c102_write_reg(cam, 0xC7, 0x7C);
+        err += sn9c102_write_reg(cam, 0x01, 0x7D);
+        err += sn9c102_write_reg(cam, 0x44, 0x7E);
+        err += sn9c102_write_reg(cam, 0x00, 0x7F);
+        err += sn9c102_write_reg(cam, 0x14, 0x84);
+        err += sn9c102_write_reg(cam, 0x00, 0x85);
+        err += sn9c102_write_reg(cam, 0x27, 0x86);
+        err += sn9c102_write_reg(cam, 0x00, 0x87);
+        err += sn9c102_write_reg(cam, 0x07, 0x88);
+        err += sn9c102_write_reg(cam, 0x00, 0x89);
+        err += sn9c102_write_reg(cam, 0xEC, 0x8A);
+        err += sn9c102_write_reg(cam, 0x0f, 0x8B);
+        err += sn9c102_write_reg(cam, 0xD8, 0x8C);
+        err += sn9c102_write_reg(cam, 0x0f, 0x8D);
+        err += sn9c102_write_reg(cam, 0x3D, 0x8E);
+        err += sn9c102_write_reg(cam, 0x00, 0x8F);
+        err += sn9c102_write_reg(cam, 0x3D, 0x90);
+        err += sn9c102_write_reg(cam, 0x00, 0x91);
+        err += sn9c102_write_reg(cam, 0xCD, 0x92);
+        err += sn9c102_write_reg(cam, 0x0f, 0x93);
+        err += sn9c102_write_reg(cam, 0xf7, 0x94);
+        err += sn9c102_write_reg(cam, 0x0f, 0x95);
+        err += sn9c102_write_reg(cam, 0x0C, 0x96);
+        err += sn9c102_write_reg(cam, 0x00, 0x97);
+        err += sn9c102_write_reg(cam, 0x00, 0x98);
+        err += sn9c102_write_reg(cam, 0x66, 0x99);
+        err += sn9c102_write_reg(cam, 0x05, 0x9A);
+        err += sn9c102_write_reg(cam, 0x00, 0x9B);
+        err += sn9c102_write_reg(cam, 0x04, 0x9C);
+        err += sn9c102_write_reg(cam, 0x00, 0x9D);
+        err += sn9c102_write_reg(cam, 0x08, 0x9E);
+        err += sn9c102_write_reg(cam, 0x00, 0x9F);
+        err += sn9c102_write_reg(cam, 0x2D, 0xC0);
+        err += sn9c102_write_reg(cam, 0x2D, 0xC1);
+        err += sn9c102_write_reg(cam, 0x3A, 0xC2);
+        err += sn9c102_write_reg(cam, 0x05, 0xC3);
+        err += sn9c102_write_reg(cam, 0x04, 0xC4);
+        err += sn9c102_write_reg(cam, 0x3F, 0xC5);
+        err += sn9c102_write_reg(cam, 0x00, 0xC6);
+        err += sn9c102_write_reg(cam, 0x00, 0xC7);
+        err += sn9c102_write_reg(cam, 0x50, 0xC8);
+        err += sn9c102_write_reg(cam, 0x3C, 0xC9);
+        err += sn9c102_write_reg(cam, 0x28, 0xCA);
+        err += sn9c102_write_reg(cam, 0xD8, 0xCB);
+        err += sn9c102_write_reg(cam, 0x14, 0xCC);
+        err += sn9c102_write_reg(cam, 0xEC, 0xCD);
+        err += sn9c102_write_reg(cam, 0x32, 0xCE);
+        err += sn9c102_write_reg(cam, 0xDD, 0xCF);
+        err += sn9c102_write_reg(cam, 0x32, 0xD0);
+        err += sn9c102_write_reg(cam, 0xDD, 0xD1);
+        err += sn9c102_write_reg(cam, 0x6A, 0xD2);
+        err += sn9c102_write_reg(cam, 0x50, 0xD3);
+        err += sn9c102_write_reg(cam, 0x00, 0xD4);
+        err += sn9c102_write_reg(cam, 0x00, 0xD5);
+        err += sn9c102_write_reg(cam, 0x00, 0xD6);
+
+        err += sn9c102_i2c_write(cam, 0x12, 0x80);
+        err += sn9c102_i2c_write(cam, 0x11, 0x09);
+        err += sn9c102_i2c_write(cam, 0x00, 0x0A);
+        err += sn9c102_i2c_write(cam, 0x01, 0x78);
+        err += sn9c102_i2c_write(cam, 0x02, 0x90);
+        err += sn9c102_i2c_write(cam, 0x03, 0x00);
+        err += sn9c102_i2c_write(cam, 0x04, 0x00);
+        err += sn9c102_i2c_write(cam, 0x05, 0x08);
+        err += sn9c102_i2c_write(cam, 0x06, 0x0B);
+        err += sn9c102_i2c_write(cam, 0x07, 0x00);
+        err += sn9c102_i2c_write(cam, 0x08, 0x1C);
+        err += sn9c102_i2c_write(cam, 0x09, 0x01);
+        err += sn9c102_i2c_write(cam, 0x0A, 0x76);
+        err += sn9c102_i2c_write(cam, 0x0B, 0x60);
+        err += sn9c102_i2c_write(cam, 0x0C, 0x00);
+        err += sn9c102_i2c_write(cam, 0x0D, 0x08);
+        err += sn9c102_i2c_write(cam, 0x0E, 0x04);
+        err += sn9c102_i2c_write(cam, 0x0F, 0x6F);
+        err += sn9c102_i2c_write(cam, 0x10, 0x20);
+        err += sn9c102_i2c_write(cam, 0x11, 0x03);
+        err += sn9c102_i2c_write(cam, 0x12, 0x05);
+        err += sn9c102_i2c_write(cam, 0x13, 0xF8);
+        err += sn9c102_i2c_write(cam, 0x14, 0x2C);
+        err += sn9c102_i2c_write(cam, 0x15, 0x00);
+        err += sn9c102_i2c_write(cam, 0x16, 0x02);
+        err += sn9c102_i2c_write(cam, 0x17, 0x10);
+        err += sn9c102_i2c_write(cam, 0x18, 0x60);
+        err += sn9c102_i2c_write(cam, 0x19, 0x02);
+        err += sn9c102_i2c_write(cam, 0x1A, 0x7B);
+        err += sn9c102_i2c_write(cam, 0x1B, 0x02);
+        err += sn9c102_i2c_write(cam, 0x1C, 0x7F);
+        err += sn9c102_i2c_write(cam, 0x1D, 0xA2);
+        err += sn9c102_i2c_write(cam, 0x1E, 0x01);
+        err += sn9c102_i2c_write(cam, 0x1F, 0x0E);
+        err += sn9c102_i2c_write(cam, 0x20, 0x05);
+        err += sn9c102_i2c_write(cam, 0x21, 0x05);
+        err += sn9c102_i2c_write(cam, 0x22, 0x05);
+        err += sn9c102_i2c_write(cam, 0x23, 0x05);
+        err += sn9c102_i2c_write(cam, 0x24, 0x68);
+        err += sn9c102_i2c_write(cam, 0x25, 0x58);
+        err += sn9c102_i2c_write(cam, 0x26, 0xD4);
+        err += sn9c102_i2c_write(cam, 0x27, 0x80);
+        err += sn9c102_i2c_write(cam, 0x28, 0x80);
+        err += sn9c102_i2c_write(cam, 0x29, 0x30);
+        err += sn9c102_i2c_write(cam, 0x2A, 0x00);
+        err += sn9c102_i2c_write(cam, 0x2B, 0x00);
+        err += sn9c102_i2c_write(cam, 0x2C, 0x80);
+        err += sn9c102_i2c_write(cam, 0x2D, 0x00);
+        err += sn9c102_i2c_write(cam, 0x2E, 0x00);
+        err += sn9c102_i2c_write(cam, 0x2F, 0x0E);
+        err += sn9c102_i2c_write(cam, 0x30, 0x08);
+        err += sn9c102_i2c_write(cam, 0x31, 0x30);
+        err += sn9c102_i2c_write(cam, 0x32, 0xB4);
+        err += sn9c102_i2c_write(cam, 0x33, 0x00);
+        err += sn9c102_i2c_write(cam, 0x34, 0x07);
+        err += sn9c102_i2c_write(cam, 0x35, 0x84);
+        err += sn9c102_i2c_write(cam, 0x36, 0x00);
+        err += sn9c102_i2c_write(cam, 0x37, 0x0C);
+        err += sn9c102_i2c_write(cam, 0x38, 0x02);
+        err += sn9c102_i2c_write(cam, 0x39, 0x43);
+        err += sn9c102_i2c_write(cam, 0x3A, 0x00);
+        err += sn9c102_i2c_write(cam, 0x3B, 0x02);
+        err += sn9c102_i2c_write(cam, 0x3C, 0x6C);
+        err += sn9c102_i2c_write(cam, 0x3D, 0x99);
+        err += sn9c102_i2c_write(cam, 0x3E, 0x0E);
+        err += sn9c102_i2c_write(cam, 0x3F, 0x41);
+        err += sn9c102_i2c_write(cam, 0x40, 0xC1);
+        err += sn9c102_i2c_write(cam, 0x41, 0x22);
+        err += sn9c102_i2c_write(cam, 0x42, 0x08);
+        err += sn9c102_i2c_write(cam, 0x43, 0xF0);
+        err += sn9c102_i2c_write(cam, 0x44, 0x10);
+        err += sn9c102_i2c_write(cam, 0x45, 0x78);
+        err += sn9c102_i2c_write(cam, 0x46, 0xA8);
+        err += sn9c102_i2c_write(cam, 0x47, 0x60);
+        err += sn9c102_i2c_write(cam, 0x48, 0x80);
+        err += sn9c102_i2c_write(cam, 0x49, 0x00);
+        err += sn9c102_i2c_write(cam, 0x4A, 0x00);
+        err += sn9c102_i2c_write(cam, 0x4B, 0x00);
+        err += sn9c102_i2c_write(cam, 0x4C, 0x00);
+        err += sn9c102_i2c_write(cam, 0x4D, 0x00);
+        err += sn9c102_i2c_write(cam, 0x4E, 0x00);
+        err += sn9c102_i2c_write(cam, 0x4F, 0x46);
+        err += sn9c102_i2c_write(cam, 0x50, 0x36);
+        err += sn9c102_i2c_write(cam, 0x51, 0x0F);
+        err += sn9c102_i2c_write(cam, 0x52, 0x17);
+        err += sn9c102_i2c_write(cam, 0x53, 0x7F);
+        err += sn9c102_i2c_write(cam, 0x54, 0x96);
+        err += sn9c102_i2c_write(cam, 0x55, 0x40);
+        err += sn9c102_i2c_write(cam, 0x56, 0x40);
+        err += sn9c102_i2c_write(cam, 0x57, 0x40);
+        err += sn9c102_i2c_write(cam, 0x58, 0x0F);
+        err += sn9c102_i2c_write(cam, 0x59, 0xBA);
+        err += sn9c102_i2c_write(cam, 0x5A, 0x9A);
+        err += sn9c102_i2c_write(cam, 0x5B, 0x22);
+        err += sn9c102_i2c_write(cam, 0x5C, 0xB9);
+        err += sn9c102_i2c_write(cam, 0x5D, 0x9B);
+        err += sn9c102_i2c_write(cam, 0x5E, 0x10);
+        err += sn9c102_i2c_write(cam, 0x5F, 0xF0);
+        err += sn9c102_i2c_write(cam, 0x60, 0x05);
+        err += sn9c102_i2c_write(cam, 0x61, 0x60);
+        err += sn9c102_i2c_write(cam, 0x62, 0x00);
+        err += sn9c102_i2c_write(cam, 0x63, 0x00);
+        err += sn9c102_i2c_write(cam, 0x64, 0x50);
+        err += sn9c102_i2c_write(cam, 0x65, 0x30);
+        err += sn9c102_i2c_write(cam, 0x66, 0x00);
+        err += sn9c102_i2c_write(cam, 0x67, 0x80);
+        err += sn9c102_i2c_write(cam, 0x68, 0x7A);
+        err += sn9c102_i2c_write(cam, 0x69, 0x90);
+        err += sn9c102_i2c_write(cam, 0x6A, 0x80);
+        err += sn9c102_i2c_write(cam, 0x6B, 0x0A);
+        err += sn9c102_i2c_write(cam, 0x6C, 0x30);
+        err += sn9c102_i2c_write(cam, 0x6D, 0x48);
+        err += sn9c102_i2c_write(cam, 0x6E, 0x80);
+        err += sn9c102_i2c_write(cam, 0x6F, 0x74);
+        err += sn9c102_i2c_write(cam, 0x70, 0x64);
+        err += sn9c102_i2c_write(cam, 0x71, 0x60);
+        err += sn9c102_i2c_write(cam, 0x72, 0x5C);
+        err += sn9c102_i2c_write(cam, 0x73, 0x58);
+        err += sn9c102_i2c_write(cam, 0x74, 0x54);
+        err += sn9c102_i2c_write(cam, 0x75, 0x4C);
+        err += sn9c102_i2c_write(cam, 0x76, 0x40);
+        err += sn9c102_i2c_write(cam, 0x77, 0x38);
+        err += sn9c102_i2c_write(cam, 0x78, 0x34);
+        err += sn9c102_i2c_write(cam, 0x79, 0x30);
+        err += sn9c102_i2c_write(cam, 0x7A, 0x2F);
+        err += sn9c102_i2c_write(cam, 0x7B, 0x2B);
+        err += sn9c102_i2c_write(cam, 0x7C, 0x03);
+        err += sn9c102_i2c_write(cam, 0x7D, 0x07);
+        err += sn9c102_i2c_write(cam, 0x7E, 0x17);
+        err += sn9c102_i2c_write(cam, 0x7F, 0x34);
+        err += sn9c102_i2c_write(cam, 0x80, 0x41);
+        err += sn9c102_i2c_write(cam, 0x81, 0x4D);
+        err += sn9c102_i2c_write(cam, 0x82, 0x58);
+        err += sn9c102_i2c_write(cam, 0x83, 0x63);
+        err += sn9c102_i2c_write(cam, 0x84, 0x6E);
+        err += sn9c102_i2c_write(cam, 0x85, 0x77);
+        err += sn9c102_i2c_write(cam, 0x86, 0x87);
+        err += sn9c102_i2c_write(cam, 0x87, 0x95);
+        err += sn9c102_i2c_write(cam, 0x88, 0xAF);
+        err += sn9c102_i2c_write(cam, 0x89, 0xC7);
+        err += sn9c102_i2c_write(cam, 0x8A, 0xDF);
+        err += sn9c102_i2c_write(cam, 0x8B, 0x99);
+        err += sn9c102_i2c_write(cam, 0x8C, 0x99);
+        err += sn9c102_i2c_write(cam, 0x8D, 0xCF);
+        err += sn9c102_i2c_write(cam, 0x8E, 0x20);
+        err += sn9c102_i2c_write(cam, 0x8F, 0x26);
+        err += sn9c102_i2c_write(cam, 0x90, 0x10);
+        err += sn9c102_i2c_write(cam, 0x91, 0x0C);
+        err += sn9c102_i2c_write(cam, 0x92, 0x25);
+        err += sn9c102_i2c_write(cam, 0x93, 0x00);
+        err += sn9c102_i2c_write(cam, 0x94, 0x50);
+        err += sn9c102_i2c_write(cam, 0x95, 0x50);
+        err += sn9c102_i2c_write(cam, 0x96, 0x00);
+        err += sn9c102_i2c_write(cam, 0x97, 0x01);
+        err += sn9c102_i2c_write(cam, 0x98, 0x10);
+        err += sn9c102_i2c_write(cam, 0x99, 0x40);
+        err += sn9c102_i2c_write(cam, 0x9A, 0x40);
+        err += sn9c102_i2c_write(cam, 0x9B, 0x20);
+        err += sn9c102_i2c_write(cam, 0x9C, 0x00);
+        err += sn9c102_i2c_write(cam, 0x9D, 0x99);
+        err += sn9c102_i2c_write(cam, 0x9E, 0x7F);
+        err += sn9c102_i2c_write(cam, 0x9F, 0x00);
+        err += sn9c102_i2c_write(cam, 0xA0, 0x00);
+        err += sn9c102_i2c_write(cam, 0xA1, 0x00);
+
+        return err;
+}
+
+
+static int ov7660_get_ctrl(struct sn9c102_device* cam,
+                           struct v4l2_control* ctrl)
+{
+        int err = 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_EXPOSURE:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x10)) < 0)
+                        return -EIO;
+                break;
+        case V4L2_CID_DO_WHITE_BALANCE:
+                ctrl->value = sn9c102_pread_reg(cam, 0x02);
+                ctrl->value = (ctrl->value & 0x04) ? 1 : 0;
+                break;
+        case V4L2_CID_RED_BALANCE:
+                ctrl->value = sn9c102_pread_reg(cam, 0x05);
+                ctrl->value &= 0x7f;
+                break;
+        case V4L2_CID_BLUE_BALANCE:
+                ctrl->value = sn9c102_pread_reg(cam, 0x06);
+                ctrl->value &= 0x7f;
+                break;
+        case SN9C102_V4L2_CID_GREEN_BALANCE:
+                ctrl->value = sn9c102_pread_reg(cam, 0x07);
+                ctrl->value &= 0x7f;
+                break;
+        case V4L2_CID_GAIN:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x00)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x7f;
+                break;
+        case V4L2_CID_AUTOGAIN:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x13)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x01;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return err ? -EIO : 0;
+}
+
+
+static int ov7660_set_ctrl(struct sn9c102_device* cam,
+                           const struct v4l2_control* ctrl)
+{
+        int err = 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_EXPOSURE:
+                err += sn9c102_i2c_write(cam, 0x10, ctrl->value);
+                break;
+        case V4L2_CID_DO_WHITE_BALANCE:
+                err += sn9c102_write_reg(cam, 0x43 | (ctrl->value << 2), 0x02);
+                break;
+        case V4L2_CID_RED_BALANCE:
+                err += sn9c102_write_reg(cam, ctrl->value, 0x05);
+                break;
+        case V4L2_CID_BLUE_BALANCE:
+                err += sn9c102_write_reg(cam, ctrl->value, 0x06);
+                break;
+        case SN9C102_V4L2_CID_GREEN_BALANCE:
+                err += sn9c102_write_reg(cam, ctrl->value, 0x07);
+                break;
+        case V4L2_CID_GAIN:
+                err += sn9c102_i2c_write(cam, 0x00, ctrl->value);
+                break;
+        case V4L2_CID_AUTOGAIN:
+                err += sn9c102_i2c_write(cam, 0x13, 0xf0 | ctrl->value |
+                                                    (ctrl->value << 1));
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return err ? -EIO : 0;
+}
+
+
+static int ov7660_set_crop(struct sn9c102_device* cam,
+                           const struct v4l2_rect* rect)
+{
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
+        int err = 0;
+        u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 1,
+           v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
+
+        err += sn9c102_write_reg(cam, h_start, 0x12);
+        err += sn9c102_write_reg(cam, v_start, 0x13);
+
+        return err;
+}
+
+
+static int ov7660_set_pix_format(struct sn9c102_device* cam,
+                                 const struct v4l2_pix_format* pix)
+{
+        int r0, err = 0;
+
+        r0 = sn9c102_pread_reg(cam, 0x01);
+
+        if (pix->pixelformat == V4L2_PIX_FMT_JPEG) {
+                err += sn9c102_write_reg(cam, r0 | 0x40, 0x01);
+                err += sn9c102_write_reg(cam, 0xa2, 0x17);
+                err += sn9c102_i2c_write(cam, 0x11, 0x00);
+        } else {
+                err += sn9c102_write_reg(cam, r0 | 0x40, 0x01);
+                err += sn9c102_write_reg(cam, 0xa2, 0x17);
+                err += sn9c102_i2c_write(cam, 0x11, 0x0d);
+        }
+
+        return err;
+}
+
+
+static struct sn9c102_sensor ov7660 = {
+        .name = "OV7660",
+        .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+        .supported_bridge = BRIDGE_SN9C105 | BRIDGE_SN9C120,
+        .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
+        .frequency = SN9C102_I2C_100KHZ,
+        .interface = SN9C102_I2C_2WIRES,
+        .i2c_slave_id = 0x21,
+        .init = &ov7660_init,
+        .qctrl = {
+                {
+                        .id = V4L2_CID_GAIN,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "global gain",
+                        .minimum = 0x00,
+                        .maximum = 0x7f,
+                        .step = 0x01,
+                        .default_value = 0x0a,
+                        .flags = 0,
+                },
+                {
+                        .id = V4L2_CID_EXPOSURE,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "exposure",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 0x01,
+                        .default_value = 0x50,
+                        .flags = 0,
+                },
+                {
+                        .id = V4L2_CID_DO_WHITE_BALANCE,
+                        .type = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name = "night mode",
+                        .minimum = 0x00,
+                        .maximum = 0x01,
+                        .step = 0x01,
+                        .default_value = 0x00,
+                        .flags = 0,
+                },
+                {
+                        .id = V4L2_CID_RED_BALANCE,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "red balance",
+                        .minimum = 0x00,
+                        .maximum = 0x7f,
+                        .step = 0x01,
+                        .default_value = 0x1f,
+                        .flags = 0,
+                },
+                {
+                        .id = V4L2_CID_BLUE_BALANCE,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "blue balance",
+                        .minimum = 0x00,
+                        .maximum = 0x7f,
+                        .step = 0x01,
+                        .default_value = 0x1e,
+                        .flags = 0,
+                },
+                {
+                        .id = V4L2_CID_AUTOGAIN,
+                        .type = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name = "auto adjust",
+                        .minimum = 0x00,
+                        .maximum = 0x01,
+                        .step = 0x01,
+                        .default_value = 0x00,
+                        .flags = 0,
+                },
+                {
+                        .id = SN9C102_V4L2_CID_GREEN_BALANCE,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "green balance",
+                        .minimum = 0x00,
+                        .maximum = 0x7f,
+                        .step = 0x01,
+                        .default_value = 0x20,
+                        .flags = 0,
+                },
+        },
+        .get_ctrl = &ov7660_get_ctrl,
+        .set_ctrl = &ov7660_set_ctrl,
+        .cropcap = {
+                .bounds = {
+                        .left = 0,
+                        .top = 0,
+                        .width = 640,
+                        .height = 480,
+                },
+                .defrect = {
+                        .left = 0,
+                        .top = 0,
+                        .width = 640,
+                        .height = 480,
+                },
+        },
+        .set_crop = &ov7660_set_crop,
+        .pix_format = {
+                .width = 640,
+                .height = 480,
+                .pixelformat = V4L2_PIX_FMT_JPEG,
+                .priv = 8,
+        },
+        .set_pix_format = &ov7660_set_pix_format
+};
+
+
+int sn9c102_probe_ov7660(struct sn9c102_device* cam)
+{
+        int pid, ver, err = 0;
+
+        err += sn9c102_write_reg(cam, 0x01, 0xf1);
+        err += sn9c102_write_reg(cam, 0x00, 0xf1);
+        err += sn9c102_write_reg(cam, 0x01, 0x01);
+        err += sn9c102_write_reg(cam, 0x00, 0x01);
+        err += sn9c102_write_reg(cam, 0x28, 0x17);
+
+        pid = sn9c102_i2c_try_read(cam, &ov7660, 0x0a);
+        ver = sn9c102_i2c_try_read(cam, &ov7660, 0x0b);
+        if (err || pid < 0 || ver < 0)
+                return -EIO;
+        if (pid != 0x76 || ver != 0x60)
+                return -ENODEV;
+        sn9c102_attach_sensor(cam, &ov7660);
+
+        return 0;
+}
diff --git a/drivers/media/video/sn9c102/sn9c102_pas106b.c b/drivers/media/video/sn9c102/sn9c102_pas106b.c
index 9915944235e8..8d79a5fae5de 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas106b.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas106b.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for PAS106B image sensor connected to the SN9C10x PC Camera     *
+ * Plug-in for PAS106B image sensor connected to the SN9C1xx PC Camera     *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -143,7 +143,7 @@ static int pas106b_set_ctrl(struct sn9c102_device* cam,
 static int pas106b_set_crop(struct sn9c102_device* cam,
                             const struct v4l2_rect* rect)
 {
-        struct sn9c102_sensor* s = &pas106b;
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
         u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 4,
            v_start = (u8)(rect->top - s->cropcap.bounds.top) + 3;
@@ -172,6 +172,7 @@ static int pas106b_set_pix_format(struct sn9c102_device* cam,
 static struct sn9c102_sensor pas106b = {
         .name = "PAS106B",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
         .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_400KHZ | SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bca.c b/drivers/media/video/sn9c102/sn9c102_pas202bca.c
deleted file mode 100644
index c8f1ae2152b8..000000000000
--- a/drivers/media/video/sn9c102/sn9c102_pas202bca.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/***************************************************************************
- * Plug-in for PAS202BCA image sensor connected to the SN9C10x PC Camera   *
- * Controllers                                                             *
- *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
- *                                                                         *
- * 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/delay.h>
-#include "sn9c102_sensor.h"
-
-
-static struct sn9c102_sensor pas202bca;
-
-
-static int pas202bca_init(struct sn9c102_device* cam)
-{
-        int err = 0;
-
-        err += sn9c102_write_reg(cam, 0x00, 0x10);
-        err += sn9c102_write_reg(cam, 0x00, 0x11);
-        err += sn9c102_write_reg(cam, 0x00, 0x14);
-        err += sn9c102_write_reg(cam, 0x20, 0x17);
-        err += sn9c102_write_reg(cam, 0x30, 0x19);
-        err += sn9c102_write_reg(cam, 0x09, 0x18);
-
-        err += sn9c102_i2c_write(cam, 0x02, 0x14);
-        err += sn9c102_i2c_write(cam, 0x03, 0x40);
-        err += sn9c102_i2c_write(cam, 0x0d, 0x2c);
-        err += sn9c102_i2c_write(cam, 0x0e, 0x01);
-        err += sn9c102_i2c_write(cam, 0x0f, 0xa9);
-        err += sn9c102_i2c_write(cam, 0x10, 0x08);
-        err += sn9c102_i2c_write(cam, 0x13, 0x63);
-        err += sn9c102_i2c_write(cam, 0x15, 0x70);
-        err += sn9c102_i2c_write(cam, 0x11, 0x01);
-
-        msleep(400);
-
-        return err;
-}
-
-
-static int pas202bca_set_pix_format(struct sn9c102_device* cam,
-                                    const struct v4l2_pix_format* pix)
-{
-        int err = 0;
-
-        if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
-                err += sn9c102_write_reg(cam, 0x24, 0x17);
-        else
-                err += sn9c102_write_reg(cam, 0x20, 0x17);
-
-        return err;
-}
-
-
-static int pas202bca_set_ctrl(struct sn9c102_device* cam,
-                              const struct v4l2_control* ctrl)
-{
-        int err = 0;
-
-        switch (ctrl->id) {
-        case V4L2_CID_EXPOSURE:
-                err += sn9c102_i2c_write(cam, 0x04, ctrl->value >> 6);
-                err += sn9c102_i2c_write(cam, 0x05, ctrl->value & 0x3f);
-                break;
-        case V4L2_CID_RED_BALANCE:
-                err += sn9c102_i2c_write(cam, 0x09, ctrl->value);
-                break;
-        case V4L2_CID_BLUE_BALANCE:
-                err += sn9c102_i2c_write(cam, 0x07, ctrl->value);
-                break;
-        case V4L2_CID_GAIN:
-                err += sn9c102_i2c_write(cam, 0x10, ctrl->value);
-                break;
-        case SN9C102_V4L2_CID_GREEN_BALANCE:
-                err += sn9c102_i2c_write(cam, 0x08, ctrl->value);
-                break;
-        case SN9C102_V4L2_CID_DAC_MAGNITUDE:
-                err += sn9c102_i2c_write(cam, 0x0c, ctrl->value);
-                break;
-        default:
-                return -EINVAL;
-        }
-        err += sn9c102_i2c_write(cam, 0x11, 0x01);
-
-        return err ? -EIO : 0;
-}
-
-
-static int pas202bca_set_crop(struct sn9c102_device* cam,
-                              const struct v4l2_rect* rect)
-{
-        struct sn9c102_sensor* s = &pas202bca;
-        int err = 0;
-        u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 3,
-           v_start = (u8)(rect->top - s->cropcap.bounds.top) + 3;
-
-        err += sn9c102_write_reg(cam, h_start, 0x12);
-        err += sn9c102_write_reg(cam, v_start, 0x13);
-
-        return err;
-}
-
-
-static struct sn9c102_sensor pas202bca = {
-        .name = "PAS202BCA",
-        .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
-        .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
-        .frequency = SN9C102_I2C_400KHZ | SN9C102_I2C_100KHZ,
-        .interface = SN9C102_I2C_2WIRES,
-        .i2c_slave_id = 0x40,
-        .init = &pas202bca_init,
-        .qctrl = {
-                {
-                        .id = V4L2_CID_EXPOSURE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "exposure",
-                        .minimum = 0x01e5,
-                        .maximum = 0x3fff,
-                        .step = 0x0001,
-                        .default_value = 0x01e5,
-                        .flags = 0,
-                },
-                {
-                        .id = V4L2_CID_GAIN,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "global gain",
-                        .minimum = 0x00,
-                        .maximum = 0x1f,
-                        .step = 0x01,
-                        .default_value = 0x0c,
-                        .flags = 0,
-                },
-                {
-                        .id = V4L2_CID_RED_BALANCE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "red balance",
-                        .minimum = 0x00,
-                        .maximum = 0x0f,
-                        .step = 0x01,
-                        .default_value = 0x01,
-                        .flags = 0,
-                },
-                {
-                        .id = V4L2_CID_BLUE_BALANCE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "blue balance",
-                        .minimum = 0x00,
-                        .maximum = 0x0f,
-                        .step = 0x01,
-                        .default_value = 0x05,
-                        .flags = 0,
-                },
-                {
-                        .id = SN9C102_V4L2_CID_GREEN_BALANCE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "green balance",
-                        .minimum = 0x00,
-                        .maximum = 0x0f,
-                        .step = 0x01,
-                        .default_value = 0x00,
-                        .flags = 0,
-                },
-                {
-                        .id = SN9C102_V4L2_CID_DAC_MAGNITUDE,
-                        .type = V4L2_CTRL_TYPE_INTEGER,
-                        .name = "DAC magnitude",
-                        .minimum = 0x00,
-                        .maximum = 0xff,
-                        .step = 0x01,
-                        .default_value = 0x04,
-                        .flags = 0,
-                },
-        },
-        .set_ctrl = &pas202bca_set_ctrl,
-        .cropcap = {
-                .bounds = {
-                        .left = 0,
-                        .top = 0,
-                        .width = 640,
-                        .height = 480,
-                },
-                .defrect = {
-                        .left = 0,
-                        .top = 0,
-                        .width = 640,
-                        .height = 480,
-                },
-        },
-        .set_crop = &pas202bca_set_crop,
-        .pix_format = {
-                .width = 640,
-                .height = 480,
-                .pixelformat = V4L2_PIX_FMT_SBGGR8,
-                .priv = 8,
-        },
-        .set_pix_format = &pas202bca_set_pix_format
-};
-
-
-int sn9c102_probe_pas202bca(struct sn9c102_device* cam)
-{
-        const struct usb_device_id pas202bca_id_table[] = {
-                { USB_DEVICE(0x0c45, 0x60af), },
-                { }
-        };
-        int err = 0;
-
-        if (!sn9c102_match_id(cam,pas202bca_id_table))
-                return -ENODEV;
-
-        err += sn9c102_write_reg(cam, 0x01, 0x01);
-        err += sn9c102_write_reg(cam, 0x40, 0x01);
-        err += sn9c102_write_reg(cam, 0x28, 0x17);
-        if (err)
-                return -EIO;
-
-        if (sn9c102_i2c_try_write(cam, &pas202bca, 0x10, 0)) /* try to write */
-                return -ENODEV;
-
-        sn9c102_attach_sensor(cam, &pas202bca);
-
-        return 0;
-}
diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
index e3c1178e339c..7894f01b56e8 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
@@ -1,13 +1,13 @@
 /***************************************************************************
- * Plug-in for PAS202BCB image sensor connected to the SN9C10x PC Camera   *
+ * Plug-in for PAS202BCB image sensor connected to the SN9C1xx PC Camera   *
  * Controllers                                                             *
  *                                                                         *
  * Copyright (C) 2004 by Carlos Eduardo Medaglia Dyonisio                  *
  *                       <medaglia@undl.org.br>                            *
  *                       http://cadu.homelinux.com:8080/                   *
  *                                                                         *
- * DAC Magnitude, exposure and green gain controls added by                *
- * Luca Risolia <luca.risolia@studio.unibo.it>                             *
+ * Support for SN9C103, DAC Magnitude, exposure and green gain controls    *
+ * added by Luca Risolia <luca.risolia@studio.unibo.it>                    *
  *                                                                         *
  * 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    *
@@ -35,12 +35,54 @@ static int pas202bcb_init(struct sn9c102_device* cam)
 {
         int err = 0;
 
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
         err += sn9c102_write_reg(cam, 0x00, 0x10);
         err += sn9c102_write_reg(cam, 0x00, 0x11);
         err += sn9c102_write_reg(cam, 0x00, 0x14);
         err += sn9c102_write_reg(cam, 0x20, 0x17);
         err += sn9c102_write_reg(cam, 0x30, 0x19);
         err += sn9c102_write_reg(cam, 0x09, 0x18);
+                break;
+        case BRIDGE_SN9C103:
+                err += sn9c102_write_reg(cam, 0x00, 0x02);
+                err += sn9c102_write_reg(cam, 0x00, 0x03);
+                err += sn9c102_write_reg(cam, 0x1a, 0x04);
+                err += sn9c102_write_reg(cam, 0x20, 0x05);
+                err += sn9c102_write_reg(cam, 0x20, 0x06);
+                err += sn9c102_write_reg(cam, 0x20, 0x07);
+                err += sn9c102_write_reg(cam, 0x00, 0x10);
+                err += sn9c102_write_reg(cam, 0x00, 0x11);
+                err += sn9c102_write_reg(cam, 0x00, 0x14);
+                err += sn9c102_write_reg(cam, 0x20, 0x17);
+                err += sn9c102_write_reg(cam, 0x30, 0x19);
+                err += sn9c102_write_reg(cam, 0x09, 0x18);
+                err += sn9c102_write_reg(cam, 0x02, 0x1c);
+                err += sn9c102_write_reg(cam, 0x03, 0x1d);
+                err += sn9c102_write_reg(cam, 0x0f, 0x1e);
+                err += sn9c102_write_reg(cam, 0x0c, 0x1f);
+                err += sn9c102_write_reg(cam, 0x00, 0x20);
+                err += sn9c102_write_reg(cam, 0x10, 0x21);
+                err += sn9c102_write_reg(cam, 0x20, 0x22);
+                err += sn9c102_write_reg(cam, 0x30, 0x23);
+                err += sn9c102_write_reg(cam, 0x40, 0x24);
+                err += sn9c102_write_reg(cam, 0x50, 0x25);
+                err += sn9c102_write_reg(cam, 0x60, 0x26);
+                err += sn9c102_write_reg(cam, 0x70, 0x27);
+                err += sn9c102_write_reg(cam, 0x80, 0x28);
+                err += sn9c102_write_reg(cam, 0x90, 0x29);
+                err += sn9c102_write_reg(cam, 0xa0, 0x2a);
+                err += sn9c102_write_reg(cam, 0xb0, 0x2b);
+                err += sn9c102_write_reg(cam, 0xc0, 0x2c);
+                err += sn9c102_write_reg(cam, 0xd0, 0x2d);
+                err += sn9c102_write_reg(cam, 0xe0, 0x2e);
+                err += sn9c102_write_reg(cam, 0xf0, 0x2f);
+                err += sn9c102_write_reg(cam, 0xff, 0x30);
+                break;
+        default:
+                break;
+        }
 
         err += sn9c102_i2c_write(cam, 0x02, 0x14);
         err += sn9c102_i2c_write(cam, 0x03, 0x40);
@@ -107,7 +149,7 @@ static int pas202bcb_set_pix_format(struct sn9c102_device* cam,
         int err = 0;
 
         if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
-                err += sn9c102_write_reg(cam, 0x24, 0x17);
+                err += sn9c102_write_reg(cam, 0x28, 0x17);
         else
                 err += sn9c102_write_reg(cam, 0x20, 0x17);
 
@@ -152,11 +194,23 @@ static int pas202bcb_set_ctrl(struct sn9c102_device* cam,
 static int pas202bcb_set_crop(struct sn9c102_device* cam,
                               const struct v4l2_rect* rect)
 {
-        struct sn9c102_sensor* s = &pas202bcb;
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
-        u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 4,
+        u8 h_start = 0,
            v_start = (u8)(rect->top - s->cropcap.bounds.top) + 3;
 
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+                h_start = (u8)(rect->left - s->cropcap.bounds.left) + 4;
+                break;
+        case BRIDGE_SN9C103:
+                h_start = (u8)(rect->left - s->cropcap.bounds.left) + 3;
+                break;
+        default:
+                break;
+        }
+
         err += sn9c102_write_reg(cam, h_start, 0x12);
         err += sn9c102_write_reg(cam, v_start, 0x13);
 
@@ -166,8 +220,8 @@ static int pas202bcb_set_crop(struct sn9c102_device* cam,
 
 static struct sn9c102_sensor pas202bcb = {
         .name = "PAS202BCB",
-        .maintainer = "Carlos Eduardo Medaglia Dyonisio "
-                      "<medaglia@undl.org.br>",
+        .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
         .sysfs_ops = SN9C102_I2C_READ | SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_400KHZ | SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
@@ -191,7 +245,7 @@ static struct sn9c102_sensor pas202bcb = {
                         .minimum = 0x00,
                         .maximum = 0x1f,
                         .step = 0x01,
-                        .default_value = 0x0c,
+                        .default_value = 0x0b,
                         .flags = 0,
                 },
                 {
@@ -201,7 +255,7 @@ static struct sn9c102_sensor pas202bcb = {
                         .minimum = 0x00,
                         .maximum = 0x0f,
                         .step = 0x01,
-                        .default_value = 0x01,
+                        .default_value = 0x00,
                         .flags = 0,
                 },
                 {
@@ -271,16 +325,27 @@ int sn9c102_probe_pas202bcb(struct sn9c102_device* cam)
          *  Minimal initialization to enable the I2C communication
          *  NOTE: do NOT change the values!
          */
-        err += sn9c102_write_reg(cam, 0x01, 0x01); /* sensor power down */
-        err += sn9c102_write_reg(cam, 0x40, 0x01); /* sensor power on */
-        err += sn9c102_write_reg(cam, 0x28, 0x17); /* sensor clock at 24 MHz */
-        if (err)
-                return -EIO;
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+                err += sn9c102_write_reg(cam, 0x01, 0x01); /* power down */
+                err += sn9c102_write_reg(cam, 0x40, 0x01); /* power on */
+                err += sn9c102_write_reg(cam, 0x28, 0x17); /* clock 24 MHz */
+                break;
+        case BRIDGE_SN9C103: /* do _not_ change anything! */
+                err += sn9c102_write_reg(cam, 0x09, 0x01);
+                err += sn9c102_write_reg(cam, 0x44, 0x01);
+                err += sn9c102_write_reg(cam, 0x44, 0x02);
+                err += sn9c102_write_reg(cam, 0x29, 0x17);
+                break;
+        default:
+                break;
+        }
 
         r0 = sn9c102_i2c_try_read(cam, &pas202bcb, 0x00);
         r1 = sn9c102_i2c_try_read(cam, &pas202bcb, 0x01);
 
-        if (r0 < 0 || r1 < 0)
+        if (err || r0 < 0 || r1 < 0)
                 return -EIO;
 
         pid = (r0 << 4) | ((r1 & 0xf0) >> 4);
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h
index 2a874ee6f9f5..05f2942639c3 100644
--- a/drivers/media/video/sn9c102/sn9c102_sensor.h
+++ b/drivers/media/video/sn9c102/sn9c102_sensor.h
@@ -1,7 +1,7 @@
 /***************************************************************************
- * API for image sensors connected to the SN9C10x PC Camera Controllers    *
+ * API for image sensors connected to the SN9C1xx PC Camera Controllers    *
  *                                                                         *
- * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -36,14 +36,13 @@ struct sn9c102_sensor;
 /*
    OVERVIEW.
    This is a small interface that allows you to add support for any CCD/CMOS
-   image sensors connected to the SN9C10X bridges. The entire API is documented
+   image sensors connected to the SN9C1XX bridges. The entire API is documented
    below. In the most general case, to support a sensor there are three steps
    you have to follow:
    1) define the main "sn9c102_sensor" structure by setting the basic fields;
    2) write a probing function to be called by the core module when the USB
       camera is recognized, then add both the USB ids and the name of that
-      function to the two corresponding tables SENSOR_TABLE and ID_TABLE (see
-      below);
+      function to the two corresponding tables in sn9c102_devtable.h;
    3) implement the methods that you want/need (and fill the rest of the main
       structure accordingly).
    "sn9c102_pas106b.c" is an example of all this stuff. Remember that you do
@@ -54,42 +53,21 @@ struct sn9c102_sensor;
 
 /*****************************************************************************/
 
-/*
-   Probing functions: on success, you must attach the sensor to the camera
-   by calling sn9c102_attach_sensor() provided below.
-   To enable the I2C communication, you might need to perform a really basic
-   initialization of the SN9C10X chip by using the write function declared
-   ahead.
-   Functions must return 0 on success, the appropriate error otherwise.
-*/
-extern int sn9c102_probe_hv7131d(struct sn9c102_device* cam);
-extern int sn9c102_probe_mi0343(struct sn9c102_device* cam);
-extern int sn9c102_probe_ov7630(struct sn9c102_device* cam);
-extern int sn9c102_probe_pas106b(struct sn9c102_device* cam);
-extern int sn9c102_probe_pas202bca(struct sn9c102_device* cam);
-extern int sn9c102_probe_pas202bcb(struct sn9c102_device* cam);
-extern int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam);
-extern int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam);
-
-/*
-   Add the above entries to this table. Be sure to add the entry in the right
-   place, since, on failure, the next probing routine is called according to
-   the order of the list below, from top to bottom.
-*/
-#define SN9C102_SENSOR_TABLE                                                  \
-static int (*sn9c102_sensor_table[])(struct sn9c102_device*) = {              \
-        &sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */     \
-        &sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */    \
-        &sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */  \
-        &sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */    \
-        &sn9c102_probe_pas202bca, /* detection mostly based on USB pid/vid */ \
-        &sn9c102_probe_ov7630, /* detection mostly based on USB pid/vid */    \
-        &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */       \
-        &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */       \
-        NULL,                                                                 \
+enum sn9c102_bridge {
+        BRIDGE_SN9C101 = 0x01,
+        BRIDGE_SN9C102 = 0x02,
+        BRIDGE_SN9C103 = 0x04,
+        BRIDGE_SN9C105 = 0x08,
+        BRIDGE_SN9C120 = 0x10,
 };
 
-/* Device identification */
+/* Return the bridge name */
+enum sn9c102_bridge sn9c102_get_bridge(struct sn9c102_device* cam);
+
+/* Return a pointer the sensor struct attached to the camera */
+struct sn9c102_sensor* sn9c102_get_sensor(struct sn9c102_device* cam);
+
+/* Identify a device */
 extern struct sn9c102_device*
 sn9c102_match_id(struct sn9c102_device* cam, const struct usb_device_id *id);
 
@@ -99,68 +77,8 @@ sn9c102_attach_sensor(struct sn9c102_device* cam,
                       struct sn9c102_sensor* sensor);
 
 /*
-   Each SN9C10x camera has proper PID/VID identifiers.
-   SN9C103 supports multiple interfaces, but we only handle the video class
-   interface.
-*/
-#define SN9C102_USB_DEVICE(vend, prod, intclass)                              \
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |                           \
-                       USB_DEVICE_ID_MATCH_INT_CLASS,                         \
-        .idVendor = (vend),                                                   \
-        .idProduct = (prod),                                                  \
-        .bInterfaceClass = (intclass)
-
-#define SN9C102_ID_TABLE                                                      \
-static const struct usb_device_id sn9c102_id_table[] = {                      \
-        { USB_DEVICE(0x0c45, 0x6001), }, /* TAS5110C1B */                     \
-        { USB_DEVICE(0x0c45, 0x6005), }, /* TAS5110C1B */                     \
-        { USB_DEVICE(0x0c45, 0x6007), },                                      \
-        { USB_DEVICE(0x0c45, 0x6009), }, /* PAS106B */                        \
-        { USB_DEVICE(0x0c45, 0x600d), }, /* PAS106B */                        \
-        { USB_DEVICE(0x0c45, 0x6024), },                                      \
-        { USB_DEVICE(0x0c45, 0x6025), }, /* TAS5130D1B and TAS5110C1B */      \
-        { USB_DEVICE(0x0c45, 0x6028), }, /* PAS202BCB */                      \
-        { USB_DEVICE(0x0c45, 0x6029), }, /* PAS106B */                        \
-        { USB_DEVICE(0x0c45, 0x602a), }, /* HV7131D */                        \
-        { USB_DEVICE(0x0c45, 0x602b), }, /* MI-0343 */                        \
-        { USB_DEVICE(0x0c45, 0x602c), }, /* OV7630 */                         \
-        { USB_DEVICE(0x0c45, 0x602d), },                                      \
-        { USB_DEVICE(0x0c45, 0x602e), }, /* OV7630 */                         \
-        { USB_DEVICE(0x0c45, 0x6030), }, /* MI03x */                          \
-        { SN9C102_USB_DEVICE(0x0c45, 0x6080, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x6082, 0xff), }, /* MI0343 & MI0360 */  \
-        { SN9C102_USB_DEVICE(0x0c45, 0x6083, 0xff), }, /* HV7131[D|E1] */     \
-        { SN9C102_USB_DEVICE(0x0c45, 0x6088, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x608a, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x608b, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x608c, 0xff), }, /* HV7131/R */         \
-        { SN9C102_USB_DEVICE(0x0c45, 0x608e, 0xff), }, /* CIS-VF10 */         \
-        { SN9C102_USB_DEVICE(0x0c45, 0x608f, 0xff), }, /* OV7630 */           \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a0, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a2, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a3, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a8, 0xff), }, /* PAS106B */          \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60aa, 0xff), }, /* TAS5130D1B */       \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ab, 0xff), }, /* TAS5110C1B */       \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ac, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ae, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60af, 0xff), }, /* PAS202BCB */        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60b0, 0xff), }, /* OV7630 (?) */       \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60b2, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60b3, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60b8, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ba, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60bb, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60bc, 0xff), },                        \
-        { SN9C102_USB_DEVICE(0x0c45, 0x60be, 0xff), },                        \
-        { }                                                                   \
-};
-
-/*****************************************************************************/
-
-/*
    Read/write routines: they always return -1 on error, 0 or the read value
-   otherwise. NOTE that a real read operation is not supported by the SN9C10X
+   otherwise. NOTE that a real read operation is not supported by the SN9C1XX
    chip for some of its registers. To work around this problem, a pseudo-read
    call is provided instead: it returns the last successfully written value
    on the register (0 if it has never been written), the usual -1 on error.
@@ -176,7 +94,7 @@ extern int sn9c102_i2c_try_read(struct sn9c102_device*,struct sn9c102_sensor*,
    These must be used if and only if the sensor doesn't implement the standard
    I2C protocol. There are a number of good reasons why you must use the
    single-byte versions of these functions: do not abuse. The first function
-   writes n bytes, from data0 to datan, to registers 0x09 - 0x09+n of SN9C10X
+   writes n bytes, from data0 to datan, to registers 0x09 - 0x09+n of SN9C1XX
    chip. The second one programs the registers 0x09 and 0x10 with data0 and
    data1, and places the n bytes read from the sensor register table in the
    buffer pointed by 'buffer'. Both the functions return -1 on error; the write
@@ -200,16 +118,6 @@ extern int sn9c102_write_regs(struct sn9c102_device*, u8* buff, u16 index);
 extern int sn9c102_write_reg(struct sn9c102_device*, u8 value, u16 index);
 extern int sn9c102_pread_reg(struct sn9c102_device*, u16 index);
 
-/*
-   NOTE: there are no exported debugging functions. To uniform the output you
-   must use the dev_info()/dev_warn()/dev_err() macros defined in device.h,
-   already included here, the argument being the struct device '&usbdev->dev'
-   of the sensor structure. Do NOT use these macros before the sensor is
-   attached or the kernel will crash! However, you should not need to notify
-   the user about common errors or other messages, since this is done by the
-   master module.
-*/
-
 /*****************************************************************************/
 
 enum sn9c102_i2c_sysfs_ops {
@@ -227,17 +135,19 @@ enum sn9c102_i2c_interface {
         SN9C102_I2C_3WIRES,
 };
 
-#define SN9C102_MAX_CTRLS V4L2_CID_LASTP1-V4L2_CID_BASE+10
+#define SN9C102_MAX_CTRLS (V4L2_CID_LASTP1-V4L2_CID_BASE+10)
 
 struct sn9c102_sensor {
         char name[32], /* sensor name */
              maintainer[64]; /* name of the mantainer <email> */
 
+        enum sn9c102_bridge supported_bridge; /* supported SN9C1xx bridges */
+
         /* Supported operations through the 'sysfs' interface */
         enum sn9c102_i2c_sysfs_ops sysfs_ops;
 
         /*
-           These sensor capabilities must be provided if the SN9C10X controller
+           These sensor capabilities must be provided if the SN9C1XX controller
            needs to communicate through the sensor serial interface by using
            at least one of the i2c functions available.
         */
@@ -260,7 +170,7 @@ struct sn9c102_sensor {
         /*
            This function will be called after the sensor has been attached.
            It should be used to initialize the sensor only, but may also
-           configure part of the SN9C10X chip if necessary. You don't need to
+           configure part of the SN9C1XX chip if necessary. You don't need to
            setup picture settings like brightness, contrast, etc.. here, if
            the corrisponding controls are implemented (see below), since
            they are adjusted in the core driver by calling the set_ctrl()
@@ -300,7 +210,7 @@ struct sn9c102_sensor {
            It is not always true that the largest achievable active window can
            cover the whole array of pixels. The V4L2 API defines another
            area called "source rectangle", which, in turn, is a subrectangle of
-           the active window. The SN9C10X chip is always programmed to read the
+           the active window. The SN9C1XX chip is always programmed to read the
            source rectangle.
            The bounds of both the active window and the source rectangle are
            specified in the cropcap substructures 'bounds' and 'defrect'.
@@ -326,13 +236,13 @@ struct sn9c102_sensor {
                         const struct v4l2_rect* rect);
         /*
            To be called on VIDIOC_C_SETCROP. The core module always calls a
-           default routine which configures the appropriate SN9C10X regs (also
+           default routine which configures the appropriate SN9C1XX regs (also
            scaling), but you may need to override/adjust specific stuff.
            'rect' contains width and height values that are multiple of 16: in
            case you override the default function, you always have to program
            the chip to match those values; on error return the corresponding
            error code without rolling back.
-           NOTE: in case, you must program the SN9C10X chip to get rid of
+           NOTE: in case, you must program the SN9C1XX chip to get rid of
                  blank pixels or blank lines at the _start_ of each line or
                  frame after each HSYNC or VSYNC, so that the image starts with
                  real RGB data (see regs 0x12, 0x13) (having set H_SIZE and,
@@ -344,16 +254,16 @@ struct sn9c102_sensor {
         /*
            What you have to define here are: 1) initial 'width' and 'height' of
            the target rectangle 2) the initial 'pixelformat', which can be
-           either V4L2_PIX_FMT_SN9C10X (for compressed video) or
-           V4L2_PIX_FMT_SBGGR8 3) 'priv', which we'll be used to indicate the
-           number of bits per pixel for uncompressed video, 8 or 9 (despite the
-           current value of 'pixelformat').
+           either V4L2_PIX_FMT_SN9C10X, V4L2_PIX_FMT_JPEG (for ompressed video)
+           or V4L2_PIX_FMT_SBGGR8 3) 'priv', which we'll be used to indicate
+           the number of bits per pixel for uncompressed video, 8 or 9 (despite
+           the current value of 'pixelformat').
            NOTE 1: both 'width' and 'height' _must_ be either 1/1 or 1/2 or 1/4
                    of cropcap.defrect.width and cropcap.defrect.height. I
                    suggest 1/1.
            NOTE 2: The initial compression quality is defined by the first bit
                    of reg 0x17 during the initialization of the image sensor.
-           NOTE 3: as said above, you have to program the SN9C10X chip to get
+           NOTE 3: as said above, you have to program the SN9C1XX chip to get
                    rid of any blank pixels, so that the output of the sensor
                    matches the RGB bayer sequence (i.e. BGBGBG...GRGRGR).
         */
@@ -378,12 +288,12 @@ struct sn9c102_sensor {
 /*****************************************************************************/
 
 /* Private ioctl's for control settings supported by some image sensors */
-#define SN9C102_V4L2_CID_DAC_MAGNITUDE V4L2_CID_PRIVATE_BASE
-#define SN9C102_V4L2_CID_GREEN_BALANCE V4L2_CID_PRIVATE_BASE + 1
-#define SN9C102_V4L2_CID_RESET_LEVEL V4L2_CID_PRIVATE_BASE + 2
-#define SN9C102_V4L2_CID_PIXEL_BIAS_VOLTAGE V4L2_CID_PRIVATE_BASE + 3
-#define SN9C102_V4L2_CID_GAMMA V4L2_CID_PRIVATE_BASE + 4
-#define SN9C102_V4L2_CID_BAND_FILTER V4L2_CID_PRIVATE_BASE + 5
-#define SN9C102_V4L2_CID_BRIGHT_LEVEL V4L2_CID_PRIVATE_BASE + 6
+#define SN9C102_V4L2_CID_DAC_MAGNITUDE (V4L2_CID_PRIVATE_BASE + 0)
+#define SN9C102_V4L2_CID_GREEN_BALANCE (V4L2_CID_PRIVATE_BASE + 1)
+#define SN9C102_V4L2_CID_RESET_LEVEL (V4L2_CID_PRIVATE_BASE + 2)
+#define SN9C102_V4L2_CID_PIXEL_BIAS_VOLTAGE (V4L2_CID_PRIVATE_BASE + 3)
+#define SN9C102_V4L2_CID_GAMMA (V4L2_CID_PRIVATE_BASE + 4)
+#define SN9C102_V4L2_CID_BAND_FILTER (V4L2_CID_PRIVATE_BASE + 5)
+#define SN9C102_V4L2_CID_BRIGHT_LEVEL (V4L2_CID_PRIVATE_BASE + 6)
 
 #endif /* _SN9C102_SENSOR_H_ */
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
index 294eb02fbd88..90023ad63adc 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for TAS5110C1B image sensor connected to the SN9C10x PC Camera  *
+ * Plug-in for TAS5110C1B image sensor connected to the SN9C1xx PC Camera  *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -64,7 +64,7 @@ static int tas5110c1b_set_ctrl(struct sn9c102_device* cam,
 static int tas5110c1b_set_crop(struct sn9c102_device* cam,
                                const struct v4l2_rect* rect)
 {
-        struct sn9c102_sensor* s = &tas5110c1b;
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
         u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 69,
            v_start = (u8)(rect->top - s->cropcap.bounds.top) + 9;
@@ -98,6 +98,7 @@ static int tas5110c1b_set_pix_format(struct sn9c102_device* cam,
 static struct sn9c102_sensor tas5110c1b = {
         .name = "TAS5110C1B",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
         .sysfs_ops = SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_3WIRES,
@@ -145,6 +146,7 @@ int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam)
         const struct usb_device_id tas5110c1b_id_table[] = {
                 { USB_DEVICE(0x0c45, 0x6001), },
                 { USB_DEVICE(0x0c45, 0x6005), },
+                { USB_DEVICE(0x0c45, 0x6007), },
                 { USB_DEVICE(0x0c45, 0x60ab), },
                 { }
         };
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
index 9ecb09032b68..cb1b318bc1ff 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for TAS5130D1B image sensor connected to the SN9C10x PC Camera  *
+ * Plug-in for TAS5130D1B image sensor connected to the SN9C1xx PC Camera  *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -65,7 +65,7 @@ static int tas5130d1b_set_ctrl(struct sn9c102_device* cam,
 static int tas5130d1b_set_crop(struct sn9c102_device* cam,
                                const struct v4l2_rect* rect)
 {
-        struct sn9c102_sensor* s = &tas5130d1b;
+        struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 104,
            v_start = (u8)(rect->top - s->cropcap.bounds.top) + 12;
         int err = 0;
@@ -99,6 +99,7 @@ static int tas5130d1b_set_pix_format(struct sn9c102_device* cam,
 static struct sn9c102_sensor tas5130d1b = {
         .name = "TAS5130D1B",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
+        .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
         .sysfs_ops = SN9C102_I2C_WRITE,
         .frequency = SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_3WIRES,
@@ -154,6 +155,7 @@ static struct sn9c102_sensor tas5130d1b = {
 int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam)
 {
         const struct usb_device_id tas5130d1b_id_table[] = {
+                { USB_DEVICE(0x0c45, 0x6024), },
                 { USB_DEVICE(0x0c45, 0x6025), },
                 { USB_DEVICE(0x0c45, 0x60aa), },
                 { }
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 7ea9132a1965..3ae5a9cd2e28 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -212,8 +212,7 @@ static int tvmixer_release(struct inode *inode, struct file *file)
                 return -ENODEV;
         }
 
-        if (client->adapter->owner)
-                module_put(client->adapter->owner);
+        module_put(client->adapter->owner);
         return 0;
 }
 
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index bc0a4fc27b24..886b5df7c9d1 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -950,17 +950,8 @@ static int tvp5150_command(struct i2c_client *c,
         }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_INT_G_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
-
-                if (reg->i2c_id != I2C_DRIVERID_TVP5150)
-                        return -EINVAL;
-                reg->val = tvp5150_read(c, reg->reg & 0xff);
-                break;
-        }
-
-        case VIDIOC_INT_S_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
         {
                 struct v4l2_register *reg = arg;
 
@@ -968,7 +959,10 @@ static int tvp5150_command(struct i2c_client *c,
                         return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                tvp5150_write(c, reg->reg & 0xff, reg->val & 0xff);
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = tvp5150_read(c, reg->reg & 0xff);
+                else
+                        tvp5150_write(c, reg->reg & 0xff, reg->val & 0xff);
                 break;
         }
 #endif
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index fc52201d607e..b3b5fd536dc3 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -162,27 +162,19 @@ static int upd64031a_command(struct i2c_client *client, unsigned int cmd, void *
                 break;
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_INT_G_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
         {
                 struct v4l2_register *reg = arg;
 
                 if (reg->i2c_id != I2C_DRIVERID_UPD64031A)
                         return -EINVAL;
-                reg->val = upd64031a_read(client, reg->reg & 0xff);
-                break;
-        }
-
-        case VIDIOC_INT_S_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
-                u8 addr = reg->reg & 0xff;
-                u8 val = reg->val & 0xff;
-
-                if (reg->i2c_id != I2C_DRIVERID_UPD64031A)
-                        return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                upd64031a_write(client, addr, val);
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = upd64031a_read(client, reg->reg & 0xff);
+                else
+                        upd64031a_write(client, reg->reg & 0xff, reg->val & 0xff);
                 break;
         }
 #endif
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index c3a7ffe5c267..8852903e7a92 100644
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -139,27 +139,19 @@ static int upd64083_command(struct i2c_client *client, unsigned int cmd, void *a
                 break;
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        case VIDIOC_INT_G_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
         {
                 struct v4l2_register *reg = arg;
 
                 if (reg->i2c_id != I2C_DRIVERID_UPD64083)
                         return -EINVAL;
-                reg->val = upd64083_read(client, reg->reg & 0xff);
-                break;
-        }
-
-        case VIDIOC_INT_S_REGISTER:
-        {
-                struct v4l2_register *reg = arg;
-                u8 addr = reg->reg & 0xff;
-                u8 val = reg->val & 0xff;
-
-                if (reg->i2c_id != I2C_DRIVERID_UPD64083)
-                        return -EINVAL;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                upd64083_write(client, addr, val);
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = upd64083_read(client, reg->reg & 0xff);
+                else
+                        upd64083_write(client, reg->reg & 0xff, reg->val & 0xff);
                 break;
         }
 #endif
diff --git a/drivers/media/video/usbvision/Kconfig b/drivers/media/video/usbvision/Kconfig
index fc24ef05b3f3..c43a5d899091 100644
--- a/drivers/media/video/usbvision/Kconfig
+++ b/drivers/media/video/usbvision/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_USBVISION
         tristate "USB video devices based on Nogatech NT1003/1004/1005"
-        depends on I2C && VIDEO_V4L2
+        depends on I2C && VIDEO_V4L2 && USB
         select VIDEO_TUNER
         select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
         ---help---
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 901f664dc6db..f2154dc072e2 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -138,7 +138,7 @@ static void *usbvision_rvmalloc(unsigned long size)
         return mem;
 }
 
-void usbvision_rvfree(void *mem, unsigned long size)
+static void usbvision_rvfree(void *mem, unsigned long size)
 {
         unsigned long adr;
 
@@ -1852,28 +1852,33 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width,
 
 /*
  * usbvision_frames_alloc
- * allocate the maximum frames this driver can manage
+ * allocate the required frames
  */
-int usbvision_frames_alloc(struct usb_usbvision *usbvision)
+int usbvision_frames_alloc(struct usb_usbvision *usbvision, int number_of_frames)
 {
         int i;
 
-        /* Allocate memory for the frame buffers */
-        usbvision->max_frame_size = MAX_FRAME_SIZE;
-        usbvision->fbuf_size = USBVISION_NUMFRAMES * usbvision->max_frame_size;
-        usbvision->fbuf = usbvision_rvmalloc(usbvision->fbuf_size);
+        /*needs to be page aligned cause the buffers can be mapped individually! */
+        usbvision->max_frame_size =  PAGE_ALIGN(usbvision->curwidth *
+                                                usbvision->curheight *
+                                                usbvision->palette.bytes_per_pixel);
 
-        if(usbvision->fbuf == NULL) {
-                err("%s: unable to allocate %d bytes for fbuf ",
-                    __FUNCTION__, usbvision->fbuf_size);
-                return -ENOMEM;
+        /* Try to do my best to allocate the frames the user want in the remaining memory */
+        usbvision->num_frames = number_of_frames;
+        while (usbvision->num_frames > 0) {
+                usbvision->fbuf_size = usbvision->num_frames * usbvision->max_frame_size;
+                if((usbvision->fbuf = usbvision_rvmalloc(usbvision->fbuf_size))) {
+                        break;
+                }
+                usbvision->num_frames--;
         }
+
         spin_lock_init(&usbvision->queue_lock);
         init_waitqueue_head(&usbvision->wait_frame);
         init_waitqueue_head(&usbvision->wait_stream);
 
         /* Allocate all buffers */
-        for (i = 0; i < USBVISION_NUMFRAMES; i++) {
+        for (i = 0; i < usbvision->num_frames; i++) {
                 usbvision->frame[i].index = i;
                 usbvision->frame[i].grabstate = FrameState_Unused;
                 usbvision->frame[i].data = usbvision->fbuf +
@@ -1887,7 +1892,8 @@ int usbvision_frames_alloc(struct usb_usbvision *usbvision)
                 usbvision->frame[i].height = usbvision->curheight;
                 usbvision->frame[i].bytes_read = 0;
         }
-        return 0;
+        PDEBUG(DBG_FUNC, "allocated %d frames (%d bytes per frame)",usbvision->num_frames,usbvision->max_frame_size);
+        return usbvision->num_frames;
 }
 
 /*
@@ -1897,9 +1903,13 @@ int usbvision_frames_alloc(struct usb_usbvision *usbvision)
 void usbvision_frames_free(struct usb_usbvision *usbvision)
 {
         /* Have to free all that memory */
+        PDEBUG(DBG_FUNC, "free %d frames",usbvision->num_frames);
+
         if (usbvision->fbuf != NULL) {
                 usbvision_rvfree(usbvision->fbuf, usbvision->fbuf_size);
                 usbvision->fbuf = NULL;
+
+                usbvision->num_frames = 0;
         }
 }
 /*
@@ -2351,6 +2361,32 @@ int usbvision_setup(struct usb_usbvision *usbvision,int format)
         return USBVISION_IS_OPERATIONAL(usbvision);
 }
 
+int usbvision_set_alternate(struct usb_usbvision *dev)
+{
+        int errCode, prev_alt = dev->ifaceAlt;
+        int i;
+
+        dev->ifaceAlt=0;
+        for(i=0;i< dev->num_alt; i++)
+                if(dev->alt_max_pkt_size[i]>dev->alt_max_pkt_size[dev->ifaceAlt])
+                        dev->ifaceAlt=i;
+
+        if (dev->ifaceAlt != prev_alt) {
+                dev->isocPacketSize = dev->alt_max_pkt_size[dev->ifaceAlt];
+                PDEBUG(DBG_FUNC,"setting alternate %d with wMaxPacketSize=%u", dev->ifaceAlt,dev->isocPacketSize);
+                errCode = usb_set_interface(dev->dev, dev->iface, dev->ifaceAlt);
+                if (errCode < 0) {
+                        err ("cannot change alternate number to %d (error=%i)",
+                                                        dev->ifaceAlt, errCode);
+                        return errCode;
+                }
+        }
+
+        PDEBUG(DBG_ISOC, "ISO Packet Length:%d", dev->isocPacketSize);
+
+        return 0;
+}
+
 /*
  * usbvision_init_isoc()
  *
@@ -2368,15 +2404,13 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
         scratch_reset(usbvision);
 
         /* Alternate interface 1 is is the biggest frame size */
-        errCode = usb_set_interface(dev, usbvision->iface, usbvision->ifaceAltActive);
+        errCode = usbvision_set_alternate(usbvision);
         if (errCode < 0) {
                 usbvision->last_error = errCode;
                 return -EBUSY;
         }
 
         regValue = (16 - usbvision_read_reg(usbvision, USBVISION_ALTER_REG)) & 0x0F;
-        usbvision->isocPacketSize = (regValue == 0) ? 0 : (regValue * 64) - 1;
-        PDEBUG(DBG_ISOC, "ISO Packet Length:%d", usbvision->isocPacketSize);
 
         usbvision->usb_bandwidth = regValue >> 1;
         PDEBUG(DBG_ISOC, "USB Bandwidth Usage: %dMbit/Sec", usbvision->usb_bandwidth);
@@ -2462,8 +2496,9 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision)
         if (!usbvision->remove_pending) {
 
                 /* Set packet size to 0 */
+                usbvision->ifaceAlt=0;
                 errCode = usb_set_interface(usbvision->dev, usbvision->iface,
-                                      usbvision->ifaceAltInactive);
+                                            usbvision->ifaceAlt);
                 if (errCode < 0) {
                         err("%s: usb_set_interface() failed: error %d", __FUNCTION__, errCode);
                         usbvision->last_error = errCode;
@@ -2490,6 +2525,7 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel)
         RESTRICT_TO_RANGE(channel, 0, usbvision->video_inputs);
         usbvision->ctl_input = channel;
           route.input = SAA7115_COMPOSITE1;
+          route.output = 0;
           call_i2c_clients(usbvision, VIDIOC_INT_S_VIDEO_ROUTING,&route);
           call_i2c_clients(usbvision, VIDIOC_S_INPUT, &usbvision->ctl_input);
 
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index af33653f0db8..ae5f42562c0c 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -230,7 +230,7 @@ static ssize_t show_hue(struct class_device *cd, char *buf)
         ctrl.value = 0;
         if(usbvision->user)
                 call_i2c_clients(usbvision, VIDIOC_G_CTRL, &ctrl);
-        return sprintf(buf, "%d\n", ctrl.value >> 8);
+        return sprintf(buf, "%d\n", ctrl.value);
 }
 static CLASS_DEVICE_ATTR(hue, S_IRUGO, show_hue, NULL);
 
@@ -243,7 +243,7 @@ static ssize_t show_contrast(struct class_device *cd, char *buf)
         ctrl.value = 0;
         if(usbvision->user)
                 call_i2c_clients(usbvision, VIDIOC_G_CTRL, &ctrl);
-        return sprintf(buf, "%d\n", ctrl.value >> 8);
+        return sprintf(buf, "%d\n", ctrl.value);
 }
 static CLASS_DEVICE_ATTR(contrast, S_IRUGO, show_contrast, NULL);
 
@@ -256,7 +256,7 @@ static ssize_t show_brightness(struct class_device *cd, char *buf)
         ctrl.value = 0;
         if(usbvision->user)
                 call_i2c_clients(usbvision, VIDIOC_G_CTRL, &ctrl);
-        return sprintf(buf, "%d\n", ctrl.value >> 8);
+        return sprintf(buf, "%d\n", ctrl.value);
 }
 static CLASS_DEVICE_ATTR(brightness, S_IRUGO, show_brightness, NULL);
 
@@ -269,7 +269,7 @@ static ssize_t show_saturation(struct class_device *cd, char *buf)
         ctrl.value = 0;
         if(usbvision->user)
                 call_i2c_clients(usbvision, VIDIOC_G_CTRL, &ctrl);
-        return sprintf(buf, "%d\n", ctrl.value >> 8);
+        return sprintf(buf, "%d\n", ctrl.value);
 }
 static CLASS_DEVICE_ATTR(saturation, S_IRUGO, show_saturation, NULL);
 
@@ -391,19 +391,14 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
         if (usbvision->user)
                 errCode = -EBUSY;
         else {
-                /* Allocate memory for the frame buffers */
-                errCode = usbvision_frames_alloc(usbvision);
-                if(!errCode) {
-                        /* Allocate memory for the scratch ring buffer */
-                        errCode = usbvision_scratch_alloc(usbvision);
-                        if ((!errCode) && (isocMode==ISOC_MODE_COMPRESS)) {
-                                /* Allocate intermediate decompression buffers only if needed */
-                                errCode = usbvision_decompress_alloc(usbvision);
-                        }
+                /* Allocate memory for the scratch ring buffer */
+                errCode = usbvision_scratch_alloc(usbvision);
+                if (isocMode==ISOC_MODE_COMPRESS) {
+                        /* Allocate intermediate decompression buffers only if needed */
+                        errCode = usbvision_decompress_alloc(usbvision);
                 }
                 if (errCode) {
                         /* Deallocate all buffers if trouble */
-                        usbvision_frames_free(usbvision);
                         usbvision_scratch_free(usbvision);
                         usbvision_decompress_free(usbvision);
                 }
@@ -476,6 +471,7 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
 
         usbvision_decompress_free(usbvision);
         usbvision_frames_free(usbvision);
+        usbvision_empty_framequeues(usbvision);
         usbvision_scratch_free(usbvision);
 
         usbvision->user--;
@@ -489,7 +485,7 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
         up(&usbvision->lock);
 
         if (usbvision->remove_pending) {
-                info("%s: Final disconnect", __FUNCTION__);
+                printk(KERN_INFO "%s: Final disconnect\n", __FUNCTION__);
                 usbvision_release(usbvision);
         }
 
@@ -519,27 +515,8 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
                 /* ioctls to allow direct acces to the NT100x registers */
-                case VIDIOC_INT_G_REGISTER:
-                {
-                        struct v4l2_register *reg = arg;
-                        int errCode;
-
-                        if (reg->i2c_id != 0)
-                                return -EINVAL;
-                        /* NT100x has a 8-bit register space */
-                        errCode = usbvision_read_reg(usbvision, reg->reg&0xff);
-                        if (errCode < 0) {
-                                err("%s: VIDIOC_INT_G_REGISTER failed: error %d", __FUNCTION__, errCode);
-                        }
-                        else {
-                                reg->val=(unsigned char)errCode;
-                                PDEBUG(DBG_IOCTL, "VIDIOC_INT_G_REGISTER reg=0x%02X, value=0x%02X",
-                                                        (unsigned int)reg->reg, reg->val);
-                                errCode = 0; // No error
-                        }
-                        return errCode;
-                }
-                case VIDIOC_INT_S_REGISTER:
+                case VIDIOC_DBG_G_REGISTER:
+                case VIDIOC_DBG_S_REGISTER:
                 {
                         struct v4l2_register *reg = arg;
                         int errCode;
@@ -548,15 +525,22 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
                         if (!capable(CAP_SYS_ADMIN))
                                 return -EPERM;
-                        errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
+                        /* NT100x has a 8-bit register space */
+                        if (cmd == VIDIOC_DBG_G_REGISTER)
+                                errCode = usbvision_read_reg(usbvision, reg->reg&0xff);
+                        else
+                                errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
                         if (errCode < 0) {
-                                err("%s: VIDIOC_INT_S_REGISTER failed: error %d", __FUNCTION__, errCode);
-                        }
-                        else {
-                                PDEBUG(DBG_IOCTL, "VIDIOC_INT_S_REGISTER reg=0x%02X, value=0x%02X",
-                                                        (unsigned int)reg->reg, reg->val);
-                                errCode = 0;
+                                err("%s: VIDIOC_DBG_%c_REGISTER failed: error %d", __FUNCTION__,
+                                    cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S', errCode);
+                                return errCode;
                         }
+                        if (cmd == VIDIOC_DBG_S_REGISTER)
+                                reg->val = (u8)errCode;
+
+                        PDEBUG(DBG_IOCTL, "VIDIOC_DBG_%c_REGISTER reg=0x%02X, value=0x%02X",
+                               cmd == VIDIOC_DBG_G_REGISTER ? 'G' : 'S',
+                               (unsigned int)reg->reg, reg->val);
                         return 0;
                 }
 #endif
@@ -792,8 +776,8 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 case VIDIOC_G_CTRL:
                 {
                         struct v4l2_control *ctrl = arg;
-                        PDEBUG(DBG_IOCTL,"VIDIOC_G_CTRL id=%x value=%x",ctrl->id,ctrl->value);
                         call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);
+                        PDEBUG(DBG_IOCTL,"VIDIOC_G_CTRL id=%x value=%x",ctrl->id,ctrl->value);
                         return 0;
                 }
                 case VIDIOC_S_CTRL:
@@ -821,7 +805,9 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                                     return ret;
                         }
 
+                        usbvision_frames_free(usbvision);
                         usbvision_empty_framequeues(usbvision);
+                        vr->count = usbvision_frames_alloc(usbvision,vr->count);
 
                         usbvision->curFrame = NULL;
 
@@ -838,7 +824,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                         if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
                                 return -EINVAL;
                         }
-                        if(vb->index>=USBVISION_NUMFRAMES)  {
+                        if(vb->index>=usbvision->num_frames)  {
                                 return -EINVAL;
                         }
                         // Updating the corresponding frame state
@@ -852,7 +838,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                                 vb->flags |= V4L2_BUF_FLAG_MAPPED;
                         vb->memory = V4L2_MEMORY_MMAP;
 
-                        vb->m.offset = vb->index*usbvision->max_frame_size;
+                        vb->m.offset = vb->index*PAGE_ALIGN(usbvision->max_frame_size);
 
                         vb->memory = V4L2_MEMORY_MMAP;
                         vb->field = V4L2_FIELD_NONE;
@@ -871,7 +857,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                         if(vb->type != V4L2_CAP_VIDEO_CAPTURE) {
                                 return -EINVAL;
                         }
-                        if(vb->index>=USBVISION_NUMFRAMES)  {
+                        if(vb->index>=usbvision->num_frames)  {
                                 return -EINVAL;
                         }
 
@@ -1041,6 +1027,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file,
                                                 if ((ret = usbvision_stream_interrupt(usbvision)))
                                                         return ret;
                                         }
+                                        usbvision_frames_free(usbvision);
                                         usbvision_empty_framequeues(usbvision);
 
                                         usbvision->curFrame = NULL;
@@ -1087,12 +1074,24 @@ static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
         if (!USBVISION_IS_OPERATIONAL(usbvision) || (buf == NULL))
                 return -EFAULT;
 
-        /* no stream is running, make it running ! */
-        usbvision->streaming = Stream_On;
-        call_i2c_clients(usbvision,VIDIOC_STREAMON , NULL);
+        /* This entry point is compatible with the mmap routines so that a user can do either
+           VIDIOC_QBUF/VIDIOC_DQBUF to get frames or call read on the device. */
+        if(!usbvision->num_frames) {
+                /* First, allocate some frames to work with if this has not been done with
+                 VIDIOC_REQBUF */
+                usbvision_frames_free(usbvision);
+                usbvision_empty_framequeues(usbvision);
+                usbvision_frames_alloc(usbvision,USBVISION_NUMFRAMES);
+        }
+
+        if(usbvision->streaming != Stream_On) {
+                /* no stream is running, make it running ! */
+                usbvision->streaming = Stream_On;
+                call_i2c_clients(usbvision,VIDIOC_STREAMON , NULL);
+        }
 
-        /* First, enqueue as many frames as possible (like a user of VIDIOC_QBUF would do) */
-        for(i=0;i<USBVISION_NUMFRAMES;i++) {
+        /* Then, enqueue as many frames as possible (like a user of VIDIOC_QBUF would do) */
+        for(i=0;i<usbvision->num_frames;i++) {
                 frame = &usbvision->frame[i];
                 if(frame->grabstate == FrameState_Unused) {
                         /* Mark it as ready and enqueue frame */
@@ -1169,6 +1168,8 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
         struct video_device *dev = video_devdata(file);
         struct usb_usbvision *usbvision = (struct usb_usbvision *) video_get_drvdata(dev);
 
+        PDEBUG(DBG_MMAP, "mmap");
+
         down(&usbvision->lock);
 
         if (!USBVISION_IS_OPERATIONAL(usbvision)) {
@@ -1177,16 +1178,16 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
         }
 
         if (!(vma->vm_flags & VM_WRITE) ||
-            size != PAGE_ALIGN(usbvision->curwidth*usbvision->curheight*usbvision->palette.bytes_per_pixel)) {
+            size != PAGE_ALIGN(usbvision->max_frame_size)) {
                 up(&usbvision->lock);
                 return -EINVAL;
         }
 
-        for (i = 0; i < USBVISION_NUMFRAMES; i++) {
-                if (((usbvision->max_frame_size*i) >> PAGE_SHIFT) == vma->vm_pgoff)
+        for (i = 0; i < usbvision->num_frames; i++) {
+                if (((PAGE_ALIGN(usbvision->max_frame_size)*i) >> PAGE_SHIFT) == vma->vm_pgoff)
                         break;
         }
-        if (i == USBVISION_NUMFRAMES) {
+        if (i == usbvision->num_frames) {
                 PDEBUG(DBG_MMAP, "mmap: user supplied mapping address is out of range");
                 up(&usbvision->lock);
                 return -EINVAL;
@@ -1242,6 +1243,13 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)
                         }
                 }
 
+                /* Alternate interface 1 is is the biggest frame size */
+                errCode = usbvision_set_alternate(usbvision);
+                if (errCode < 0) {
+                        usbvision->last_error = errCode;
+                        return -EBUSY;
+                }
+
                 // If so far no errors then we shall start the radio
                 usbvision->radio = 1;
                 call_i2c_clients(usbvision,AUDC_SET_RADIO,&usbvision->tuner_type);
@@ -1273,6 +1281,11 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
 
         down(&usbvision->lock);
 
+        /* Set packet size to 0 */
+        usbvision->ifaceAlt=0;
+        errCode = usb_set_interface(usbvision->dev, usbvision->iface,
+                                    usbvision->ifaceAlt);
+
         usbvision_audio_off(usbvision);
         usbvision->radio=0;
         usbvision->user--;
@@ -1285,7 +1298,7 @@ static int usbvision_radio_close(struct inode *inode, struct file *file)
         up(&usbvision->lock);
 
         if (usbvision->remove_pending) {
-                info("%s: Final disconnect", __FUNCTION__);
+                printk(KERN_INFO "%s: Final disconnect\n", __FUNCTION__);
                 usbvision_release(usbvision);
         }
 
@@ -1611,7 +1624,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
         if (video_register_device(usbvision->vdev, VFL_TYPE_GRABBER, video_nr)<0) {
                 goto err_exit;
         }
-        info("USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]", usbvision->nr,usbvision->vdev->minor & 0x1f);
+        printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n", usbvision->nr,usbvision->vdev->minor & 0x1f);
 
         // Radio Device:
         if (usbvision_device_data[usbvision->DevModel].Radio) {
@@ -1623,7 +1636,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
                 if (video_register_device(usbvision->rdev, VFL_TYPE_RADIO, radio_nr)<0) {
                         goto err_exit;
                 }
-                info("USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]", usbvision->nr, usbvision->rdev->minor & 0x1f);
+                printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n", usbvision->nr, usbvision->rdev->minor & 0x1f);
         }
         // vbi Device:
         if (usbvision_device_data[usbvision->DevModel].vbi) {
@@ -1634,7 +1647,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
                 if (video_register_device(usbvision->vbi, VFL_TYPE_VBI, vbi_nr)<0) {
                         goto err_exit;
                 }
-                info("USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)", usbvision->nr,usbvision->vbi->minor & 0x1f);
+                printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n", usbvision->nr,usbvision->vbi->minor & 0x1f);
         }
         // all done
         return 0;
@@ -1764,15 +1777,17 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision)
  */
 static int __devinit usbvision_probe(struct usb_interface *intf, const struct usb_device_id *devid)
 {
-        struct usb_device *dev = interface_to_usbdev(intf);
+        struct usb_device *dev = usb_get_dev(interface_to_usbdev(intf));
+        struct usb_interface *uif;
         __u8 ifnum = intf->altsetting->desc.bInterfaceNumber;
         const struct usb_host_interface *interface;
         struct usb_usbvision *usbvision = NULL;
         const struct usb_endpoint_descriptor *endpoint;
-        int model;
+        int model,i;
 
         PDEBUG(DBG_PROBE, "VID=%#04x, PID=%#04x, ifnum=%u",
                                         dev->descriptor.idVendor, dev->descriptor.idProduct, ifnum);
+
         /* Is it an USBVISION video dev? */
         model = 0;
         for(model = 0; usbvision_device_data[model].idVendor; model++) {
@@ -1783,7 +1798,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf, const struct us
                         continue;
                 }
 
-                info("%s: %s found", __FUNCTION__, usbvision_device_data[model].ModelString);
+                printk(KERN_INFO "%s: %s found\n", __FUNCTION__, usbvision_device_data[model].ModelString);
                 break;
         }
 
@@ -1799,7 +1814,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf, const struct us
         endpoint = &interface->endpoint[1].desc;
         if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC) {
                 err("%s: interface %d. has non-ISO endpoint!", __FUNCTION__, ifnum);
-                err("%s: Endpoint attribures %d", __FUNCTION__, endpoint->bmAttributes);
+                err("%s: Endpoint attributes %d", __FUNCTION__, endpoint->bmAttributes);
                 return -ENODEV;
         }
         if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
@@ -1826,6 +1841,28 @@ static int __devinit usbvision_probe(struct usb_interface *intf, const struct us
 
         down(&usbvision->lock);
 
+        /* compute alternate max packet sizes */
+        uif = dev->actconfig->interface[0];
+
+        usbvision->num_alt=uif->num_altsetting;
+        PDEBUG(DBG_PROBE, "Alternate settings: %i",usbvision->num_alt);
+        usbvision->alt_max_pkt_size = kmalloc(32*
+                                              usbvision->num_alt,GFP_KERNEL);
+        if (usbvision->alt_max_pkt_size == NULL) {
+                err("usbvision: out of memory!\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < usbvision->num_alt ; i++) {
+                u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc.
+                                      wMaxPacketSize);
+                usbvision->alt_max_pkt_size[i] =
+                        (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
+                PDEBUG(DBG_PROBE, "Alternate setting %i, max size= %i",i,
+                       usbvision->alt_max_pkt_size[i]);
+        }
+
+
         usbvision->nr = usbvision_nr++;
 
         usbvision->have_tuner = usbvision_device_data[model].Tuner;
@@ -1838,8 +1875,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf, const struct us
         usbvision->DevModel = model;
         usbvision->remove_pending = 0;
         usbvision->iface = ifnum;
-        usbvision->ifaceAltInactive = 0;
-        usbvision->ifaceAltActive = 1;
+        usbvision->ifaceAlt = 0;
         usbvision->video_endp = endpoint->bEndpointAddress;
         usbvision->isocPacketSize = 0;
         usbvision->usb_bandwidth = 0;
@@ -1895,7 +1931,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
         up(&usbvision->lock);
 
         if (usbvision->user) {
-                info("%s: In use, disconnect pending", __FUNCTION__);
+                printk(KERN_INFO "%s: In use, disconnect pending\n", __FUNCTION__);
                 wake_up_interruptible(&usbvision->wait_frame);
                 wake_up_interruptible(&usbvision->wait_stream);
         }
@@ -2061,7 +2097,7 @@ static int __init usbvision_init(void)
         errCode = usb_register(&usbvision_driver);
 
         if (errCode == 0) {
-                info(DRIVER_DESC " : " USBVISION_VERSION_STRING);
+                printk(KERN_INFO DRIVER_DESC " : " USBVISION_VERSION_STRING "\n");
                 PDEBUG(DBG_PROBE, "success");
         }
         return errCode;
diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index e2bcaba93871..ad6afd3e42a4 100644
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -33,6 +33,7 @@
 
 #include <linux/list.h>
 #include <linux/usb.h>
+#include <linux/i2c.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 #include <linux/videodev2.h>
@@ -396,8 +397,11 @@ struct usb_usbvision {
 
         /* Device structure */
         struct usb_device *dev;
+        /* usb transfer */
+        int num_alt;            /* Number of alternative settings */
+        unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
         unsigned char iface;                                            /* Video interface number */
-        unsigned char ifaceAltActive, ifaceAltInactive;                 /* Alt settings */
+        unsigned char ifaceAlt;                 /* Alt settings */
         unsigned char Vin_Reg2_Preset;
         struct semaphore lock;
         struct timer_list powerOffTimer;
@@ -421,6 +425,7 @@ struct usb_usbvision {
         wait_queue_head_t wait_stream;                                  /* Processes waiting */
         struct usbvision_frame *curFrame;                               // pointer to current frame, set by usbvision_find_header
         struct usbvision_frame frame[USBVISION_NUMFRAMES];              // frame buffer
+        int num_frames;                                                 // number of frames allocated
         struct usbvision_sbuf sbuf[USBVISION_NUMSBUF];                  // S buffering
         volatile int remove_pending;                                    /* If set then about to exit */
 
@@ -486,12 +491,11 @@ int usbvision_init_i2c(struct usb_usbvision *usbvision);
 void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,void *arg);
 
 /* defined in usbvision-core.c                                      */
-void usbvision_rvfree(void *mem, unsigned long size);
 int usbvision_read_reg(struct usb_usbvision *usbvision, unsigned char reg);
 int usbvision_write_reg(struct usb_usbvision *usbvision, unsigned char reg,
                         unsigned char value);
 
-int usbvision_frames_alloc(struct usb_usbvision *usbvision);
+int usbvision_frames_alloc(struct usb_usbvision *usbvision, int number_of_frames);
 void usbvision_frames_free(struct usb_usbvision *usbvision);
 int usbvision_scratch_alloc(struct usb_usbvision *usbvision);
 void usbvision_scratch_free(struct usb_usbvision *usbvision);
@@ -502,6 +506,7 @@ int usbvision_setup(struct usb_usbvision *usbvision,int format);
 int usbvision_init_isoc(struct usb_usbvision *usbvision);
 int usbvision_restart_isoc(struct usb_usbvision *usbvision);
 void usbvision_stop_isoc(struct usb_usbvision *usbvision);
+int usbvision_set_alternate(struct usb_usbvision *dev);
 
 int usbvision_set_audio(struct usb_usbvision *usbvision, int AudioChannel);
 int usbvision_audio_off(struct usb_usbvision *usbvision);
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 8a13e595304e..d2c1ae0dbfba 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -11,7 +11,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  *
- * Author:      Bill Dirks <bdirks@pacbell.net>
+ * Author:      Bill Dirks <bill@thedirks.org>
  *              et al.
  *
  */
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index b8ee37ded3c9..ddfd80c5618b 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -12,7 +12,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  *
- * Author:      Bill Dirks <bdirks@pacbell.net>
+ * Author:      Bill Dirks <bill@thedirks.org>
  *              based on code by Alan Cox, <alan@cymru.net>
  *
  */
@@ -271,11 +271,6 @@ char *v4l2_type_names[] = {
         [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "slicec-vbi-out",
 };
 
-static char *v4l2_memory_names[] = {
-        [V4L2_MEMORY_MMAP]    = "mmap",
-        [V4L2_MEMORY_USERPTR] = "userptr",
-        [V4L2_MEMORY_OVERLAY] = "overlay",
-};
 
 #define prt_names(a,arr) (((a)>=0)&&((a)<ARRAY_SIZE(arr)))?arr[a]:"unknown"
 
@@ -400,9 +395,10 @@ static const char *v4l2_int_ioctls[] = {
         [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
         [_IOC_NR(TDA9887_SET_CONFIG)]          = "TDA9887_SET_CONFIG",
 
+        [_IOC_NR(VIDIOC_DBG_S_REGISTER)]       = "VIDIOC_DBG_S_REGISTER",
+        [_IOC_NR(VIDIOC_DBG_G_REGISTER)]       = "VIDIOC_DBG_G_REGISTER",
+
         [_IOC_NR(VIDIOC_INT_S_TUNER_MODE)]     = "VIDIOC_INT_S_TUNER_MODE",
-        [_IOC_NR(VIDIOC_INT_S_REGISTER)]       = "VIDIOC_INT_S_REGISTER",
-        [_IOC_NR(VIDIOC_INT_G_REGISTER)]       = "VIDIOC_INT_G_REGISTER",
         [_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",
@@ -419,14 +415,6 @@ static const char *v4l2_int_ioctls[] = {
 };
 #define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
 
-static void v4l_print_pix_fmt (char *s, struct v4l2_pix_format *fmt)
-{
-        printk ("%s: width=%d, height=%d, format=%d, field=%s, "
-                "bytesperline=%d sizeimage=%d, colorspace=%d\n", s,
-                fmt->width,fmt->height,fmt->pixelformat,
-                prt_names(fmt->field,v4l2_field_names),
-                fmt->bytesperline,fmt->sizeimage,fmt->colorspace);
-};
 
 /* Common ioctl debug function. This function can be used by
    external ioctl messages as well as internal V4L ioctl */
@@ -466,576 +454,6 @@ void v4l_printk_ioctl(unsigned int cmd)
         }
 }
 
-/* Common ioctl debug function. This function can be used by
-   external ioctl messages as well as internal V4L ioctl and its
-   arguments */
-void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
-{
-        printk(s);
-        printk(": ");
-        v4l_printk_ioctl(cmd);
-        switch (cmd) {
-        case VIDIOC_INT_G_CHIP_IDENT:
-        {
-                enum v4l2_chip_ident  *p=arg;
-                printk ("%s: chip ident=%d\n", s, *p);
-                break;
-        }
-        case VIDIOC_G_PRIORITY:
-        case VIDIOC_S_PRIORITY:
-        {
-                enum v4l2_priority *p=arg;
-                printk ("%s: priority=%d\n", s, *p);
-                break;
-        }
-        case VIDIOC_INT_S_TUNER_MODE:
-        {
-                enum v4l2_tuner_type *p=arg;
-                printk ("%s: tuner type=%d\n", s, *p);
-                break;
-        }
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        case DECODER_SET_VBI_BYPASS:
-        case DECODER_ENABLE_OUTPUT:
-        case DECODER_GET_STATUS:
-        case DECODER_SET_OUTPUT:
-        case DECODER_SET_INPUT:
-        case DECODER_SET_GPIO:
-        case DECODER_SET_NORM:
-        case VIDIOCCAPTURE:
-        case VIDIOCSYNC:
-        case VIDIOCSWRITEMODE:
-#endif
-        case TUNER_SET_TYPE_ADDR:
-        case TUNER_SET_STANDBY:
-        case TDA9887_SET_CONFIG:
-#ifdef __OLD_VIDIOC_
-        case VIDIOC_OVERLAY_OLD:
-#endif
-        case VIDIOC_STREAMOFF:
-        case VIDIOC_G_OUTPUT:
-        case VIDIOC_S_OUTPUT:
-        case VIDIOC_STREAMON:
-        case VIDIOC_G_INPUT:
-        case VIDIOC_OVERLAY:
-        case VIDIOC_S_INPUT:
-        {
-                int *p=arg;
-                printk ("%s: value=%d\n", s, *p);
-                break;
-        }
-        case VIDIOC_G_AUDIO:
-        case VIDIOC_S_AUDIO:
-        case VIDIOC_ENUMAUDIO:
-#ifdef __OLD_VIDIOC_
-        case VIDIOC_G_AUDIO_OLD:
-#endif
-        {
-                struct v4l2_audio *p=arg;
-
-                printk ("%s: index=%d, name=%s, capability=%d, mode=%d\n",
-                        s,p->index, p->name,p->capability, p->mode);
-                break;
-        }
-        case VIDIOC_G_AUDOUT:
-        case VIDIOC_S_AUDOUT:
-        case VIDIOC_ENUMAUDOUT:
-#ifdef __OLD_VIDIOC_
-        case VIDIOC_G_AUDOUT_OLD:
-#endif
-        {
-                struct v4l2_audioout *p=arg;
-                printk ("%s: index=%d, name=%s, capability=%d, mode=%d\n", s,
-                                p->index, p->name, p->capability,p->mode);
-                break;
-        }
-        case VIDIOC_QBUF:
-        case VIDIOC_DQBUF:
-        case VIDIOC_QUERYBUF:
-        {
-                struct v4l2_buffer *p=arg;
-                struct v4l2_timecode *tc=&p->timecode;
-                printk ("%s: %02ld:%02d:%02d.%08ld index=%d, type=%s, "
-                        "bytesused=%d, flags=0x%08x, "
-                        "field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx\n",
-                                s,
-                                (p->timestamp.tv_sec/3600),
-                                (int)(p->timestamp.tv_sec/60)%60,
-                                (int)(p->timestamp.tv_sec%60),
-                                p->timestamp.tv_usec,
-                                p->index,
-                                prt_names(p->type,v4l2_type_names),
-                                p->bytesused,p->flags,
-                                p->field,p->sequence,
-                                prt_names(p->memory,v4l2_memory_names),
-                                p->m.userptr);
-                printk ("%s: timecode= %02d:%02d:%02d type=%d, "
-                        "flags=0x%08x, frames=%d, userbits=0x%08x\n",
-                                s,tc->hours,tc->minutes,tc->seconds,
-                                tc->type, tc->flags, tc->frames, *(__u32 *) tc->userbits);
-                break;
-        }
-        case VIDIOC_QUERYCAP:
-        {
-                struct v4l2_capability *p=arg;
-                printk ("%s: driver=%s, card=%s, bus=%s, version=0x%08x, "
-                        "capabilities=0x%08x\n", s,
-                                p->driver,p->card,p->bus_info,
-                                p->version,
-                                p->capabilities);
-                break;
-        }
-        case VIDIOC_G_CTRL:
-        case VIDIOC_S_CTRL:
-#ifdef __OLD_VIDIOC_
-        case VIDIOC_S_CTRL_OLD:
-#endif
-        {
-                struct v4l2_control *p=arg;
-                printk ("%s: id=%d, value=%d\n", s, p->id, p->value);
-                break;
-        }
-        case VIDIOC_G_EXT_CTRLS:
-        case VIDIOC_S_EXT_CTRLS:
-        case VIDIOC_TRY_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *p = arg;
-                int i;
-
-                printk("%s: ctrl_class=%d, count=%d\n", s, p->ctrl_class, p->count);
-                for (i = 0; i < p->count; i++) {
-                        struct v4l2_ext_control *c = &p->controls[i];
-                        if (cmd == VIDIOC_G_EXT_CTRLS)
-                                printk("%s: id=%d\n", s, c->id);
-                        else
-                                printk("%s: id=%d, value=%d\n", s, c->id, c->value);
-                }
-                break;
-        }
-        case VIDIOC_G_CROP:
-        case VIDIOC_S_CROP:
-        {
-                struct v4l2_crop *p=arg;
-                /*FIXME: Should also show rect structs */
-                printk ("%s: type=%d\n", s, p->type);
-                break;
-        }
-        case VIDIOC_CROPCAP:
-#ifdef __OLD_VIDIOC_
-        case VIDIOC_CROPCAP_OLD:
-#endif
-        {
-                struct v4l2_cropcap *p=arg;
-                /*FIXME: Should also show rect structs */
-                printk ("%s: type=%d\n", s, p->type);
-                break;
-        }
-        case VIDIOC_INT_DECODE_VBI_LINE:
-        {
-                struct v4l2_decode_vbi_line *p=arg;
-                printk ("%s: is_second_field=%d, ptr=0x%08lx, line=%d, "
-                        "type=%d\n", s,
-                                p->is_second_field,(unsigned long)p->p,p->line,p->type);
-                break;
-        }
-        case VIDIOC_ENUM_FMT:
-        {
-                struct v4l2_fmtdesc *p=arg;
-                printk ("%s: index=%d, type=%d, flags=%d, description=%s,"
-                        " pixelformat=%d\n", s,
-                                p->index, p->type, p->flags,p->description,
-                                p->pixelformat);
-
-                break;
-        }
-        case VIDIOC_G_FMT:
-        case VIDIOC_S_FMT:
-        case VIDIOC_TRY_FMT:
-        {
-                struct v4l2_format *p=arg;
-                printk ("%s: type=%s\n", s,
-                                prt_names(p->type,v4l2_type_names));
-                switch (p->type) {
-                case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                        v4l_print_pix_fmt (s, &p->fmt.pix);
-                        break;
-                default:
-                        break;
-                }
-        }
-        case VIDIOC_G_FBUF:
-        case VIDIOC_S_FBUF:
-        {
-                struct v4l2_framebuffer *p=arg;
-                printk ("%s: capability=%d, flags=%d, base=0x%08lx\n", s,
-                                p->capability,p->flags, (unsigned long)p->base);
-                v4l_print_pix_fmt (s, &p->fmt);
-                break;
-        }
-        case VIDIOC_G_FREQUENCY:
-        case VIDIOC_S_FREQUENCY:
-        {
-                struct v4l2_frequency *p=arg;
-                printk ("%s: tuner=%d, type=%d, frequency=%d\n", s,
-                                p->tuner,p->type,p->frequency);
-                break;
-        }
-        case VIDIOC_ENUMINPUT:
-        {
-                struct v4l2_input *p=arg;
-                printk ("%s: index=%d, name=%s, type=%d, audioset=%d, "
-                        "tuner=%d, std=%Ld, status=%d\n", s,
-                                p->index,p->name,p->type,p->audioset,
-                                p->tuner,
-                                (unsigned long long)p->std,
-                                p->status);
-                break;
-        }
-        case VIDIOC_G_JPEGCOMP:
-        case VIDIOC_S_JPEGCOMP:
-        {
-                struct v4l2_jpegcompression *p=arg;
-                printk ("%s: quality=%d, APPn=%d, APP_len=%d, COM_len=%d,"
-                        " jpeg_markers=%d\n", s,
-                                p->quality,p->APPn,p->APP_len,
-                                p->COM_len,p->jpeg_markers);
-                break;
-        }
-        case VIDIOC_G_MODULATOR:
-        case VIDIOC_S_MODULATOR:
-        {
-                struct v4l2_modulator *p=arg;
-                printk ("%s: index=%d, name=%s, capability=%d, rangelow=%d,"
-                        " rangehigh=%d, txsubchans=%d\n", s,
-                                p->index, p->name,p->capability,p->rangelow,
-                                p->rangehigh,p->txsubchans);
-                break;
-        }
-        case VIDIOC_G_MPEGCOMP:
-        case VIDIOC_S_MPEGCOMP:
-        {
-                struct v4l2_mpeg_compression *p=arg;
-                /*FIXME: Several fields not shown */
-                printk ("%s: ts_pid_pmt=%d, ts_pid_audio=%d, ts_pid_video=%d, "
-                        "ts_pid_pcr=%d, ps_size=%d, au_sample_rate=%d, "
-                        "au_pesid=%c, vi_frame_rate=%d, vi_frames_per_gop=%d, "
-                        "vi_bframes_count=%d, vi_pesid=%c\n", s,
-                                p->ts_pid_pmt,p->ts_pid_audio, p->ts_pid_video,
-                                p->ts_pid_pcr, p->ps_size, p->au_sample_rate,
-                                p->au_pesid, p->vi_frame_rate,
-                                p->vi_frames_per_gop, p->vi_bframes_count,
-                                p->vi_pesid);
-                break;
-        }
-        case VIDIOC_ENUMOUTPUT:
-        {
-                struct v4l2_output *p=arg;
-                printk ("%s: index=%d, name=%s,type=%d, audioset=%d, "
-                        "modulator=%d, std=%Ld\n",
-                                s,p->index,p->name,p->type,p->audioset,
-                                p->modulator,
-                                (unsigned long long)p->std);
-                break;
-        }
-        case VIDIOC_QUERYCTRL:
-        {
-                struct v4l2_queryctrl *p=arg;
-                printk ("%s: id=%d, type=%d, name=%s, min/max=%d/%d,"
-                        " step=%d, default=%d, flags=0x%08x\n", s,
-                                p->id,p->type,p->name,p->minimum,p->maximum,
-                                p->step,p->default_value,p->flags);
-                break;
-        }
-        case VIDIOC_QUERYMENU:
-        {
-                struct v4l2_querymenu *p=arg;
-                printk ("%s: id=%d, index=%d, name=%s\n", s,
-                                p->id,p->index,p->name);
-                break;
-        }
-        case VIDIOC_INT_G_REGISTER:
-        case VIDIOC_INT_S_REGISTER:
-        {
-                struct v4l2_register *p=arg;
-                printk ("%s: i2c_id=%d, reg=%lu, val=%d\n", s,
-                                p->i2c_id,p->reg,p->val);
-
-                break;
-        }
-        case VIDIOC_REQBUFS:
-        {
-                struct v4l2_requestbuffers *p=arg;
-                printk ("%s: count=%d, type=%s, memory=%s\n", s,
-                                p->count,
-                                prt_names(p->type,v4l2_type_names),
-                                prt_names(p->memory,v4l2_memory_names));
-                break;
-        }
-        case VIDIOC_INT_S_AUDIO_ROUTING:
-        case VIDIOC_INT_S_VIDEO_ROUTING:
-        case VIDIOC_INT_G_AUDIO_ROUTING:
-        case VIDIOC_INT_G_VIDEO_ROUTING:
-        {
-                struct v4l2_routing  *p=arg;
-                printk ("%s: input=0x%x, output=0x%x\n", s, p->input, p->output);
-                break;
-        }
-        case VIDIOC_INT_S_CRYSTAL_FREQ:
-        {
-                struct v4l2_crystal_freq *p=arg;
-                printk ("%s: freq=%u, flags=0x%x\n", s, p->freq, p->flags);
-                break;
-        }
-        case VIDIOC_G_SLICED_VBI_CAP:
-        {
-                struct v4l2_sliced_vbi_cap *p=arg;
-                printk ("%s: service_set=%d\n", s,
-                                p->service_set);
-                break;
-        }
-        case VIDIOC_INT_S_VBI_DATA:
-        case VIDIOC_INT_G_VBI_DATA:
-        {
-                struct v4l2_sliced_vbi_data  *p=arg;
-                printk ("%s: id=%d, field=%d, line=%d\n", s,
-                                p->id, p->field, p->line);
-                break;
-        }
-        case VIDIOC_ENUMSTD:
-        {
-                struct v4l2_standard *p=arg;
-                printk ("%s: index=%d, id=%Ld, name=%s, fps=%d/%d, "
-                        "framelines=%d\n", s, p->index,
-                                (unsigned long long)p->id, p->name,
-                                p->frameperiod.numerator,
-                                p->frameperiod.denominator,
-                                p->framelines);
-
-                break;
-        }
-        case VIDIOC_G_PARM:
-        case VIDIOC_S_PARM:
-#ifdef __OLD_VIDIOC_
-        case VIDIOC_S_PARM_OLD:
-#endif
-        {
-                struct v4l2_streamparm *p=arg;
-                printk ("%s: type=%d\n", s, p->type);
-
-                break;
-        }
-        case VIDIOC_G_TUNER:
-        case VIDIOC_S_TUNER:
-        {
-                struct v4l2_tuner *p=arg;
-                printk ("%s: index=%d, name=%s, type=%d, capability=%d, "
-                        "rangelow=%d, rangehigh=%d, signal=%d, afc=%d, "
-                        "rxsubchans=%d, audmode=%d\n", s,
-                                p->index, p->name, p->type,
-                                p->capability, p->rangelow,p->rangehigh,
-                                p->rxsubchans, p->audmode, p->signal,
-                                p->afc);
-                break;
-        }
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        case VIDIOCGVBIFMT:
-        case VIDIOCSVBIFMT:
-        {
-                struct vbi_format *p=arg;
-                printk ("%s: sampling_rate=%d, samples_per_line=%d, "
-                        "sample_format=%d, start=%d/%d, count=%d/%d, flags=%d\n", s,
-                                p->sampling_rate,p->samples_per_line,
-                                p->sample_format,p->start[0],p->start[1],
-                                p->count[0],p->count[1],p->flags);
-                break;
-        }
-        case VIDIOCGAUDIO:
-        case VIDIOCSAUDIO:
-        {
-                struct video_audio *p=arg;
-                printk ("%s: audio=%d, volume=%d, bass=%d, treble=%d, "
-                        "flags=%d, name=%s, mode=%d, balance=%d, step=%d\n",
-                                s,p->audio,p->volume,p->bass, p->treble,
-                                p->flags,p->name,p->mode,p->balance,p->step);
-                break;
-        }
-        case VIDIOCGFBUF:
-        case VIDIOCSFBUF:
-        {
-                struct video_buffer *p=arg;
-                printk ("%s: base=%08lx, height=%d, width=%d, depth=%d, "
-                        "bytesperline=%d\n", s,
-                                (unsigned long) p->base, p->height, p->width,
-                                p->depth,p->bytesperline);
-                break;
-        }
-        case VIDIOCGCAP:
-        {
-                struct video_capability *p=arg;
-                printk ("%s: name=%s, type=%d, channels=%d, audios=%d, "
-                        "maxwidth=%d, maxheight=%d, minwidth=%d, minheight=%d\n",
-                                s,p->name,p->type,p->channels,p->audios,
-                                p->maxwidth,p->maxheight,p->minwidth,
-                                p->minheight);
-
-                break;
-        }
-        case VIDIOCGCAPTURE:
-        case VIDIOCSCAPTURE:
-        {
-                struct video_capture *p=arg;
-                printk ("%s: x=%d, y=%d, width=%d, height=%d, decimation=%d,"
-                        " flags=%d\n", s,
-                                p->x, p->y,p->width, p->height,
-                                p->decimation,p->flags);
-                break;
-        }
-        case VIDIOCGCHAN:
-        case VIDIOCSCHAN:
-        {
-                struct video_channel *p=arg;
-                printk ("%s: channel=%d, name=%s, tuners=%d, flags=%d, "
-                        "type=%d, norm=%d\n", s,
-                                p->channel,p->name,p->tuners,
-                                p->flags,p->type,p->norm);
-
-                break;
-        }
-        case VIDIOCSMICROCODE:
-        {
-                struct video_code *p=arg;
-                printk ("%s: loadwhat=%s, datasize=%d\n", s,
-                                p->loadwhat,p->datasize);
-                break;
-        }
-        case DECODER_GET_CAPABILITIES:
-        {
-                struct video_decoder_capability *p=arg;
-                printk ("%s: flags=%d, inputs=%d, outputs=%d\n", s,
-                                p->flags,p->inputs,p->outputs);
-                break;
-        }
-        case DECODER_INIT:
-        {
-                struct video_decoder_init *p=arg;
-                printk ("%s: len=%c\n", s, p->len);
-                break;
-        }
-        case VIDIOCGPLAYINFO:
-        {
-                struct video_info *p=arg;
-                printk ("%s: frame_count=%d, h_size=%d, v_size=%d, "
-                        "smpte_timecode=%d, picture_type=%d, "
-                        "temporal_reference=%d, user_data=%s\n", s,
-                                p->frame_count, p->h_size,
-                                p->v_size, p->smpte_timecode,
-                                p->picture_type, p->temporal_reference,
-                                p->user_data);
-                break;
-        }
-        case VIDIOCKEY:
-        {
-                struct video_key *p=arg;
-                printk ("%s: key=%s, flags=%d\n", s,
-                                p->key, p->flags);
-                break;
-        }
-        case VIDIOCGMBUF:
-        {
-                struct video_mbuf *p=arg;
-                printk ("%s: size=%d, frames=%d, offsets=0x%08lx\n", s,
-                                p->size,
-                                p->frames,
-                                (unsigned long)p->offsets);
-                break;
-        }
-        case VIDIOCMCAPTURE:
-        {
-                struct video_mmap *p=arg;
-                printk ("%s: frame=%d, height=%d, width=%d, format=%d\n", s,
-                                p->frame,
-                                p->height, p->width,
-                                p->format);
-                break;
-        }
-        case VIDIOCGPICT:
-        case VIDIOCSPICT:
-        case DECODER_SET_PICTURE:
-        {
-                struct video_picture *p=arg;
-
-                printk ("%s: brightness=%d, hue=%d, colour=%d, contrast=%d,"
-                        " whiteness=%d, depth=%d, palette=%d\n", s,
-                                p->brightness, p->hue, p->colour,
-                                p->contrast, p->whiteness, p->depth,
-                                p->palette);
-                break;
-        }
-        case VIDIOCSPLAYMODE:
-        {
-                struct video_play_mode *p=arg;
-                printk ("%s: mode=%d, p1=%d, p2=%d\n", s,
-                                p->mode,p->p1,p->p2);
-                break;
-        }
-        case VIDIOCGTUNER:
-        case VIDIOCSTUNER:
-        {
-                struct video_tuner *p=arg;
-                printk ("%s: tuner=%d, name=%s, rangelow=%ld, rangehigh=%ld, "
-                        "flags=%d, mode=%d, signal=%d\n", s,
-                                p->tuner, p->name,p->rangelow, p->rangehigh,
-                                p->flags,p->mode, p->signal);
-                break;
-        }
-        case VIDIOCGUNIT:
-        {
-                struct video_unit *p=arg;
-                printk ("%s: video=%d, vbi=%d, radio=%d, audio=%d, "
-                        "teletext=%d\n", s,
-                                p->video,p->vbi,p->radio,p->audio,p->teletext);
-                break;
-        }
-        case VIDIOCGWIN:
-        case VIDIOCSWIN:
-        {
-                struct video_window *p=arg;
-                printk ("%s: x=%d, y=%d, width=%d, height=%d, chromakey=%d,"
-                        " flags=%d, clipcount=%d\n", s,
-                                p->x, p->y,p->width, p->height,
-                                p->chromakey,p->flags,
-                                p->clipcount);
-                break;
-        }
-        case VIDIOCGFREQ:
-        case VIDIOCSFREQ:
-        {
-                unsigned long *p=arg;
-                printk ("%s: value=%lu\n", s, *p);
-                break;
-        }
-#endif
-        case VIDIOC_INT_AUDIO_CLOCK_FREQ:
-        case VIDIOC_INT_I2S_CLOCK_FREQ:
-        case VIDIOC_INT_S_STANDBY:
-        case VIDIOC_INT_RESET:
-        {
-                u32 *p=arg;
-
-                printk ("%s: value=%d\n", s, *p);
-                break;
-        }
-        case VIDIOC_G_STD:
-        case VIDIOC_S_STD:
-        case VIDIOC_QUERYSTD:
-        {
-                v4l2_std_id *p=arg;
-
-                printk ("%s: value=%Lu\n", s, (unsigned long long)*p);
-                break;
-        }
-        }
-}
 
 /* ----------------------------------------------------------------- */
 
@@ -1544,7 +962,6 @@ EXPORT_SYMBOL(v4l2_prio_check);
 EXPORT_SYMBOL(v4l2_field_names);
 EXPORT_SYMBOL(v4l2_type_names);
 EXPORT_SYMBOL(v4l_printk_ioctl);
-EXPORT_SYMBOL(v4l_printk_ioctl_arg);
 
 EXPORT_SYMBOL(v4l2_ctrl_next);
 EXPORT_SYMBOL(v4l2_ctrl_check);
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index 6504a5866849..459786ff459a 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -148,6 +148,8 @@ int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
         dprintk(1,"init user [0x%lx+0x%lx => %d pages]\n",
                 data,size,dma->nr_pages);
 
+        dma->varea = (void *) data;
+
         down_read(&current->mm->mmap_sem);
         err = get_user_pages(current,current->mm,
                              data & PAGE_MASK, dma->nr_pages,
@@ -285,6 +287,7 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)
 
         vfree(dma->vmalloc);
         dma->vmalloc = NULL;
+        dma->varea = NULL;
 
         if (dma->bus_addr) {
                 dma->bus_addr = 0;
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index a786c1f5b960..dc9b1ef678aa 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1453,6 +1453,26 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                 ret=vfd->vidioc_log_status(file, fh);
                 break;
         }
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        case VIDIOC_DBG_G_REGISTER:
+        {
+                struct v4l2_register *p=arg;
+                if (!capable(CAP_SYS_ADMIN))
+                        ret=-EPERM;
+                else if (vfd->vidioc_g_register)
+                        ret=vfd->vidioc_g_register(file, fh, p);
+                break;
+        }
+        case VIDIOC_DBG_S_REGISTER:
+        {
+                struct v4l2_register *p=arg;
+                if (!capable(CAP_SYS_ADMIN))
+                        ret=-EPERM;
+                else if (vfd->vidioc_s_register)
+                        ret=vfd->vidioc_s_register(file, fh, p);
+                break;
+        }
+#endif
         } /* switch */
 
         if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index cfb6b1f0402c..f7e1d1910374 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -145,7 +145,9 @@ struct vivi_buffer {
 
         struct vivi_fmt        *fmt;
 
+#ifdef CONFIG_VIVI_SCATTER
         struct sg_to_addr      *to_addr;
+#endif
 };
 
 struct vivi_dmaqueue {
@@ -230,6 +232,7 @@ static u8 bars[8][3] = {
 #define TSTAMP_MAX_Y TSTAMP_MIN_Y+15
 #define TSTAMP_MIN_X 64
 
+#ifdef CONFIG_VIVI_SCATTER
 static void prep_to_addr(struct sg_to_addr to_addr[],
                          struct videobuf_buffer *vb)
 {
@@ -262,14 +265,24 @@ static int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])
 
         return (p1);
 }
+#endif
 
+#ifdef CONFIG_VIVI_SCATTER
 static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
                      int hmax, int line, char *timestr)
+#else
+static void gen_line(char *basep,int inipos,int wmax,
+                     int hmax, int line, char *timestr)
+#endif
 {
-        int  w,i,j,pos=inipos,pgpos,oldpg,y;
-        char *p,*s,*basep;
-        struct page *pg;
+        int  w,i,j,pos=inipos,y;
+        char *p,*s;
         u8   chr,r,g,b,color;
+#ifdef CONFIG_VIVI_SCATTER
+        int pgpos,oldpg;
+        char *basep;
+        struct page *pg;
+
         unsigned long flags;
         spinlock_t spinlock;
 
@@ -280,6 +293,7 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
         pg=pfn_to_page(sg_dma_address(to_addr[oldpg].sg) >> PAGE_SHIFT);
         spin_lock_irqsave(&spinlock,flags);
         basep = kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[oldpg].sg->offset;
+#endif
 
         /* We will just duplicate the second pixel at the packet */
         wmax/=2;
@@ -291,6 +305,7 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
                 b=bars[w*7/wmax][2];
 
                 for (color=0;color<4;color++) {
+#ifdef CONFIG_VIVI_SCATTER
                         pgpos=get_addr_pos(pos,pages,to_addr);
                         if (pgpos!=oldpg) {
                                 pg=pfn_to_page(sg_dma_address(to_addr[pgpos].sg) >> PAGE_SHIFT);
@@ -299,6 +314,9 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
                                 oldpg=pgpos;
                         }
                         p=basep+pos-to_addr[pgpos].pos;
+#else
+                        p=basep+pos;
+#endif
 
                         switch (color) {
                                 case 0:
@@ -343,6 +361,7 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
 
                                 pos=inipos+j*2;
                                 for (color=0;color<4;color++) {
+#ifdef CONFIG_VIVI_SCATTER
                                         pgpos=get_addr_pos(pos,pages,to_addr);
                                         if (pgpos!=oldpg) {
                                                 pg=pfn_to_page(sg_dma_address(
@@ -356,6 +375,9 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
                                                 oldpg=pgpos;
                                         }
                                         p=basep+pos-to_addr[pgpos].pos;
+#else
+                                        p=basep+pos;
+#endif
 
                                         y=TO_Y(r,g,b);
 
@@ -380,19 +402,27 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
 
 
 end:
+#ifdef CONFIG_VIVI_SCATTER
         kunmap_atomic(basep, KM_BOUNCE_READ);
         spin_unlock_irqrestore(&spinlock,flags);
-
+#else
+        return;
+#endif
 }
 static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
 {
         int h,pos=0;
         int hmax  = buf->vb.height;
         int wmax  = buf->vb.width;
-        struct videobuf_buffer *vb=&buf->vb;
-        struct sg_to_addr *to_addr=buf->to_addr;
         struct timeval ts;
+#ifdef CONFIG_VIVI_SCATTER
+        struct sg_to_addr *to_addr=buf->to_addr;
+        struct videobuf_buffer *vb=&buf->vb;
+#else
+        char *tmpbuf;
+#endif
 
+#ifdef CONFIG_VIVI_SCATTER
         /* Test if DMA mapping is ready */
         if (!sg_dma_address(&vb->dma.sglist[0]))
                 return;
@@ -401,9 +431,28 @@ static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
 
         /* Check if there is enough memory */
         BUG_ON(buf->vb.dma.nr_pages << PAGE_SHIFT < (buf->vb.width*buf->vb.height)*2);
+#else
+        if (buf->vb.dma.varea) {
+                tmpbuf=kmalloc (wmax*2, GFP_KERNEL);
+        } else {
+                tmpbuf=buf->vb.dma.vmalloc;
+        }
+
+#endif
 
         for (h=0;h<hmax;h++) {
+#ifdef CONFIG_VIVI_SCATTER
                 gen_line(to_addr,pos,vb->dma.nr_pages,wmax,hmax,h,dev->timestr);
+#else
+                if (buf->vb.dma.varea) {
+                        gen_line(tmpbuf,0,wmax,hmax,h,dev->timestr);
+                        /* FIXME: replacing to __copy_to_user */
+                        if (copy_to_user(buf->vb.dma.varea+pos,tmpbuf,wmax*2)!=0)
+                                dprintk(2,"vivifill copy_to_user failed.\n");
+                } else {
+                        gen_line(tmpbuf,pos,wmax,hmax,h,dev->timestr);
+                }
+#endif
                 pos += wmax*2;
         }
 
@@ -429,7 +478,7 @@ static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
                         dev->h,dev->m,dev->s,(dev->us+500)/1000);
 
         dprintk(2,"vivifill at %s: Buffer 0x%08lx size= %d\n",dev->timestr,
-                        (unsigned long)buf->vb.dma.vmalloc,pos);
+                        (unsigned long)buf->vb.dma.varea,pos);
 
         /* Advice that buffer was filled */
         buf->vb.state = STATE_DONE;
@@ -471,11 +520,12 @@ static void vivi_thread_tick(struct vivi_dmaqueue  *dma_q)
 
                 /* Fill buffer */
                 vivi_fillbuff(dev,buf);
-        }
-        if (list_empty(&dma_q->active)) {
-                del_timer(&dma_q->timeout);
-        } else {
-                mod_timer(&dma_q->timeout, jiffies+BUFFER_TIMEOUT);
+
+                if (list_empty(&dma_q->active)) {
+                        del_timer(&dma_q->timeout);
+                } else {
+                        mod_timer(&dma_q->timeout, jiffies+BUFFER_TIMEOUT);
+                }
         }
         if (bc != 1)
                 dprintk(1,"%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);
@@ -522,6 +572,8 @@ static int vivi_thread(void *data)
 
         dprintk(1,"thread started\n");
 
+        mod_timer(&dma_q->timeout, jiffies+BUFFER_TIMEOUT);
+
         for (;;) {
                 vivi_sleep(dma_q);
 
@@ -538,7 +590,6 @@ static int vivi_start_thread(struct vivi_dmaqueue  *dma_q)
         dma_q->ini_jiffies=jiffies;
 
         dprintk(1,"%s\n",__FUNCTION__);
-        init_waitqueue_head(&dma_q->wq);
 
         dma_q->kthread = kthread_run(vivi_thread, dma_q, "vivi");
 
@@ -546,6 +597,9 @@ static int vivi_start_thread(struct vivi_dmaqueue  *dma_q)
                 printk(KERN_ERR "vivi: kernel_thread() failed\n");
                 return PTR_ERR(dma_q->kthread);
         }
+        /* Wakes thread */
+        wake_up_interruptible(&dma_q->wq);
+
         dprintk(1,"returning from %s\n",__FUNCTION__);
         return 0;
 }
@@ -663,9 +717,11 @@ static void free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)
         if (in_interrupt())
                 BUG();
 
+#ifdef CONFIG_VIVI_SCATTER
         /*FIXME: Maybe a spinlock is required here */
         kfree(buf->to_addr);
         buf->to_addr=NULL;
+#endif
 
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_unmap(vq, &buf->vb.dma);
@@ -711,11 +767,12 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
 
         buf->vb.state = STATE_PREPARED;
 
+#ifdef CONFIG_VIVI_SCATTER
         if (NULL == (buf->to_addr = kmalloc(sizeof(*buf->to_addr) * vb->dma.nr_pages,GFP_KERNEL))) {
                 rc=-ENOMEM;
                 goto fail;
         }
-
+#endif
         return 0;
 
 fail:
@@ -780,6 +837,7 @@ static void buffer_release(struct videobuf_queue *vq, struct videobuf_buffer *vb
         free_buffer(vq,buf);
 }
 
+#ifdef CONFIG_VIVI_SCATTER
 static int vivi_map_sg(void *dev, struct scatterlist *sg, int nents,
                        int direction)
 {
@@ -812,6 +870,7 @@ static int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist, int nr_pages,
 //      flush_write_buffers();
         return 0;
 }
+#endif
 
 static struct videobuf_queue_ops vivi_video_qops = {
         .buf_setup      = buffer_setup,
@@ -820,9 +879,9 @@ static struct videobuf_queue_ops vivi_video_qops = {
         .buf_release    = buffer_release,
 
         /* Non-pci handling routines */
-        .vb_map_sg      = vivi_map_sg,
-        .vb_dma_sync_sg = vivi_dma_sync_sg,
-        .vb_unmap_sg    = vivi_unmap_sg,
+//      .vb_map_sg      = vivi_map_sg,
+//      .vb_dma_sync_sg = vivi_dma_sync_sg,
+//      .vb_unmap_sg    = vivi_unmap_sg,
 };
 
 /* ------------------------------------------------------------------
@@ -1200,11 +1259,19 @@ static int vivi_open(struct inode *inode, struct file *file)
         sprintf(dev->timestr,"%02d:%02d:%02d:%03d",
                         dev->h,dev->m,dev->s,(dev->us+500)/1000);
 
+#ifdef CONFIG_VIVI_SCATTER
+        videobuf_queue_init(&fh->vb_vidq,VIDEOBUF_DMA_SCATTER, &vivi_video_qops,
+                        NULL, NULL,
+                        fh->type,
+                        V4L2_FIELD_INTERLACED,
+                        sizeof(struct vivi_buffer),fh);
+#else
         videobuf_queue_init(&fh->vb_vidq, &vivi_video_qops,
                         NULL, NULL,
                         fh->type,
                         V4L2_FIELD_INTERLACED,
                         sizeof(struct vivi_buffer),fh);
+#endif
 
         return 0;
 }
@@ -1352,6 +1419,7 @@ static int __init vivi_init(void)
         /* init video dma queues */
         INIT_LIST_HEAD(&dev->vidq.active);
         INIT_LIST_HEAD(&dev->vidq.queued);
+        init_waitqueue_head(&dev->vidq.wq);
 
         /* initialize locks */
         init_MUTEX(&dev->lock);
diff --git a/drivers/media/video/zc0301/zc0301.h b/drivers/media/video/zc0301/zc0301.h
index b9c93b8c16f7..710f12eb9126 100644
--- a/drivers/media/video/zc0301/zc0301.h
+++ b/drivers/media/video/zc0301/zc0301.h
@@ -1,7 +1,7 @@
 /***************************************************************************
- * V4L2 driver for ZC0301 Image Processor and Control Chip                 *
+ * V4L2 driver for ZC0301[P] Image Processor and Control Chip              *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 8da7f15f6290..f1120551c70c 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -1,7 +1,7 @@
 /***************************************************************************
  * Video4Linux2 driver for ZC0301[P] Image Processor and Control Chip      *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * Informations about the chip internals needed to enable the I2C protocol *
  * have been taken from the documentation of the ZC030x Video4Linux1       *
@@ -52,8 +52,8 @@
 #define ZC0301_MODULE_AUTHOR  "(C) 2006 Luca Risolia"
 #define ZC0301_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
 #define ZC0301_MODULE_LICENSE "GPL"
-#define ZC0301_MODULE_VERSION "1:1.05"
-#define ZC0301_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 5)
+#define ZC0301_MODULE_VERSION "1:1.07"
+#define ZC0301_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 7)
 
 /*****************************************************************************/
 
@@ -89,7 +89,7 @@ MODULE_PARM_DESC(force_munmap,
                  "\ndetected camera."
                  "\n 0 = do not force memory unmapping"
                  "\n 1 = force memory unmapping (save memory)"
-                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
+                 "\nDefault value is "__MODULE_STRING(ZC0301_FORCE_MUNMAP)"."
                  "\n");
 
 static unsigned int frame_timeout[] = {[0 ... ZC0301_MAX_DEVICES-1] =
@@ -136,7 +136,8 @@ zc0301_request_buffers(struct zc0301_device* cam, u32 count,
 
         cam->nbuffers = count;
         while (cam->nbuffers > 0) {
-                if ((buff = vmalloc_32(cam->nbuffers * PAGE_ALIGN(imagesize))))
+                if ((buff = vmalloc_32_user(cam->nbuffers *
+                                            PAGE_ALIGN(imagesize))))
                         break;
                 cam->nbuffers--;
         }
@@ -430,7 +431,8 @@ static int zc0301_start_transfer(struct zc0301_device* cam)
         struct usb_host_interface* altsetting = usb_altnum_to_altsetting(
                                                      usb_ifnum_to_if(udev, 0),
                                                      ZC0301_ALTERNATE_SETTING);
-        const unsigned int psz = altsetting->endpoint[0].desc.wMaxPacketSize;
+        const unsigned int psz = le16_to_cpu(altsetting->
+                                             endpoint[0].desc.wMaxPacketSize);
         struct urb* urb;
         s8 i, j;
         int err = 0;
@@ -489,7 +491,7 @@ static int zc0301_start_transfer(struct zc0301_device* cam)
         return 0;
 
 free_urbs:
-        for (i = 0; i < ZC0301_URBS; i++)
+        for (i = 0; (i < ZC0301_URBS) && cam->urb[i]; i++)
                 usb_free_urb(cam->urb[i]);
 
 free_buffers:
@@ -1288,6 +1290,35 @@ zc0301_vidioc_s_crop(struct zc0301_device* cam, void __user * arg)
 
 
 static int
+zc0301_vidioc_enum_framesizes(struct zc0301_device* cam, void __user * arg)
+{
+        struct v4l2_frmsizeenum frmsize;
+
+        if (copy_from_user(&frmsize, arg, sizeof(frmsize)))
+                return -EFAULT;
+
+        if (frmsize.index != 0 && frmsize.index != 1)
+                return -EINVAL;
+
+        if (frmsize.pixel_format != V4L2_PIX_FMT_JPEG)
+                return -EINVAL;
+
+        frmsize.type = V4L2_FRMSIZE_TYPE_DISCRETE;
+
+        if (frmsize.index == 1) {
+                frmsize.discrete.width = cam->sensor.cropcap.defrect.width;
+                frmsize.discrete.height = cam->sensor.cropcap.defrect.height;
+        }
+        memset(&frmsize.reserved, 0, sizeof(frmsize.reserved));
+
+        if (copy_to_user(arg, &frmsize, sizeof(frmsize)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
 zc0301_vidioc_enum_fmt(struct zc0301_device* cam, void __user * arg)
 {
         struct v4l2_fmtdesc fmtd;
@@ -1295,6 +1326,9 @@ zc0301_vidioc_enum_fmt(struct zc0301_device* cam, void __user * arg)
         if (copy_from_user(&fmtd, arg, sizeof(fmtd)))
                 return -EFAULT;
 
+        if (fmtd.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
         if (fmtd.index == 0) {
                 strcpy(fmtd.description, "JPEG");
                 fmtd.pixelformat = V4L2_PIX_FMT_JPEG;
@@ -1795,6 +1829,9 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
         case VIDIOC_S_FMT:
                 return zc0301_vidioc_try_s_fmt(cam, cmd, arg);
 
+        case VIDIOC_ENUM_FRAMESIZES:
+                return zc0301_vidioc_enum_framesizes(cam, arg);
+
         case VIDIOC_G_JPEGCOMP:
                 return zc0301_vidioc_g_jpegcomp(cam, arg);
 
@@ -1830,6 +1867,7 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
         case VIDIOC_QUERYSTD:
         case VIDIOC_ENUMSTD:
         case VIDIOC_QUERYMENU:
+        case VIDIOC_ENUM_FRAMEINTERVALS:
                 return -EINVAL;
 
         default:
@@ -1876,6 +1914,7 @@ static const struct file_operations zc0301_fops = {
         .open =    zc0301_open,
         .release = zc0301_release,
         .ioctl =   zc0301_ioctl,
+        .compat_ioctl = v4l_compat_ioctl32,
         .read =    zc0301_read,
         .poll =    zc0301_poll,
         .mmap =    zc0301_mmap,
@@ -1913,7 +1952,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         mutex_init(&cam->dev_mutex);
 
         DBG(2, "ZC0301[P] Image Processor and Control Chip detected "
-               "(vid/pid 0x%04X/0x%04X)",id->idVendor, id->idProduct);
+               "(vid/pid 0x%04X:0x%04X)",id->idVendor, id->idProduct);
 
         for  (i = 0; zc0301_sensor_table[i]; i++) {
                 err = zc0301_sensor_table[i](cam);
diff --git a/drivers/media/video/zc0301/zc0301_pas202bcb.c b/drivers/media/video/zc0301/zc0301_pas202bcb.c
index ecfd39a56df1..3efb92a0d0da 100644
--- a/drivers/media/video/zc0301/zc0301_pas202bcb.c
+++ b/drivers/media/video/zc0301/zc0301_pas202bcb.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for PAS202BCB image sensor connected to the ZC0301[P] Image     *
+ * Plug-in for PAS202BCB image sensor connected to the ZC0301 Image        *
  * Processor and Control Chip                                              *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * Initialization values of the ZC0301[P] have been taken from the SPCA5XX *
  * driver maintained by Michel Xhaard <mxhaard@magic.fr>                   *
diff --git a/drivers/media/video/zc0301/zc0301_pb0330.c b/drivers/media/video/zc0301/zc0301_pb0330.c
index ed8542e6c50f..5784b1d1491c 100644
--- a/drivers/media/video/zc0301/zc0301_pb0330.c
+++ b/drivers/media/video/zc0301/zc0301_pb0330.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for PB-0330 image sensor connected to the ZC0301[P] Image       *
+ * Plug-in for PB-0330 image sensor connected to the ZC0301P Image         *
  * Processor and Control Chip                                              *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * Initialization values of the ZC0301[P] have been taken from the SPCA5XX *
  * driver maintained by Michel Xhaard <mxhaard@magic.fr>                   *
diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h
index 3daf049a288a..44e82cff9319 100644
--- a/drivers/media/video/zc0301/zc0301_sensor.h
+++ b/drivers/media/video/zc0301/zc0301_sensor.h
@@ -1,8 +1,8 @@
 /***************************************************************************
- * API for image sensors connected to the ZC0301 Image Processor and       *
+ * API for image sensors connected to the ZC0301[P] Image Processor and    *
  * Control Chip                                                            *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -70,7 +70,7 @@ static const struct usb_device_id zc0301_id_table[] =  {                      \
         { ZC0301_USB_DEVICE(0x041e, 0x4036, 0xff), }, /* HV7131 */            \
         { ZC0301_USB_DEVICE(0x041e, 0x403a, 0xff), }, /* HV7131 */            \
         { ZC0301_USB_DEVICE(0x0458, 0x7007, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x0458, 0x700C, 0xff), }, /* TAS5130 */           \
+        { ZC0301_USB_DEVICE(0x0458, 0x700c, 0xff), }, /* TAS5130 */           \
         { ZC0301_USB_DEVICE(0x0458, 0x700f, 0xff), }, /* TAS5130 */           \
         { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */            \
         { ZC0301_USB_DEVICE(0x055f, 0xd003, 0xff), }, /* TAS5130 */           \
@@ -93,9 +93,9 @@ extern int zc0301_i2c_read(struct zc0301_device*, u16 address, u8 length);
 
 /*****************************************************************************/
 
-#define ZC0301_MAX_CTRLS V4L2_CID_LASTP1-V4L2_CID_BASE+10
-#define ZC0301_V4L2_CID_DAC_MAGNITUDE V4L2_CID_PRIVATE_BASE
-#define ZC0301_V4L2_CID_GREEN_BALANCE V4L2_CID_PRIVATE_BASE + 1
+#define ZC0301_MAX_CTRLS (V4L2_CID_LASTP1 - V4L2_CID_BASE + 10)
+#define ZC0301_V4L2_CID_DAC_MAGNITUDE (V4L2_CID_PRIVATE_BASE + 0)
+#define ZC0301_V4L2_CID_GREEN_BALANCE (V4L2_CID_PRIVATE_BASE + 1)
 
 struct zc0301_sensor {
         char name[32];