115 files changed, 18589 insertions, 5840 deletions

diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index 31fccb4f05d6..4b71fd6f7aed 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -116,7 +116,7 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
         [ 46 ] = KEY_BLUE,
         [ 24 ] = KEY_KPPLUS,            /* fine tune + */
         [ 25 ] = KEY_KPMINUS,           /* fine tune - */
-        [ 33 ] = KEY_KPDOT,
+        [ 33 ] = KEY_KPDOT,
         [ 19 ] = KEY_KPENTER,
         [ 34 ] = KEY_BACK,
         [ 35 ] = KEY_PLAYPAUSE,
@@ -239,7 +239,7 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
         dprintk(1,"%s: key event code=%d down=%d\n",
                 dev->name,ir->keycode,ir->keypressed);
         input_report_key(dev,ir->keycode,ir->keypressed);
-        input_sync(dev);
+        input_sync(dev);
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 47e28b0ee951..a35330315f65 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -13,6 +13,8 @@
 #include "bcm3510.h"
 #include "stv0297.h"
 #include "mt312.h"
+#include "lgdt330x.h"
+#include "dvb-pll.h"
 
 /* lnb control */
 
@@ -234,7 +236,6 @@ static struct stv0299_config samsung_tbmu24112_config = {
         .inittab = samsung_tbmu24112_inittab,
         .mclk = 88000000UL,
         .invert = 0,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_LK,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
@@ -296,6 +297,52 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir
         return request_firmware(fw, name, fc->dev);
 }
 
+static int lgdt3303_pll_set(struct dvb_frontend* fe,
+                            struct dvb_frontend_parameters* params)
+{
+        struct flexcop_device *fc = fe->dvb->priv;
+        u8 buf[4];
+        struct i2c_msg msg =
+                { .addr = 0x61, .flags = 0, .buf = buf, .len = 4 };
+        int err;
+
+        dvb_pll_configure(&dvb_pll_tdvs_tua6034,buf, params->frequency, 0);
+        dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
+                        __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
+        if ((err = i2c_transfer(&fc->i2c_adap, &msg, 1)) != 1) {
+                printk(KERN_WARNING "lgdt3303: %s error "
+                           "(addr %02x <- %02x, err = %i)\n",
+                           __FUNCTION__, buf[0], buf[1], err);
+                if (err < 0)
+                        return err;
+                else
+                        return -EREMOTEIO;
+        }
+
+        buf[0] = 0x86 | 0x18;
+        buf[1] = 0x50;
+        msg.len = 2;
+        if ((err = i2c_transfer(&fc->i2c_adap, &msg, 1)) != 1) {
+                printk(KERN_WARNING "lgdt3303: %s error "
+                           "(addr %02x <- %02x, err = %i)\n",
+                           __FUNCTION__, buf[0], buf[1], err);
+                if (err < 0)
+                        return err;
+                else
+                        return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static struct lgdt330x_config air2pc_atsc_hd5000_config = {
+        .demod_address       = 0x59,
+        .demod_chip          = LGDT3303,
+        .serial_mpeg         = 0x04,
+        .pll_set             = lgdt3303_pll_set,
+        .clock_polarity_flip = 1,
+};
+
 static struct nxt2002_config samsung_tbmv_config = {
         .demod_address    = 0x0a,
         .request_firmware = flexcop_fe_request_firmware,
@@ -458,6 +505,11 @@ int flexcop_frontend_init(struct flexcop_device *fc)
                 fc->dev_type          = FC_AIR_ATSC2;
                 info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);
         } else
+        /* try the air atsc 3nd generation (lgdt3303) */
+        if ((fc->fe = lgdt330x_attach(&air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {
+                fc->dev_type          = FC_AIR_ATSC3;
+                info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);
+        } else
         /* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
         if ((fc->fe = bcm3510_attach(&air2pc_atsc_first_gen_config, &fc->i2c_adap)) != NULL) {
                 fc->dev_type          = FC_AIR_ATSC1;
diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/dvb/b2c2/flexcop-misc.c
index 3a08d38b318a..62282d8dbfa8 100644
--- a/drivers/media/dvb/b2c2/flexcop-misc.c
+++ b/drivers/media/dvb/b2c2/flexcop-misc.c
@@ -51,6 +51,7 @@ const char *flexcop_device_names[] = {
         "Sky2PC/SkyStar 2 DVB-S",
         "Sky2PC/SkyStar 2 DVB-S (old version)",
         "Cable2PC/CableStar 2 DVB-C",
+        "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)",
 };
 
 const char *flexcop_bus_names[] = {
diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/dvb/b2c2/flexcop-reg.h
index 4ae1eb5bfe98..23cc6431e2b8 100644
--- a/drivers/media/dvb/b2c2/flexcop-reg.h
+++ b/drivers/media/dvb/b2c2/flexcop-reg.h
@@ -26,6 +26,7 @@ typedef enum {
         FC_SKY,
         FC_SKY_OLD,
         FC_CABLE,
+        FC_AIR_ATSC3,
 } flexcop_device_type_t;
 
 typedef enum {
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 12873d435406..123ed96f6faa 100644
--- a/drivers/media/dvb/b2c2/flexcop.c
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -193,6 +193,7 @@ static void flexcop_reset(struct flexcop_device *fc)
         v204 = fc->read_ibi_reg(fc,misc_204);
         v204.misc_204.Per_reset_sig = 0;
         fc->write_ibi_reg(fc,misc_204,v204);
+        msleep(1);
         v204.misc_204.Per_reset_sig = 1;
         fc->write_ibi_reg(fc,misc_204,v204);
 }
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index 1e85d16491b0..2337b41714e0 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -6,10 +6,12 @@ config DVB_BT8XX
         select DVB_NXT6000
         select DVB_CX24110
         select DVB_OR51211
+        select DVB_LGDT330X
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
           the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
-          the pcHDTV HD2000 cards, and certain AVerMedia cards.
+          the pcHDTV HD2000 cards, the DViCO FusionHDTV Lite cards, and
+          some AVerMedia cards.
 
           Since these cards have no MPEG decoder onboard, they transmit
           only compressed MPEG data over the PCI bus, so you need
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index b3c9d7327ac1..8977c7a313df 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -690,8 +690,8 @@ struct dst_types dst_tlist[] = {
                 .device_id = "DTT-CI",
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_TERR,
-                .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_2,
-                .dst_feature = 0
+                .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_MULTI_FE,
+                .dst_feature = DST_TYPE_HAS_CA
         },
 
         {
@@ -796,6 +796,56 @@ static int dst_get_vendor(struct dst_state *state)
         return 0;
 }
 
+static int dst_get_tuner_info(struct dst_state *state)
+{
+        u8 get_tuner_1[] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+        u8 get_tuner_2[] = { 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+        get_tuner_1[7] = dst_check_sum(get_tuner_1, 7);
+        get_tuner_2[7] = dst_check_sum(get_tuner_2, 7);
+        if (state->type_flags & DST_TYPE_HAS_MULTI_FE) {
+                if (dst_command(state, get_tuner_2, 8) < 0) {
+                        dprintk(verbose, DST_INFO, 1, "Unsupported Command");
+                        return -1;
+                }
+        } else {
+                if (dst_command(state, get_tuner_1, 8) < 0) {
+                        dprintk(verbose, DST_INFO, 1, "Unsupported Command");
+                        return -1;
+                }
+        }
+        memset(&state->board_info, '\0', 8);
+        memcpy(&state->board_info, &state->rxbuffer, 8);
+        if (state->type_flags & DST_TYPE_HAS_MULTI_FE) {
+                if (state->board_info[1] == 0x0b) {
+                        if (state->type_flags & DST_TYPE_HAS_TS204)
+                                state->type_flags &= ~DST_TYPE_HAS_TS204;
+                        state->type_flags |= DST_TYPE_HAS_NEWTUNE;
+                        dprintk(verbose, DST_INFO, 1, "DST type has TS=188");
+                } else {
+                        if (state->type_flags & DST_TYPE_HAS_NEWTUNE)
+                                state->type_flags &= ~DST_TYPE_HAS_NEWTUNE;
+                        state->type_flags |= DST_TYPE_HAS_TS204;
+                        dprintk(verbose, DST_INFO, 1, "DST type has TS=204");
+                }
+        } else {
+                if (state->board_info[0] == 0xbc) {
+                        if (state->type_flags & DST_TYPE_HAS_TS204)
+                                state->type_flags &= ~DST_TYPE_HAS_TS204;
+                        state->type_flags |= DST_TYPE_HAS_NEWTUNE;
+                        dprintk(verbose, DST_INFO, 1, "DST type has TS=188, Daughterboard=[%d]", state->board_info[1]);
+
+                } else if (state->board_info[0] == 0xcc) {
+                        if (state->type_flags & DST_TYPE_HAS_NEWTUNE)
+                                state->type_flags &= ~DST_TYPE_HAS_NEWTUNE;
+                        state->type_flags |= DST_TYPE_HAS_TS204;
+                        dprintk(verbose, DST_INFO, 1, "DST type has TS=204 Daughterboard=[%d]", state->board_info[1]);
+                }
+        }
+
+        return 0;
+}
+
 static int dst_get_device_id(struct dst_state *state)
 {
         u8 reply;
@@ -855,15 +905,12 @@ static int dst_get_device_id(struct dst_state *state)
         state->dst_type = use_dst_type;
         dst_type_flags_print(state->type_flags);
 
-        if (state->type_flags & DST_TYPE_HAS_TS204) {
-                dst_packsize(state, 204);
-        }
-
         return 0;
 }
 
 static int dst_probe(struct dst_state *state)
 {
+        sema_init(&state->dst_mutex, 1);
         if ((rdc_8820_reset(state)) < 0) {
                 dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed.");
                 return -1;
@@ -886,6 +933,13 @@ static int dst_probe(struct dst_state *state)
                 dprintk(verbose, DST_INFO, 1, "MAC: Unsupported command");
                 return 0;
         }
+        if ((state->type_flags & DST_TYPE_HAS_MULTI_FE) || (state->type_flags & DST_TYPE_HAS_FW_BUILD)) {
+                if (dst_get_tuner_info(state) < 0)
+                        dprintk(verbose, DST_INFO, 1, "Tuner: Unsupported command");
+        }
+        if (state->type_flags & DST_TYPE_HAS_TS204) {
+                dst_packsize(state, 204);
+        }
         if (state->type_flags & DST_TYPE_HAS_FW_BUILD) {
                 if (dst_fw_ver(state) < 0) {
                         dprintk(verbose, DST_INFO, 1, "FW: Unsupported command");
@@ -907,21 +961,23 @@ static int dst_probe(struct dst_state *state)
 int dst_command(struct dst_state *state, u8 *data, u8 len)
 {
         u8 reply;
+
+        down(&state->dst_mutex);
         if ((dst_comm_init(state)) < 0) {
                 dprintk(verbose, DST_NOTICE, 1, "DST Communication Initialization Failed.");
-                return -1;
+                goto error;
         }
         if (write_dst(state, data, len)) {
                 dprintk(verbose, DST_INFO, 1, "Tring to recover.. ");
                 if ((dst_error_recovery(state)) < 0) {
                         dprintk(verbose, DST_ERROR, 1, "Recovery Failed.");
-                        return -1;
+                        goto error;
                 }
-                return -1;
+                goto error;
         }
         if ((dst_pio_disable(state)) < 0) {
                 dprintk(verbose, DST_ERROR, 1, "PIO Disable Failed.");
-                return -1;
+                goto error;
         }
         if (state->type_flags & DST_TYPE_HAS_FW_1)
                 udelay(3000);
@@ -929,36 +985,41 @@ int dst_command(struct dst_state *state, u8 *data, u8 len)
                 dprintk(verbose, DST_DEBUG, 1, "Trying to recover.. ");
                 if ((dst_error_recovery(state)) < 0) {
                         dprintk(verbose, DST_INFO, 1, "Recovery Failed.");
-                        return -1;
+                        goto error;
                 }
-                return -1;
+                goto error;
         }
         if (reply != ACK) {
                 dprintk(verbose, DST_INFO, 1, "write not acknowledged 0x%02x ", reply);
-                return -1;
+                goto error;
         }
         if (len >= 2 && data[0] == 0 && (data[1] == 1 || data[1] == 3))
-                return 0;
+                goto error;
         if (state->type_flags & DST_TYPE_HAS_FW_1)
                 udelay(3000);
         else
                 udelay(2000);
         if (!dst_wait_dst_ready(state, NO_DELAY))
-                return -1;
+                goto error;
         if (read_dst(state, state->rxbuffer, FIXED_COMM)) {
                 dprintk(verbose, DST_DEBUG, 1, "Trying to recover.. ");
                 if ((dst_error_recovery(state)) < 0) {
                         dprintk(verbose, DST_INFO, 1, "Recovery failed.");
-                        return -1;
+                        goto error;
                 }
-                return -1;
+                goto error;
         }
         if (state->rxbuffer[7] != dst_check_sum(state->rxbuffer, 7)) {
                 dprintk(verbose, DST_INFO, 1, "checksum failure");
-                return -1;
+                goto error;
         }
-
+        up(&state->dst_mutex);
         return 0;
+
+error:
+        up(&state->dst_mutex);
+        return -EIO;
+
 }
 EXPORT_SYMBOL(dst_command);
 
@@ -1016,7 +1077,7 @@ static int dst_get_tuna(struct dst_state *state)
                 return 0;
         state->diseq_flags &= ~(HAS_LOCK);
         if (!dst_wait_dst_ready(state, NO_DELAY))
-                return 0;
+                return -EIO;
         if (state->type_flags & DST_TYPE_HAS_NEWTUNE)
                 /* how to get variable length reply ???? */
                 retval = read_dst(state, state->rx_tuna, 10);
@@ -1024,22 +1085,27 @@ static int dst_get_tuna(struct dst_state *state)
                 retval = read_dst(state, &state->rx_tuna[2], FIXED_COMM);
         if (retval < 0) {
                 dprintk(verbose, DST_DEBUG, 1, "read not successful");
-                return 0;
+                return retval;
         }
         if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
                 if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) {
                         dprintk(verbose, DST_INFO, 1, "checksum failure ? ");
-                        return 0;
+                        return -EIO;
                 }
         } else {
                 if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[2], 7)) {
                         dprintk(verbose, DST_INFO, 1, "checksum failure? ");
-                        return 0;
+                        return -EIO;
                 }
         }
         if (state->rx_tuna[2] == 0 && state->rx_tuna[3] == 0)
                 return 0;
-        state->decode_freq = ((state->rx_tuna[2] & 0x7f) << 8) + state->rx_tuna[3];
+        if (state->dst_type == DST_TYPE_IS_SAT) {
+                state->decode_freq = ((state->rx_tuna[2] & 0x7f) << 8) + state->rx_tuna[3];
+        } else {
+                state->decode_freq = ((state->rx_tuna[2] & 0x7f) << 16) + (state->rx_tuna[3] << 8) + state->rx_tuna[4];
+        }
+        state->decode_freq = state->decode_freq * 1000;
         state->decode_lock = 1;
         state->diseq_flags |= HAS_LOCK;
 
@@ -1062,10 +1128,10 @@ static int dst_write_tuna(struct dvb_frontend *fe)
                         dst_set_voltage(fe, SEC_VOLTAGE_13);
         }
         state->diseq_flags &= ~(HAS_LOCK | ATTEMPT_TUNE);
-
+        down(&state->dst_mutex);
         if ((dst_comm_init(state)) < 0) {
                 dprintk(verbose, DST_DEBUG, 1, "DST Communication initialization failed.");
-                return -1;
+                goto error;
         }
         if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
                 state->tx_tuna[9] = dst_check_sum(&state->tx_tuna[0], 9);
@@ -1077,23 +1143,29 @@ static int dst_write_tuna(struct dvb_frontend *fe)
         if (retval < 0) {
                 dst_pio_disable(state);
                 dprintk(verbose, DST_DEBUG, 1, "write not successful");
-                return retval;
+                goto werr;
         }
         if ((dst_pio_disable(state)) < 0) {
                 dprintk(verbose, DST_DEBUG, 1, "DST PIO disable failed !");
-                return -1;
+                goto error;
         }
         if ((read_dst(state, &reply, GET_ACK) < 0)) {
                 dprintk(verbose, DST_DEBUG, 1, "read verify not successful.");
-                return -1;
+                goto error;
         }
         if (reply != ACK) {
                 dprintk(verbose, DST_DEBUG, 1, "write not acknowledged 0x%02x ", reply);
-                return 0;
+                goto error;
         }
         state->diseq_flags |= ATTEMPT_TUNE;
-
-        return dst_get_tuna(state);
+        retval = dst_get_tuna(state);
+werr:
+        up(&state->dst_mutex);
+        return retval;
+
+error:
+        up(&state->dst_mutex);
+        return -EIO;
 }
 
 /*
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 6776a592045f..e6541aff3996 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -69,62 +69,53 @@ static int ca_set_pid(void)
 }
 
 
-static int put_checksum(u8 *check_string, int length)
+static void put_checksum(u8 *check_string, int length)
 {
-        u8 i = 0, checksum = 0;
-
-        dprintk(verbose, DST_CA_DEBUG, 1, " ========================= Checksum calculation ===========================");
-        dprintk(verbose, DST_CA_DEBUG, 1, " String Length=[0x%02x]", length);
-        dprintk(verbose, DST_CA_DEBUG, 1, " String=[");
-
-        while (i < length) {
-                dprintk(verbose, DST_CA_DEBUG, 0, " %02x", check_string[i]);
-                checksum += check_string[i];
-                i++;
-        }
-        dprintk(verbose, DST_CA_DEBUG, 0, " ]\n");
-        dprintk(verbose, DST_CA_DEBUG, 1, "Sum=[%02x]\n", checksum);
-        check_string[length] = ~checksum + 1;
-        dprintk(verbose, DST_CA_DEBUG, 1, " Checksum=[%02x]", check_string[length]);
-        dprintk(verbose, DST_CA_DEBUG, 1, " ==========================================================================");
-
-        return 0;
+        dprintk(verbose, DST_CA_DEBUG, 1, " Computing string checksum.");
+        dprintk(verbose, DST_CA_DEBUG, 1, "  -> string length : 0x%02x", length);
+        check_string[length] = dst_check_sum (check_string, length);
+        dprintk(verbose, DST_CA_DEBUG, 1, "  -> checksum      : 0x%02x", check_string[length]);
 }
 
 static int dst_ci_command(struct dst_state* state, u8 * data, u8 *ca_string, u8 len, int read)
 {
         u8 reply;
 
+        down(&state->dst_mutex);
         dst_comm_init(state);
         msleep(65);
 
         if (write_dst(state, data, len)) {
                 dprintk(verbose, DST_CA_INFO, 1, " Write not successful, trying to recover");
                 dst_error_recovery(state);
-                return -1;
+                goto error;
         }
         if ((dst_pio_disable(state)) < 0) {
                 dprintk(verbose, DST_CA_ERROR, 1, " DST PIO disable failed.");
-                return -1;
+                goto error;
         }
         if (read_dst(state, &reply, GET_ACK) < 0) {
                 dprintk(verbose, DST_CA_INFO, 1, " Read not successful, trying to recover");
                 dst_error_recovery(state);
-                return -1;
+                goto error;
         }
         if (read) {
                 if (! dst_wait_dst_ready(state, LONG_DELAY)) {
                         dprintk(verbose, DST_CA_NOTICE, 1, " 8820 not ready");
-                        return -1;
+                        goto error;
                 }
                 if (read_dst(state, ca_string, 128) < 0) {      /*      Try to make this dynamic        */
                         dprintk(verbose, DST_CA_INFO, 1, " Read not successful, trying to recover");
                         dst_error_recovery(state);
-                        return -1;
+                        goto error;
                 }
         }
-
+        up(&state->dst_mutex);
         return 0;
+
+error:
+        up(&state->dst_mutex);
+        return -EIO;
 }
 
 
@@ -166,7 +157,7 @@ static int ca_get_app_info(struct dst_state *state)
         return 0;
 }
 
-static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps, void *arg)
+static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps, void __user *arg)
 {
         int i;
         u8 slot_cap[256];
@@ -192,25 +183,25 @@ static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps,
         p_ca_caps->descr_num = slot_cap[7];
         p_ca_caps->descr_type = 1;
 
-        if (copy_to_user((struct ca_caps *)arg, p_ca_caps, sizeof (struct ca_caps)))
+        if (copy_to_user(arg, p_ca_caps, sizeof (struct ca_caps)))
                 return -EFAULT;
 
         return 0;
 }
 
 /*      Need some more work     */
-static int ca_get_slot_descr(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+static int ca_get_slot_descr(struct dst_state *state, struct ca_msg *p_ca_message, void __user *arg)
 {
         return -EOPNOTSUPP;
 }
 
 
-static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_slot_info, void *arg)
+static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_slot_info, void __user *arg)
 {
         int i;
         static u8 slot_command[8] = {0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff};
 
-        u8 *slot_info = state->rxbuffer;
+        u8 *slot_info = state->messages;
 
         put_checksum(&slot_command[0], 7);
         if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_info, GET_REPLY)) < 0) {
@@ -238,19 +229,19 @@ static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_s
         } else
                 p_ca_slot_info->flags = 0;
 
-        if (copy_to_user((struct ca_slot_info *)arg, p_ca_slot_info, sizeof (struct ca_slot_info)))
+        if (copy_to_user(arg, p_ca_slot_info, sizeof (struct ca_slot_info)))
                 return -EFAULT;
 
         return 0;
 }
 
 
-static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message, void __user *arg)
 {
         u8 i = 0;
         u32 command = 0;
 
-        if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
+        if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg)))
                 return -EFAULT;
 
         if (p_ca_message->msg) {
@@ -266,7 +257,7 @@ static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message,
                 switch (command) {
                 case CA_APP_INFO:
                         memcpy(p_ca_message->msg, state->messages, 128);
-                        if (copy_to_user((void *)arg, p_ca_message, sizeof (struct ca_msg)) )
+                        if (copy_to_user(arg, p_ca_message, sizeof (struct ca_msg)) )
                                 return -EFAULT;
                         break;
                 }
@@ -315,7 +306,7 @@ static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 l
         return 0;
 }
 
-u32 asn_1_decode(u8 *asn_1_array)
+static u32 asn_1_decode(u8 *asn_1_array)
 {
         u8 length_field = 0, word_count = 0, count = 0;
         u32 length = 0;
@@ -328,7 +319,8 @@ u32 asn_1_decode(u8 *asn_1_array)
         } else {
                 word_count = length_field & 0x7f;
                 for (count = 0; count < word_count; count++) {
-                        length = (length | asn_1_array[count + 1]) << 8;
+                        length = length  << 8;
+                        length += asn_1_array[count + 1];
                         dprintk(verbose, DST_CA_DEBUG, 1, " Length=[%04x]", length);
                 }
         }
@@ -399,13 +391,14 @@ static int dst_check_ca_pmt(struct dst_state *state, struct ca_msg *p_ca_message
         return 0;
 }
 
-static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, void __user *arg)
 {
         int i = 0;
         unsigned int ca_message_header_len;
 
         u32 command = 0;
         struct ca_msg *hw_buffer;
+        int result = 0;
 
         if ((hw_buffer = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
                 dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
@@ -413,8 +406,11 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
         }
         dprintk(verbose, DST_CA_DEBUG, 1, " ");
 
-        if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
-                return -EFAULT;
+        if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) {
+                result = -EFAULT;
+                goto free_mem_and_exit;
+        }
+
 
         if (p_ca_message->msg) {
                 ca_message_header_len = p_ca_message->length;   /*      Restore it back when you are done       */
@@ -433,7 +429,8 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
                         dprintk(verbose, DST_CA_DEBUG, 1, "Command = SEND_CA_PMT");
                         if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, 0)) < 0) {   // code simplification started
                                 dprintk(verbose, DST_CA_ERROR, 1, " -->CA_PMT Failed !");
-                                return -1;
+                                result = -1;
+                                goto free_mem_and_exit;
                         }
                         dprintk(verbose, DST_CA_INFO, 1, " -->CA_PMT Success !");
                         break;
@@ -442,7 +439,8 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
                         /*      Have to handle the 2 basic types of cards here  */
                         if ((dst_check_ca_pmt(state, p_ca_message, hw_buffer)) < 0) {
                                 dprintk(verbose, DST_CA_ERROR, 1, " -->CA_PMT_REPLY Failed !");
-                                return -1;
+                                result = -1;
+                                goto free_mem_and_exit;
                         }
                         dprintk(verbose, DST_CA_INFO, 1, " -->CA_PMT_REPLY Success !");
                         break;
@@ -451,22 +449,28 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
 
                         if ((ca_get_app_info(state)) < 0) {
                                 dprintk(verbose, DST_CA_ERROR, 1, " -->CA_APP_INFO_ENQUIRY Failed !");
-                                return -1;
+                                result = -1;
+                                goto free_mem_and_exit;
                         }
                         dprintk(verbose, DST_CA_INFO, 1, " -->CA_APP_INFO_ENQUIRY Success !");
                         break;
                 }
         }
-        return 0;
+free_mem_and_exit:
+        kfree (hw_buffer);
+
+        return result;
 }
 
-static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg)
+static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long ioctl_arg)
 {
         struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
         struct dst_state* state = (struct dst_state*) dvbdev->priv;
         struct ca_slot_info *p_ca_slot_info;
         struct ca_caps *p_ca_caps;
         struct ca_msg *p_ca_message;
+        void __user *arg = (void __user *)ioctl_arg;
+        int result = 0;
 
         if ((p_ca_message = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
                 dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
@@ -486,14 +490,16 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                 dprintk(verbose, DST_CA_INFO, 1, " Sending message");
                 if ((ca_send_message(state, p_ca_message, arg)) < 0) {
                         dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SEND_MSG Failed !");
-                        return -1;
+                        result = -1;
+                        goto free_mem_and_exit;
                 }
                 break;
         case CA_GET_MSG:
                 dprintk(verbose, DST_CA_INFO, 1, " Getting message");
                 if ((ca_get_message(state, p_ca_message, arg)) < 0) {
                         dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_MSG Failed !");
-                        return -1;
+                        result = -1;
+                        goto free_mem_and_exit;
                 }
                 dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_MSG Success !");
                 break;
@@ -506,7 +512,8 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                 dprintk(verbose, DST_CA_INFO, 1, " Getting Slot info");
                 if ((ca_get_slot_info(state, p_ca_slot_info, arg)) < 0) {
                         dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_SLOT_INFO Failed !");
-                        return -1;
+                        result = -1;
+                        goto free_mem_and_exit;
                 }
                 dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_SLOT_INFO Success !");
                 break;
@@ -514,7 +521,8 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                 dprintk(verbose, DST_CA_INFO, 1, " Getting Slot capabilities");
                 if ((ca_get_slot_caps(state, p_ca_caps, arg)) < 0) {
                         dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_CAP Failed !");
-                        return -1;
+                        result = -1;
+                        goto free_mem_and_exit;
                 }
                 dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_CAP Success !");
                 break;
@@ -522,7 +530,8 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                 dprintk(verbose, DST_CA_INFO, 1, " Getting descrambler description");
                 if ((ca_get_slot_descr(state, p_ca_message, arg)) < 0) {
                         dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_DESCR_INFO Failed !");
-                        return -1;
+                        result = -1;
+                        goto free_mem_and_exit;
                 }
                 dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_DESCR_INFO Success !");
                 break;
@@ -530,7 +539,8 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                 dprintk(verbose, DST_CA_INFO, 1, " Setting descrambler");
                 if ((ca_set_slot_descr()) < 0) {
                         dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SET_DESCR Failed !");
-                        return -1;
+                        result = -1;
+                        goto free_mem_and_exit;
                 }
                 dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_DESCR Success !");
                 break;
@@ -538,14 +548,19 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                 dprintk(verbose, DST_CA_INFO, 1, " Setting PID");
                 if ((ca_set_pid()) < 0) {
                         dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SET_PID Failed !");
-                        return -1;
+                        result = -1;
+                        goto free_mem_and_exit;
                 }
                 dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !");
         default:
-                return -EOPNOTSUPP;
+                result = -EOPNOTSUPP;
         };
+ free_mem_and_exit:
+        kfree (p_ca_message);
+        kfree (p_ca_slot_info);
+        kfree (p_ca_caps);
 
-        return 0;
+        return result;
 }
 
 static int dst_ca_open(struct inode *inode, struct file *file)
@@ -582,7 +597,7 @@ static int dst_ca_write(struct file *file, const char __user *buffer, size_t len
 
 static struct file_operations dst_ca_fops = {
         .owner = THIS_MODULE,
-        .ioctl = (void *)dst_ca_ioctl,
+        .ioctl = dst_ca_ioctl,
         .open = dst_ca_open,
         .release = dst_ca_release,
         .read = dst_ca_read,
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 3281a6ca3685..81557f38fe38 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -22,6 +22,7 @@
 #ifndef DST_COMMON_H
 #define DST_COMMON_H
 
+#include <linux/smp_lock.h>
 #include <linux/dvb/frontend.h>
 #include <linux/device.h>
 #include "bt878.h"
@@ -49,6 +50,7 @@
 #define DST_TYPE_HAS_FW_BUILD   64
 #define DST_TYPE_HAS_OBS_REGS   128
 #define DST_TYPE_HAS_INC_COUNT  256
+#define DST_TYPE_HAS_MULTI_FE   512
 
 /*      Card capability list    */
 
@@ -117,6 +119,9 @@ struct dst_state {
         u8 fw_version[8];
         u8 card_info[8];
         u8 vendor[8];
+        u8 board_info[8];
+
+        struct semaphore dst_mutex;
 };
 
 struct dst_types {
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index c5c7672cd538..2e398090cf63 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -34,6 +34,7 @@
 #include "dvb_frontend.h"
 #include "dvb-bt8xx.h"
 #include "bt878.h"
+#include "dvb-pll.h"
 
 static int debug;
 
@@ -279,7 +280,7 @@ static int microtune_mt7202dtf_pll_set(struct dvb_frontend* fe, struct dvb_front
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = ((div >> 10) & 0x60) | cfg;
-        data[3] = cpump | band_select;
+        data[3] = (cpump << 6) | band_select;
 
         i2c_transfer(card->i2c_adapter, &msg, 1);
         return (div * 166666 - 36000000);
@@ -522,9 +523,7 @@ static void digitv_alps_tded4_reset(struct dvb_bt8xx_card *bt)
         /*
          * Reset the frontend, must be called before trying
          * to initialise the MT352 or mt352_attach
-         * will fail.
-         *
-         * Presumably not required for the NXT6000 frontend.
+         * will fail. Same goes for the nxt6000 frontend.
          *
          */
 
@@ -546,14 +545,63 @@ static struct mt352_config digitv_alps_tded4_config = {
         .pll_set = digitv_alps_tded4_pll_set,
 };
 
+static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+{
+        struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
+        u8 buf[4];
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
+        int err;
+
+        dvb_pll_configure(&dvb_pll_tdvs_tua6034, buf, params->frequency, 0);
+        dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
+                __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
+        if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) {
+                printk(KERN_WARNING "dvb-bt8xx: %s error "
+                        "(addr %02x <- %02x, err = %i)\n",
+                        __FUNCTION__, buf[0], buf[1], err);
+                if (err < 0)
+                        return err;
+                else
+                        return -EREMOTEIO;
+        }
+
+        /* Set the Auxiliary Byte. */
+        buf[2] &= ~0x20;
+        buf[2] |= 0x18;
+        buf[3] = 0x50;
+        i2c_transfer(card->i2c_adapter, &msg, 1);
+
+        return 0;
+}
+
+static struct lgdt330x_config tdvs_tua6034_config = {
+        .demod_address    = 0x0e,
+        .demod_chip       = LGDT3303,
+        .serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
+        .pll_set          = tdvs_tua6034_pll_set,
+};
+
+static void lgdt330x_reset(struct dvb_bt8xx_card *bt)
+{
+        /* Set pin 27 of the lgdt3303 chip high to reset the frontend */
+
+        /* Pulse the reset line */
+        bttv_write_gpio(bt->bttv_nr, 0x00e00007, 0x00000001); /* High */
+        bttv_write_gpio(bt->bttv_nr, 0x00e00007, 0x00000000); /* Low  */
+        msleep(100);
+
+        bttv_write_gpio(bt->bttv_nr, 0x00e00007, 0x00000001); /* High */
+        msleep(100);
+}
+
 static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 {
         int ret;
         struct dst_state* state = NULL;
 
         switch(type) {
-#ifdef BTTV_DVICO_DVBT_LITE
-        case BTTV_DVICO_DVBT_LITE:
+#ifdef BTTV_BOARD_DVICO_DVBT_LITE
+        case BTTV_BOARD_DVICO_DVBT_LITE:
                 card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter);
                 if (card->fe != NULL) {
                         card->fe->ops->info.frequency_min = 174000000;
@@ -562,10 +610,19 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 break;
 #endif
 
-#ifdef BTTV_TWINHAN_VP3021
-        case BTTV_TWINHAN_VP3021:
+#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
+        case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
+                lgdt330x_reset(card);
+                card->fe = lgdt330x_attach(&tdvs_tua6034_config, card->i2c_adapter);
+                if (card->fe != NULL)
+                        dprintk ("dvb_bt8xx: lgdt330x detected\n");
+                break;
+#endif
+
+#ifdef BTTV_BOARD_TWINHAN_VP3021
+        case BTTV_BOARD_TWINHAN_VP3021:
 #else
-        case BTTV_NEBULA_DIGITV:
+        case BTTV_BOARD_NEBULA_DIGITV:
 #endif
                 /*
                  * It is possible to determine the correct frontend using the I2C bus (see the Nebula SDK);
@@ -573,6 +630,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                  */
 
                 /* Old Nebula (marked (c)2003 on high profile pci card) has nxt6000 demod */
+                digitv_alps_tded4_reset(card);
                 card->fe = nxt6000_attach(&vp3021_alps_tded4_config, card->i2c_adapter);
                 if (card->fe != NULL) {
                         dprintk ("dvb_bt8xx: an nxt6000 was detected on your digitv card\n");
@@ -587,11 +645,11 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                         dprintk ("dvb_bt8xx: an mt352 was detected on your digitv card\n");
                 break;
 
-        case BTTV_AVDVBT_761:
+        case BTTV_BOARD_AVDVBT_761:
                 card->fe = sp887x_attach(&microtune_mt7202dtf_config, card->i2c_adapter);
                 break;
 
-        case BTTV_AVDVBT_771:
+        case BTTV_BOARD_AVDVBT_771:
                 card->fe = mt352_attach(&advbt771_samsung_tdtc9251dh0_config, card->i2c_adapter);
                 if (card->fe != NULL) {
                         card->fe->ops->info.frequency_min = 174000000;
@@ -599,7 +657,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 }
                 break;
 
-        case BTTV_TWINHAN_DST:
+        case BTTV_BOARD_TWINHAN_DST:
                 /*      DST is not a frontend driver !!!                */
                 state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
                 /*      Setup the Card                                  */
@@ -620,11 +678,11 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                         ret = dst_ca_attach(state, &card->dvb_adapter);
                 break;
 
-        case BTTV_PINNACLESAT:
+        case BTTV_BOARD_PINNACLESAT:
                 card->fe = cx24110_attach(&pctvsat_config, card->i2c_adapter);
                 break;
 
-        case BTTV_PC_HDTV:
+        case BTTV_BOARD_PC_HDTV:
                 card->fe = or51211_attach(&or51211_config, card->i2c_adapter);
                 break;
         }
@@ -746,7 +804,7 @@ static int dvb_bt8xx_probe(struct device *dev)
         card->i2c_adapter = &sub->core->i2c_adap;
 
         switch(sub->core->type) {
-        case BTTV_PINNACLESAT:
+        case BTTV_BOARD_PINNACLESAT:
                 card->gpio_mode = 0x0400c060;
                 /* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR,
                               BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */
@@ -754,8 +812,8 @@ static int dvb_bt8xx_probe(struct device *dev)
                 card->irq_err_ignore = 0;
                 break;
 
-#ifdef BTTV_DVICO_DVBT_LITE
-        case BTTV_DVICO_DVBT_LITE:
+#ifdef BTTV_BOARD_DVICO_DVBT_LITE
+        case BTTV_BOARD_DVICO_DVBT_LITE:
 #endif
                 card->gpio_mode = 0x0400C060;
                 card->op_sync_orin = 0;
@@ -765,26 +823,34 @@ static int dvb_bt8xx_probe(struct device *dev)
                  * DA_APP(parallel) */
                 break;
 
-#ifdef BTTV_TWINHAN_VP3021
-        case BTTV_TWINHAN_VP3021:
+#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
+        case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
+#endif
+                card->gpio_mode = 0x0400c060;
+                card->op_sync_orin = BT878_RISC_SYNC_MASK;
+                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
+                break;
+
+#ifdef BTTV_BOARD_TWINHAN_VP3021
+        case BTTV_BOARD_TWINHAN_VP3021:
 #else
-        case BTTV_NEBULA_DIGITV:
+        case BTTV_BOARD_NEBULA_DIGITV:
 #endif
-        case BTTV_AVDVBT_761:
+        case BTTV_BOARD_AVDVBT_761:
                 card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5);
                 card->op_sync_orin = 0;
                 card->irq_err_ignore = 0;
                 /* A_PWRDN DA_SBR DA_APP (high speed serial) */
                 break;
 
-        case BTTV_AVDVBT_771: //case 0x07711461:
+        case BTTV_BOARD_AVDVBT_771: //case 0x07711461:
                 card->gpio_mode = 0x0400402B;
                 card->op_sync_orin = BT878_RISC_SYNC_MASK;
                 card->irq_err_ignore = 0;
                 /* A_PWRDN DA_SBR  DA_APP[0] PKTP=10 RISC_ENABLE FIFO_ENABLE*/
                 break;
 
-        case BTTV_TWINHAN_DST:
+        case BTTV_BOARD_TWINHAN_DST:
                 card->gpio_mode = 0x2204f2c;
                 card->op_sync_orin = BT878_RISC_SYNC_MASK;
                 card->irq_err_ignore = BT878_APABORT | BT878_ARIPERR |
@@ -802,7 +868,7 @@ static int dvb_bt8xx_probe(struct device *dev)
                  * RISC+FIFO ENABLE */
                 break;
 
-        case BTTV_PC_HDTV:
+        case BTTV_BOARD_PC_HDTV:
                 card->gpio_mode = 0x0100EC7B;
                 card->op_sync_orin = 0;
                 card->irq_err_ignore = 0;
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 9ec8e5bd6c1f..cf035a80361c 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -35,6 +35,7 @@
 #include "nxt6000.h"
 #include "cx24110.h"
 #include "or51211.h"
+#include "lgdt330x.h"
 
 struct dvb_bt8xx_card {
         struct semaphore lock;
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h
index 9719a3b30f78..7d7b0067f228 100644
--- a/drivers/media/dvb/dvb-core/demux.h
+++ b/drivers/media/dvb/dvb-core/demux.h
@@ -48,8 +48,11 @@
  * DMX_MAX_SECFEED_SIZE: Maximum length (in bytes) of a private section feed filter.
  */
 
+#ifndef DMX_MAX_SECTION_SIZE
+#define DMX_MAX_SECTION_SIZE 4096
+#endif
 #ifndef DMX_MAX_SECFEED_SIZE
-#define DMX_MAX_SECFEED_SIZE 4096
+#define DMX_MAX_SECFEED_SIZE (DMX_MAX_SECTION_SIZE + 188)
 #endif
 
 
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index dc476dda2b71..b4c899b15959 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -246,7 +246,7 @@ static int dvb_dmx_swfilter_section_copy_dump(struct dvb_demux_feed *feed,
 
         for (n = 0; sec->secbufp + 2 < limit; n++) {
                 seclen = section_length(sec->secbuf);
-                if (seclen <= 0 || seclen > DMX_MAX_SECFEED_SIZE
+                if (seclen <= 0 || seclen > DMX_MAX_SECTION_SIZE
                     || seclen + sec->secbufp > limit)
                         return 0;
                 sec->seclen = seclen;
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index a8bc84240b50..6ffa6b216363 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -42,8 +42,6 @@
 #include "dvb_frontend.h"
 #include "dvbdev.h"
 
-// #define DEBUG_LOCKLOSS 1
-
 static int dvb_frontend_debug;
 static int dvb_shutdown_timeout = 5;
 static int dvb_force_auto_inversion;
@@ -438,25 +436,6 @@ static int dvb_frontend_thread(void *data)
                         if (s & FE_HAS_LOCK)
                                 continue;
                         else { /* if we _WERE_ tuned, but now don't have a lock */
-#ifdef DEBUG_LOCKLOSS
-                                /* first of all try setting the tone again if it was on - this
-                                 * sometimes works around problems with noisy power supplies */
-                                if (fe->ops->set_tone && (fepriv->tone == SEC_TONE_ON)) {
-                                        fe->ops->set_tone(fe, fepriv->tone);
-                                        mdelay(100);
-                                        s = 0;
-                                        fe->ops->read_status(fe, &s);
-                                        if (s & FE_HAS_LOCK) {
-                                                printk("DVB%i: Lock was lost, but regained by setting "
-                                                       "the tone. This may indicate your power supply "
-                                                       "is noisy/slightly incompatable with this DVB-S "
-                                                       "adapter\n", fe->dvb->num);
-                                                fepriv->state = FESTATE_TUNED;
-                                                continue;
-                                        }
-                                }
-#endif
-                                /* some other reason for losing the lock - start zigzagging */
                                 fepriv->state = FESTATE_ZIGZAG_FAST;
                                 fepriv->started_auto_step = fepriv->auto_step;
                                 check_wrapped = 0;
@@ -577,6 +556,49 @@ static void dvb_frontend_stop(struct dvb_frontend *fe)
                                 fepriv->thread_pid);
 }
 
+s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime)
+{
+        return ((curtime.tv_usec < lasttime.tv_usec) ?
+                1000000 - lasttime.tv_usec + curtime.tv_usec :
+                curtime.tv_usec - lasttime.tv_usec);
+}
+EXPORT_SYMBOL(timeval_usec_diff);
+
+static inline void timeval_usec_add(struct timeval *curtime, u32 add_usec)
+{
+        curtime->tv_usec += add_usec;
+        if (curtime->tv_usec >= 1000000) {
+                curtime->tv_usec -= 1000000;
+                curtime->tv_sec++;
+        }
+}
+
+/*
+ * Sleep until gettimeofday() > waketime + add_usec
+ * This needs to be as precise as possible, but as the delay is
+ * usually between 2ms and 32ms, it is done using a scheduled msleep
+ * followed by usleep (normally a busy-wait loop) for the remainder
+ */
+void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec)
+{
+        struct timeval lasttime;
+        s32 delta, newdelta;
+
+        timeval_usec_add(waketime, add_usec);
+
+        do_gettimeofday(&lasttime);
+        delta = timeval_usec_diff(lasttime, *waketime);
+        if (delta > 2500) {
+                msleep((delta - 1500) / 1000);
+                do_gettimeofday(&lasttime);
+                newdelta = timeval_usec_diff(lasttime, *waketime);
+                delta = (newdelta > delta) ? 0 : newdelta;
+        }
+        if (delta > 0)
+                udelay(delta);
+}
+EXPORT_SYMBOL(dvb_frontend_sleep_until);
+
 static int dvb_frontend_start(struct dvb_frontend *fe)
 {
         int ret;
@@ -728,6 +750,60 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                         err = fe->ops->dishnetwork_send_legacy_command(fe, (unsigned int) parg);
                         fepriv->state = FESTATE_DISEQC;
                         fepriv->status = 0;
+                } else if (fe->ops->set_voltage) {
+                        /*
+                         * NOTE: This is a fallback condition.  Some frontends
+                         * (stv0299 for instance) take longer than 8msec to
+                         * respond to a set_voltage command.  Those switches
+                         * need custom routines to switch properly.  For all
+                         * other frontends, the following shoule work ok.
+                         * Dish network legacy switches (as used by Dish500)
+                         * are controlled by sending 9-bit command words
+                         * spaced 8msec apart.
+                         * the actual command word is switch/port dependant
+                         * so it is up to the userspace application to send
+                         * the right command.
+                         * The command must always start with a '0' after
+                         * initialization, so parg is 8 bits and does not
+                         * include the initialization or start bit
+                         */
+                        unsigned int cmd = ((unsigned int) parg) << 1;
+                        struct timeval nexttime;
+                        struct timeval tv[10];
+                        int i;
+                        u8 last = 1;
+                        if (dvb_frontend_debug)
+                                printk("%s switch command: 0x%04x\n", __FUNCTION__, cmd);
+                        do_gettimeofday(&nexttime);
+                        if (dvb_frontend_debug)
+                                memcpy(&tv[0], &nexttime, sizeof(struct timeval));
+                        /* before sending a command, initialize by sending
+                         * a 32ms 18V to the switch
+                         */
+                        fe->ops->set_voltage(fe, SEC_VOLTAGE_18);
+                        dvb_frontend_sleep_until(&nexttime, 32000);
+
+                        for (i = 0; i < 9; i++) {
+                                if (dvb_frontend_debug)
+                                        do_gettimeofday(&tv[i + 1]);
+                                if ((cmd & 0x01) != last) {
+                                        /* set voltage to (last ? 13V : 18V) */
+                                        fe->ops->set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);
+                                        last = (last) ? 0 : 1;
+                                }
+                                cmd = cmd >> 1;
+                                if (i != 8)
+                                        dvb_frontend_sleep_until(&nexttime, 8000);
+                        }
+                        if (dvb_frontend_debug) {
+                                printk("%s(%d): switch delay (should be 32k followed by all 8k\n",
+                                        __FUNCTION__, fe->dvb->num);
+                                for (i = 1; i < 10; i++)
+                                        printk("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i]));
+                        }
+                        err = 0;
+                        fepriv->state = FESTATE_DISEQC;
+                        fepriv->status = 0;
                 }
                 break;
 
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 9c2c1d1136bd..348c9b0b988a 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -101,4 +101,7 @@ extern int dvb_register_frontend(struct dvb_adapter* dvb,
 
 extern int dvb_unregister_frontend(struct dvb_frontend* fe);
 
+extern void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec);
+extern s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime);
+
 #endif
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
index e55322ef76b3..49f541d9a042 100644
--- a/drivers/media/dvb/dvb-usb/a800.c
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -43,11 +43,9 @@ static struct dvb_usb_rc_key a800_rc_keys[] = {
         { 0x02, 0x13, KEY_RIGHT },       /* R / CH RTN */
         { 0x02, 0x17, KEY_PROG2 },       /* SNAP SHOT */
         { 0x02, 0x10, KEY_PROG3 },       /* 16-CH PREV */
-        { 0x02, 0x03, KEY_CHANNELUP },   /* CH UP */
         { 0x02, 0x1e, KEY_VOLUMEDOWN },  /* VOL DOWN */
         { 0x02, 0x0c, KEY_ZOOM },        /* FULL SCREEN */
         { 0x02, 0x1f, KEY_VOLUMEUP },    /* VOL UP */
-        { 0x02, 0x02, KEY_CHANNELDOWN }, /* CH DOWN */
         { 0x02, 0x14, KEY_MUTE },        /* MUTE */
         { 0x02, 0x08, KEY_AUDIO },       /* AUDIO */
         { 0x02, 0x19, KEY_RECORD },      /* RECORD */
@@ -57,8 +55,6 @@ static struct dvb_usb_rc_key a800_rc_keys[] = {
         { 0x02, 0x1d, KEY_BACK },        /* << / RED */
         { 0x02, 0x1c, KEY_FORWARD },     /* >> / YELLOW */
         { 0x02, 0x03, KEY_TEXT },        /* TELETEXT */
-        { 0x02, 0x01, KEY_FIRST },       /* |<< / GREEN */
-        { 0x02, 0x00, KEY_LAST },        /* >>| / BLUE */
         { 0x02, 0x04, KEY_EPG },         /* EPG */
         { 0x02, 0x15, KEY_MENU },        /* MENU */
 
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 0058505634a0..aa271a2496d5 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -82,13 +82,15 @@ static int dibusb_tuner_probe_and_attach(struct dvb_usb_device *d)
 static struct dvb_usb_properties dibusb1_1_properties;
 static struct dvb_usb_properties dibusb1_1_an2235_properties;
 static struct dvb_usb_properties dibusb2_0b_properties;
+static struct dvb_usb_properties artec_t1_usb2_properties;
 
 static int dibusb_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
 {
         if (dvb_usb_device_init(intf,&dibusb1_1_properties,THIS_MODULE,NULL) == 0 ||
                 dvb_usb_device_init(intf,&dibusb1_1_an2235_properties,THIS_MODULE,NULL) == 0 ||
-                dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0)
+                dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0 ||
+                dvb_usb_device_init(intf,&artec_t1_usb2_properties,THIS_MODULE,NULL) == 0)
                 return 0;
 
         return -EINVAL;
@@ -128,10 +130,13 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
 
 /* 27 */        { USB_DEVICE(USB_VID_KWORLD,            USB_PID_KWORLD_VSTREAM_COLD) },
 
+/* 28 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,         USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+/* 29 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,         USB_PID_ULTIMA_TVBOX_USB2_WARM) },
+
 // #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
 
 #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
-/* 28 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+/* 30 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
 #endif
                         { }             /* Terminating entry */
 };
@@ -264,7 +269,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
                 },
 #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
                 {       "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)",
-                        { &dibusb_dib3000mb_table[28], NULL },
+                        { &dibusb_dib3000mb_table[30], NULL },
                         { NULL },
                 },
 #endif
@@ -273,7 +278,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
 
 static struct dvb_usb_properties dibusb2_0b_properties = {
         .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
-        .pid_filter_count = 32,
+        .pid_filter_count = 16,
 
         .usb_ctrl = CYPRESS_FX2,
 
@@ -321,6 +326,52 @@ static struct dvb_usb_properties dibusb2_0b_properties = {
         }
 };
 
+static struct dvb_usb_properties artec_t1_usb2_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .pid_filter_count = 16,
+
+        .usb_ctrl = CYPRESS_FX2,
+
+        .firmware = "dvb-usb-dibusb-6.0.0.8.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb2_0_streaming_ctrl,
+        .pid_filter       = dibusb_pid_filter,
+        .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+        .power_ctrl       = dibusb2_0_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mb_frontend_attach,
+        .tuner_attach     = dibusb_tuner_probe_and_attach,
+
+        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc_key_map       = dibusb_rc_keys,
+        .rc_key_map_size  = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
+        .rc_query         = dibusb_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x06,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 1,
+        .devices = {
+                {       "Artec T1 USB2.0",
+                        { &dibusb_dib3000mb_table[28], NULL },
+                        { &dibusb_dib3000mb_table[29], NULL },
+                },
+        }
+};
+
 static struct usb_driver dibusb_driver = {
         .owner          = THIS_MODULE,
         .name           = "dvb_usb_dibusb_mb",
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
index 6611f62977c0..2d99d05c7eab 100644
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -11,7 +11,9 @@
 #ifndef _DVB_USB_DIBUSB_H_
 #define _DVB_USB_DIBUSB_H_
 
-#define DVB_USB_LOG_PREFIX "dibusb"
+#ifndef DVB_USB_LOG_PREFIX
+ #define DVB_USB_LOG_PREFIX "dibusb"
+#endif
 #include "dvb-usb.h"
 
 #include "dib3000.h"
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 0818996bf150..6be99e537e12 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -43,10 +43,14 @@
 #define USB_PID_COMPRO_DVBU2000_WARM            0xd001
 #define USB_PID_COMPRO_DVBU2000_UNK_COLD        0x010c
 #define USB_PID_COMPRO_DVBU2000_UNK_WARM        0x010d
+#define USB_PID_DIBCOM_HOOK_DEFAULT                     0x0064
+#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM      0x0065
 #define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
 #define USB_PID_DIBCOM_MOD3000_WARM                     0x0bb9
 #define USB_PID_DIBCOM_MOD3001_COLD                     0x0bc6
 #define USB_PID_DIBCOM_MOD3001_WARM                     0x0bc7
+#define USB_PID_DIBCOM_STK7700                          0x1e14
+#define USB_PID_DIBCOM_STK7700_REENUM           0x1e15
 #define USB_PID_DIBCOM_ANCHOR_2135_COLD         0x2131
 #define USB_PID_GRANDTEC_DVBT_USB_COLD          0x0fa0
 #define USB_PID_GRANDTEC_DVBT_USB_WARM          0x0fa1
@@ -68,6 +72,7 @@
 #define USB_PID_ULTIMA_TVBOX_AN2235_WARM        0x8108
 #define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD        0x2235
 #define USB_PID_ULTIMA_TVBOX_USB2_COLD          0x8109
+#define USB_PID_ULTIMA_TVBOX_USB2_WARM          0x810a
 #define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD       0x8613
 #define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM       0x1002
 #define USB_PID_UNK_HYPER_PALTEK_COLD           0x005e
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index f5799a4c228e..36b7048c02d2 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -196,7 +196,9 @@ static int dvb_usb_allocate_stream_buffers(struct dvb_usb_device *d, int num, un
                         dvb_usb_free_stream_buffers(d);
                         return -ENOMEM;
                 }
-                deb_mem("buffer %d: %p (dma: %d)\n",d->buf_num,d->buf_list[d->buf_num],d->dma_addr[d->buf_num]);
+                deb_mem("buffer %d: %p (dma: %llu)\n",
+                        d->buf_num, d->buf_list[d->buf_num],
+                        (unsigned long long)d->dma_addr[d->buf_num]);
                 memset(d->buf_list[d->buf_num],0,size);
         }
         deb_mem("allocation successful\n");
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index a50a41f6f79d..8e269e1c1f9d 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -164,6 +164,14 @@ config DVB_NXT2002
         help
           An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
+config DVB_NXT200X
+        tristate "Nextwave NXT2002/NXT2004 based"
+        depends on DVB_CORE
+        select FW_LOADER
+        help
+          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+          to support this frontend.
+
 config DVB_OR51211
         tristate "or51211 based (pcHDTV HD2000 card)"
         depends on DVB_CORE
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index ad8658ffd60a..a98760fe08a1 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o
 obj-$(CONFIG_DVB_TDA10021) += tda10021.o
 obj-$(CONFIG_DVB_STV0297) += stv0297.o
 obj-$(CONFIG_DVB_NXT2002) += nxt2002.o
+obj-$(CONFIG_DVB_NXT200X) += nxt200x.o
 obj-$(CONFIG_DVB_OR51211) += or51211.o
 obj-$(CONFIG_DVB_OR51132) += or51132.o
 obj-$(CONFIG_DVB_BCM3510) += bcm3510.o
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 536c35d969b7..f857b869616c 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -226,7 +226,7 @@ struct dvb_pll_desc dvb_pll_tua6034 = {
 EXPORT_SYMBOL(dvb_pll_tua6034);
 
 /* Infineon TUA6034
- * used in LG Innotek TDVS-H062F
+ * used in LG TDVS H061F and LG TDVS H062F
  */
 struct dvb_pll_desc dvb_pll_tdvs_tua6034 = {
         .name  = "LG/Infineon TUA6034",
@@ -292,6 +292,58 @@ struct dvb_pll_desc dvb_pll_tded4 = {
 };
 EXPORT_SYMBOL(dvb_pll_tded4);
 
+/* ALPS TDHU2
+ * used in AverTVHD MCE A180
+ */
+struct dvb_pll_desc dvb_pll_tdhu2 = {
+        .name = "ALPS TDHU2",
+        .min = 54000000,
+        .max = 864000000,
+        .count = 4,
+        .entries = {
+                { 162000000, 44000000, 62500, 0x85, 0x01 },
+                { 426000000, 44000000, 62500, 0x85, 0x02 },
+                { 782000000, 44000000, 62500, 0x85, 0x08 },
+                { 999999999, 44000000, 62500, 0x85, 0x88 },
+        }
+};
+EXPORT_SYMBOL(dvb_pll_tdhu2);
+
+/* Philips TUV1236D
+ * used in ATI HDTV Wonder
+ */
+struct dvb_pll_desc dvb_pll_tuv1236d = {
+        .name  = "Philips TUV1236D",
+        .min   =  54000000,
+        .max   = 864000000,
+        .count = 3,
+        .entries = {
+                { 157250000, 44000000, 62500, 0xc6, 0x41 },
+                { 454000000, 44000000, 62500, 0xc6, 0x42 },
+                { 999999999, 44000000, 62500, 0xc6, 0x44 },
+        },
+};
+EXPORT_SYMBOL(dvb_pll_tuv1236d);
+
+/* Samsung TBMV30111IN
+ * used in Air2PC ATSC - 2nd generation (nxt2002)
+ */
+struct dvb_pll_desc dvb_pll_tbmv30111in = {
+        .name = "Samsung TBMV30111IN",
+        .min = 54000000,
+        .max = 860000000,
+        .count = 4,
+        .entries = {
+                { 172000000, 44000000, 166666, 0xb4, 0x01 },
+                { 214000000, 44000000, 166666, 0xb4, 0x02 },
+                { 467000000, 44000000, 166666, 0xbc, 0x02 },
+                { 721000000, 44000000, 166666, 0xbc, 0x08 },
+                { 841000000, 44000000, 166666, 0xf4, 0x08 },
+                { 999999999, 44000000, 166666, 0xfc, 0x02 },
+        }
+};
+EXPORT_SYMBOL(dvb_pll_tbmv30111in);
+
 /* ----------------------------------------------------------- */
 /* code                                                        */
 
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index 205b2d1a8852..497d31dcf41e 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -36,6 +36,10 @@ extern struct dvb_pll_desc dvb_pll_tda665x;
 extern struct dvb_pll_desc dvb_pll_fmd1216me;
 extern struct dvb_pll_desc dvb_pll_tded4;
 
+extern struct dvb_pll_desc dvb_pll_tuv1236d;
+extern struct dvb_pll_desc dvb_pll_tdhu2;
+extern struct dvb_pll_desc dvb_pll_tbmv30111in;
+
 int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
                       u32 freq, int bandwidth);
 
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 7852b83b82d4..6a33f5a19a8d 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -26,6 +26,8 @@
  *   DViCO FusionHDTV 3 Gold-Q
  *   DViCO FusionHDTV 3 Gold-T
  *   DViCO FusionHDTV 5 Gold
+ *   DViCO FusionHDTV 5 Lite
+ *   Air2PC/AirStar 2 ATSC 3rd generation (HD5000)
  *
  * TODO:
  * signal strength always returns 0.
@@ -222,6 +224,11 @@ static int lgdt330x_init(struct dvb_frontend* fe)
                 0x4c, 0x14
         };
 
+        static u8 flip_lgdt3303_init_data[] = {
+                0x4c, 0x14,
+                0x87, 0xf3
+        };
+
         struct lgdt330x_state* state = fe->demodulator_priv;
         char  *chip_name;
         int    err;
@@ -234,8 +241,13 @@ static int lgdt330x_init(struct dvb_frontend* fe)
                 break;
         case LGDT3303:
                 chip_name = "LGDT3303";
-                err = i2c_write_demod_bytes(state, lgdt3303_init_data,
-                                            sizeof(lgdt3303_init_data));
+                if (state->config->clock_polarity_flip) {
+                        err = i2c_write_demod_bytes(state, flip_lgdt3303_init_data,
+                                                    sizeof(flip_lgdt3303_init_data));
+                } else {
+                        err = i2c_write_demod_bytes(state, lgdt3303_init_data,
+                                                    sizeof(lgdt3303_init_data));
+                }
                 break;
         default:
                 chip_name = "undefined";
@@ -743,9 +755,8 @@ static struct dvb_frontend_ops lgdt3302_ops = {
                 .frequency_min= 54000000,
                 .frequency_max= 858000000,
                 .frequency_stepsize= 62500,
-                /* Symbol rate is for all VSB modes need to check QAM */
-                .symbol_rate_min    = 10762000,
-                .symbol_rate_max    = 10762000,
+                .symbol_rate_min    = 5056941,  /* QAM 64 */
+                .symbol_rate_max    = 10762000, /* VSB 8  */
                 .caps = FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB
         },
         .init                 = lgdt330x_init,
@@ -767,9 +778,8 @@ static struct dvb_frontend_ops lgdt3303_ops = {
                 .frequency_min= 54000000,
                 .frequency_max= 858000000,
                 .frequency_stepsize= 62500,
-                /* Symbol rate is for all VSB modes need to check QAM */
-                .symbol_rate_min    = 10762000,
-                .symbol_rate_max    = 10762000,
+                .symbol_rate_min    = 5056941,  /* QAM 64 */
+                .symbol_rate_max    = 10762000, /* VSB 8  */
                 .caps = FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB
         },
         .init                 = lgdt330x_init,
diff --git a/drivers/media/dvb/frontends/lgdt330x.h b/drivers/media/dvb/frontends/lgdt330x.h
index e209ba1e47c5..2a6529cccf1a 100644
--- a/drivers/media/dvb/frontends/lgdt330x.h
+++ b/drivers/media/dvb/frontends/lgdt330x.h
@@ -47,6 +47,10 @@ struct lgdt330x_config
 
         /* Need to set device param for start_dma */
         int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+
+        /* Flip the polarity of the mpeg data transfer clock using alternate init data
+         * This option applies ONLY to LGDT3303 - 0:disabled (default) 1:enabled */
+        int clock_polarity_flip;
 };
 
 extern struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
new file mode 100644
index 000000000000..bad0933eb714
--- /dev/null
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -0,0 +1,1205 @@
+/*
+ *    Support for NXT2002 and NXT2004 - VSB/QAM
+ *
+ *    Copyright (C) 2005 Kirk Lapray (kirk.lapray@gmail.com)
+ *    based on nxt2002 by Taylor Jacob <rtjacob@earthlink.net>
+ *    and nxt2004 by Jean-Francois Thibert (jeanfrancois@sagetv.com)
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+*/
+
+/*
+ *                      NOTES ABOUT THIS DRIVER
+ *
+ * This Linux driver supports:
+ *   B2C2/BBTI Technisat Air2PC - ATSC (NXT2002)
+ *   AverTVHD MCE A180 (NXT2004)
+ *   ATI HDTV Wonder (NXT2004)
+ *
+ * This driver needs external firmware. Please use the command
+ * "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2002" or
+ * "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2004" to
+ * download/extract the appropriate firmware, and then copy it to
+ * /usr/lib/hotplug/firmware/ or /lib/firmware/
+ * (depending on configuration of firmware hotplug).
+ */
+#define NXT2002_DEFAULT_FIRMWARE "dvb-fe-nxt2002.fw"
+#define NXT2004_DEFAULT_FIRMWARE "dvb-fe-nxt2004.fw"
+#define CRC_CCIT_MASK 0x1021
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+#include "dvb_frontend.h"
+#include "dvb-pll.h"
+#include "nxt200x.h"
+
+struct nxt200x_state {
+
+        struct i2c_adapter* i2c;
+        struct dvb_frontend_ops ops;
+        const struct nxt200x_config* config;
+        struct dvb_frontend frontend;
+
+        /* demodulator private data */
+        nxt_chip_type demod_chip;
+        u8 initialised:1;
+};
+
+static int debug;
+#define dprintk(args...) \
+        do { \
+                if (debug) printk(KERN_DEBUG "nxt200x: " args); \
+        } while (0)
+
+static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len)
+{
+        int err;
+        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = len };
+
+        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
+                printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
+                        __FUNCTION__, addr, err);
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len)
+{
+        int err;
+        struct i2c_msg msg = { .addr = addr, .flags = I2C_M_RD, .buf = buf, .len = len };
+
+        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
+                printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
+                        __FUNCTION__, addr, err);
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg, u8 *buf, u8 len)
+{
+        u8 buf2 [len+1];
+        int err;
+        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf2, .len = len + 1 };
+
+        buf2[0] = reg;
+        memcpy(&buf2[1], buf, len);
+
+        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
+                printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
+                        __FUNCTION__, state->config->demod_address, err);
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 len)
+{
+        u8 reg2 [] = { reg };
+
+        struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = reg2, .len = 1 },
+                        { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = buf, .len = len } };
+
+        int err;
+
+        if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
+                printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
+                        __FUNCTION__, state->config->demod_address, err);
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static u16 nxt200x_crc(u16 crc, u8 c)
+{
+        u8 i;
+        u16 input = (u16) c & 0xFF;
+
+        input<<=8;
+        for(i=0; i<8; i++) {
+                if((crc^input) & 0x8000)
+                        crc=(crc<<1)^CRC_CCIT_MASK;
+                else
+                        crc<<=1;
+                input<<=1;
+        }
+        return crc;
+}
+
+static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len)
+{
+        u8 attr, len2, buf;
+        dprintk("%s\n", __FUNCTION__);
+
+        /* set mutli register register */
+        nxt200x_writebytes(state, 0x35, &reg, 1);
+
+        /* send the actual data */
+        nxt200x_writebytes(state, 0x36, data, len);
+
+        switch (state->demod_chip) {
+                case NXT2002:
+                        len2 = len;
+                        buf = 0x02;
+                        break;
+                case NXT2004:
+                        /* probably not right, but gives correct values */
+                        attr = 0x02;
+                        if (reg & 0x80) {
+                                attr = attr << 1;
+                                if (reg & 0x04)
+                                        attr = attr >> 1;
+                        }
+                        /* set write bit */
+                        len2 = ((attr << 4) | 0x10) | len;
+                        buf = 0x80;
+                        break;
+                default:
+                        return -EINVAL;
+                        break;
+        }
+
+        /* set multi register length */
+        nxt200x_writebytes(state, 0x34, &len2, 1);
+
+        /* toggle the multireg write bit */
+        nxt200x_writebytes(state, 0x21, &buf, 1);
+
+        nxt200x_readbytes(state, 0x21, &buf, 1);
+
+        switch (state->demod_chip) {
+                case NXT2002:
+                        if ((buf & 0x02) == 0)
+                                return 0;
+                        break;
+                case NXT2004:
+                        if (buf == 0)
+                                return 0;
+                        break;
+                default:
+                        return -EINVAL;
+                        break;
+        }
+
+        printk(KERN_WARNING "nxt200x: Error writing multireg register 0x%02X\n",reg);
+
+        return 0;
+}
+
+static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len)
+{
+        int i;
+        u8 buf, len2, attr;
+        dprintk("%s\n", __FUNCTION__);
+
+        /* set mutli register register */
+        nxt200x_writebytes(state, 0x35, &reg, 1);
+
+        switch (state->demod_chip) {
+                case NXT2002:
+                        /* set multi register length */
+                        len2 = len & 0x80;
+                        nxt200x_writebytes(state, 0x34, &len2, 1);
+
+                        /* read the actual data */
+                        nxt200x_readbytes(state, reg, data, len);
+                        return 0;
+                        break;
+                case NXT2004:
+                        /* probably not right, but gives correct values */
+                        attr = 0x02;
+                        if (reg & 0x80) {
+                                attr = attr << 1;
+                                if (reg & 0x04)
+                                        attr = attr >> 1;
+                        }
+
+                        /* set multi register length */
+                        len2 = (attr << 4) | len;
+                        nxt200x_writebytes(state, 0x34, &len2, 1);
+
+                        /* toggle the multireg bit*/
+                        buf = 0x80;
+                        nxt200x_writebytes(state, 0x21, &buf, 1);
+
+                        /* read the actual data */
+                        for(i = 0; i < len; i++) {
+                                nxt200x_readbytes(state, 0x36 + i, &data[i], 1);
+                        }
+                        return 0;
+                        break;
+                default:
+                        return -EINVAL;
+                        break;
+        }
+}
+
+static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
+{
+        u8 buf, stopval, counter = 0;
+        dprintk("%s\n", __FUNCTION__);
+
+        /* set correct stop value */
+        switch (state->demod_chip) {
+                case NXT2002:
+                        stopval = 0x40;
+                        break;
+                case NXT2004:
+                        stopval = 0x10;
+                        break;
+                default:
+                        stopval = 0;
+                        break;
+        }
+
+        buf = 0x80;
+        nxt200x_writebytes(state, 0x22, &buf, 1);
+
+        while (counter < 20) {
+                nxt200x_readbytes(state, 0x31, &buf, 1);
+                if (buf & stopval)
+                        return;
+                msleep(10);
+                counter++;
+        }
+
+        printk(KERN_WARNING "nxt200x: Timeout waiting for nxt200x to stop. This is ok after firmware upload.\n");
+        return;
+}
+
+static void nxt200x_microcontroller_start (struct nxt200x_state* state)
+{
+        u8 buf;
+        dprintk("%s\n", __FUNCTION__);
+
+        buf = 0x00;
+        nxt200x_writebytes(state, 0x22, &buf, 1);
+}
+
+static void nxt2004_microcontroller_init (struct nxt200x_state* state)
+{
+        u8 buf[9];
+        u8 counter = 0;
+        dprintk("%s\n", __FUNCTION__);
+
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0x2b, buf, 1);
+        buf[0] = 0x70;
+        nxt200x_writebytes(state, 0x34, buf, 1);
+        buf[0] = 0x04;
+        nxt200x_writebytes(state, 0x35, buf, 1);
+        buf[0] = 0x01; buf[1] = 0x23; buf[2] = 0x45; buf[3] = 0x67; buf[4] = 0x89;
+        buf[5] = 0xAB; buf[6] = 0xCD; buf[7] = 0xEF; buf[8] = 0xC0;
+        nxt200x_writebytes(state, 0x36, buf, 9);
+        buf[0] = 0x80;
+        nxt200x_writebytes(state, 0x21, buf, 1);
+
+        while (counter < 20) {
+                nxt200x_readbytes(state, 0x21, buf, 1);
+                if (buf[0] == 0)
+                        return;
+                msleep(10);
+                counter++;
+        }
+
+        printk(KERN_WARNING "nxt200x: Timeout waiting for nxt2004 to init.\n");
+
+        return;
+}
+
+static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
+{
+        u8 buf, count = 0;
+
+        dprintk("%s\n", __FUNCTION__);
+
+        dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[0], data[1], data[2], data[3]);
+
+        /* if NXT2004, write directly to tuner. if NXT2002, write through NXT chip.
+         * direct write is required for Philips TUV1236D and ALPS TDHU2 */
+        switch (state->demod_chip) {
+                case NXT2004:
+                        if (i2c_writebytes(state, state->config->pll_address, data, 4))
+                                printk(KERN_WARNING "nxt200x: error writing to tuner\n");
+                        /* wait until we have a lock */
+                        while (count < 20) {
+                                i2c_readbytes(state, state->config->pll_address, &buf, 1);
+                                if (buf & 0x40)
+                                        return 0;
+                                msleep(100);
+                                count++;
+                        }
+                        printk("nxt2004: timeout waiting for tuner lock\n");
+                        break;
+                case NXT2002:
+                        /* set the i2c transfer speed to the tuner */
+                        buf = 0x03;
+                        nxt200x_writebytes(state, 0x20, &buf, 1);
+
+                        /* setup to transfer 4 bytes via i2c */
+                        buf = 0x04;
+                        nxt200x_writebytes(state, 0x34, &buf, 1);
+
+                        /* write actual tuner bytes */
+                        nxt200x_writebytes(state, 0x36, data, 4);
+
+                        /* set tuner i2c address */
+                        buf = state->config->pll_address;
+                        nxt200x_writebytes(state, 0x35, &buf, 1);
+
+                        /* write UC Opmode to begin transfer */
+                        buf = 0x80;
+                        nxt200x_writebytes(state, 0x21, &buf, 1);
+
+                        while (count < 20) {
+                                nxt200x_readbytes(state, 0x21, &buf, 1);
+                                if ((buf & 0x80)== 0x00)
+                                        return 0;
+                                msleep(100);
+                                count++;
+                        }
+                        printk("nxt2002: timeout error writing tuner\n");
+                        break;
+                default:
+                        return -EINVAL;
+                        break;
+        }
+        return 0;
+}
+
+static void nxt200x_agc_reset(struct nxt200x_state* state)
+{
+        u8 buf;
+        dprintk("%s\n", __FUNCTION__);
+
+        switch (state->demod_chip) {
+                case NXT2002:
+                        buf = 0x08;
+                        nxt200x_writebytes(state, 0x08, &buf, 1);
+                        buf = 0x00;
+                        nxt200x_writebytes(state, 0x08, &buf, 1);
+                        break;
+                case NXT2004:
+                        nxt200x_readreg_multibyte(state, 0x08, &buf, 1);
+                        buf = 0x08;
+                        nxt200x_writereg_multibyte(state, 0x08, &buf, 1);
+                        buf = 0x00;
+                        nxt200x_writereg_multibyte(state, 0x08, &buf, 1);
+                        break;
+                default:
+                        break;
+        }
+        return;
+}
+
+static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
+{
+
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 buf[3], written = 0, chunkpos = 0;
+        u16 rambase, position, crc = 0;
+
+        dprintk("%s\n", __FUNCTION__);
+        dprintk("Firmware is %zu bytes\n", fw->size);
+
+        /* Get the RAM base for this nxt2002 */
+        nxt200x_readbytes(state, 0x10, buf, 1);
+
+        if (buf[0] & 0x10)
+                rambase = 0x1000;
+        else
+                rambase = 0x0000;
+
+        dprintk("rambase on this nxt2002 is %04X\n", rambase);
+
+        /* Hold the micro in reset while loading firmware */
+        buf[0] = 0x80;
+        nxt200x_writebytes(state, 0x2B, buf, 1);
+
+        for (position = 0; position < fw->size; position++) {
+                if (written == 0) {
+                        crc = 0;
+                        chunkpos = 0x28;
+                        buf[0] = ((rambase + position) >> 8);
+                        buf[1] = (rambase + position) & 0xFF;
+                        buf[2] = 0x81;
+                        /* write starting address */
+                        nxt200x_writebytes(state, 0x29, buf, 3);
+                }
+                written++;
+                chunkpos++;
+
+                if ((written % 4) == 0)
+                        nxt200x_writebytes(state, chunkpos, &fw->data[position-3], 4);
+
+                crc = nxt200x_crc(crc, fw->data[position]);
+
+                if ((written == 255) || (position+1 == fw->size)) {
+                        /* write remaining bytes of firmware */
+                        nxt200x_writebytes(state, chunkpos+4-(written %4),
+                                &fw->data[position-(written %4) + 1],
+                                written %4);
+                        buf[0] = crc << 8;
+                        buf[1] = crc & 0xFF;
+
+                        /* write crc */
+                        nxt200x_writebytes(state, 0x2C, buf, 2);
+
+                        /* do a read to stop things */
+                        nxt200x_readbytes(state, 0x2A, buf, 1);
+
+                        /* set transfer mode to complete */
+                        buf[0] = 0x80;
+                        nxt200x_writebytes(state, 0x2B, buf, 1);
+
+                        written = 0;
+                }
+        }
+
+        return 0;
+};
+
+static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
+{
+
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 buf[3];
+        u16 rambase, position, crc=0;
+
+        dprintk("%s\n", __FUNCTION__);
+        dprintk("Firmware is %zu bytes\n", fw->size);
+
+        /* set rambase */
+        rambase = 0x1000;
+
+        /* hold the micro in reset while loading firmware */
+        buf[0] = 0x80;
+        nxt200x_writebytes(state, 0x2B, buf,1);
+
+        /* calculate firmware CRC */
+        for (position = 0; position < fw->size; position++) {
+                crc = nxt200x_crc(crc, fw->data[position]);
+        }
+
+        buf[0] = rambase >> 8;
+        buf[1] = rambase & 0xFF;
+        buf[2] = 0x81;
+        /* write starting address */
+        nxt200x_writebytes(state,0x29,buf,3);
+
+        for (position = 0; position < fw->size;) {
+                nxt200x_writebytes(state, 0x2C, &fw->data[position],
+                        fw->size-position > 255 ? 255 : fw->size-position);
+                position += (fw->size-position > 255 ? 255 : fw->size-position);
+        }
+        buf[0] = crc >> 8;
+        buf[1] = crc & 0xFF;
+
+        dprintk("firmware crc is 0x%02X 0x%02X\n", buf[0], buf[1]);
+
+        /* write crc */
+        nxt200x_writebytes(state, 0x2C, buf,2);
+
+        /* do a read to stop things */
+        nxt200x_readbytes(state, 0x2C, buf, 1);
+
+        /* set transfer mode to complete */
+        buf[0] = 0x80;
+        nxt200x_writebytes(state, 0x2B, buf,1);
+
+        return 0;
+};
+
+static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
+                                             struct dvb_frontend_parameters *p)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 buf[4];
+
+        /* stop the micro first */
+        nxt200x_microcontroller_stop(state);
+
+        if (state->demod_chip == NXT2004) {
+                /* make sure demod is set to digital */
+                buf[0] = 0x04;
+                nxt200x_writebytes(state, 0x14, buf, 1);
+                buf[0] = 0x00;
+                nxt200x_writebytes(state, 0x17, buf, 1);
+        }
+
+        /* get tuning information */
+        dvb_pll_configure(state->config->pll_desc, buf, p->frequency, 0);
+
+        /* set additional params */
+        switch (p->u.vsb.modulation) {
+                case QAM_64:
+                case QAM_256:
+                        /* Set punctured clock for QAM */
+                        /* This is just a guess since I am unable to test it */
+                        if (state->config->set_ts_params)
+                                state->config->set_ts_params(fe, 1);
+
+                        /* set input */
+                        if (state->config->set_pll_input)
+                                state->config->set_pll_input(buf, 1);
+                        break;
+                case VSB_8:
+                        /* Set non-punctured clock for VSB */
+                        if (state->config->set_ts_params)
+                                state->config->set_ts_params(fe, 0);
+
+                        /* set input */
+                        if (state->config->set_pll_input)
+                                state->config->set_pll_input(buf, 0);
+                        break;
+                default:
+                        return -EINVAL;
+                        break;
+        }
+
+        /* write frequency information */
+        nxt200x_writetuner(state, buf);
+
+        /* reset the agc now that tuning has been completed */
+        nxt200x_agc_reset(state);
+
+        /* set target power level */
+        switch (p->u.vsb.modulation) {
+                case QAM_64:
+                case QAM_256:
+                        buf[0] = 0x74;
+                        break;
+                case VSB_8:
+                        buf[0] = 0x70;
+                        break;
+                default:
+                        return -EINVAL;
+                        break;
+        }
+        nxt200x_writebytes(state, 0x42, buf, 1);
+
+        /* configure sdm */
+        switch (state->demod_chip) {
+                case NXT2002:
+                        buf[0] = 0x87;
+                        break;
+                case NXT2004:
+                        buf[0] = 0x07;
+                        break;
+                default:
+                        return -EINVAL;
+                        break;
+        }
+        nxt200x_writebytes(state, 0x57, buf, 1);
+
+        /* write sdm1 input */
+        buf[0] = 0x10;
+        buf[1] = 0x00;
+        nxt200x_writebytes(state, 0x58, buf, 2);
+
+        /* write sdmx input */
+        switch (p->u.vsb.modulation) {
+                case QAM_64:
+                                buf[0] = 0x68;
+                                break;
+                case QAM_256:
+                                buf[0] = 0x64;
+                                break;
+                case VSB_8:
+                                buf[0] = 0x60;
+                                break;
+                default:
+                                return -EINVAL;
+                                break;
+        }
+        buf[1] = 0x00;
+        nxt200x_writebytes(state, 0x5C, buf, 2);
+
+        /* write adc power lpf fc */
+        buf[0] = 0x05;
+        nxt200x_writebytes(state, 0x43, buf, 1);
+
+        if (state->demod_chip == NXT2004) {
+                /* write ??? */
+                buf[0] = 0x00;
+                buf[1] = 0x00;
+                nxt200x_writebytes(state, 0x46, buf, 2);
+        }
+
+        /* write accumulator2 input */
+        buf[0] = 0x80;
+        buf[1] = 0x00;
+        nxt200x_writebytes(state, 0x4B, buf, 2);
+
+        /* write kg1 */
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0x4D, buf, 1);
+
+        /* write sdm12 lpf fc */
+        buf[0] = 0x44;
+        nxt200x_writebytes(state, 0x55, buf, 1);
+
+        /* write agc control reg */
+        buf[0] = 0x04;
+        nxt200x_writebytes(state, 0x41, buf, 1);
+
+        if (state->demod_chip == NXT2004) {
+                nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+                buf[0] = 0x24;
+                nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+
+                /* soft reset? */
+                nxt200x_readreg_multibyte(state, 0x08, buf, 1);
+                buf[0] = 0x10;
+                nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+                nxt200x_readreg_multibyte(state, 0x08, buf, 1);
+                buf[0] = 0x00;
+                nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+
+                nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+                buf[0] = 0x04;
+                nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+                buf[0] = 0x00;
+                nxt200x_writereg_multibyte(state, 0x81, buf, 1);
+                buf[0] = 0x80; buf[1] = 0x00; buf[2] = 0x00;
+                nxt200x_writereg_multibyte(state, 0x82, buf, 3);
+                nxt200x_readreg_multibyte(state, 0x88, buf, 1);
+                buf[0] = 0x11;
+                nxt200x_writereg_multibyte(state, 0x88, buf, 1);
+                nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+                buf[0] = 0x44;
+                nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+        }
+
+        /* write agc ucgp0 */
+        switch (p->u.vsb.modulation) {
+                case QAM_64:
+                                buf[0] = 0x02;
+                                break;
+                case QAM_256:
+                                buf[0] = 0x03;
+                                break;
+                case VSB_8:
+                                buf[0] = 0x00;
+                                break;
+                default:
+                                return -EINVAL;
+                                break;
+        }
+        nxt200x_writebytes(state, 0x30, buf, 1);
+
+        /* write agc control reg */
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0x41, buf, 1);
+
+        /* write accumulator2 input */
+        buf[0] = 0x80;
+        buf[1] = 0x00;
+        nxt200x_writebytes(state, 0x49, buf,2);
+        nxt200x_writebytes(state, 0x4B, buf,2);
+
+        /* write agc control reg */
+        buf[0] = 0x04;
+        nxt200x_writebytes(state, 0x41, buf, 1);
+
+        nxt200x_microcontroller_start(state);
+
+        if (state->demod_chip == NXT2004) {
+                nxt2004_microcontroller_init(state);
+
+                /* ???? */
+                buf[0] = 0xF0;
+                buf[1] = 0x00;
+                nxt200x_writebytes(state, 0x5C, buf, 2);
+        }
+
+        /* adjacent channel detection should be done here, but I don't
+        have any stations with this need so I cannot test it */
+
+        return 0;
+}
+
+static int nxt200x_read_status(struct dvb_frontend* fe, fe_status_t* status)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 lock;
+        nxt200x_readbytes(state, 0x31, &lock, 1);
+
+        *status = 0;
+        if (lock & 0x20) {
+                *status |= FE_HAS_SIGNAL;
+                *status |= FE_HAS_CARRIER;
+                *status |= FE_HAS_VITERBI;
+                *status |= FE_HAS_SYNC;
+                *status |= FE_HAS_LOCK;
+        }
+        return 0;
+}
+
+static int nxt200x_read_ber(struct dvb_frontend* fe, u32* ber)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 b[3];
+
+        nxt200x_readreg_multibyte(state, 0xE6, b, 3);
+
+        *ber = ((b[0] << 8) + b[1]) * 8;
+
+        return 0;
+}
+
+static int nxt200x_read_signal_strength(struct dvb_frontend* fe, u16* strength)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 b[2];
+        u16 temp = 0;
+
+        /* setup to read cluster variance */
+        b[0] = 0x00;
+        nxt200x_writebytes(state, 0xA1, b, 1);
+
+        /* get multreg val */
+        nxt200x_readreg_multibyte(state, 0xA6, b, 2);
+
+        temp = (b[0] << 8) | b[1];
+        *strength = ((0x7FFF - temp) & 0x0FFF) * 16;
+
+        return 0;
+}
+
+static int nxt200x_read_snr(struct dvb_frontend* fe, u16* snr)
+{
+
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 b[2];
+        u16 temp = 0, temp2;
+        u32 snrdb = 0;
+
+        /* setup to read cluster variance */
+        b[0] = 0x00;
+        nxt200x_writebytes(state, 0xA1, b, 1);
+
+        /* get multreg val from 0xA6 */
+        nxt200x_readreg_multibyte(state, 0xA6, b, 2);
+
+        temp = (b[0] << 8) | b[1];
+        temp2 = 0x7FFF - temp;
+
+        /* snr will be in db */
+        if (temp2 > 0x7F00)
+                snrdb = 1000*24 + ( 1000*(30-24) * ( temp2 - 0x7F00 ) / ( 0x7FFF - 0x7F00 ) );
+        else if (temp2 > 0x7EC0)
+                snrdb = 1000*18 + ( 1000*(24-18) * ( temp2 - 0x7EC0 ) / ( 0x7F00 - 0x7EC0 ) );
+        else if (temp2 > 0x7C00)
+                snrdb = 1000*12 + ( 1000*(18-12) * ( temp2 - 0x7C00 ) / ( 0x7EC0 - 0x7C00 ) );
+        else
+                snrdb = 1000*0 + ( 1000*(12-0) * ( temp2 - 0 ) / ( 0x7C00 - 0 ) );
+
+        /* the value reported back from the frontend will be FFFF=32db 0000=0db */
+        *snr = snrdb * (0xFFFF/32000);
+
+        return 0;
+}
+
+static int nxt200x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        u8 b[3];
+
+        nxt200x_readreg_multibyte(state, 0xE6, b, 3);
+        *ucblocks = b[2];
+
+        return 0;
+}
+
+static int nxt200x_sleep(struct dvb_frontend* fe)
+{
+        return 0;
+}
+
+static int nxt2002_init(struct dvb_frontend* fe)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        const struct firmware *fw;
+        int ret;
+        u8 buf[2];
+
+        /* request the firmware, this will block until someone uploads it */
+        printk("nxt2002: Waiting for firmware upload (%s)...\n", NXT2002_DEFAULT_FIRMWARE);
+        ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE, &state->i2c->dev);
+        printk("nxt2002: Waiting for firmware upload(2)...\n");
+        if (ret) {
+                printk("nxt2002: No firmware uploaded (timeout or file not found?)\n");
+                return ret;
+        }
+
+        ret = nxt2002_load_firmware(fe, fw);
+        if (ret) {
+                printk("nxt2002: Writing firmware to device failed\n");
+                release_firmware(fw);
+                return ret;
+        }
+        printk("nxt2002: Firmware upload complete\n");
+
+        /* Put the micro into reset */
+        nxt200x_microcontroller_stop(state);
+
+        /* ensure transfer is complete */
+        buf[0]=0x00;
+        nxt200x_writebytes(state, 0x2B, buf, 1);
+
+        /* Put the micro into reset for real this time */
+        nxt200x_microcontroller_stop(state);
+
+        /* soft reset everything (agc,frontend,eq,fec)*/
+        buf[0] = 0x0F;
+        nxt200x_writebytes(state, 0x08, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0x08, buf, 1);
+
+        /* write agc sdm configure */
+        buf[0] = 0xF1;
+        nxt200x_writebytes(state, 0x57, buf, 1);
+
+        /* write mod output format */
+        buf[0] = 0x20;
+        nxt200x_writebytes(state, 0x09, buf, 1);
+
+        /* write fec mpeg mode */
+        buf[0] = 0x7E;
+        buf[1] = 0x00;
+        nxt200x_writebytes(state, 0xE9, buf, 2);
+
+        /* write mux selection */
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0xCC, buf, 1);
+
+        return 0;
+}
+
+static int nxt2004_init(struct dvb_frontend* fe)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        const struct firmware *fw;
+        int ret;
+        u8 buf[3];
+
+        /* ??? */
+        buf[0]=0x00;
+        nxt200x_writebytes(state, 0x1E, buf, 1);
+
+        /* request the firmware, this will block until someone uploads it */
+        printk("nxt2004: Waiting for firmware upload (%s)...\n", NXT2004_DEFAULT_FIRMWARE);
+        ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE, &state->i2c->dev);
+        printk("nxt2004: Waiting for firmware upload(2)...\n");
+        if (ret) {
+                printk("nxt2004: No firmware uploaded (timeout or file not found?)\n");
+                return ret;
+        }
+
+        ret = nxt2004_load_firmware(fe, fw);
+        if (ret) {
+                printk("nxt2004: Writing firmware to device failed\n");
+                release_firmware(fw);
+                return ret;
+        }
+        printk("nxt2004: Firmware upload complete\n");
+
+        /* ensure transfer is complete */
+        buf[0] = 0x01;
+        nxt200x_writebytes(state, 0x19, buf, 1);
+
+        nxt2004_microcontroller_init(state);
+        nxt200x_microcontroller_stop(state);
+        nxt200x_microcontroller_stop(state);
+        nxt2004_microcontroller_init(state);
+        nxt200x_microcontroller_stop(state);
+
+        /* soft reset everything (agc,frontend,eq,fec)*/
+        buf[0] = 0xFF;
+        nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+
+        /* write agc sdm configure */
+        buf[0] = 0xD7;
+        nxt200x_writebytes(state, 0x57, buf, 1);
+
+        /* ???*/
+        buf[0] = 0x07;
+        buf[1] = 0xfe;
+        nxt200x_writebytes(state, 0x35, buf, 2);
+        buf[0] = 0x12;
+        nxt200x_writebytes(state, 0x34, buf, 1);
+        buf[0] = 0x80;
+        nxt200x_writebytes(state, 0x21, buf, 1);
+
+        /* ???*/
+        buf[0] = 0x21;
+        nxt200x_writebytes(state, 0x0A, buf, 1);
+
+        /* ???*/
+        buf[0] = 0x01;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+
+        /* write fec mpeg mode */
+        buf[0] = 0x7E;
+        buf[1] = 0x00;
+        nxt200x_writebytes(state, 0xE9, buf, 2);
+
+        /* write mux selection */
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0xCC, buf, 1);
+
+        /* ???*/
+        nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+
+        /* soft reset? */
+        nxt200x_readreg_multibyte(state, 0x08, buf, 1);
+        buf[0] = 0x10;
+        nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+        nxt200x_readreg_multibyte(state, 0x08, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+
+        /* ???*/
+        nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x01;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x70;
+        nxt200x_writereg_multibyte(state, 0x81, buf, 1);
+        buf[0] = 0x31; buf[1] = 0x5E; buf[2] = 0x66;
+        nxt200x_writereg_multibyte(state, 0x82, buf, 3);
+
+        nxt200x_readreg_multibyte(state, 0x88, buf, 1);
+        buf[0] = 0x11;
+        nxt200x_writereg_multibyte(state, 0x88, buf, 1);
+        nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x40;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+
+        nxt200x_readbytes(state, 0x10, buf, 1);
+        buf[0] = 0x10;
+        nxt200x_writebytes(state, 0x10, buf, 1);
+        nxt200x_readbytes(state, 0x0A, buf, 1);
+        buf[0] = 0x21;
+        nxt200x_writebytes(state, 0x0A, buf, 1);
+
+        nxt2004_microcontroller_init(state);
+
+        buf[0] = 0x21;
+        nxt200x_writebytes(state, 0x0A, buf, 1);
+        buf[0] = 0x7E;
+        nxt200x_writebytes(state, 0xE9, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0xEA, buf, 1);
+
+        nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+        nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+
+        /* soft reset? */
+        nxt200x_readreg_multibyte(state, 0x08, buf, 1);
+        buf[0] = 0x10;
+        nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+        nxt200x_readreg_multibyte(state, 0x08, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x08, buf, 1);
+
+        nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x04;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x81, buf, 1);
+        buf[0] = 0x80; buf[1] = 0x00; buf[2] = 0x00;
+        nxt200x_writereg_multibyte(state, 0x82, buf, 3);
+
+        nxt200x_readreg_multibyte(state, 0x88, buf, 1);
+        buf[0] = 0x11;
+        nxt200x_writereg_multibyte(state, 0x88, buf, 1);
+
+        nxt200x_readreg_multibyte(state, 0x80, buf, 1);
+        buf[0] = 0x44;
+        nxt200x_writereg_multibyte(state, 0x80, buf, 1);
+
+        /* initialize tuner */
+        nxt200x_readbytes(state, 0x10, buf, 1);
+        buf[0] = 0x12;
+        nxt200x_writebytes(state, 0x10, buf, 1);
+        buf[0] = 0x04;
+        nxt200x_writebytes(state, 0x13, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0x16, buf, 1);
+        buf[0] = 0x04;
+        nxt200x_writebytes(state, 0x14, buf, 1);
+        buf[0] = 0x00;
+        nxt200x_writebytes(state, 0x14, buf, 1);
+        nxt200x_writebytes(state, 0x17, buf, 1);
+        nxt200x_writebytes(state, 0x14, buf, 1);
+        nxt200x_writebytes(state, 0x17, buf, 1);
+
+        return 0;
+}
+
+static int nxt200x_init(struct dvb_frontend* fe)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        int ret = 0;
+
+        if (!state->initialised) {
+                switch (state->demod_chip) {
+                        case NXT2002:
+                                ret = nxt2002_init(fe);
+                                break;
+                        case NXT2004:
+                                ret = nxt2004_init(fe);
+                                break;
+                        default:
+                                return -EINVAL;
+                                break;
+                }
+                state->initialised = 1;
+        }
+        return ret;
+}
+
+static int nxt200x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
+{
+        fesettings->min_delay_ms = 500;
+        fesettings->step_size = 0;
+        fesettings->max_drift = 0;
+        return 0;
+}
+
+static void nxt200x_release(struct dvb_frontend* fe)
+{
+        struct nxt200x_state* state = fe->demodulator_priv;
+        kfree(state);
+}
+
+static struct dvb_frontend_ops nxt200x_ops;
+
+struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
+                                   struct i2c_adapter* i2c)
+{
+        struct nxt200x_state* state = NULL;
+        u8 buf [] = {0,0,0,0,0};
+
+        /* allocate memory for the internal state */
+        state = (struct nxt200x_state*) kmalloc(sizeof(struct nxt200x_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+        memset(state,0,sizeof(*state));
+
+        /* setup the state */
+        state->config = config;
+        state->i2c = i2c;
+        memcpy(&state->ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops));
+        state->initialised = 0;
+
+        /* read card id */
+        nxt200x_readbytes(state, 0x00, buf, 5);
+        dprintk("NXT info: %02X %02X %02X %02X %02X\n",
+                buf[0], buf[1], buf[2], buf[3], buf[4]);
+
+        /* set demod chip */
+        switch (buf[0]) {
+                case 0x04:
+                        state->demod_chip = NXT2002;
+                        printk("nxt200x: NXT2002 Detected\n");
+                        break;
+                case 0x05:
+                        state->demod_chip = NXT2004;
+                        printk("nxt200x: NXT2004 Detected\n");
+                        break;
+                default:
+                        goto error;
+        }
+
+        /* make sure demod chip is supported */
+        switch (state->demod_chip) {
+                case NXT2002:
+                        if (buf[0] != 0x04) goto error;         /* device id */
+                        if (buf[1] != 0x02) goto error;         /* fab id */
+                        if (buf[2] != 0x11) goto error;         /* month */
+                        if (buf[3] != 0x20) goto error;         /* year msb */
+                        if (buf[4] != 0x00) goto error;         /* year lsb */
+                        break;
+                case NXT2004:
+                        if (buf[0] != 0x05) goto error;         /* device id */
+                        break;
+                default:
+                        goto error;
+        }
+
+        /* create dvb_frontend */
+        state->frontend.ops = &state->ops;
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+
+error:
+        kfree(state);
+        printk("Unknown/Unsupported NXT chip: %02X %02X %02X %02X %02X\n",
+                buf[0], buf[1], buf[2], buf[3], buf[4]);
+        return NULL;
+}
+
+static struct dvb_frontend_ops nxt200x_ops = {
+
+        .info = {
+                .name = "Nextwave NXT200X VSB/QAM frontend",
+                .type = FE_ATSC,
+                .frequency_min =  54000000,
+                .frequency_max = 860000000,
+                .frequency_stepsize = 166666,   /* stepsize is just a guess */
+                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+                        FE_CAN_8VSB | FE_CAN_QAM_64 | FE_CAN_QAM_256
+        },
+
+        .release = nxt200x_release,
+
+        .init = nxt200x_init,
+        .sleep = nxt200x_sleep,
+
+        .set_frontend = nxt200x_setup_frontend_parameters,
+        .get_tune_settings = nxt200x_get_tune_settings,
+
+        .read_status = nxt200x_read_status,
+        .read_ber = nxt200x_read_ber,
+        .read_signal_strength = nxt200x_read_signal_strength,
+        .read_snr = nxt200x_read_snr,
+        .read_ucblocks = nxt200x_read_ucblocks,
+};
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+MODULE_DESCRIPTION("NXT200X (ATSC 8VSB & ITU-T J.83 AnnexB 64/256 QAM) Demodulator Driver");
+MODULE_AUTHOR("Kirk Lapray, Jean-Francois Thibert, and Taylor Jacob");
+MODULE_LICENSE("GPL");
+
+EXPORT_SYMBOL(nxt200x_attach);
+
diff --git a/drivers/media/dvb/frontends/nxt200x.h b/drivers/media/dvb/frontends/nxt200x.h
new file mode 100644
index 000000000000..1d9d70bc37ef
--- /dev/null
+++ b/drivers/media/dvb/frontends/nxt200x.h
@@ -0,0 +1,61 @@
+/*
+ *    Support for NXT2002 and NXT2004 - VSB/QAM
+ *
+ *    Copyright (C) 2005 Kirk Lapray (kirk.lapray@gmail.com)
+ *    based on nxt2002 by Taylor Jacob <rtjacob@earthlink.net>
+ *    and nxt2004 by Jean-Francois Thibert (jeanfrancois@sagetv.com)
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+*/
+
+#ifndef NXT200X_H
+#define NXT200X_H
+
+#include <linux/dvb/frontend.h>
+#include <linux/firmware.h>
+
+typedef enum nxt_chip_t {
+                NXTUNDEFINED,
+                NXT2002,
+                NXT2004
+}nxt_chip_type;
+
+struct nxt200x_config
+{
+        /* the demodulator's i2c address */
+        u8 demod_address;
+
+        /* tuner information */
+        u8 pll_address;
+        struct dvb_pll_desc *pll_desc;
+
+        /* used to set pll input */
+        int (*set_pll_input)(u8* buf, int input);
+
+        /* need to set device param for start_dma */
+        int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+};
+
+extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
+                                           struct i2c_adapter* i2c);
+
+#endif /* NXT200X_H */
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index fc74c40d6477..78bded861d02 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -468,6 +468,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
         unsigned char snd_buf[2];
         u8 rcvr_stat;
         u16 snr_equ;
+        u32 signal_strength;
         int usK;
 
         snd_buf[0]=0x04;
@@ -503,7 +504,11 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
         usK = (rcvr_stat & 0x10) ? 3 : 0;
 
         /* The value reported back from the frontend will be FFFF=100% 0000=0% */
-        *strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000;
+        signal_strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000;
+        if (signal_strength > 0xffff)
+                *strength = 0xffff;
+        else
+                *strength = signal_strength;
         dprintk("read_signal_strength %i\n",*strength);
 
         return 0;
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 8a9db23dd1b7..531f76246e5f 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -339,6 +339,7 @@ static int or51211_read_signal_strength(struct dvb_frontend* fe, u16* strength)
         u8 rec_buf[2];
         u8 snd_buf[4];
         u8 snr_equ;
+        u32 signal_strength;
 
         /* SNR after Equalizer */
         snd_buf[0] = 0x04;
@@ -358,8 +359,11 @@ static int or51211_read_signal_strength(struct dvb_frontend* fe, u16* strength)
         snr_equ = rec_buf[0] & 0xff;
 
         /* The value reported back from the frontend will be FFFF=100% 0000=0% */
-        *strength = (((5334 - i20Log10(snr_equ))/3+5)*65535)/1000;
-
+        signal_strength = (((5334 - i20Log10(snr_equ))/3+5)*65535)/1000;
+        if (signal_strength > 0xffff)
+                *strength = 0xffff;
+        else
+                *strength = signal_strength;
         dprintk("read_signal_strength %i\n",*strength);
 
         return 0;
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 889d9257215d..29c48665e130 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -64,8 +64,12 @@ struct stv0299_state {
         u32 tuner_frequency;
         u32 symbol_rate;
         fe_code_rate_t fec_inner;
+        int errmode;
 };
 
+#define STATUS_BER 0
+#define STATUS_UCBLOCKS 1
+
 static int debug;
 static int debug_legacy_dish_switch;
 #define dprintk(args...) \
@@ -383,36 +387,6 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
         };
 }
 
-static inline s32 stv0299_calc_usec_delay (struct timeval lasttime, struct timeval curtime)
-{
-        return ((curtime.tv_usec < lasttime.tv_usec) ?
-                1000000 - lasttime.tv_usec + curtime.tv_usec :
-                curtime.tv_usec - lasttime.tv_usec);
-}
-
-static void stv0299_sleep_until (struct timeval *waketime, u32 add_usec)
-{
-        struct timeval lasttime;
-        s32 delta, newdelta;
-
-        waketime->tv_usec += add_usec;
-        if (waketime->tv_usec >= 1000000) {
-                waketime->tv_usec -= 1000000;
-                waketime->tv_sec++;
-        }
-
-        do_gettimeofday (&lasttime);
-        delta = stv0299_calc_usec_delay (lasttime, *waketime);
-        if (delta > 2500) {
-                msleep ((delta - 1500) / 1000);
-                do_gettimeofday (&lasttime);
-                newdelta = stv0299_calc_usec_delay (lasttime, *waketime);
-                delta = (newdelta > delta) ? 0 : newdelta;
-        }
-        if (delta > 0)
-                udelay (delta);
-}
-
 static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
 {
         struct stv0299_state* state = fe->demodulator_priv;
@@ -440,7 +414,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
                 memcpy (&tv[0], &nexttime, sizeof (struct timeval));
         stv0299_writeregI (state, 0x0c, reg0x0c | 0x50); /* set LNB to 18V */
 
-        stv0299_sleep_until (&nexttime, 32000);
+        dvb_frontend_sleep_until(&nexttime, 32000);
 
         for (i=0; i<9; i++) {
                 if (debug_legacy_dish_switch)
@@ -454,13 +428,13 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
                 cmd = cmd >> 1;
 
                 if (i != 8)
-                        stv0299_sleep_until (&nexttime, 8000);
+                        dvb_frontend_sleep_until(&nexttime, 8000);
         }
         if (debug_legacy_dish_switch) {
                 printk ("%s(%d): switch delay (should be 32k followed by all 8k\n",
                         __FUNCTION__, fe->dvb->num);
-                for (i=1; i < 10; i++)
-                        printk ("%d: %d\n", i, stv0299_calc_usec_delay (tv[i-1] , tv[i]));
+                for (i = 1; i < 10; i++)
+                        printk ("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i]));
         }
 
         return 0;
@@ -517,8 +491,7 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 {
         struct stv0299_state* state = fe->demodulator_priv;
 
-        stv0299_writeregI(state, 0x34, (stv0299_readreg(state, 0x34) & 0xcf) | 0x10);
-        msleep(100);
+        if (state->errmode != STATUS_BER) return 0;
         *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
 
         return 0;
@@ -557,9 +530,8 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
         struct stv0299_state* state = fe->demodulator_priv;
 
-        stv0299_writeregI(state, 0x34, (stv0299_readreg(state, 0x34) & 0xcf) | 0x30);
-        msleep(100);
-        *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
+        if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0;
+        else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
 
         return 0;
 }
@@ -581,49 +553,14 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         if (state->config->invert) invval = (~invval) & 1;
         stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval);
 
-        if (state->config->enhanced_tuning) {
-                /* check if we should do a finetune */
-                int frequency_delta = p->frequency - state->tuner_frequency;
-                int minmax = p->u.qpsk.symbol_rate / 2000;
-                if (minmax < 5000) minmax = 5000;
-
-                if ((frequency_delta > -minmax) && (frequency_delta < minmax) && (frequency_delta != 0) &&
-                    (state->fec_inner == p->u.qpsk.fec_inner) &&
-                    (state->symbol_rate == p->u.qpsk.symbol_rate)) {
-                        int Drot_freq = (frequency_delta << 16) / (state->config->mclk / 1000);
-
-                        // zap the derotator registers first
-                        stv0299_writeregI(state, 0x22, 0x00);
-                        stv0299_writeregI(state, 0x23, 0x00);
-
-                        // now set them as we want
-                        stv0299_writeregI(state, 0x22, Drot_freq >> 8);
-                        stv0299_writeregI(state, 0x23, Drot_freq);
-                } else {
-                        /* A "normal" tune is requested */
-                        stv0299_writeregI(state, 0x05, 0xb5);   /*  enable i2c repeater on stv0299  */
-                        state->config->pll_set(fe, state->i2c, p);
-                        stv0299_writeregI(state, 0x05, 0x35);   /*  disable i2c repeater on stv0299  */
-
-                        stv0299_writeregI(state, 0x32, 0x80);
-                        stv0299_writeregI(state, 0x22, 0x00);
-                        stv0299_writeregI(state, 0x23, 0x00);
-                        stv0299_writeregI(state, 0x32, 0x19);
-                        stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
-                        stv0299_set_FEC (state, p->u.qpsk.fec_inner);
-                }
-        } else {
-                stv0299_writeregI(state, 0x05, 0xb5);   /*  enable i2c repeater on stv0299  */
-                state->config->pll_set(fe, state->i2c, p);
-                stv0299_writeregI(state, 0x05, 0x35);   /*  disable i2c repeater on stv0299  */
+        stv0299_writeregI(state, 0x05, 0xb5);   /*  enable i2c repeater on stv0299  */
+        state->config->pll_set(fe, state->i2c, p);
+        stv0299_writeregI(state, 0x05, 0x35);   /*  disable i2c repeater on stv0299  */
 
-                stv0299_set_FEC (state, p->u.qpsk.fec_inner);
-                stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
-                stv0299_writeregI(state, 0x22, 0x00);
-                stv0299_writeregI(state, 0x23, 0x00);
-                stv0299_readreg (state, 0x23);
-                stv0299_writeregI(state, 0x12, 0xb9);
-        }
+        stv0299_set_FEC (state, p->u.qpsk.fec_inner);
+        stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
+        stv0299_writeregI(state, 0x22, 0x00);
+        stv0299_writeregI(state, 0x23, 0x00);
 
         state->tuner_frequency = p->frequency;
         state->fec_inner = p->u.qpsk.fec_inner;
@@ -708,6 +645,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
         state->tuner_frequency = 0;
         state->symbol_rate = 0;
         state->fec_inner = 0;
+        state->errmode = STATUS_BER;
 
         /* check if the demod is there */
         stv0299_writeregI(state, 0x02, 0x34); /* standby off */
diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h
index d0c4484861e1..9af3d71c89db 100644
--- a/drivers/media/dvb/frontends/stv0299.h
+++ b/drivers/media/dvb/frontends/stv0299.h
@@ -73,9 +73,6 @@ struct stv0299_config
         /* does the inversion require inversion? */
         u8 invert:1;
 
-        /* Should the enhanced tuning code be used? */
-        u8 enhanced_tuning:1;
-
         /* Skip reinitialisation? */
         u8 skip_reinit:1;
 
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 3529c618f828..7968743826fc 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -420,7 +420,7 @@ static void tda10046_init_plls(struct dvb_frontend* fe)
         struct tda1004x_state* state = fe->demodulator_priv;
 
         tda1004x_write_byteI(state, TDA10046H_CONFPLL1, 0xf0);
-        tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10); // PLL M = 10
+        tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 0x0a); // PLL M = 10
         if (state->config->xtal_freq == TDA10046_XTAL_4M ) {
                 dprintk("%s: setting up PLLs for a 4 MHz Xtal\n", __FUNCTION__);
                 tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0
@@ -597,7 +597,10 @@ static int tda10046_init(struct dvb_frontend* fe)
         // Init the tuner PLL
         if (state->config->pll_init) {
                 tda1004x_enable_tuner_i2c(state);
-                state->config->pll_init(fe);
+                if (state->config->pll_init(fe)) {
+                        printk(KERN_ERR "tda1004x: pll init failed\n");
+                        return  -EIO;
+                }
                 tda1004x_disable_tuner_i2c(state);
         }
 
@@ -667,7 +670,10 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
 
         // set frequency
         tda1004x_enable_tuner_i2c(state);
-        state->config->pll_set(fe, fe_params);
+        if (state->config->pll_set(fe, fe_params)) {
+                printk(KERN_ERR "tda1004x: pll set failed\n");
+                return  -EIO;
+        }
         tda1004x_disable_tuner_i2c(state);
 
         // Hardcoded to use auto as much as possible on the TDA10045 as it
@@ -832,6 +838,8 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
 
         case TDA1004X_DEMOD_TDA10046:
                 tda1004x_write_mask(state, TDA1004X_AUTO, 0x40, 0x40);
+                msleep(1);
+                tda1004x_write_mask(state, TDA10046H_AGC_CONF, 4, 1);
                 break;
         }
 
@@ -1129,7 +1137,12 @@ static int tda1004x_sleep(struct dvb_frontend* fe)
                 if (state->config->pll_sleep != NULL) {
                         tda1004x_enable_tuner_i2c(state);
                         state->config->pll_sleep(fe);
-                        tda1004x_disable_tuner_i2c(state);
+                        if (state->config->if_freq != TDA10046_FREQ_052) {
+                                /* special hack for Philips EUROPA Based boards:
+                                 * keep the I2c bridge open for tuner access in analog mode
+                                 */
+                                tda1004x_disable_tuner_i2c(state);
+                        }
                 }
                 tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 1);
                 break;
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 85b437bbddcd..bbebd1c4caca 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -286,15 +286,10 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets)
          *     although one packet has been transfered.
          */
         if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) {
-                unsigned int i = 0, valid;
+                unsigned int i = 0;
                 while (pluto->dma_buf[i] == 0x47)
                         i += 188;
-                valid = i / 188;
-                if (nbpackets != valid) {
-                        dev_err(&pluto->pdev->dev, "nbpackets=%u valid=%u\n",
-                                        nbpackets, valid);
-                        nbpackets = valid;
-                }
+                nbpackets = i / 188;
         }
 
         dvb_dmx_swfilter_packets(&pluto->demux, pluto->dma_buf, nbpackets);
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 22b203f8ff27..87ea52757a21 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1566,7 +1566,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -1644,7 +1644,6 @@ static struct stv0299_config alps_bsru6_config = {
         .inittab = alps_bsru6_inittab,
         .mclk = 88000000UL,
         .invert = 1,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
@@ -1669,7 +1668,7 @@ static u8 alps_bsbe1_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -1721,7 +1720,6 @@ static struct stv0299_config alps_bsbe1_config = {
         .inittab = alps_bsbe1_inittab,
         .mclk = 88000000UL,
         .invert = 1,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .min_delay_ms = 100,
         .set_symbol_rate = alps_bsru6_set_symbol_rate,
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 7692cd23f839..aa75dc03a0b3 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -499,7 +499,7 @@ static u8 typhoon_cinergy1200s_inittab[] = {
         0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,             // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,             // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,             // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -531,7 +531,6 @@ static struct stv0299_config typhoon_config = {
         .inittab = typhoon_cinergy1200s_inittab,
         .mclk = 88000000UL,
         .invert = 0,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP0,
@@ -546,7 +545,6 @@ static struct stv0299_config cinergy_1200s_config = {
         .inittab = typhoon_cinergy1200s_inittab,
         .mclk = 88000000UL,
         .invert = 0,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_0,
         .volt13_op0_op1 = STV0299_VOLT13_OP0,
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 51c30ba68140..75fb92d60998 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -490,7 +490,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,             // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,             // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,             // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -580,7 +580,6 @@ static struct stv0299_config alps_bsru6_config = {
         .inittab = alps_bsru6_inittab,
         .mclk = 88000000UL,
         .invert = 1,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
@@ -710,7 +709,6 @@ static struct stv0299_config philips_su1278_tt_config = {
         .inittab = philips_su1278_tt_inittab,
         .mclk = 64000000UL,
         .invert = 0,
-        .enhanced_tuning = 1,
         .skip_reinit = 1,
         .lock_output = STV0229_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index b1f21ef0e3b3..755df81cbc49 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -305,7 +305,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -379,7 +379,6 @@ static struct stv0299_config alps_bsru6_config = {
         .inittab = alps_bsru6_inittab,
         .mclk = 88000000UL,
         .invert = 1,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 43d6c8268642..4fd8bbc47037 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -226,12 +226,14 @@ static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, int arg)
         return 0;
 }
 
-static void lnbp21_init(struct budget* budget)
+static int lnbp21_init(struct budget* budget)
 {
         u8 buf = 0x00;
         struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = &buf, .len = sizeof(buf) };
 
-        i2c_transfer (&budget->i2c_adap, &msg, 1);
+        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1)
+                return -EIO;
+        return 0;
 }
 
 static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
@@ -273,7 +275,7 @@ static u8 alps_bsru6_inittab[] = {
         0x01, 0x15,
         0x02, 0x00,
         0x03, 0x00,
-        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
         0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
         0x06, 0x40,   /* DAC not used, set to high impendance mode */
         0x07, 0x00,   /* DAC LSB */
@@ -284,7 +286,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,   // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,   // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -358,7 +360,6 @@ static struct stv0299_config alps_bsru6_config = {
         .inittab = alps_bsru6_inittab,
         .mclk = 88000000UL,
         .invert = 1,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
@@ -367,6 +368,79 @@ static struct stv0299_config alps_bsru6_config = {
         .pll_set = alps_bsru6_pll_set,
 };
 
+static u8 alps_bsbe1_inittab[] = {
+        0x01, 0x15,
+        0x02, 0x30,
+        0x03, 0x00,
+        0x04, 0x7d,  /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x05, 0x35,  /* I2CT = 0, SCLT = 1, SDAT = 1 */
+        0x06, 0x40,  /* DAC not used, set to high impendance mode */
+        0x07, 0x00,  /* DAC LSB */
+        0x08, 0x40,  /* DiSEqC off, LNB power on OP2/LOCK pin on */
+        0x09, 0x00,  /* FIFO */
+        0x0c, 0x51,  /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
+        0x0d, 0x82,  /* DC offset compensation = ON, beta_agc1 = 2 */
+        0x0e, 0x23,  /* alpha_tmg = 2, beta_tmg = 3 */
+        0x10, 0x3f,  // AGC2 0x3d
+        0x11, 0x84,
+        0x12, 0xb9,
+        0x15, 0xc9,  // lock detector threshold
+        0x16, 0x00,
+        0x17, 0x00,
+        0x18, 0x00,
+        0x19, 0x00,
+        0x1a, 0x00,
+        0x1f, 0x50,
+        0x20, 0x00,
+        0x21, 0x00,
+        0x22, 0x00,
+        0x23, 0x00,
+        0x28, 0x00, // out imp: normal out type: parallel FEC mode:0
+        0x29, 0x1e, // 1/2 threshold
+        0x2a, 0x14, // 2/3 threshold
+        0x2b, 0x0f, // 3/4 threshold
+        0x2c, 0x09, // 5/6 threshold
+        0x2d, 0x05, // 7/8 threshold
+        0x2e, 0x01,
+        0x31, 0x1f, // test all FECs
+        0x32, 0x19, // viterbi and synchro search
+        0x33, 0xfc, // rs control
+        0x34, 0x93, // error control
+        0x0f, 0x92, // 0x80 = inverse AGC
+        0xff, 0xff
+};
+
+static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
+{
+        int ret;
+        u8 data[4];
+        u32 div;
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
+
+        if ((params->frequency < 950000) || (params->frequency > 2150000))
+                return -EINVAL;
+
+        div = (params->frequency + (125 - 1)) / 125; // round correctly
+        data[0] = (div >> 8) & 0x7f;
+        data[1] = div & 0xff;
+        data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
+        data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4;
+
+        ret = i2c_transfer(i2c, &msg, 1);
+        return (ret != 1) ? -EIO : 0;
+}
+
+static struct stv0299_config alps_bsbe1_config = {
+        .demod_address = 0x68,
+        .inittab = alps_bsbe1_inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .skip_reinit = 0,
+        .min_delay_ms = 100,
+        .set_symbol_rate = alps_bsru6_set_symbol_rate,
+        .pll_set = alps_bsbe1_pll_set,
+};
+
 static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
         struct budget* budget = (struct budget*) fe->dvb->priv;
@@ -500,6 +574,19 @@ static u8 read_pwm(struct budget* budget)
 static void frontend_init(struct budget *budget)
 {
         switch(budget->dev->pci->subsystem_device) {
+        case 0x1017:
+                // try the ALPS BSBE1 now
+                budget->dvb_frontend = stv0299_attach(&alps_bsbe1_config, &budget->i2c_adap);
+                if (budget->dvb_frontend) {
+                        budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage;
+                        budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
+                        if (lnbp21_init(budget)) {
+                                printk("%s: No LNBP21 found!\n", __FUNCTION__);
+                                goto error_out;
+                        }
+                }
+
+                break;
         case 0x1003: // Hauppauge/TT Nova budget (stv0299/ALPS BSRU6(tsa5059) OR ves1893/ALPS BSRV2(sp5659))
         case 0x1013:
                 // try the ALPS BSRV2 first of all
@@ -554,7 +641,10 @@ static void frontend_init(struct budget *budget)
                 if (budget->dvb_frontend) {
                         budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage;
                         budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
-                        lnbp21_init(budget);
+                        if (lnbp21_init(budget)) {
+                                printk("%s: No LNBP21 found!\n", __FUNCTION__);
+                                goto error_out;
+                        }
                         break;
                 }
         }
@@ -566,13 +656,17 @@ static void frontend_init(struct budget *budget)
                        budget->dev->pci->subsystem_vendor,
                        budget->dev->pci->subsystem_device);
         } else {
-                if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) {
-                        printk("budget: Frontend registration failed!\n");
-                        if (budget->dvb_frontend->ops->release)
-                                budget->dvb_frontend->ops->release(budget->dvb_frontend);
-                        budget->dvb_frontend = NULL;
-                }
+                if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend))
+                        goto error_out;
         }
+        return;
+
+error_out:
+        printk("budget: Frontend registration failed!\n");
+        if (budget->dvb_frontend->ops->release)
+                budget->dvb_frontend->ops->release(budget->dvb_frontend);
+        budget->dvb_frontend = NULL;
+        return;
 }
 
 static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
@@ -618,6 +712,7 @@ static int budget_detach (struct saa7146_dev* dev)
 
 static struct saa7146_extension budget_extension;
 
+MAKE_BUDGET_INFO(ttbs2, "TT-Budget/WinTV-NOVA-S PCI (rev AL/alps bsbe1 lnbp21 frontend)", BUDGET_TT);
 MAKE_BUDGET_INFO(ttbs,  "TT-Budget/WinTV-NOVA-S  PCI",  BUDGET_TT);
 MAKE_BUDGET_INFO(ttbc,  "TT-Budget/WinTV-NOVA-C  PCI",  BUDGET_TT);
 MAKE_BUDGET_INFO(ttbt,  "TT-Budget/WinTV-NOVA-T  PCI",  BUDGET_TT);
@@ -630,6 +725,7 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(ttbc,  0x13c2, 0x1004),
         MAKE_EXTENSION_PCI(ttbt,  0x13c2, 0x1005),
         MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
+        MAKE_EXTENSION_PCI(ttbs2, 0x13c2, 0x1017),
         MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1016),
         MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60),
         MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index d200ab0ad9e7..fd53d6010502 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1198,7 +1198,7 @@ static u8 alps_bsbe1_inittab[] = {
         0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,             // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,             // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,             // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -1240,7 +1240,7 @@ static u8 alps_bsru6_inittab[] = {
         0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
         0x10, 0x3f,             // AGC2  0x3d
         0x11, 0x84,
-        0x12, 0xb5,             // Lock detect: -64  Carrier freq detect:on
+        0x12, 0xb9,
         0x15, 0xc9,             // lock detector threshold
         0x16, 0x00,
         0x17, 0x00,
@@ -1335,7 +1335,6 @@ static struct stv0299_config alps_stv0299_config = {
         .inittab = alps_bsru6_inittab,
         .mclk = 88000000UL,
         .invert = 1,
-        .enhanced_tuning = 0,
         .skip_reinit = 0,
         .lock_output = STV0229_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bbb989df4cf0..199b01188858 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -25,6 +25,16 @@ config VIDEO_BT848
           To compile this driver as a module, choose M here: the
           module will be called bttv.
 
+config VIDEO_BT848_DVB
+        tristate "DVB/ATSC Support for bt878 based TV cards"
+        depends on VIDEO_BT848 && DVB_CORE
+        select DVB_BT8XX
+        ---help---
+          This adds support for DVB/ATSC cards based on the BT878 chip.
+
+          To compile this driver as a module, choose M here: the
+          module will be called dvb-bt8xx.
+
 config VIDEO_SAA6588
         tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
         depends on VIDEO_DEV && I2C && VIDEO_BT848
@@ -243,29 +253,7 @@ config VIDEO_MEYE
           To compile this driver as a module, choose M here: the
           module will be called meye.
 
-config VIDEO_SAA7134
-        tristate "Philips SAA7134 support"
-        depends on VIDEO_DEV && PCI && I2C && SOUND
-        select VIDEO_BUF
-        select VIDEO_IR
-        select VIDEO_TUNER
-        select CRC32
-        ---help---
-          This is a video4linux driver for Philips SAA7130/7134 based
-          TV cards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7134.
-
-config VIDEO_SAA7134_DVB
-        tristate "DVB Support for saa7134 based TV cards"
-        depends on VIDEO_SAA7134 && DVB_CORE
-        select VIDEO_BUF_DVB
-        select DVB_MT352
-        select DVB_TDA1004X
-        ---help---
-          This adds support for DVB cards based on the
-          Philips saa7134 chip.
+source "drivers/media/video/saa7134/Kconfig"
 
 config VIDEO_MXB
         tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
@@ -316,34 +304,9 @@ config VIDEO_HEXIUM_GEMINI
           To compile this driver as a module, choose M here: the
           module will be called hexium_gemini.
 
-config VIDEO_CX88
-        tristate "Conexant 2388x (bt878 successor) support"
-        depends on VIDEO_DEV && PCI && I2C && EXPERIMENTAL
-        select I2C_ALGOBIT
-        select FW_LOADER
-        select VIDEO_BTCX
-        select VIDEO_BUF
-        select VIDEO_TUNER
-        select VIDEO_TVEEPROM
-        select VIDEO_IR
-        ---help---
-          This is a video4linux driver for Conexant 2388x based
-          TV cards.
+source "drivers/media/video/cx88/Kconfig"
 
-          To compile this driver as a module, choose M here: the
-          module will be called cx8800
-
-config VIDEO_CX88_DVB
-        tristate "DVB Support for cx2388x based TV cards"
-        depends on VIDEO_CX88 && DVB_CORE
-        select VIDEO_BUF_DVB
-        select DVB_MT352
-        select DVB_OR51132
-        select DVB_CX22702
-        select DVB_LGDT330X
-        ---help---
-          This adds support for DVB/ATSC cards based on the
-          Connexant 2388x chip.
+source "drivers/media/video/em28xx/Kconfig"
 
 config VIDEO_OVCAMCHIP
         tristate "OmniVision Camera Chip support"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 046b82de9285..3ac465992400 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -5,7 +5,6 @@
 bttv-objs       :=      bttv-driver.o bttv-cards.o bttv-if.o \
                         bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o
 zoran-objs      :=      zr36120.o zr36120_i2c.o zr36120_mem.o
-rds-objs        :=      saa6588.o
 zr36067-objs    :=      zoran_procfs.o zoran_device.o \
                         zoran_driver.o zoran_card.o
 tuner-objs      :=      tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
@@ -16,7 +15,7 @@ obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o
-obj-$(CONFIG_VIDEO_SAA6588) += rds.o
+obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o
 obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o
 obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o
 obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o
@@ -39,6 +38,8 @@ obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
 obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
+obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
+obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o
 obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
 obj-$(CONFIG_VIDEO_MXB) += saa7111.o tuner.o tda9840.o tea6415c.o tea6420.o mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 0823ddaf7004..881cdcb1875d 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 76c1b63ebdf2..e4063950ae57 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 
 #include <media/audiochip.h>
-#include <media/id.h>
 #include "bttv.h"
 #include "bt832.h"
 
@@ -54,36 +53,36 @@ static struct i2c_driver driver;
 static struct i2c_client client_template;
 
 struct bt832 {
-        struct i2c_client client;
+        struct i2c_client client;
 };
 
 int bt832_hexdump(struct i2c_client *i2c_client_s, unsigned char *buf)
 {
         int i,rc;
         buf[0]=0x80; // start at register 0 with auto-increment
-        if (1 != (rc = i2c_master_send(i2c_client_s,buf,1)))
-                printk("bt832: i2c i/o error: rc == %d (should be 1)\n",rc);
+        if (1 != (rc = i2c_master_send(i2c_client_s,buf,1)))
+                printk("bt832: i2c i/o error: rc == %d (should be 1)\n",rc);
 
-        for(i=0;i<65;i++)
-                buf[i]=0;
-        if (65 != (rc=i2c_master_recv(i2c_client_s,buf,65)))
-                printk("bt832: i2c i/o error: rc == %d (should be 65)\n",rc);
+        for(i=0;i<65;i++)
+                buf[i]=0;
+        if (65 != (rc=i2c_master_recv(i2c_client_s,buf,65)))
+                printk("bt832: i2c i/o error: rc == %d (should be 65)\n",rc);
 
-        // Note: On READ the first byte is the current index
-        //  (e.g. 0x80, what we just wrote)
+        // Note: On READ the first byte is the current index
+        //  (e.g. 0x80, what we just wrote)
 
-        if(1) {
-                int i;
-                printk("BT832 hexdump:\n");
-                for(i=1;i<65;i++) {
+        if(1) {
+                int i;
+                printk("BT832 hexdump:\n");
+                for(i=1;i<65;i++) {
                         if(i!=1) {
                           if(((i-1)%8)==0) printk(" ");
-                          if(((i-1)%16)==0) printk("\n");
+                          if(((i-1)%16)==0) printk("\n");
                         }
-                        printk(" %02x",buf[i]);
-                }
-                printk("\n");
-        }
+                        printk(" %02x",buf[i]);
+                }
+                printk("\n");
+        }
         return 0;
 }
 
@@ -102,13 +101,13 @@ int bt832_init(struct i2c_client *i2c_client_s)
                 return 0;
         }
 
-        printk("Write 0 tp VPSTATUS\n");
-        buf[0]=BT832_VP_STATUS; // Reg.52
-        buf[1]= 0x00;
-        if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
+        printk("Write 0 tp VPSTATUS\n");
+        buf[0]=BT832_VP_STATUS; // Reg.52
+        buf[1]= 0x00;
+        if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
+                printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
 
-        bt832_hexdump(i2c_client_s,buf);
+        bt832_hexdump(i2c_client_s,buf);
 
 
         // Leave low power mode:
@@ -116,17 +115,17 @@ int bt832_init(struct i2c_client *i2c_client_s)
         buf[0]=BT832_CAM_SETUP0; //0x39 57
         buf[1]=0x08;
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error LLPM: rc == %d (should be 2)\n",rc);
+                printk("bt832: i2c i/o error LLPM: rc == %d (should be 2)\n",rc);
 
-        bt832_hexdump(i2c_client_s,buf);
+        bt832_hexdump(i2c_client_s,buf);
 
         printk("Write 0 tp VPSTATUS\n");
-        buf[0]=BT832_VP_STATUS; // Reg.52
-        buf[1]= 0x00;
-        if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
+        buf[0]=BT832_VP_STATUS; // Reg.52
+        buf[1]= 0x00;
+        if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
+                printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
 
-        bt832_hexdump(i2c_client_s,buf);
+        bt832_hexdump(i2c_client_s,buf);
 
 
         // Enable Output
@@ -134,22 +133,22 @@ int bt832_init(struct i2c_client *i2c_client_s)
         buf[0]=BT832_VP_CONTROL1; // Reg.40
         buf[1]= 0x27 & (~0x01); // Default | !skip
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error EO: rc == %d (should be 2)\n",rc);
+                printk("bt832: i2c i/o error EO: rc == %d (should be 2)\n",rc);
 
-        bt832_hexdump(i2c_client_s,buf);
+        bt832_hexdump(i2c_client_s,buf);
 
 
         // for testing (even works when no camera attached)
         printk("bt832: *** Generate NTSC M Bars *****\n");
         buf[0]=BT832_VP_TESTCONTROL0; // Reg. 42
         buf[1]=3; // Generate NTSC System M bars, Generate Frame timing internally
-        if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
-                printk("bt832: i2c i/o error MBAR: rc == %d (should be 2)\n",rc);
+        if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
+                printk("bt832: i2c i/o error MBAR: rc == %d (should be 2)\n",rc);
 
         printk("Bt832: Camera Present: %s\n",
                 (buf[1+BT832_CAM_STATUS] & BT832_56_CAMERA_PRESENT) ? "yes":"no");
 
-        bt832_hexdump(i2c_client_s,buf);
+        bt832_hexdump(i2c_client_s,buf);
         kfree(buf);
         return 1;
 }
@@ -162,17 +161,17 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
 
         printk("bt832_attach\n");
 
-        client_template.adapter = adap;
-        client_template.addr    = addr;
+        client_template.adapter = adap;
+        client_template.addr    = addr;
 
-        printk("bt832: chip found @ 0x%x\n", addr<<1);
+        printk("bt832: chip found @ 0x%x\n", addr<<1);
 
-        if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
-                return -ENOMEM;
+        if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
+                return -ENOMEM;
         memset(t,0,sizeof(*t));
         t->client = client_template;
-        i2c_set_clientdata(&t->client, t);
-        i2c_attach_client(&t->client);
+        i2c_set_clientdata(&t->client, t);
+        i2c_attach_client(&t->client);
 
         if(! bt832_init(&t->client)) {
                 bt832_detach(&t->client);
@@ -211,7 +210,7 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
         printk("bt832: command %x\n",cmd);
 
-        switch (cmd) {
+        switch (cmd) {
                 case BT832_HEXDUMP: {
                         unsigned char *buf;
                         buf=kmalloc(65,GFP_KERNEL);
diff --git a/drivers/media/video/bt832.h b/drivers/media/video/bt832.h
index 9b6a8d2c96b5..1ce8fa71f7db 100644
--- a/drivers/media/video/bt832.h
+++ b/drivers/media/video/bt832.h
@@ -233,8 +233,8 @@ SetInterlaceMode( spec.interlace );
 /* from web:
  Video Sampling
 Digital video is a sampled form of analog video. The most common sampling schemes in use today are:
-                  Pixel Clock   Horiz    Horiz    Vert
-                   Rate         Total    Active
+                  Pixel Clock   Horiz    Horiz    Vert
+                   Rate         Total    Active
 NTSC square pixel  12.27 MHz    780      640      525
 NTSC CCIR-601      13.5  MHz    858      720      525
 NTSC 4FSc          14.32 MHz    910      768      525
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 0881a17d5226..3413bace443a 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -6,7 +6,7 @@
     like the big tvcards array for the most part
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
-                           & Marcus Metzler (mocm@thp.uni-koeln.de)
+                           & Marcus Metzler (mocm@thp.uni-koeln.de)
     (c) 1999-2001 Gerd Knorr <kraxel@goldbach.in-berlin.de>
 
     This program is free software; you can redistribute it and/or modify
@@ -145,162 +145,163 @@ static struct CARD {
         int cardnr;
         char *name;
 } cards[] __devinitdata = {
-        { 0x13eb0070, BTTV_HAUPPAUGE878,  "Hauppauge WinTV" },
-        { 0x39000070, BTTV_HAUPPAUGE878,  "Hauppauge WinTV-D" },
-        { 0x45000070, BTTV_HAUPPAUGEPVR,  "Hauppauge WinTV/PVR" },
-        { 0xff000070, BTTV_OSPREY1x0,     "Osprey-100" },
-        { 0xff010070, BTTV_OSPREY2x0_SVID,"Osprey-200" },
-        { 0xff020070, BTTV_OSPREY500,     "Osprey-500" },
-        { 0xff030070, BTTV_OSPREY2000,    "Osprey-2000" },
-        { 0xff040070, BTTV_OSPREY540,     "Osprey-540" },
-
-        { 0x00011002, BTTV_ATI_TVWONDER,  "ATI TV Wonder" },
-        { 0x00031002, BTTV_ATI_TVWONDERVE,"ATI TV Wonder/VE" },
-
-        { 0x6606107d, BTTV_WINFAST2000,   "Leadtek WinFast TV 2000" },
-        { 0x6607107d, BTTV_WINFASTVC100,  "Leadtek WinFast VC 100" },
-        { 0x6609107d, BTTV_WINFAST2000,   "Leadtek TV 2000 XP" },
-        { 0x263610b4, BTTV_STB2,          "STB TV PCI FM, Gateway P/N 6000704" },
-        { 0x264510b4, BTTV_STB2,          "STB TV PCI FM, Gateway P/N 6000704" },
-        { 0x402010fc, BTTV_GVBCTV3PCI,    "I-O Data Co. GV-BCTV3/PCI" },
-        { 0x405010fc, BTTV_GVBCTV4PCI,    "I-O Data Co. GV-BCTV4/PCI" },
-        { 0x407010fc, BTTV_GVBCTV5PCI,    "I-O Data Co. GV-BCTV5/PCI" },
-        { 0xd01810fc, BTTV_GVBCTV5PCI,    "I-O Data Co. GV-BCTV5/PCI" },
-
-        { 0x001211bd, BTTV_PINNACLE,      "Pinnacle PCTV" },
+        { 0x13eb0070, BTTV_BOARD_HAUPPAUGE878,  "Hauppauge WinTV" },
+        { 0x39000070, BTTV_BOARD_HAUPPAUGE878,  "Hauppauge WinTV-D" },
+        { 0x45000070, BTTV_BOARD_HAUPPAUGEPVR,  "Hauppauge WinTV/PVR" },
+        { 0xff000070, BTTV_BOARD_OSPREY1x0,     "Osprey-100" },
+        { 0xff010070, BTTV_BOARD_OSPREY2x0_SVID,"Osprey-200" },
+        { 0xff020070, BTTV_BOARD_OSPREY500,     "Osprey-500" },
+        { 0xff030070, BTTV_BOARD_OSPREY2000,    "Osprey-2000" },
+        { 0xff040070, BTTV_BOARD_OSPREY540,     "Osprey-540" },
+        { 0xff070070, BTTV_BOARD_OSPREY440,     "Osprey-440" },
+
+        { 0x00011002, BTTV_BOARD_ATI_TVWONDER,  "ATI TV Wonder" },
+        { 0x00031002, BTTV_BOARD_ATI_TVWONDERVE,"ATI TV Wonder/VE" },
+
+        { 0x6606107d, BTTV_BOARD_WINFAST2000,   "Leadtek WinFast TV 2000" },
+        { 0x6607107d, BTTV_BOARD_WINFASTVC100,  "Leadtek WinFast VC 100" },
+        { 0x6609107d, BTTV_BOARD_WINFAST2000,   "Leadtek TV 2000 XP" },
+        { 0x263610b4, BTTV_BOARD_STB2,          "STB TV PCI FM, Gateway P/N 6000704" },
+        { 0x264510b4, BTTV_BOARD_STB2,          "STB TV PCI FM, Gateway P/N 6000704" },
+        { 0x402010fc, BTTV_BOARD_GVBCTV3PCI,    "I-O Data Co. GV-BCTV3/PCI" },
+        { 0x405010fc, BTTV_BOARD_GVBCTV4PCI,    "I-O Data Co. GV-BCTV4/PCI" },
+        { 0x407010fc, BTTV_BOARD_GVBCTV5PCI,    "I-O Data Co. GV-BCTV5/PCI" },
+        { 0xd01810fc, BTTV_BOARD_GVBCTV5PCI,    "I-O Data Co. GV-BCTV5/PCI" },
+
+        { 0x001211bd, BTTV_BOARD_PINNACLE,      "Pinnacle PCTV" },
         /* some cards ship with byteswapped IDs ... */
-        { 0x1200bd11, BTTV_PINNACLE,      "Pinnacle PCTV [bswap]" },
-        { 0xff00bd11, BTTV_PINNACLE,      "Pinnacle PCTV [bswap]" },
+        { 0x1200bd11, BTTV_BOARD_PINNACLE,      "Pinnacle PCTV [bswap]" },
+        { 0xff00bd11, BTTV_BOARD_PINNACLE,      "Pinnacle PCTV [bswap]" },
         /* this seems to happen as well ... */
-        { 0xff1211bd, BTTV_PINNACLE,      "Pinnacle PCTV" },
-
-        { 0x3000121a, BTTV_VOODOOTV_FM,   "3Dfx VoodooTV FM/ VoodooTV 200" },
-        { 0x263710b4, BTTV_VOODOOTV_FM,   "3Dfx VoodooTV FM/ VoodooTV 200" },
-        { 0x3060121a, BTTV_STB2,          "3Dfx VoodooTV 100/ STB OEM" },
-
-        { 0x3000144f, BTTV_MAGICTVIEW063, "(Askey Magic/others) TView99 CPH06x" },
-        { 0xa005144f, BTTV_MAGICTVIEW063, "CPH06X TView99-Card" },
-        { 0x3002144f, BTTV_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH05x" },
-        { 0x3005144f, BTTV_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH061/06L (T1/LC)" },
-        { 0x5000144f, BTTV_MAGICTVIEW061, "Askey CPH050" },
-        { 0x300014ff, BTTV_MAGICTVIEW061, "TView 99 (CPH061)" },
-        { 0x300214ff, BTTV_PHOEBE_TVMAS,  "Phoebe TV Master (CPH060)" },
-
-        { 0x00011461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
-        { 0x00021461, BTTV_AVERMEDIA98,   "AVermedia TVCapture 98" },
-        { 0x00031461, BTTV_AVPHONE98,     "AVerMedia TVPhone98" },
-        { 0x00041461, BTTV_AVERMEDIA98,   "AVerMedia TVCapture 98" },
-        { 0x03001461, BTTV_AVERMEDIA98,   "VDOMATE TV TUNER CARD" },
-
-        { 0x1117153b, BTTV_TERRATVALUE,   "Terratec TValue (Philips PAL B/G)" },
-        { 0x1118153b, BTTV_TERRATVALUE,   "Terratec TValue (Temic PAL B/G)" },
-        { 0x1119153b, BTTV_TERRATVALUE,   "Terratec TValue (Philips PAL I)" },
-        { 0x111a153b, BTTV_TERRATVALUE,   "Terratec TValue (Temic PAL I)" },
-
-        { 0x1123153b, BTTV_TERRATVRADIO,  "Terratec TV Radio+" },
-        { 0x1127153b, BTTV_TERRATV,       "Terratec TV+ (V1.05)"    },
+        { 0xff1211bd, BTTV_BOARD_PINNACLE,      "Pinnacle PCTV" },
+
+        { 0x3000121a, BTTV_BOARD_VOODOOTV_FM,   "3Dfx VoodooTV FM/ VoodooTV 200" },
+        { 0x263710b4, BTTV_BOARD_VOODOOTV_FM,   "3Dfx VoodooTV FM/ VoodooTV 200" },
+        { 0x3060121a, BTTV_BOARD_STB2,    "3Dfx VoodooTV 100/ STB OEM" },
+
+        { 0x3000144f, BTTV_BOARD_MAGICTVIEW063, "(Askey Magic/others) TView99 CPH06x" },
+        { 0xa005144f, BTTV_BOARD_MAGICTVIEW063, "CPH06X TView99-Card" },
+        { 0x3002144f, BTTV_BOARD_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH05x" },
+        { 0x3005144f, BTTV_BOARD_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH061/06L (T1/LC)" },
+        { 0x5000144f, BTTV_BOARD_MAGICTVIEW061, "Askey CPH050" },
+        { 0x300014ff, BTTV_BOARD_MAGICTVIEW061, "TView 99 (CPH061)" },
+        { 0x300214ff, BTTV_BOARD_PHOEBE_TVMAS,  "Phoebe TV Master (CPH060)" },
+
+        { 0x00011461, BTTV_BOARD_AVPHONE98,     "AVerMedia TVPhone98" },
+        { 0x00021461, BTTV_BOARD_AVERMEDIA98,   "AVermedia TVCapture 98" },
+        { 0x00031461, BTTV_BOARD_AVPHONE98,     "AVerMedia TVPhone98" },
+        { 0x00041461, BTTV_BOARD_AVERMEDIA98,   "AVerMedia TVCapture 98" },
+        { 0x03001461, BTTV_BOARD_AVERMEDIA98,   "VDOMATE TV TUNER CARD" },
+
+        { 0x1117153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue (Philips PAL B/G)" },
+        { 0x1118153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue (Temic PAL B/G)" },
+        { 0x1119153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue (Philips PAL I)" },
+        { 0x111a153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue (Temic PAL I)" },
+
+        { 0x1123153b, BTTV_BOARD_TERRATVRADIO,  "Terratec TV Radio+" },
+        { 0x1127153b, BTTV_BOARD_TERRATV,       "Terratec TV+ (V1.05)"    },
         /* clashes with FlyVideo
-         *{ 0x18521852, BTTV_TERRATV,     "Terratec TV+ (V1.10)"    }, */
-        { 0x1134153b, BTTV_TERRATVALUE,   "Terratec TValue (LR102)" },
-        { 0x1135153b, BTTV_TERRATVALUER,  "Terratec TValue Radio" }, /* LR102 */
-        { 0x5018153b, BTTV_TERRATVALUE,   "Terratec TValue" },       /* ?? */
-        { 0xff3b153b, BTTV_TERRATVALUER,  "Terratec TValue Radio" }, /* ?? */
-
-        { 0x400015b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV" },
-        { 0x400a15b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV" },
-        { 0x400d15b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" },
-        { 0x401015b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" },
-        { 0x401615b0, BTTV_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" },
-
-        { 0x1430aa00, BTTV_PV143,         "Provideo PV143A" },
-        { 0x1431aa00, BTTV_PV143,         "Provideo PV143B" },
-        { 0x1432aa00, BTTV_PV143,         "Provideo PV143C" },
-        { 0x1433aa00, BTTV_PV143,         "Provideo PV143D" },
-        { 0x1433aa03, BTTV_PV143,         "Security Eyes" },
-
-        { 0x1460aa00, BTTV_PV150,         "Provideo PV150A-1" },
-        { 0x1461aa01, BTTV_PV150,         "Provideo PV150A-2" },
-        { 0x1462aa02, BTTV_PV150,         "Provideo PV150A-3" },
-        { 0x1463aa03, BTTV_PV150,         "Provideo PV150A-4" },
-
-        { 0x1464aa04, BTTV_PV150,         "Provideo PV150B-1" },
-        { 0x1465aa05, BTTV_PV150,         "Provideo PV150B-2" },
-        { 0x1466aa06, BTTV_PV150,         "Provideo PV150B-3" },
-        { 0x1467aa07, BTTV_PV150,         "Provideo PV150B-4" },
-
-        { 0xa132ff00, BTTV_IVC100,        "IVC-100"  },
-        { 0xa1550000, BTTV_IVC200,        "IVC-200"  },
-        { 0xa1550001, BTTV_IVC200,        "IVC-200"  },
-        { 0xa1550002, BTTV_IVC200,        "IVC-200"  },
-        { 0xa1550003, BTTV_IVC200,        "IVC-200"  },
-        { 0xa1550100, BTTV_IVC200,        "IVC-200G" },
-        { 0xa1550101, BTTV_IVC200,        "IVC-200G" },
-        { 0xa1550102, BTTV_IVC200,        "IVC-200G" },
-        { 0xa1550103, BTTV_IVC200,        "IVC-200G" },
-        { 0xa182ff00, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff01, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff02, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff03, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff04, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff05, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff06, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff07, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff08, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff09, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff0a, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff0b, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff0c, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff0d, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff0e, BTTV_IVC120,        "IVC-120G" },
-        { 0xa182ff0f, BTTV_IVC120,        "IVC-120G" },
-
-        { 0x41424344, BTTV_GRANDTEC,      "GrandTec Multi Capture" },
-        { 0x01020304, BTTV_XGUARD,        "Grandtec Grand X-Guard" },
-
-        { 0x18501851, BTTV_CHRONOS_VS2,   "FlyVideo 98 (LR50)/ Chronos Video Shuttle II" },
-        { 0xa0501851, BTTV_CHRONOS_VS2,   "FlyVideo 98 (LR50)/ Chronos Video Shuttle II" },
-        { 0x18511851, BTTV_FLYVIDEO98EZ,  "FlyVideo 98EZ (LR51)/ CyberMail AV" },
-        { 0x18521852, BTTV_TYPHOON_TVIEW, "FlyVideo 98FM (LR50)/ Typhoon TView TV/FM Tuner" },
-        { 0x41a0a051, BTTV_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" },
-        { 0x18501f7f, BTTV_FLYVIDEO_98,   "Lifeview Flyvideo 98" },
-
-        { 0x010115cb, BTTV_GMV1,          "AG GMV1" },
-        { 0x010114c7, BTTV_MODTEC_205,    "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" },
-
-        { 0x10b42636, BTTV_HAUPPAUGE878,  "STB ???" },
-        { 0x217d6606, BTTV_WINFAST2000,   "Leadtek WinFast TV 2000" },
-        { 0xfff6f6ff, BTTV_WINFAST2000,   "Leadtek WinFast TV 2000" },
-        { 0x03116000, BTTV_SENSORAY311,   "Sensoray 311" },
-        { 0x00790e11, BTTV_WINDVR,        "Canopus WinDVR PCI" },
-        { 0xa0fca1a0, BTTV_ZOLTRIX,       "Face to Face Tvmax" },
-        { 0x20007063, BTTV_PC_HDTV,       "pcHDTV HD-2000 TV"},
-        { 0x82b2aa6a, BTTV_SIMUS_GVC1100, "SIMUS GVC1100" },
-        { 0x146caa0c, BTTV_PV951,         "ituner spectra8" },
-        { 0x200a1295, BTTV_PXC200,        "ImageNation PXC200A" },
-
-        { 0x40111554, BTTV_PV_BT878P_9B,  "Prolink Pixelview PV-BT" },
-        { 0x17de0a01, BTTV_KWORLD,        "Mecer TV/FM/Video Tuner" },
-
-        { 0x01051805, BTTV_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #1" },
-        { 0x01061805, BTTV_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #2" },
-        { 0x01071805, BTTV_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #3" },
-        { 0x01081805, BTTV_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #4" },
-
-        { 0x15409511, BTTV_ACORP_Y878F, "Acorp Y878F" },
+         *{ 0x18521852, BTTV_BOARD_TERRATV,     "Terratec TV+ (V1.10)"    }, */
+        { 0x1134153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue (LR102)" },
+        { 0x1135153b, BTTV_BOARD_TERRATVALUER,  "Terratec TValue Radio" }, /* LR102 */
+        { 0x5018153b, BTTV_BOARD_TERRATVALUE,   "Terratec TValue" },       /* ?? */
+        { 0xff3b153b, BTTV_BOARD_TERRATVALUER,  "Terratec TValue Radio" }, /* ?? */
+
+        { 0x400015b0, BTTV_BOARD_ZOLTRIX_GENIE, "Zoltrix Genie TV" },
+        { 0x400a15b0, BTTV_BOARD_ZOLTRIX_GENIE, "Zoltrix Genie TV" },
+        { 0x400d15b0, BTTV_BOARD_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" },
+        { 0x401015b0, BTTV_BOARD_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" },
+        { 0x401615b0, BTTV_BOARD_ZOLTRIX_GENIE, "Zoltrix Genie TV / Radio" },
+
+        { 0x1430aa00, BTTV_BOARD_PV143,         "Provideo PV143A" },
+        { 0x1431aa00, BTTV_BOARD_PV143,         "Provideo PV143B" },
+        { 0x1432aa00, BTTV_BOARD_PV143,         "Provideo PV143C" },
+        { 0x1433aa00, BTTV_BOARD_PV143,         "Provideo PV143D" },
+        { 0x1433aa03, BTTV_BOARD_PV143,         "Security Eyes" },
+
+        { 0x1460aa00, BTTV_BOARD_PV150,         "Provideo PV150A-1" },
+        { 0x1461aa01, BTTV_BOARD_PV150,         "Provideo PV150A-2" },
+        { 0x1462aa02, BTTV_BOARD_PV150,         "Provideo PV150A-3" },
+        { 0x1463aa03, BTTV_BOARD_PV150,         "Provideo PV150A-4" },
+
+        { 0x1464aa04, BTTV_BOARD_PV150,         "Provideo PV150B-1" },
+        { 0x1465aa05, BTTV_BOARD_PV150,         "Provideo PV150B-2" },
+        { 0x1466aa06, BTTV_BOARD_PV150,         "Provideo PV150B-3" },
+        { 0x1467aa07, BTTV_BOARD_PV150,         "Provideo PV150B-4" },
+
+        { 0xa132ff00, BTTV_BOARD_IVC100,        "IVC-100"  },
+        { 0xa1550000, BTTV_BOARD_IVC200,        "IVC-200"  },
+        { 0xa1550001, BTTV_BOARD_IVC200,        "IVC-200"  },
+        { 0xa1550002, BTTV_BOARD_IVC200,        "IVC-200"  },
+        { 0xa1550003, BTTV_BOARD_IVC200,        "IVC-200"  },
+        { 0xa1550100, BTTV_BOARD_IVC200,        "IVC-200G" },
+        { 0xa1550101, BTTV_BOARD_IVC200,        "IVC-200G" },
+        { 0xa1550102, BTTV_BOARD_IVC200,        "IVC-200G" },
+        { 0xa1550103, BTTV_BOARD_IVC200,        "IVC-200G" },
+        { 0xa182ff00, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff01, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff02, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff03, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff04, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff05, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff06, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff07, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff08, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff09, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff0a, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff0b, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff0c, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff0d, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff0e, BTTV_BOARD_IVC120,        "IVC-120G" },
+        { 0xa182ff0f, BTTV_BOARD_IVC120,        "IVC-120G" },
+
+        { 0x41424344, BTTV_BOARD_GRANDTEC,      "GrandTec Multi Capture" },
+        { 0x01020304, BTTV_BOARD_XGUARD,        "Grandtec Grand X-Guard" },
+
+        { 0x18501851, BTTV_BOARD_CHRONOS_VS2,   "FlyVideo 98 (LR50)/ Chronos Video Shuttle II" },
+        { 0xa0501851, BTTV_BOARD_CHRONOS_VS2,   "FlyVideo 98 (LR50)/ Chronos Video Shuttle II" },
+        { 0x18511851, BTTV_BOARD_FLYVIDEO98EZ,  "FlyVideo 98EZ (LR51)/ CyberMail AV" },
+        { 0x18521852, BTTV_BOARD_TYPHOON_TVIEW, "FlyVideo 98FM (LR50)/ Typhoon TView TV/FM Tuner" },
+        { 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" },
+        { 0x18501f7f, BTTV_BOARD_FLYVIDEO_98,   "Lifeview Flyvideo 98" },
+
+        { 0x010115cb, BTTV_BOARD_GMV1,          "AG GMV1" },
+        { 0x010114c7, BTTV_BOARD_MODTEC_205,    "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" },
+
+        { 0x10b42636, BTTV_BOARD_HAUPPAUGE878,  "STB ???" },
+        { 0x217d6606, BTTV_BOARD_WINFAST2000,   "Leadtek WinFast TV 2000" },
+        { 0xfff6f6ff, BTTV_BOARD_WINFAST2000,   "Leadtek WinFast TV 2000" },
+        { 0x03116000, BTTV_BOARD_SENSORAY311,   "Sensoray 311" },
+        { 0x00790e11, BTTV_BOARD_WINDVR,        "Canopus WinDVR PCI" },
+        { 0xa0fca1a0, BTTV_BOARD_ZOLTRIX,       "Face to Face Tvmax" },
+        { 0x20007063, BTTV_BOARD_PC_HDTV,       "pcHDTV HD-2000 TV"},
+        { 0x82b2aa6a, BTTV_BOARD_SIMUS_GVC1100, "SIMUS GVC1100" },
+        { 0x146caa0c, BTTV_BOARD_PV951,         "ituner spectra8" },
+        { 0x200a1295, BTTV_BOARD_PXC200,        "ImageNation PXC200A" },
+
+        { 0x40111554, BTTV_BOARD_PV_BT878P_9B,  "Prolink Pixelview PV-BT" },
+        { 0x17de0a01, BTTV_BOARD_KWORLD,        "Mecer TV/FM/Video Tuner" },
+
+        { 0x01051805, BTTV_BOARD_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #1" },
+        { 0x01061805, BTTV_BOARD_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #2" },
+        { 0x01071805, BTTV_BOARD_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #3" },
+        { 0x01081805, BTTV_BOARD_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #4" },
+
+        { 0x15409511, BTTV_BOARD_ACORP_Y878F, "Acorp Y878F" },
 
         /* likely broken, vendor id doesn't match the other magic views ...
-         * { 0xa0fca04f, BTTV_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, */
+         * { 0xa0fca04f, BTTV_BOARD_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, */
 
         /* DVB cards (using pci function .1 for mpeg data xfer) */
-        { 0x01010071, BTTV_NEBULA_DIGITV, "Nebula Electronics DigiTV" },
-        { 0x07611461, BTTV_AVDVBT_761,    "AverMedia AverTV DVB-T 761" },
-        { 0x001c11bd, BTTV_PINNACLESAT,   "Pinnacle PCTV Sat" },
-        { 0x002611bd, BTTV_TWINHAN_DST,   "Pinnacle PCTV SAT CI" },
-        { 0x00011822, BTTV_TWINHAN_DST,   "Twinhan VisionPlus DVB" },
-        { 0xfc00270f, BTTV_TWINHAN_DST,   "ChainTech digitop DST-1000 DVB-S" },
-        { 0x07711461, BTTV_AVDVBT_771,    "AVermedia AverTV DVB-T 771" },
-        { 0xdb1018ac, BTTV_DVICO_DVBT_LITE,    "DViCO FusionHDTV DVB-T Lite" },
-        { 0xd50018ac, BTTV_DVICO_FUSIONHDTV_5_LITE,    "DViCO FusionHDTV 5 Lite" },
+        { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" },
+        { 0x07611461, BTTV_BOARD_AVDVBT_761,    "AverMedia AverTV DVB-T 761" },
+        { 0x001c11bd, BTTV_BOARD_PINNACLESAT,   "Pinnacle PCTV Sat" },
+        { 0x002611bd, BTTV_BOARD_TWINHAN_DST,   "Pinnacle PCTV SAT CI" },
+        { 0x00011822, BTTV_BOARD_TWINHAN_DST,   "Twinhan VisionPlus DVB" },
+        { 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" },
+        { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE,    "DViCO FusionHDTV 5 Lite" },
 
         { 0, -1, NULL }
 };
@@ -309,2116 +310,2494 @@ static struct CARD {
 /* array with description for bt848 / bt878 tv/grabber cards               */
 
 struct tvcard bttv_tvcards[] = {
-{
-/* ---- card 0x00 ---------------------------------- */
-        .name           = " *** UNKNOWN/GENERIC *** ",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1, 0},
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "MIRO PCTV",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 15,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 2, 0, 0, 0, 10},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Hauppauge (bt848)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 1, 2, 3, 4},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "STB, Gateway P/N 6000699 (bt848)",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 4, 0, 2, 3, 1},
-        .no_msp34xx     = 1,
-        .needs_tvaudio  = 1,
-        .tuner_type     = TUNER_PHILIPS_NTSC,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-        .has_radio      = 1,
-},{
-
-/* ---- card 0x04 ---------------------------------- */
-        .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 2,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 0,
-        .tuner_type     = 4,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Diamond DTV2000",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 3,
-        .muxsel         = { 2, 3, 1, 0},
-        .audiomux       = { 0, 1, 0, 1, 3},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "AVerMedia TVPhone",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 3,
-        .muxsel         = { 2, 3, 1, 1},
-        .gpiomask       = 0x0f,
-        .audiomux       = { 0x0c, 0x04, 0x08, 0x04, 0},
-        /*                0x04 for some cards ?? */
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = avermedia_tvphone_audio,
-        .has_remote     = 1,
-},{
-        .name           = "MATRIX-Vision MV-Delta",
-        .video_inputs   = 5,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = 3,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 0, 0},
-        .audiomux       = {0 },
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x08 ---------------------------------- */
-        .name           = "Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xc00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0xc00, 0x800, 0x400, 0xc00, 0},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "IMS/IXmicro TurboTV",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 3,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 1, 1, 2, 3, 0},
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_TEMIC_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Hauppauge (bt878)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x0f, /* old: 7 */
-        .muxsel         = { 2, 0, 1, 1},
-        .audiomux       = { 0, 1, 2, 3, 4},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "MIRO PCTV pro",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x3014f,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x20001,0x10001, 0, 0,10},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x0c ---------------------------------- */
-        .name           = "ADS Technologies Channel Surfer TV (bt848)",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 15,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 13, 14, 11, 7, 0, 0},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "AVerMedia TVCapture 98",
-        .video_inputs   = 3,
-        .audio_inputs   = 4,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 15,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 13, 14, 11, 7, 0, 0},
-        .needs_tvaudio  = 1,
-        .msp34xx_alt    = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = avermedia_tv_stereo_audio,
-},{
-        .name           = "Aimslab Video Highway Xtreme (VHX)",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 2, 1, 3, 4}, /* old: { 0, 1, 2, 3, 4} */
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Zoltrix TV-Max",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 15,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = {0 , 0, 1 , 0, 10},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x10 ---------------------------------- */
-        .name           = "Prolink Pixelview PlayTV (bt878)",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x01fe00,
-        .muxsel         = { 2, 3, 1, 1},
-        /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
-        .audiomux       = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 },
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-},{
-        .name           = "Leadtek WinView 601",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x8300f8,
-        .muxsel         = { 2, 3, 1, 1,0},
-        .audiomux       = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = winview_audio,
-        .has_radio      = 1,
-},{
-        .name           = "AVEC Intercapture",
-        .video_inputs   = 3,
-        .audio_inputs   = 2,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0,
-        .muxsel         = {2, 3, 1, 1},
-        .audiomux       = {1, 0, 0, 0, 0},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = -1,
-        .gpiomask       = 0x8dff00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0 },
-        .no_msp34xx     = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x14 ---------------------------------- */
-        .name           = "CEI Raffles Card",
-        .video_inputs   = 3,
-        .audio_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = {2, 3, 1, 1},
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50",
-        .video_inputs   = 4,
-        .audio_inputs   = 2,  /* tuner, line in */
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1800,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800},
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL_I,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Askey CPH050/ Phoebe Tv Master + FM",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xc00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = {0, 1, 0x800, 0x400, 0xc00, 0},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = -1,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 3, -1 },
-        .digital_mode   = DIGITAL_MODE_CAMERA,
-        .audiomux       = { 0, 0, 0, 0, 0 },
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_ALPS_TSBB5_PAL_I,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x18 ---------------------------------- */
-        .name           = "Askey CPH05X/06X (bt878) [many vendors]",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xe00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = {0x400, 0x400, 0x400, 0x400, 0xc00},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_remote     = 1,
-},{
-        .name           = "Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1f0fff,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x20000, 0x30000, 0x10000, 0, 0x40000},
-        .needs_tvaudio  = 0,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = terratv_audio,
-},{
-        .name           = "Hauppauge WinCam newer (bt878)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 3,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 0, 1, 1},
-        .audiomux       = { 0, 1, 2, 3, 4},
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50",
-        .video_inputs   = 4,
-        .audio_inputs   = 2,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1800,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800},
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_SECAM,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x1c ---------------------------------- */
-        .name           = "Terratec TerraTV+ Version 1.1 (bt878)",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1f0fff,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x20000, 0x30000, 0x10000, 0x00000, 0x40000},
-        .needs_tvaudio  = 0,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = terratv_audio,
-        /* GPIO wiring:
-        External 20 pin connector (for Active Radio Upgrade board)
-        gpio00: i2c-sda
-        gpio01: i2c-scl
-        gpio02: om5610-data
-        gpio03: om5610-clk
-        gpio04: om5610-wre
-        gpio05: om5610-stereo
-        gpio06: rds6588-davn
-        gpio07: Pin 7 n.c.
-        gpio08: nIOW
-        gpio09+10: nIOR, nSEL ?? (bt878)
-                gpio09: nIOR (bt848)
-                gpio10: nSEL (bt848)
-        Sound Routing:
-        gpio16: u2-A0 (1st 4052bt)
-        gpio17: u2-A1
-        gpio18: u2-nEN
-        gpio19: u4-A0 (2nd 4052)
-        gpio20: u4-A1
-                u4-nEN - GND
-        Btspy:
-                00000 : Cdrom (internal audio input)
-                10000 : ext. Video audio input
-                20000 : TV Mono
-                a0000 : TV Mono/2
-        1a0000 : TV Stereo
-                30000 : Radio
-                40000 : Mute
-*/
-
-},{
-        /* Jannik Fritsch <jannik@techfak.uni-bielefeld.de> */
-        .name           = "Imagenation PXC200",
-        .video_inputs   = 5,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = 1, /* was: 4 */
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 0, 0},
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .muxsel_hook    = PXC200_muxsel,
-
-},{
-        .name           = "Lifeview FlyVideo 98 LR50",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1800,  /* 0x8dfe00 */
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0x0800, 0x1000, 0x1000, 0x1800, 0 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Formac iProTV, Formac ProTV I (bt848)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 3,
-        .gpiomask       = 1,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 1, 0, 0, 0, 0 },
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x20 ---------------------------------- */
-        .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 2,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 0,
-        .tuner_type     = 4,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Terratec TerraTValue Version Bt878",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xffff00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x500, 0, 0x300, 0x900, 0x900},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Leadtek WinFast 2000/ WinFast 2000 XP",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1, 1, 0}, /* TV, CVid, SVid, CVid over SVid connector */
-        /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
-        .gpiomask       = 0xb33000,
-        .audiomux       = { 0x122000,0x1000,0x0000,0x620000,0x800000 },
-        /* Audio Routing for "WinFast 2000 XP" (no tv stereo !)
-                gpio23 -- hef4052:nEnable (0x800000)
-                gpio12 -- hef4052:A1
-                gpio13 -- hef4052:A0
-        0x0000: external audio
-        0x1000: FM
-        0x2000: TV
-        0x3000: n.c.
-        Note: There exists another variant "Winfast 2000" with tv stereo !?
-        Note: eeprom only contains FF and pci subsystem id 107d:6606
-        */
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .has_radio      = 1,
-        .tuner_type     = 5, /* default for now, gpio reads BFFF06 for Pal bg+dk */
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = winfast2000_audio,
-        .has_remote     = 1,
-},{
-        .name           = "Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II",
-        .video_inputs   = 4,
-        .audio_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1800,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800},
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x24 ---------------------------------- */
-        .name           = "Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner",
-        .video_inputs   = 4,
-        .audio_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1800,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_radio      = 1,
-},{
-        .name           = "Prolink PixelView PlayTV pro",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xff,
-        .muxsel         = { 2, 3, 1, 1 },
-        .audiomux       = { 0x21, 0x20, 0x24, 0x2c, 0x29, 0x29 },
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Askey CPH06X TView99",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x551e00,
-        .muxsel         = { 2, 3, 1, 0},
-        .audiomux       = { 0x551400, 0x551200, 0, 0, 0x551c00, 0x551200 },
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_remote     = 1,
-},{
-        .name           = "Pinnacle PCTV Studio/Rave",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x03000F,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 2, 0xd0001, 0, 0, 1},
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x28 ---------------------------------- */
-        .name           = "STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 4, 0, 2, 3, 1},
-        .no_msp34xx     = 1,
-        .needs_tvaudio  = 1,
-        .tuner_type     = TUNER_PHILIPS_NTSC,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-        .has_radio      = 1,
-},{
-        .name           = "AVerMedia TVPhone 98",
-        .video_inputs   = 3,
-        .audio_inputs   = 4,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 15,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 13, 4, 11, 7, 0, 0},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_radio      = 1,
-        .audio_hook     = avermedia_tvphone_audio,
-},{
-        .name           = "ProVideo PV951", /* pic16c54 */
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0, 0, 0, 0},
-        .needs_tvaudio  = 1,
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Little OnAir TV",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xe00b,
-        .muxsel         = {2, 3, 1, 1},
-        .audiomux       = {0xff9ff6, 0xff9ff6, 0xff1ff7, 0, 0xff3ffc},
-        .no_msp34xx     = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x2c ---------------------------------- */
-        .name           = "Sigma TVII-FM",
-        .video_inputs   = 2,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = -1,
-        .gpiomask       = 3,
-        .muxsel         = {2, 3, 1, 1},
-        .audiomux       = {1, 1, 0, 2, 3},
-        .no_msp34xx     = 1,
-        .pll            = PLL_NONE,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "MATRIX-Vision MV-Delta 2",
-        .video_inputs   = 5,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = 3,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 0, 0},
-        .audiomux       = {0 },
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Zoltrix Genie TV/FM",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xbcf03f,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0xbc803f, 0xbc903f, 0xbcb03f, 0, 0xbcb03f},
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 21,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Terratec TV/Radio+",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x70000,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x20000, 0x30000, 0x10000, 0, 0x40000, 0x20000 },
-        .needs_tvaudio  = 1,
-        .no_msp34xx     = 1,
-        .pll            = PLL_35,
-        .tuner_type     = 1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_radio      = 1,
-},{
-
-/* ---- card 0x30 ---------------------------------- */
-        .name           = "Askey CPH03x/ Dynalink Magic TView",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 15,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = {2,0,0,0,1},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "IODATA GV-BCTV3/PCI",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x010f00,
-        .muxsel         = {2, 3, 0, 0},
-        .audiomux       = {0x10000, 0, 0x10000, 0, 0, 0},
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_ALPS_TSHC6_NTSC,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = gvbctv3pci_audio,
-},{
-        .name           = "Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP",
-        .video_inputs   = 5,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 3,
-        .gpiomask       = 0xAA0000,
-        .muxsel         = { 2,3,1,1,-1 },
-        .digital_mode   = DIGITAL_MODE_CAMERA,
-        .audiomux       = { 0x20000, 0, 0x80000, 0x80000, 0xa8000, 0x46000  },
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL_I,
-        .tuner_addr     = ADDR_UNSET,
-        .has_remote     = 1,
-        /* GPIO wiring: (different from Rev.4C !)
-                GPIO17: U4.A0 (first hef4052bt)
-                GPIO19: U4.A1
-                GPIO20: U5.A1 (second hef4052bt)
-                GPIO21: U4.nEN
-                GPIO22: BT832 Reset Line
-                GPIO23: A5,A0, U5,nEN
-        Note: At i2c=0x8a is a Bt832 chip, which changes to 0x88 after being reset via GPIO22
-        */
-},{
-        .name           = "Eagle Wireless Capricorn2 (bt878A)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 0, 1, 1},
-        .audiomux       = { 0, 1, 2, 3, 4},
-        .pll            = PLL_28,
-        .tuner_type     = -1 /* TUNER_ALPS_TMDH2_NTSC */,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x34 ---------------------------------- */
-        /* David Härdeman <david@2gen.com> */
-        .name           = "Pinnacle PCTV Studio Pro",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 3,
-        .gpiomask       = 0x03000F,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 1, 0xd0001, 0, 0, 10},
-                        /* sound path (5 sources):
-                        MUX1 (mask 0x03), Enable Pin 0x08 (0=enable, 1=disable)
-                                0= ext. Audio IN
-                                1= from MUX2
-                                2= Mono TV sound from Tuner
-                                3= not connected
-                        MUX2 (mask 0x30000):
-                                0,2,3= from MSP34xx
-                                1= FM stereo Radio from Tuner */
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Claas Langbehn <claas@bigfoot.com>,
-        Sven Grothklags <sven@upb.de> */
-        .name           = "Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS",
-        .video_inputs   = 4,
-        .audio_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1c,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0, 0x10, 8, 4 },
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .has_radio      = 1,
-},{
-        /* Tim Röstermundt <rosterm@uni-muenster.de>
-        in de.comp.os.unix.linux.hardware:
-                options bttv card=0 pll=1 radio=1 gpiomask=0x18e0
-                audiomux=0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
-                options tuner type=5 */
-        .name           = "Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x18e0,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x0000,0x0800,0x1000,0x1000,0x18e0 },
-                /* For cards with tda9820/tda9821:
-                        0x0000: Tuner normal stereo
-                        0x0080: Tuner A2 SAP (second audio program = Zweikanalton)
-                        0x0880: Tuner A2 stereo */
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Miguel Angel Alvarez <maacruz@navegalia.com>
-        old Easy TV BT848 version (model CPH031) */
-        .name           = "Askey CPH031/ BESTBUY Easy TV",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xF,
-        .muxsel         = { 2, 3, 1, 0},
-        .audiomux       = { 2, 0, 0, 0, 10},
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_TEMIC_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x38 ---------------------------------- */
-        /* Gordon Heydon <gjheydon@bigfoot.com ('98) */
-        .name           = "Lifeview FlyVideo 98FM LR50",
-        .video_inputs   = 4,
-        .audio_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1800,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
-        .pll            = PLL_28,
-        .tuner_type     = 5,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* This is the ultimate cheapo capture card
-        * just a BT848A on a small PCB!
-        * Steve Hosgood <steve@equiinet.com> */
-        .name           = "GrandTec 'Grand Video Capture' (Bt848)",
-        .video_inputs   = 2,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 1,
-        .gpiomask       = 0,
-        .muxsel         = { 3, 1 },
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 0,
-        .no_msp34xx     = 1,
-        .pll            = PLL_35,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Daniel Herrington <daniel.herrington@home.com> */
-        .name           = "Askey CPH060/ Phoebe TV Master Only (No FM)",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xe00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x400, 0x400, 0x400, 0x400, 0x800, 0x400 },
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_TEMIC_4036FY5_NTSC,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Matti Mottus <mottus@physic.ut.ee> */
-        .name           = "Askey CPH03x TV Capturer",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x03000F,
-        .muxsel         = { 2, 3, 1, 0},
-        .audiomux       = { 2,0,0,0,1 },
-        .pll            = PLL_28,
-        .tuner_type     = 0,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x3c ---------------------------------- */
-        /* Philip Blundell <philb@gnu.org> */
-        .name           = "Modular Technology MM100PCTV",
-        .video_inputs   = 2,
-        .audio_inputs   = 2,
-        .tuner          = 0,
-        .svhs           = -1,
-        .gpiomask       = 11,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 2, 0, 0, 1, 8},
-        .pll            = PLL_35,
-        .tuner_type     = TUNER_TEMIC_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Adrian Cox <adrian@humboldt.co.uk */
-        .name           = "AG Electronics GMV1",
-        .video_inputs   = 2,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 1,
-        .gpiomask       = 0xF,
-        .muxsel         = { 2, 2},
-        .audiomux       = { },
-        .no_msp34xx     = 1,
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Miguel Angel Alvarez <maacruz@navegalia.com>
-        new Easy TV BT878 version (model CPH061)
-        special thanks to Informatica Mieres for providing the card */
-        .name           = "Askey CPH061/ BESTBUY Easy TV (bt878)",
-        .video_inputs   = 3,
-        .audio_inputs   = 2,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xFF,
-        .muxsel         = { 2, 3, 1, 0},
-        .audiomux       = { 1, 0, 4, 4, 9},
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Lukas Gebauer <geby@volny.cz> */
-        .name           = "ATI TV-Wonder",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xf03f,
-        .muxsel         = { 2, 3, 1, 0 },
-        .audiomux       = { 0xbffe, 0, 0xbfff, 0, 0xbffe},
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x40 ---------------------------------- */
-        /* Lukas Gebauer <geby@volny.cz> */
-        .name           = "ATI TV-Wonder VE",
-        .video_inputs   = 2,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = -1,
-        .gpiomask       = 1,
-        .muxsel         = { 2, 3, 0, 1},
-        .audiomux       = { 0, 0, 1, 0, 0},
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* DeeJay <deejay@westel900.net (2000S) */
-        .name           = "Lifeview FlyVideo 2000S LR90",
-        .video_inputs   = 3,
-        .audio_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x18e0,
-        .muxsel         = { 2, 3, 0, 1},
-                        /* Radio changed from 1e80 to 0x800 to make
-                        FlyVideo2000S in .hu happy (gm)*/
-                        /* -dk-???: set mute=0x1800 for tda9874h daughterboard */
-        .audiomux       = { 0x0000,0x0800,0x1000,0x1000,0x1800, 0x1080 },
-        .audio_hook     = fv2000s_audio,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 5,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Terratec TValueRadio",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0xffff00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x500, 0x500, 0x300, 0x900, 0x900},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .has_radio      = 1,
-},{
-        /* TANAKA Kei <peg00625@nifty.com> */
-        .name           = "IODATA GV-BCTV4/PCI",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x010f00,
-        .muxsel         = {2, 3, 0, 0},
-        .audiomux       = {0x10000, 0, 0x10000, 0, 0, 0},
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_SHARP_2U5JF5540_NTSC,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = gvbctv3pci_audio,
-},{
-
-/* ---- card 0x44 ---------------------------------- */
-        .name           = "3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)",
-        /* try "insmod msp3400 simple=0" if you have
-        * sound problems with this card. */
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = -1,
-        .gpiomask       = 0x4f8a00,
-        /* 0x100000: 1=MSP enabled (0=disable again)
-        * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
-        .audiomux       = {0x947fff, 0x987fff,0x947fff,0x947fff, 0x947fff},
-        /* tvtuner, radio,   external,internal, mute,  stereo
-        * tuner, Composit, SVid, Composit-on-Svid-adapter */
-        .muxsel         = { 2, 3 ,0 ,1},
-        .tuner_type     = TUNER_MT2032,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-        .has_radio      = 1,
-},{
-        /* Philip Blundell <pb@nexus.co.uk> */
-        .name           = "Active Imaging AIMMS",
-        .video_inputs   = 1,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-        .muxsel         = { 2 },
-        .gpiomask       = 0
-},{
-        /* Tomasz Pyra <hellfire@sedez.iq.pl> */
-        .name           = "Prolink Pixelview PV-BT878P+ (Rev.4C,8E)",
-        .video_inputs   = 3,
-        .audio_inputs   = 4,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 15,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0, 11, 7, 13, 0}, /* TV and Radio with same GPIO ! */
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 25,
-        .tuner_addr     = ADDR_UNSET,
-        .has_remote     = 1,
-        /* GPIO wiring:
-                GPIO0: U4.A0 (hef4052bt)
-                GPIO1: U4.A1
-                GPIO2: U4.A1 (second hef4052bt)
-                GPIO3: U4.nEN, U5.A0, A5.nEN
-                GPIO8-15: vrd866b ?
+        /* ---- card 0x00 ---------------------------------- */
+        [BTTV_BOARD_UNKNOWN] = {
+                .name           = " *** UNKNOWN/GENERIC *** ",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1, 0},
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_MIRO] = {
+                .name           = "MIRO PCTV",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 2, 0, 0, 0, 10},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_HAUPPAUGE] = {
+                .name           = "Hauppauge (bt848)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 1, 2, 3, 4},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_STB] = {
+                .name           = "STB, Gateway P/N 6000699 (bt848)",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 4, 0, 2, 3, 1},
+                .no_msp34xx     = 1,
+                .needs_tvaudio  = 1,
+                .tuner_type     = TUNER_PHILIPS_NTSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+        },
+
+        /* ---- card 0x04 ---------------------------------- */
+        [BTTV_BOARD_INTEL] = {
+                .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 2,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 0,
+                .tuner_type     = 4,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_DIAMOND] = {
+                .name           = "Diamond DTV2000",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 3,
+                .muxsel         = { 2, 3, 1, 0},
+                .audiomux       = { 0, 1, 0, 1, 3},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_AVERMEDIA] = {
+                .name           = "AVerMedia TVPhone",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 3,
+                .muxsel         = { 2, 3, 1, 1},
+                .gpiomask       = 0x0f,
+                .audiomux       = { 0x0c, 0x04, 0x08, 0x04, 0},
+                /*                0x04 for some cards ?? */
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = avermedia_tvphone_audio,
+                .has_remote     = 1,
+        },
+        [BTTV_BOARD_MATRIX_VISION] = {
+                .name           = "MATRIX-Vision MV-Delta",
+                .video_inputs   = 5,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 3,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 0, 0},
+                .audiomux       = {0 },
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x08 ---------------------------------- */
+        [BTTV_BOARD_FLYVIDEO] = {
+                .name           = "Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xc00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0xc00, 0x800, 0x400, 0xc00, 0},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_TURBOTV] = {
+                .name           = "IMS/IXmicro TurboTV",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 3,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 1, 1, 2, 3, 0},
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_TEMIC_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_HAUPPAUGE878] = {
+                .name           = "Hauppauge (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x0f, /* old: 7 */
+                .muxsel         = { 2, 0, 1, 1},
+                .audiomux       = { 0, 1, 2, 3, 4},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_MIROPRO] = {
+                .name           = "MIRO PCTV pro",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x3014f,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x20001,0x10001, 0, 0,10},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x0c ---------------------------------- */
+        [BTTV_BOARD_ADSTECH_TV] = {
+                .name           = "ADS Technologies Channel Surfer TV (bt848)",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 13, 14, 11, 7, 0, 0},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_AVERMEDIA98] = {
+                .name           = "AVerMedia TVCapture 98",
+                .video_inputs   = 3,
+                .audio_inputs   = 4,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 13, 14, 11, 7, 0, 0},
+                .needs_tvaudio  = 1,
+                .msp34xx_alt    = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = avermedia_tv_stereo_audio,
+                .no_gpioirq     = 1,
+        },
+        [BTTV_BOARD_VHX] = {
+                .name           = "Aimslab Video Highway Xtreme (VHX)",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 2, 1, 3, 4}, /* old: { 0, 1, 2, 3, 4} */
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_ZOLTRIX] = {
+                .name           = "Zoltrix TV-Max",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = {0 , 0, 1 , 0, 10},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x10 ---------------------------------- */
+        [BTTV_BOARD_PIXVIEWPLAYTV] = {
+                .name           = "Prolink Pixelview PlayTV (bt878)",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x01fe00,
+                .muxsel         = { 2, 3, 1, 1},
+        #if 0
+                /* old */
+                .audiomux       = { 0x01c000, 0, 0x018000, 0x014000, 0x002000, 0 },
+        #else
+                /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
+                .audiomux       = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 },
+        #endif
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+        },
+        [BTTV_BOARD_WINVIEW_601] = {
+                .name           = "Leadtek WinView 601",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x8300f8,
+                .muxsel         = { 2, 3, 1, 1,0},
+                .audiomux       = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007,0xcfa007},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = winview_audio,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_AVEC_INTERCAP] = {
+                .name           = "AVEC Intercapture",
+                .video_inputs   = 3,
+                .audio_inputs   = 2,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0,
+                .muxsel         = {2, 3, 1, 1},
+                .audiomux       = {1, 0, 0, 0, 0},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_LIFE_FLYKIT] = {
+                .name           = "Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = -1,
+                .gpiomask       = 0x8dff00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0 },
+                .no_msp34xx     = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x14 ---------------------------------- */
+        [BTTV_BOARD_CEI_RAFFLES] = {
+                .name           = "CEI Raffles Card",
+                .video_inputs   = 3,
+                .audio_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = {2, 3, 1, 1},
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_CONFERENCETV] = {
+                .name           = "Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50",
+                .video_inputs   = 4,
+                .audio_inputs   = 2,  /* tuner, line in */
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1800,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800},
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_PHOEBE_TVMAS] = {
+                .name           = "Askey CPH050/ Phoebe Tv Master + FM",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xc00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = {0, 1, 0x800, 0x400, 0xc00, 0},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_MODTEC_205] = {
+                .name           = "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = -1,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 3, -1 },
+                .digital_mode   = DIGITAL_MODE_CAMERA,
+                .audiomux       = { 0, 0, 0, 0, 0 },
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_ALPS_TSBB5_PAL_I,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x18 ---------------------------------- */
+        [BTTV_BOARD_MAGICTVIEW061] = {
+                .name           = "Askey CPH05X/06X (bt878) [many vendors]",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xe00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = {0x400, 0x400, 0x400, 0x400, 0xc00},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,
+        },
+        [BTTV_BOARD_VOBIS_BOOSTAR] = {
+                .name           = "Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1f0fff,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x20000, 0x30000, 0x10000, 0, 0x40000},
+                .needs_tvaudio  = 0,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = terratv_audio,
+        },
+        [BTTV_BOARD_HAUPPAUG_WCAM] = {
+                .name           = "Hauppauge WinCam newer (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 3,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 0, 1, 1},
+                .audiomux       = { 0, 1, 2, 3, 4},
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_MAXI] = {
+                .name           = "Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50",
+                .video_inputs   = 4,
+                .audio_inputs   = 2,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1800,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800},
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_SECAM,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x1c ---------------------------------- */
+        [BTTV_BOARD_TERRATV] = {
+                .name           = "Terratec TerraTV+ Version 1.1 (bt878)",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1f0fff,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x20000, 0x30000, 0x10000, 0x00000, 0x40000},
+                .needs_tvaudio  = 0,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = terratv_audio,
+                /* GPIO wiring:
+                External 20 pin connector (for Active Radio Upgrade board)
+                gpio00: i2c-sda
+                gpio01: i2c-scl
+                gpio02: om5610-data
+                gpio03: om5610-clk
+                gpio04: om5610-wre
+                gpio05: om5610-stereo
+                gpio06: rds6588-davn
+                gpio07: Pin 7 n.c.
+                gpio08: nIOW
+                gpio09+10: nIOR, nSEL ?? (bt878)
+                        gpio09: nIOR (bt848)
+                        gpio10: nSEL (bt848)
+                Sound Routing:
+                gpio16: u2-A0 (1st 4052bt)
+                gpio17: u2-A1
+                gpio18: u2-nEN
+                gpio19: u4-A0 (2nd 4052)
+                gpio20: u4-A1
+                        u4-nEN - GND
+                Btspy:
+                        00000 : Cdrom (internal audio input)
+                        10000 : ext. Video audio input
+                        20000 : TV Mono
+                        a0000 : TV Mono/2
+                1a0000 : TV Stereo
+                        30000 : Radio
+                        40000 : Mute
         */
-},{
-        .name           = "Lifeview FlyVideo 98EZ (capture only) LR51",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1, 1}, /* AV1, AV2, SVHS, CVid adapter on SVHS */
-        .pll            = PLL_28,
-        .no_msp34xx     = 1,
-        .tuner_type     = UNSET,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-/* ---- card 0x48 ---------------------------------- */
-        /* Dariusz Kowalewski <darekk@automex.pl> */
-        .name           = "Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x3f,
-        .muxsel         = { 2, 3, 1, 1 },
-        .audiomux       = { 0x01, 0x00, 0x03, 0x03, 0x09, 0x02 },
-        .needs_tvaudio  = 1,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 5,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = pvbt878p9b_audio, /* Note: not all cards have stereo */
-        .has_radio      = 1,  /* Note: not all cards have radio */
-        .has_remote     = 1,
-        /* GPIO wiring:
-                GPIO0: A0 hef4052
-                GPIO1: A1 hef4052
-                GPIO3: nEN hef4052
-                GPIO8-15: vrd866b
-                GPIO20,22,23: R30,R29,R28
-        */
-},{
-        /* Clay Kunz <ckunz@mail.arc.nasa.gov> */
-        /* you must jumper JP5 for the card to work */
-        .name           = "Sensoray 311",
-        .video_inputs   = 5,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 4,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 0, 0},
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 0,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Miguel Freitas <miguel@cetuc.puc-rio.br> */
-        .name           = "RemoteVision MX (RV605)",
-        .video_inputs   = 16,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .gpiomask       = 0x00,
-        .gpiomask2      = 0x07ff,
-        .muxsel         = { 0x33, 0x13, 0x23, 0x43, 0xf3, 0x73, 0xe3, 0x03,
-                        0xd3, 0xb3, 0xc3, 0x63, 0x93, 0x53, 0x83, 0xa3 },
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .muxsel_hook    = rv605_muxsel,
-},{
-        .name           = "Powercolor MTV878/ MTV878R/ MTV878F",
-        .video_inputs   = 3,
-        .audio_inputs   = 2,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x1C800F,  /* Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset */
-        .muxsel         = { 2, 1, 1, },
-        .audiomux       = { 0, 1, 2, 2, 4 },
-        .needs_tvaudio  = 0,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-        .has_radio      = 1,
-},{
-
-/* ---- card 0x4c ---------------------------------- */
-        /* Masaki Suzuki <masaki@btree.org> */
-        .name           = "Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x140007,
-        .muxsel         = { 2, 3, 1, 1 },
-        .audiomux       = { 0, 1, 2, 3, 4, 0 },
-        .tuner_type     = TUNER_PHILIPS_NTSC,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = windvr_audio,
-},{
-        .name           = "GrandTec Multi Capture Card (Bt878)",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 0 },
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 0,
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF",
-        .video_inputs   = 4,
-        .audio_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 3, 1, 1 },   /* Tuner, SVid, SVHS, SVid to SVHS connector */
-        .audiomux       = { 0 ,0 ,4, 4,4,4},/* Yes, this tuner uses the same audio output for TV and FM radio!
-                                        * This card lacks external Audio In, so we mute it on Ext. & Int.
-                                        * The PCB can take a sbx1637/sbx1673, wiring unknown.
-                                        * This card lacks PCI subsystem ID, sigh.
-                                        * audiomux=1: lower volume, 2+3: mute
-                                        * btwincap uses 0x80000/0x80003
-                                        */
-        .needs_tvaudio  = 0,
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 5,
-        .tuner_addr     = ADDR_UNSET,
-        /* Samsung TCPA9095PC27A (BG+DK), philips compatible, w/FM, stereo and
-        radio signal strength indicators work fine. */
-        .has_radio      = 1,
-        /* GPIO Info:
-                GPIO0,1:   HEF4052 A0,A1
-                GPIO2:     HEF4052 nENABLE
-                GPIO3-7:   n.c.
-                GPIO8-13:  IRDC357 data0-5 (data6 n.c. ?) [chip not present on my card]
-                GPIO14,15: ??
-                GPIO16-21: n.c.
-                GPIO22,23: ??
-                ??       : mtu8b56ep microcontroller for IR (GPIO wiring unknown)*/
-},{
-        /* Arthur Tetzlaff-Deas, DSP Design Ltd <software@dspdesign.com> */
-        .name           = "DSP Design TCVIDEO",
-        .video_inputs   = 4,
-        .svhs           = -1,
-        .muxsel         = { 2, 3, 1, 0},
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-        /* ---- card 0x50 ---------------------------------- */
-        .name           = "Hauppauge WinTV PVR",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = { 2, 0, 1, 1},
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-
-        .gpiomask       = 7,
-        .audiomux       = {7},
-},{
-        .name           = "IODATA GV-BCTV5/PCI",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x0f0f80,
-        .muxsel         = {2, 3, 1, 0},
-        .audiomux       = {0x030000, 0x010000, 0, 0, 0x020000, 0},
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_NTSC_M,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = gvbctv5pci_audio,
-        .has_radio      = 1,
-},{
-        .name           = "Osprey 100/150 (878)", /* 0x1(2|3)-45C6-C1 */
-        .video_inputs   = 4,                  /* id-inputs-clock */
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 3,
-        .muxsel         = { 3, 2, 0, 1 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        .name           = "Osprey 100/150 (848)", /* 0x04-54C0-C1 & older boards */
-        .video_inputs   = 3,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-
-        /* ---- card 0x54 ---------------------------------- */
-        .name           = "Osprey 101 (848)", /* 0x05-40C0-C1 */
-        .video_inputs   = 2,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 1,
-        .muxsel         = { 3, 1 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        .name           = "Osprey 101/151",       /* 0x1(4|5)-0004-C4 */
-        .video_inputs   = 1,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .muxsel         = { 0 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        .name           = "Osprey 101/151 w/ svid",  /* 0x(16|17|20)-00C4-C1 */
-        .video_inputs   = 2,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 1,
-        .muxsel         = { 0, 1 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        .name           = "Osprey 200/201/250/251",  /* 0x1(8|9|E|F)-0004-C4 */
-        .video_inputs   = 1,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = -1,
-        .muxsel         = { 0 },
-        .pll            = PLL_28,
-        .tuner_type     = UNSET,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-
-        /* ---- card 0x58 ---------------------------------- */
-        .name           = "Osprey 200/250",   /* 0x1(A|B)-00C4-C1 */
-        .video_inputs   = 2,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = 1,
-        .muxsel         = { 0, 1 },
-        .pll            = PLL_28,
-        .tuner_type     = UNSET,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        .name           = "Osprey 210/220",   /* 0x1(A|B)-04C0-C1 */
-        .video_inputs   = 2,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = 1,
-        .muxsel         = { 2, 3 },
-        .pll            = PLL_28,
-        .tuner_type     = UNSET,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        .name           = "Osprey 500",   /* 500 */
-        .video_inputs   = 2,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = 1,
-        .muxsel         = { 2, 3 },
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        .name           = "Osprey 540",   /* 540 */
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-
-        /* ---- card 0x5C ---------------------------------- */
-        .name           = "Osprey 2000",  /* 2000 */
-        .video_inputs   = 2,
-        .audio_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = 1,
-        .muxsel         = { 2, 3 },
-        .pll            = PLL_28,
-        .tuner_type     = UNSET,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,      /* must avoid, conflicts with the bt860 */
-},{
-        /* M G Berberich <berberic@forwiss.uni-passau.de> */
-        .name           = "IDS Eagle",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .svhs           = -1,
-        .gpiomask       = 0,
-        .muxsel         = { 0, 1, 2, 3 },
-        .muxsel_hook    = eagle_muxsel,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .pll            = PLL_28,
-},{
-        .name           = "Pinnacle PCTV Sat",
-        .video_inputs   = 2,
-        .audio_inputs   = 0,
-        .svhs           = 1,
-        .tuner          = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .gpiomask       = 0x01,
-        .audiomux       = { 0, 0, 0, 0, 1 },
-        .muxsel         = { 3, 0, 1, 2},
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .no_gpioirq     = 1,
-        .has_dvb        = 1,
-},{
-        .name           = "Formac ProTV II (bt878)",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 3,
-        .gpiomask       = 2,
-        /* TV, Comp1, Composite over SVID con, SVID */
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 2, 2, 0, 0, 0 },
-        .pll            = PLL_28,
-        .has_radio      = 1,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-/* sound routing:
-        GPIO=0x00,0x01,0x03: mute (?)
-        0x02: both TV and radio (tuner: FM1216/I)
-        The card has onboard audio connectors labeled "cdrom" and "board",
-        not soldered here, though unknown wiring.
-        Card lacks: external audio in, pci subsystem id.
-*/
-},{
-
-        /* ---- card 0x60 ---------------------------------- */
-        .name           = "MachTV",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = -1,
-        .gpiomask       = 7,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 1, 2, 3, 4},
-        .needs_tvaudio  = 1,
-        .tuner_type     = 5,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = 1,
-},{
-        .name           = "Euresys Picolo",
-        .video_inputs   = 3,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = 2,
-        .gpiomask       = 0,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .muxsel         = { 2, 0, 1},
-        .pll            = PLL_28,
-        .tuner_type     = UNSET,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Luc Van Hoeylandt <luc@e-magic.be> */
-        .name           = "ProVideo PV150", /* 0x4f */
-        .video_inputs   = 2,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3 },
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 0,
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = UNSET,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Hiroshi Takekawa <sian@big.or.jp> */
-        /* This card lacks subsystem ID */
-        .name           = "AD-TVK503", /* 0x63 */
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x001e8007,
-        .muxsel         = { 2, 3, 1, 0 },
-        /*                  Tuner, Radio, external, internal, off,  on */
-        .audiomux       = { 0x08,  0x0f,  0x0a,     0x08,     0x0f, 0x08 },
-        .needs_tvaudio  = 0,
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 2,
-        .tuner_addr     = ADDR_UNSET,
-        .audio_hook     = adtvk503_audio,
-},{
-
-        /* ---- card 0x64 ---------------------------------- */
-        .name           = "Hercules Smart TV Stereo",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x00,
-        .muxsel         = { 2, 3, 1, 1 },
-        .needs_tvaudio  = 1,
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = 5,
-        .tuner_addr     = ADDR_UNSET,
-        /* Notes:
-        - card lacks subsystem ID
-        - stereo variant w/ daughter board with tda9874a @0xb0
-        - Audio Routing:
-                always from tda9874 independent of GPIO (?)
-                external line in: unknown
-        - Other chips: em78p156elp @ 0x96 (probably IR remote control)
-                hef4053 (instead 4052) for unknown function
-        */
-},{
-        .name           = "Pace TV & Radio Card",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1, 1}, /* Tuner, CVid, SVid, CVid over SVid connector */
-        .gpiomask       = 0,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .tuner_type     = 1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_radio      = 1,
-        .pll            = PLL_28,
-        /* Bt878, Bt832, FI1246 tuner; no pci subsystem id
-        only internal line out: (4pin header) RGGL
-        Radio must be decoded by msp3410d (not routed through)*/
-        /*
-        .digital_mode   = DIGITAL_MODE_CAMERA,  todo!
-        */
-},{
-        /* Chris Willing <chris@vislab.usyd.edu.au> */
-        .name           = "IVC-200",
-        .video_inputs   = 1,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .svhs           = -1,
-        .gpiomask       = 0xdf,
-        .muxsel         = { 2 },
-        .pll            = PLL_28,
-},{
-        .name           = "Grand X-Guard / Trust 814PCI",
-        .video_inputs   = 16,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .tuner_type     = 4,
-        .tuner_addr     = ADDR_UNSET,
-        .gpiomask2      = 0xff,
-        .muxsel         = { 2,2,2,2, 3,3,3,3, 1,1,1,1, 0,0,0,0 },
-        .muxsel_hook    = xguard_muxsel,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .pll            = PLL_28,
-},{
-
-        /* ---- card 0x68 ---------------------------------- */
-        .name           = "Nebula Electronics DigiTV",
-        .video_inputs   = 1,
-        .tuner          = -1,
-        .svhs           = -1,
-        .muxsel         = { 2, 3, 1, 0},
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_dvb        = 1,
-        .no_gpioirq     = 1,
-},{
-        /* Jorge Boncompte - DTI2 <jorge@dti2.net> */
-        .name           = "ProVideo PV143",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .gpiomask       = 0,
-        .muxsel         = { 2, 3, 1, 0 },
-        .audiomux       = { 0 },
-        .needs_tvaudio  = 0,
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* M.Klahr@phytec.de */
-        .name           = "PHYTEC VD-009-X1 MiniDIN (bt878)",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1, /* card has no tuner */
-        .svhs           = 3,
-        .gpiomask       = 0x00,
-        .muxsel         = { 2, 3, 1, 0},
-        .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "PHYTEC VD-009-X1 Combi (bt878)",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1, /* card has no tuner */
-        .svhs           = 3,
-        .gpiomask       = 0x00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-
-        /* ---- card 0x6c ---------------------------------- */
-        .name           = "PHYTEC VD-009 MiniDIN (bt878)",
-        .video_inputs   = 10,
-        .audio_inputs   = 0,
-        .tuner          = -1, /* card has no tuner */
-        .svhs           = 9,
-        .gpiomask       = 0x00,
-        .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
-                                via the upper nibble of muxsel. here: used for
-                                xternal video-mux */
-        .muxsel         = { 0x02, 0x12, 0x22, 0x32, 0x03, 0x13, 0x23, 0x33, 0x01, 0x00 },
-        .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "PHYTEC VD-009 Combi (bt878)",
-        .video_inputs   = 10,
-        .audio_inputs   = 0,
-        .tuner          = -1, /* card has no tuner */
-        .svhs           = 9,
-        .gpiomask       = 0x00,
-        .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
-                                via the upper nibble of muxsel. here: used for
-                                xternal video-mux */
-        .muxsel         = { 0x02, 0x12, 0x22, 0x32, 0x03, 0x13, 0x23, 0x33, 0x01, 0x01 },
-        .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        .name           = "IVC-100",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .svhs           = -1,
-        .gpiomask       = 0xdf,
-        .muxsel         = { 2, 3, 1, 0 },
-        .pll            = PLL_28,
-},{
-        /* IVC-120G - Alan Garfield <alan@fromorbit.com> */
-        .name           = "IVC-120G",
-        .video_inputs   = 16,
-        .audio_inputs   = 0,    /* card has no audio */
-        .tuner          = -1,   /* card has no tuner */
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .svhs           = -1,   /* card has no svhs */
-        .needs_tvaudio  = 0,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .gpiomask       = 0x00,
-        .muxsel         = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                        0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10 },
-        .muxsel_hook    = ivc120_muxsel,
-        .pll            = PLL_28,
-},{
-
-        /* ---- card 0x70 ---------------------------------- */
-        .name           = "pcHDTV HD-2000 TV",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1, 0},
-        .tuner_type     = TUNER_PHILIPS_ATSC,
-        .tuner_addr     = ADDR_UNSET,
-        .has_dvb        = 1,
-},{
-        .name           = "Twinhan DST + clones",
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .tuner_type     = TUNER_ABSENT,
-        .tuner_addr     = ADDR_UNSET,
-        .no_video       = 1,
-        .has_dvb        = 1,
-},{
-        .name           = "Winfast VC100",
-        .video_inputs   = 3,
-        .audio_inputs   = 0,
-        .svhs           = 1,
-        .tuner          = -1,
-        .muxsel         = { 3, 1, 1, 3}, /* Vid In, SVid In, Vid over SVid in connector */
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .tuner_type     = TUNER_ABSENT,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-},{
-        .name           = "Teppro TEV-560/InterVision IV-560",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 3,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 1, 1, 1, 1, 0},
-        .needs_tvaudio  = 1,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_35,
-},{
-
-        /* ---- card 0x74 ---------------------------------- */
-        .name           = "SIMUS GVC1100",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-        .muxsel         = { 2, 2, 2, 2},
-        .gpiomask       = 0x3F,
-        .muxsel_hook    = gvc1100_muxsel,
-},{
-        /* Carlos Silva r3pek@r3pek.homelinux.org || card 0x75 */
-        .name           = "NGS NGSTV+",
-        .video_inputs   = 3,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x008007,
-        .muxsel         = {2, 3, 0, 0},
-        .audiomux       = {0, 0, 0, 0, 0x000003, 0},
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .has_remote     = 1,
-},{
-        /* http://linuxmedialabs.com */
-        .name           = "LMLBT4",
-        .video_inputs   = 4, /* IN1,IN2,IN3,IN4 */
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .muxsel         = { 2, 3, 1, 0 },
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .needs_tvaudio  = 0,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Helmroos Harri <harri.helmroos@pp.inet.fi> */
-        .name           = "Tekram M205 PRO",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .svhs           = 2,
-        .needs_tvaudio  = 0,
-        .gpiomask       = 0x68,
-        .muxsel         = { 2, 3, 1},
-        .audiomux       = { 0x68, 0x68, 0x61, 0x61, 0x00 },
-        .pll            = PLL_28,
-},{
-
-        /* ---- card 0x78 ---------------------------------- */
-        /* Javier Cendan Ares <jcendan@lycos.es> */
-        /* bt878 TV + FM without subsystem ID */
-        .name           = "Conceptronic CONTVFMi",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x008007,
-        .muxsel         = { 2, 3, 1, 1 },
-        .audiomux       = { 0, 1, 2, 2, 3 },
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .has_remote     = 1,
-        .has_radio      = 1,
-},{
-        /*Eric DEBIEF <debief@telemsa.com>*/
-        /*EURESYS Picolo Tetra : 4 Conexant Fusion 878A, no audio, video input set with analog multiplexers GPIO controled*/
-        /* adds picolo_tetra_muxsel(), picolo_tetra_init(), the folowing declaration strucure, and #define BTTV_PICOLO_TETRA_CHIP*/
-        /*0x79 in bttv.h*/
-        .name           = "Euresys Picolo Tetra",
-        .video_inputs   = 4,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .gpiomask       = 0,
-        .gpiomask2      = 0x3C<<16,/*Set the GPIO[18]->GPIO[21] as output pin.==> drive the video inputs through analog multiplexers*/
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .muxsel         = {2,2,2,2},/*878A input is always MUX0, see above.*/
-        .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
-        .pll            = PLL_28,
-        .needs_tvaudio  = 0,
-        .muxsel_hook    = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Spirit TV Tuner from http://spiritmodems.com.au */
-        /* Stafford Goodsell <surge@goliath.homeunix.org> */
-        .name           = "Spirit TV Tuner",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x0000000f,
-        .muxsel         = { 2, 1, 1 },
-        .audiomux       = { 0x02, 0x00, 0x00, 0x00, 0x00},
-        .tuner_type     = TUNER_TEMIC_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-},{
-        /* Wolfram Joost <wojo@frokaschwei.de> */
-        .name           = "AVerMedia AVerTV DVB-T 771",
-        .video_inputs   = 2,
-        .svhs           = 1,
-        .tuner          = -1,
-        .tuner_type     = TUNER_ABSENT,
-        .tuner_addr     = ADDR_UNSET,
-        .muxsel         = { 3 , 3 },
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .pll            = PLL_28,
-        .has_dvb        = 1,
-        .no_gpioirq     = 1,
-        .has_remote     = 1,
-},{
-        /* ---- card 0x7c ---------------------------------- */
-        /* Matt Jesson <dvb@jesson.eclipse.co.uk> */
-        /* Based on the Nebula card data - added remote and new card number - BTTV_AVDVBT_761, see also ir-kbd-gpio.c */
-        .name           = "AverMedia AverTV DVB-T 761",
-        .video_inputs   = 2,
-        .tuner          = -1,
-        .svhs           = 1,
-        .muxsel         = { 3, 1, 2, 0}, /* Comp0, S-Video, ?, ? */
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .has_dvb        = 1,
-        .no_gpioirq     = 1,
-        .has_remote     = 1,
-},{
-        /* andre.schwarz@matrix-vision.de */
-        .name             = "MATRIX Vision Sigma-SQ",
-        .video_inputs     = 16,
-        .audio_inputs     = 0,
-        .tuner            = -1,
-        .svhs             = -1,
-        .gpiomask         = 0x0,
-        .muxsel           = { 2, 2, 2, 2, 2, 2, 2, 2,
-                        3, 3, 3, 3, 3, 3, 3, 3 },
-        .muxsel_hook      = sigmaSQ_muxsel,
-        .audiomux         = { 0 },
-        .no_msp34xx       = 1,
-        .pll              = PLL_28,
-        .tuner_type       = -1,
-        .tuner_addr       = ADDR_UNSET,
-},{
-        /* andre.schwarz@matrix-vision.de */
-        .name             = "MATRIX Vision Sigma-SLC",
-        .video_inputs     = 4,
-        .audio_inputs     = 0,
-        .tuner            = -1,
-        .svhs             = -1,
-        .gpiomask         = 0x0,
-        .muxsel           = { 2, 2, 2, 2 },
-        .muxsel_hook      = sigmaSLC_muxsel,
-        .audiomux         = { 0 },
-        .no_msp34xx       = 1,
-        .pll              = PLL_28,
-        .tuner_type       = -1,
-        .tuner_addr       = ADDR_UNSET,
-},{
-        /* BTTV_APAC_VIEWCOMP */
-        /* Attila Kondoros <attila.kondoros@chello.hu> */
-        /* bt878 TV + FM 0x00000000 subsystem ID */
-        .name           = "APAC Viewcomp 878(AMAX)",
-        .video_inputs   = 2,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = -1,
-        .gpiomask       = 0xFF,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 2, 0, 0, 0, 10},
-        .needs_tvaudio  = 0,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_PAL,
-        .tuner_addr     = ADDR_UNSET,
-        .has_remote     = 1,   /* miniremote works, see ir-kbd-gpio.c */
-        .has_radio      = 1,   /* not every card has radio */
-},{
-
-        /* ---- card 0x80 ---------------------------------- */
-        /* Chris Pascoe <c.pascoe@itee.uq.edu.au> */
-        .name           = "DViCO FusionHDTV DVB-T Lite",
-        .tuner          = -1,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .pll            = PLL_28,
-        .no_video       = 1,
-        .has_dvb        = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-},{
-        /* Steven <photon38@pchome.com.tw> */
-        .name           = "V-Gear MyVCD",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x3f,
-        .muxsel         = {2, 3, 1, 0},
-        .audiomux       = {0x31, 0x31, 0x31, 0x31, 0x31, 0x31},
-        .no_msp34xx     = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_PHILIPS_NTSC_M,
-        .tuner_addr     = ADDR_UNSET,
-        .has_radio      = 0,
-},{
-        /* Rick C <cryptdragoon@gmail.com> */
-        .name           = "Super TV Tuner",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1, 0},
-        .tuner_type     = TUNER_PHILIPS_NTSC,
-        .tuner_addr     = ADDR_UNSET,
-        .gpiomask       = 0x008007,
-        .audiomux       = { 0, 0x000001,0,0, 0},
-        .needs_tvaudio  = 1,
-        .has_radio      = 1,
-},{
-        /* Chris Fanning <video4linux@haydon.net> */
-        .name           = "Tibet Systems 'Progress DVR' CS16",
-        .video_inputs   = 16,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .svhs           = -1,
-        .muxsel         = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
-        .pll            = PLL_28,
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .muxsel_hook    = tibetCS16_muxsel,
-},
-{
-        /* Bill Brack <wbrack@mmm.com.hk> */
-        /*
-        * Note that, because of the card's wiring, the "master"
-        * BT878A chip (i.e. the one which controls the analog switch
-        * and must use this card type) is the 2nd one detected.  The
-        * other 3 chips should use card type 0x85, whose description
-        * follows this one.  There is a EEPROM on the card (which is
-        * connected to the I2C of one of those other chips), but is
-        * not currently handled.  There is also a facility for a
-        * "monitor", which is also not currently implemented.
-        */
-        .name           = "Kodicom 4400R (master)",
-        .video_inputs   = 16,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .svhs           = -1,
-        /* GPIO bits 0-9 used for analog switch:
-        *   00 - 03:    camera selector
-        *   04 - 06:    channel (controller) selector
-        *   07: data (1->on, 0->off)
-        *   08: strobe
-        *   09: reset
-        * bit 16 is input from sync separator for the channel
-        */
-        .gpiomask       = 0x0003ff,
-        .no_gpioirq     = 1,
-        .muxsel         = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
-        .pll            = PLL_28,
-        .no_msp34xx     = 1,
-        .no_tda7432     = 1,
-        .no_tda9875     = 1,
-        .muxsel_hook    = kodicom4400r_muxsel,
-},
-{
-        /* Bill Brack <wbrack@mmm.com.hk> */
-        /* Note that, for reasons unknown, the "master" BT878A chip (i.e. the
-        * one which controls the analog switch, and must use the card type)
-        * is the 2nd one detected.  The other 3 chips should use this card
-        * type
+
+        },
+        [BTTV_BOARD_PXC200] = {
+                /* Jannik Fritsch <jannik@techfak.uni-bielefeld.de> */
+                .name           = "Imagenation PXC200",
+                .video_inputs   = 5,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 1, /* was: 4 */
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 0, 0},
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .muxsel_hook    = PXC200_muxsel,
+
+        },
+        [BTTV_BOARD_FLYVIDEO_98] = {
+                .name           = "Lifeview FlyVideo 98 LR50",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1800,  /* 0x8dfe00 */
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0x0800, 0x1000, 0x1000, 0x1800, 0 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_IPROTV] = {
+                .name           = "Formac iProTV, Formac ProTV I (bt848)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 3,
+                .gpiomask       = 1,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 1, 0, 0, 0, 0 },
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x20 ---------------------------------- */
+        [BTTV_BOARD_INTEL_C_S_PCI] = {
+                .name           = "Intel Create and Share PCI/ Smart Video Recorder III",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 2,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 0,
+                .tuner_type     = 4,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_TERRATVALUE] = {
+                .name           = "Terratec TerraTValue Version Bt878",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xffff00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x500, 0, 0x300, 0x900, 0x900},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_WINFAST2000] = {
+                .name           = "Leadtek WinFast 2000/ WinFast 2000 XP",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1, 1, 0}, /* TV, CVid, SVid, CVid over SVid connector */
+        #if 0
+                .gpiomask       = 0xc33000,
+                .audiomux       = { 0x422000,0x1000,0x0000,0x620000,0x800000 },
+        #else
+                /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
+                .gpiomask       = 0xb33000,
+                .audiomux       = { 0x122000,0x1000,0x0000,0x620000,0x800000 },
+        #endif
+                /* Audio Routing for "WinFast 2000 XP" (no tv stereo !)
+                        gpio23 -- hef4052:nEnable (0x800000)
+                        gpio12 -- hef4052:A1
+                        gpio13 -- hef4052:A0
+                0x0000: external audio
+                0x1000: FM
+                0x2000: TV
+                0x3000: n.c.
+                Note: There exists another variant "Winfast 2000" with tv stereo !?
+                Note: eeprom only contains FF and pci subsystem id 107d:6606
+                */
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+                .tuner_type     = 5, /* default for now, gpio reads BFFF06 for Pal bg+dk */
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = winfast2000_audio,
+                .has_remote     = 1,
+        },
+        [BTTV_BOARD_CHRONOS_VS2] = {
+                .name           = "Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II",
+                .video_inputs   = 4,
+                .audio_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1800,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800},
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x24 ---------------------------------- */
+        [BTTV_BOARD_TYPHOON_TVIEW] = {
+                .name           = "Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner",
+                .video_inputs   = 4,
+                .audio_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1800,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_PXELVWPLTVPRO] = {
+                .name           = "Prolink PixelView PlayTV pro",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xff,
+                .muxsel         = { 2, 3, 1, 1 },
+                .audiomux       = { 0x21, 0x20, 0x24, 0x2c, 0x29, 0x29 },
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_MAGICTVIEW063] = {
+                .name           = "Askey CPH06X TView99",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x551e00,
+                .muxsel         = { 2, 3, 1, 0},
+                .audiomux       = { 0x551400, 0x551200, 0, 0, 0x551c00, 0x551200 },
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,
+        },
+        [BTTV_BOARD_PINNACLE] = {
+                .name           = "Pinnacle PCTV Studio/Rave",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x03000F,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 2, 0xd0001, 0, 0, 1},
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x28 ---------------------------------- */
+        [BTTV_BOARD_STB2] = {
+                .name           = "STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 4, 0, 2, 3, 1},
+                .no_msp34xx     = 1,
+                .needs_tvaudio  = 1,
+                .tuner_type     = TUNER_PHILIPS_NTSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_AVPHONE98] = {
+                .name           = "AVerMedia TVPhone 98",
+                .video_inputs   = 3,
+                .audio_inputs   = 4,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 13, 4, 11, 7, 0, 0},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_radio      = 1,
+                .audio_hook     = avermedia_tvphone_audio,
+        },
+        [BTTV_BOARD_PV951] = {
+                .name           = "ProVideo PV951", /* pic16c54 */
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0, 0, 0, 0},
+                .needs_tvaudio  = 1,
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_ONAIR_TV] = {
+                .name           = "Little OnAir TV",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xe00b,
+                .muxsel         = {2, 3, 1, 1},
+                .audiomux       = {0xff9ff6, 0xff9ff6, 0xff1ff7, 0, 0xff3ffc},
+                .no_msp34xx     = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x2c ---------------------------------- */
+        [BTTV_BOARD_SIGMA_TVII_FM] = {
+                .name           = "Sigma TVII-FM",
+                .video_inputs   = 2,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = -1,
+                .gpiomask       = 3,
+                .muxsel         = {2, 3, 1, 1},
+                .audiomux       = {1, 1, 0, 2, 3},
+                .no_msp34xx     = 1,
+                .pll            = PLL_NONE,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_MATRIX_VISION2] = {
+                .name           = "MATRIX-Vision MV-Delta 2",
+                .video_inputs   = 5,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 3,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 0, 0},
+                .audiomux       = {0 },
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_ZOLTRIX_GENIE] = {
+                .name           = "Zoltrix Genie TV/FM",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xbcf03f,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0xbc803f, 0xbc903f, 0xbcb03f, 0, 0xbcb03f},
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 21,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_TERRATVRADIO] = {
+                .name           = "Terratec TV/Radio+",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x70000,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x20000, 0x30000, 0x10000, 0, 0x40000, 0x20000 },
+                .needs_tvaudio  = 1,
+                .no_msp34xx     = 1,
+                .pll            = PLL_35,
+                .tuner_type     = 1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_radio      = 1,
+        },
+
+        /* ---- card 0x30 ---------------------------------- */
+        [BTTV_BOARD_DYNALINK] = {
+                .name           = "Askey CPH03x/ Dynalink Magic TView",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = {2,0,0,0,1},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_GVBCTV3PCI] = {
+                .name           = "IODATA GV-BCTV3/PCI",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x010f00,
+                .muxsel         = {2, 3, 0, 0},
+                .audiomux       = {0x10000, 0, 0x10000, 0, 0, 0},
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_ALPS_TSHC6_NTSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = gvbctv3pci_audio,
+        },
+        [BTTV_BOARD_PXELVWPLTVPAK] = {
+                .name           = "Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP",
+                .video_inputs   = 5,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 3,
+                .gpiomask       = 0xAA0000,
+                .muxsel         = { 2,3,1,1,-1 },
+                .digital_mode   = DIGITAL_MODE_CAMERA,
+                .audiomux       = { 0x20000, 0, 0x80000, 0x80000, 0xa8000, 0x46000  },
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,
+                /* GPIO wiring: (different from Rev.4C !)
+                        GPIO17: U4.A0 (first hef4052bt)
+                        GPIO19: U4.A1
+                        GPIO20: U5.A1 (second hef4052bt)
+                        GPIO21: U4.nEN
+                        GPIO22: BT832 Reset Line
+                        GPIO23: A5,A0, U5,nEN
+                Note: At i2c=0x8a is a Bt832 chip, which changes to 0x88 after being reset via GPIO22
+                */
+        },
+        [BTTV_BOARD_EAGLE] = {
+                .name           = "Eagle Wireless Capricorn2 (bt878A)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 0, 1, 1},
+                .audiomux       = { 0, 1, 2, 3, 4},
+                .pll            = PLL_28,
+                .tuner_type     = -1 /* TUNER_ALPS_TMDH2_NTSC */,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x34 ---------------------------------- */
+        [BTTV_BOARD_PINNACLEPRO] = {
+                /* David Härdeman <david@2gen.com> */
+                .name           = "Pinnacle PCTV Studio Pro",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 3,
+                .gpiomask       = 0x03000F,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 1, 0xd0001, 0, 0, 10},
+                                /* sound path (5 sources):
+                                MUX1 (mask 0x03), Enable Pin 0x08 (0=enable, 1=disable)
+                                        0= ext. Audio IN
+                                        1= from MUX2
+                                        2= Mono TV sound from Tuner
+                                        3= not connected
+                                MUX2 (mask 0x30000):
+                                        0,2,3= from MSP34xx
+                                        1= FM stereo Radio from Tuner */
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_TVIEW_RDS_FM] = {
+                /* Claas Langbehn <claas@bigfoot.com>,
+                Sven Grothklags <sven@upb.de> */
+                .name           = "Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS",
+                .video_inputs   = 4,
+                .audio_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1c,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0, 0x10, 8, 4 },
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_LIFETEC_9415] = {
+                /* Tim Röstermundt <rosterm@uni-muenster.de>
+                in de.comp.os.unix.linux.hardware:
+                        options bttv card=0 pll=1 radio=1 gpiomask=0x18e0
+                        audiomux=0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
+                        options tuner type=5 */
+                .name           = "Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x18e0,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x0000,0x0800,0x1000,0x1000,0x18e0 },
+                        /* For cards with tda9820/tda9821:
+                                0x0000: Tuner normal stereo
+                                0x0080: Tuner A2 SAP (second audio program = Zweikanalton)
+                                0x0880: Tuner A2 stereo */
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_BESTBUY_EASYTV] = {
+                /* Miguel Angel Alvarez <maacruz@navegalia.com>
+                old Easy TV BT848 version (model CPH031) */
+                .name           = "Askey CPH031/ BESTBUY Easy TV",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xF,
+                .muxsel         = { 2, 3, 1, 0},
+                .audiomux       = { 2, 0, 0, 0, 10},
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_TEMIC_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x38 ---------------------------------- */
+        [BTTV_BOARD_FLYVIDEO_98FM] = {
+                /* Gordon Heydon <gjheydon@bigfoot.com ('98) */
+                .name           = "Lifeview FlyVideo 98FM LR50",
+                .video_inputs   = 4,
+                .audio_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1800,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0x800, 0x1000, 0x1000, 0x1800, 0 },
+                .pll            = PLL_28,
+                .tuner_type     = 5,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+                /* This is the ultimate cheapo capture card
+                * just a BT848A on a small PCB!
+                * Steve Hosgood <steve@equiinet.com> */
+        [BTTV_BOARD_GRANDTEC] = {
+                .name           = "GrandTec 'Grand Video Capture' (Bt848)",
+                .video_inputs   = 2,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 1,
+                .gpiomask       = 0,
+                .muxsel         = { 3, 1 },
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 0,
+                .no_msp34xx     = 1,
+                .pll            = PLL_35,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_ASKEY_CPH060] = {
+                /* Daniel Herrington <daniel.herrington@home.com> */
+                .name           = "Askey CPH060/ Phoebe TV Master Only (No FM)",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xe00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x400, 0x400, 0x400, 0x400, 0x800, 0x400 },
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_TEMIC_4036FY5_NTSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_ASKEY_CPH03X] = {
+                /* Matti Mottus <mottus@physic.ut.ee> */
+                .name           = "Askey CPH03x TV Capturer",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x03000F,
+                .muxsel         = { 2, 3, 1, 0},
+                .audiomux       = { 2,0,0,0,1 },
+                .pll            = PLL_28,
+                .tuner_type     = 0,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x3c ---------------------------------- */
+        [BTTV_BOARD_MM100PCTV] = {
+                /* Philip Blundell <philb@gnu.org> */
+                .name           = "Modular Technology MM100PCTV",
+                .video_inputs   = 2,
+                .audio_inputs   = 2,
+                .tuner          = 0,
+                .svhs           = -1,
+                .gpiomask       = 11,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 2, 0, 0, 1, 8},
+                .pll            = PLL_35,
+                .tuner_type     = TUNER_TEMIC_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_GMV1] = {
+                /* Adrian Cox <adrian@humboldt.co.uk */
+                .name           = "AG Electronics GMV1",
+                .video_inputs   = 2,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 1,
+                .gpiomask       = 0xF,
+                .muxsel         = { 2, 2},
+                .audiomux       = { },
+                .no_msp34xx     = 1,
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_BESTBUY_EASYTV2] = {
+                /* Miguel Angel Alvarez <maacruz@navegalia.com>
+                new Easy TV BT878 version (model CPH061)
+                special thanks to Informatica Mieres for providing the card */
+                .name           = "Askey CPH061/ BESTBUY Easy TV (bt878)",
+                .video_inputs   = 3,
+                .audio_inputs   = 2,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xFF,
+                .muxsel         = { 2, 3, 1, 0},
+                .audiomux       = { 1, 0, 4, 4, 9},
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_ATI_TVWONDER] = {
+                /* Lukas Gebauer <geby@volny.cz> */
+                .name           = "ATI TV-Wonder",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xf03f,
+                .muxsel         = { 2, 3, 1, 0 },
+                .audiomux       = { 0xbffe, 0, 0xbfff, 0, 0xbffe},
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x40 ---------------------------------- */
+        [BTTV_BOARD_ATI_TVWONDERVE] = {
+                /* Lukas Gebauer <geby@volny.cz> */
+                .name           = "ATI TV-Wonder VE",
+                .video_inputs   = 2,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = -1,
+                .gpiomask       = 1,
+                .muxsel         = { 2, 3, 0, 1},
+                .audiomux       = { 0, 0, 1, 0, 0},
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_FLYVIDEO2000] = {
+                /* DeeJay <deejay@westel900.net (2000S) */
+                .name           = "Lifeview FlyVideo 2000S LR90",
+                .video_inputs   = 3,
+                .audio_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x18e0,
+                .muxsel         = { 2, 3, 0, 1},
+                                /* Radio changed from 1e80 to 0x800 to make
+                                FlyVideo2000S in .hu happy (gm)*/
+                                /* -dk-???: set mute=0x1800 for tda9874h daughterboard */
+                .audiomux       = { 0x0000,0x0800,0x1000,0x1000,0x1800, 0x1080 },
+                .audio_hook     = fv2000s_audio,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 5,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_TERRATVALUER] = {
+                .name           = "Terratec TValueRadio",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0xffff00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x500, 0x500, 0x300, 0x900, 0x900},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_GVBCTV4PCI] = {
+                /* TANAKA Kei <peg00625@nifty.com> */
+                .name           = "IODATA GV-BCTV4/PCI",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x010f00,
+                .muxsel         = {2, 3, 0, 0},
+                .audiomux       = {0x10000, 0, 0x10000, 0, 0, 0},
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_SHARP_2U5JF5540_NTSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = gvbctv3pci_audio,
+        },
+
+        /* ---- card 0x44 ---------------------------------- */
+        [BTTV_BOARD_VOODOOTV_FM] = {
+                .name           = "3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)",
+                /* try "insmod msp3400 simple=0" if you have
+                * sound problems with this card. */
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = -1,
+                .gpiomask       = 0x4f8a00,
+                /* 0x100000: 1=MSP enabled (0=disable again)
+                * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
+                .audiomux       = {0x947fff, 0x987fff,0x947fff,0x947fff, 0x947fff},
+                /* tvtuner, radio,   external,internal, mute,  stereo
+                * tuner, Composit, SVid, Composit-on-Svid-adapter */
+                .muxsel         = { 2, 3 ,0 ,1},
+                .tuner_type     = TUNER_MT2032,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_AIMMS] = {
+                /* Philip Blundell <pb@nexus.co.uk> */
+                .name           = "Active Imaging AIMMS",
+                .video_inputs   = 1,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .muxsel         = { 2 },
+                .gpiomask       = 0
+        },
+        [BTTV_BOARD_PV_BT878P_PLUS] = {
+                /* Tomasz Pyra <hellfire@sedez.iq.pl> */
+                .name           = "Prolink Pixelview PV-BT878P+ (Rev.4C,8E)",
+                .video_inputs   = 3,
+                .audio_inputs   = 4,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0, 11, 7, 13, 0}, /* TV and Radio with same GPIO ! */
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 25,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,
+                /* GPIO wiring:
+                        GPIO0: U4.A0 (hef4052bt)
+                        GPIO1: U4.A1
+                        GPIO2: U4.A1 (second hef4052bt)
+                        GPIO3: U4.nEN, U5.A0, A5.nEN
+                        GPIO8-15: vrd866b ?
+                */
+        },
+        [BTTV_BOARD_FLYVIDEO98EZ] = {
+                .name           = "Lifeview FlyVideo 98EZ (capture only) LR51",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1, 1}, /* AV1, AV2, SVHS, CVid adapter on SVHS */
+                .pll            = PLL_28,
+                .no_msp34xx     = 1,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+        /* ---- card 0x48 ---------------------------------- */
+        [BTTV_BOARD_PV_BT878P_9B] = {
+                /* Dariusz Kowalewski <darekk@automex.pl> */
+                .name           = "Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x3f,
+                .muxsel         = { 2, 3, 1, 1 },
+                .audiomux       = { 0x01, 0x00, 0x03, 0x03, 0x09, 0x02 },
+                .needs_tvaudio  = 1,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 5,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = pvbt878p9b_audio, /* Note: not all cards have stereo */
+                .has_radio      = 1,  /* Note: not all cards have radio */
+                .has_remote     = 1,
+                /* GPIO wiring:
+                        GPIO0: A0 hef4052
+                        GPIO1: A1 hef4052
+                        GPIO3: nEN hef4052
+                        GPIO8-15: vrd866b
+                        GPIO20,22,23: R30,R29,R28
+                */
+        },
+        [BTTV_BOARD_SENSORAY311] = {
+                /* Clay Kunz <ckunz@mail.arc.nasa.gov> */
+                /* you must jumper JP5 for the card to work */
+                .name           = "Sensoray 311",
+                .video_inputs   = 5,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 4,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 0, 0},
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 0,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_RV605] = {
+                /* Miguel Freitas <miguel@cetuc.puc-rio.br> */
+                .name           = "RemoteVision MX (RV605)",
+                .video_inputs   = 16,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .gpiomask       = 0x00,
+                .gpiomask2      = 0x07ff,
+                .muxsel         = { 0x33, 0x13, 0x23, 0x43, 0xf3, 0x73, 0xe3, 0x03,
+                                0xd3, 0xb3, 0xc3, 0x63, 0x93, 0x53, 0x83, 0xa3 },
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .muxsel_hook    = rv605_muxsel,
+        },
+        [BTTV_BOARD_POWERCLR_MTV878] = {
+                .name           = "Powercolor MTV878/ MTV878R/ MTV878F",
+                .video_inputs   = 3,
+                .audio_inputs   = 2,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x1C800F,  /* Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset */
+                .muxsel         = { 2, 1, 1, },
+                .audiomux       = { 0, 1, 2, 2, 4 },
+                .needs_tvaudio  = 0,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+        },
+
+        /* ---- card 0x4c ---------------------------------- */
+        [BTTV_BOARD_WINDVR] = {
+                /* Masaki Suzuki <masaki@btree.org> */
+                .name           = "Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x140007,
+                .muxsel         = { 2, 3, 1, 1 },
+                .audiomux       = { 0, 1, 2, 3, 4, 0 },
+                .tuner_type     = TUNER_PHILIPS_NTSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = windvr_audio,
+        },
+        [BTTV_BOARD_GRANDTEC_MULTI] = {
+                .name           = "GrandTec Multi Capture Card (Bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 0 },
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 0,
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_KWORLD] = {
+                .name           = "Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF",
+                .video_inputs   = 4,
+                .audio_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 3, 1, 1 },   /* Tuner, SVid, SVHS, SVid to SVHS connector */
+                .audiomux       = { 0 ,0 ,4, 4,4,4},/* Yes, this tuner uses the same audio output for TV and FM radio!
+                                                * This card lacks external Audio In, so we mute it on Ext. & Int.
+                                                * The PCB can take a sbx1637/sbx1673, wiring unknown.
+                                                * This card lacks PCI subsystem ID, sigh.
+                                                * audiomux=1: lower volume, 2+3: mute
+                                                * btwincap uses 0x80000/0x80003
+                                                */
+                .needs_tvaudio  = 0,
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 5,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                /* Samsung TCPA9095PC27A (BG+DK), philips compatible, w/FM, stereo and
+                radio signal strength indicators work fine. */
+                .has_radio      = 1,
+                /* GPIO Info:
+                        GPIO0,1:   HEF4052 A0,A1
+                        GPIO2:     HEF4052 nENABLE
+                        GPIO3-7:   n.c.
+                        GPIO8-13:  IRDC357 data0-5 (data6 n.c. ?) [chip not present on my card]
+                        GPIO14,15: ??
+                        GPIO16-21: n.c.
+                        GPIO22,23: ??
+                        ??       : mtu8b56ep microcontroller for IR (GPIO wiring unknown)*/
+        },
+        [BTTV_BOARD_DSP_TCVIDEO] = {
+                /* Arthur Tetzlaff-Deas, DSP Design Ltd <software@dspdesign.com> */
+                .name           = "DSP Design TCVIDEO",
+                .video_inputs   = 4,
+                .svhs           = -1,
+                .muxsel         = { 2, 3, 1, 0},
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+                /* ---- card 0x50 ---------------------------------- */
+        [BTTV_BOARD_HAUPPAUGEPVR] = {
+                .name           = "Hauppauge WinTV PVR",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = { 2, 0, 1, 1},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+
+                .gpiomask       = 7,
+                .audiomux       = {7},
+        },
+        [BTTV_BOARD_GVBCTV5PCI] = {
+                .name           = "IODATA GV-BCTV5/PCI",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x0f0f80,
+                .muxsel         = {2, 3, 1, 0},
+                .audiomux       = {0x030000, 0x010000, 0, 0, 0x020000, 0},
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_NTSC_M,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = gvbctv5pci_audio,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_OSPREY1x0] = {
+                .name           = "Osprey 100/150 (878)", /* 0x1(2|3)-45C6-C1 */
+                .video_inputs   = 4,                  /* id-inputs-clock */
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 3,
+                .muxsel         = { 3, 2, 0, 1 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+        [BTTV_BOARD_OSPREY1x0_848] = {
+                .name           = "Osprey 100/150 (848)", /* 0x04-54C0-C1 & older boards */
+                .video_inputs   = 3,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+
+                /* ---- card 0x54 ---------------------------------- */
+        [BTTV_BOARD_OSPREY101_848] = {
+                .name           = "Osprey 101 (848)", /* 0x05-40C0-C1 */
+                .video_inputs   = 2,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 3, 1 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+        [BTTV_BOARD_OSPREY1x1] = {
+                .name           = "Osprey 101/151",       /* 0x1(4|5)-0004-C4 */
+                .video_inputs   = 1,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .muxsel         = { 0 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+        [BTTV_BOARD_OSPREY1x1_SVID] = {
+                .name           = "Osprey 101/151 w/ svid",  /* 0x(16|17|20)-00C4-C1 */
+                .video_inputs   = 2,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 0, 1 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+        [BTTV_BOARD_OSPREY2xx] = {
+                .name           = "Osprey 200/201/250/251",  /* 0x1(8|9|E|F)-0004-C4 */
+                .video_inputs   = 1,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = -1,
+                .muxsel         = { 0 },
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+
+                /* ---- card 0x58 ---------------------------------- */
+        [BTTV_BOARD_OSPREY2x0_SVID] = {
+                .name           = "Osprey 200/250",   /* 0x1(A|B)-00C4-C1 */
+                .video_inputs   = 2,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 0, 1 },
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+        [BTTV_BOARD_OSPREY2x0] = {
+                .name           = "Osprey 210/220",   /* 0x1(A|B)-04C0-C1 */
+                .video_inputs   = 2,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 2, 3 },
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+        [BTTV_BOARD_OSPREY500] = {
+                .name           = "Osprey 500",   /* 500 */
+                .video_inputs   = 2,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 2, 3 },
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+        [BTTV_BOARD_OSPREY540] = {
+                .name           = "Osprey 540",   /* 540 */
+                .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,
+                .radio_addr     = ADDR_UNSET,
+                .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 ---------------------------------- */
+        [BTTV_BOARD_OSPREY2000] = {
+                .name           = "Osprey 2000",  /* 2000 */
+                .video_inputs   = 2,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 2, 3 },
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,      /* must avoid, conflicts with the bt860 */
+        },
+        [BTTV_BOARD_IDS_EAGLE] = {
+                /* M G Berberich <berberic@forwiss.uni-passau.de> */
+                .name           = "IDS Eagle",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .svhs           = -1,
+                .gpiomask       = 0,
+                .muxsel         = { 0, 1, 2, 3 },
+                .muxsel_hook    = eagle_muxsel,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .pll            = PLL_28,
+        },
+        [BTTV_BOARD_PINNACLESAT] = {
+                .name           = "Pinnacle PCTV Sat",
+                .video_inputs   = 2,
+                .audio_inputs   = 0,
+                .svhs           = 1,
+                .tuner          = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .muxsel         = { 3, 0, 1, 2},
+                .pll            = PLL_28,
+                .no_gpioirq     = 1,
+                .has_dvb        = 1,
+        },
+        [BTTV_BOARD_FORMAC_PROTV] = {
+                .name           = "Formac ProTV II (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 3,
+                .gpiomask       = 2,
+                /* TV, Comp1, Composite over SVID con, SVID */
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 2, 2, 0, 0, 0 },
+                .pll            = PLL_28,
+                .has_radio      = 1,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        /* sound routing:
+                GPIO=0x00,0x01,0x03: mute (?)
+                0x02: both TV and radio (tuner: FM1216/I)
+                The card has onboard audio connectors labeled "cdrom" and "board",
+                not soldered here, though unknown wiring.
+                Card lacks: external audio in, pci subsystem id.
         */
-        .name           = "Kodicom 4400R (slave)",
-        .video_inputs   = 16,
-        .audio_inputs   = 0,
-        .tuner          = -1,
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .svhs           = -1,
-        .gpiomask       = 0x010000,
-        .no_gpioirq     = 1,
-        .muxsel         = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
-        .pll            = PLL_28,
-        .no_msp34xx     = 1,
-        .no_tda7432     = 1,
-        .no_tda9875     = 1,
-        .muxsel_hook    = kodicom4400r_muxsel,
-},
-{
-        /* ---- card 0x86---------------------------------- */
-        /* Michael Henson <mhenson@clarityvi.com> */
-        /* Adlink RTV24 with special unlock codes */
-        .name           = "Adlink RTV24",
-        .video_inputs   = 4,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1, 0},
-        .tuner_type     = -1,
-        .tuner_addr     = ADDR_UNSET,
-        .pll            = PLL_28,
-},
-{
-        /* ---- card 0x87---------------------------------- */
-        /* Michael Krufky <mkrufky@m1k.net> */
-        .name           = "DViCO FusionHDTV 5 Lite",
-        .tuner          = 0,
-        .tuner_type     = TUNER_LG_TDVS_H062F,
-        .tuner_addr     = ADDR_UNSET,
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .svhs           = 2,
-        .muxsel         = { 2, 3, 1 },
-        .gpiomask       = 0x00e00007,
-        .audiomux       = { 0x00400005, 0, 0x00000001, 0, 0x00c00007, 0 },
-        .no_msp34xx     = 1,
-        .no_tda9875     = 1,
-        .no_tda7432     = 1,
-},{
-        /* ---- card 0x88---------------------------------- */
-        /* Mauro Carvalho Chehab <mchehab@brturbo.com.br> */
-        .name           = "Acorp Y878F",
-        .video_inputs   = 3,
-        .audio_inputs   = 1,
-        .tuner          = 0,
-        .svhs           = 2,
-        .gpiomask       = 0x01fe00,
-        .muxsel         = { 2, 3, 1, 1},
-        .audiomux       = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 },
-        .needs_tvaudio  = 1,
-        .pll            = PLL_28,
-        .tuner_type     = TUNER_YMEC_TVF66T5_B_DFF,
-        .tuner_addr     = 0xc1 >>1,
-        .has_radio      = 1,
-}};
+        },
+
+                /* ---- card 0x60 ---------------------------------- */
+        [BTTV_BOARD_MACHTV] = {
+                .name           = "MachTV",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = -1,
+                .gpiomask       = 7,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 1, 2, 3, 4},
+                .needs_tvaudio  = 1,
+                .tuner_type     = 5,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+        },
+        [BTTV_BOARD_EURESYS_PICOLO] = {
+                .name           = "Euresys Picolo",
+                .video_inputs   = 3,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = 2,
+                .gpiomask       = 0,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .muxsel         = { 2, 0, 1},
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_PV150] = {
+                /* Luc Van Hoeylandt <luc@e-magic.be> */
+                .name           = "ProVideo PV150", /* 0x4f */
+                .video_inputs   = 2,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3 },
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 0,
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_AD_TVK503] = {
+                /* Hiroshi Takekawa <sian@big.or.jp> */
+                /* This card lacks subsystem ID */
+                .name           = "AD-TVK503", /* 0x63 */
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x001e8007,
+                .muxsel         = { 2, 3, 1, 0 },
+                /*                  Tuner, Radio, external, internal, off,  on */
+                .audiomux       = { 0x08,  0x0f,  0x0a,     0x08,     0x0f, 0x08 },
+                .needs_tvaudio  = 0,
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 2,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .audio_hook     = adtvk503_audio,
+        },
+
+                /* ---- card 0x64 ---------------------------------- */
+        [BTTV_BOARD_HERCULES_SM_TV] = {
+                .name           = "Hercules Smart TV Stereo",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x00,
+                .muxsel         = { 2, 3, 1, 1 },
+                .needs_tvaudio  = 1,
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 5,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                /* Notes:
+                - card lacks subsystem ID
+                - stereo variant w/ daughter board with tda9874a @0xb0
+                - Audio Routing:
+                        always from tda9874 independent of GPIO (?)
+                        external line in: unknown
+                - Other chips: em78p156elp @ 0x96 (probably IR remote control)
+                        hef4053 (instead 4052) for unknown function
+                */
+        },
+        [BTTV_BOARD_PACETV] = {
+                .name           = "Pace TV & Radio Card",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1, 1}, /* Tuner, CVid, SVid, CVid over SVid connector */
+                .gpiomask       = 0,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .tuner_type     = 1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_radio      = 1,
+                .pll            = PLL_28,
+                /* Bt878, Bt832, FI1246 tuner; no pci subsystem id
+                only internal line out: (4pin header) RGGL
+                Radio must be decoded by msp3410d (not routed through)*/
+                /*
+                .digital_mode   = DIGITAL_MODE_CAMERA,  todo!
+                */
+        },
+        [BTTV_BOARD_IVC200] = {
+                /* Chris Willing <chris@vislab.usyd.edu.au> */
+                .name           = "IVC-200",
+                .video_inputs   = 1,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .svhs           = -1,
+                .gpiomask       = 0xdf,
+                .muxsel         = { 2 },
+                .pll            = PLL_28,
+        },
+        [BTTV_BOARD_XGUARD] = {
+                .name           = "Grand X-Guard / Trust 814PCI",
+                .video_inputs   = 16,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .tuner_type     = 4,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask2      = 0xff,
+                .muxsel         = { 2,2,2,2, 3,3,3,3, 1,1,1,1, 0,0,0,0 },
+                .muxsel_hook    = xguard_muxsel,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .pll            = PLL_28,
+        },
+
+                /* ---- card 0x68 ---------------------------------- */
+        [BTTV_BOARD_NEBULA_DIGITV] = {
+                .name           = "Nebula Electronics DigiTV",
+                .video_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = -1,
+                .muxsel         = { 2, 3, 1, 0},
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_dvb        = 1,
+                .no_gpioirq     = 1,
+        },
+        [BTTV_BOARD_PV143] = {
+                /* Jorge Boncompte - DTI2 <jorge@dti2.net> */
+                .name           = "ProVideo PV143",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .gpiomask       = 0,
+                .muxsel         = { 2, 3, 1, 0 },
+                .audiomux       = { 0 },
+                .needs_tvaudio  = 0,
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_VD009X1_MINIDIN] = {
+                /* M.Klahr@phytec.de */
+                .name           = "PHYTEC VD-009-X1 MiniDIN (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1, /* card has no tuner */
+                .svhs           = 3,
+                .gpiomask       = 0x00,
+                .muxsel         = { 2, 3, 1, 0},
+                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_VD009X1_COMBI] = {
+                .name           = "PHYTEC VD-009-X1 Combi (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1, /* card has no tuner */
+                .svhs           = 3,
+                .gpiomask       = 0x00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+                /* ---- card 0x6c ---------------------------------- */
+        [BTTV_BOARD_VD009_MINIDIN] = {
+                .name           = "PHYTEC VD-009 MiniDIN (bt878)",
+                .video_inputs   = 10,
+                .audio_inputs   = 0,
+                .tuner          = -1, /* card has no tuner */
+                .svhs           = 9,
+                .gpiomask       = 0x00,
+                .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
+                                        via the upper nibble of muxsel. here: used for
+                                        xternal video-mux */
+                .muxsel         = { 0x02, 0x12, 0x22, 0x32, 0x03, 0x13, 0x23, 0x33, 0x01, 0x00 },
+                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_VD009_COMBI] = {
+                .name           = "PHYTEC VD-009 Combi (bt878)",
+                .video_inputs   = 10,
+                .audio_inputs   = 0,
+                .tuner          = -1, /* card has no tuner */
+                .svhs           = 9,
+                .gpiomask       = 0x00,
+                .gpiomask2      = 0x03, /* gpiomask2 defines the bits used to switch audio
+                                        via the upper nibble of muxsel. here: used for
+                                        xternal video-mux */
+                .muxsel         = { 0x02, 0x12, 0x22, 0x32, 0x03, 0x13, 0x23, 0x33, 0x01, 0x01 },
+                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_IVC100] = {
+                .name           = "IVC-100",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .svhs           = -1,
+                .gpiomask       = 0xdf,
+                .muxsel         = { 2, 3, 1, 0 },
+                .pll            = PLL_28,
+        },
+        [BTTV_BOARD_IVC120] = {
+                /* IVC-120G - Alan Garfield <alan@fromorbit.com> */
+                .name           = "IVC-120G",
+                .video_inputs   = 16,
+                .audio_inputs   = 0,    /* card has no audio */
+                .tuner          = -1,   /* card has no tuner */
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .svhs           = -1,   /* card has no svhs */
+                .needs_tvaudio  = 0,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .gpiomask       = 0x00,
+                .muxsel         = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+                                0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10 },
+                .muxsel_hook    = ivc120_muxsel,
+                .pll            = PLL_28,
+        },
+
+                /* ---- card 0x70 ---------------------------------- */
+        [BTTV_BOARD_PC_HDTV] = {
+                .name           = "pcHDTV HD-2000 TV",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1, 0},
+                .tuner_type     = TUNER_PHILIPS_ATSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_dvb        = 1,
+        },
+        [BTTV_BOARD_TWINHAN_DST] = {
+                .name           = "Twinhan DST + clones",
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .tuner_type     = TUNER_ABSENT,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_video       = 1,
+                .has_dvb        = 1,
+        },
+        [BTTV_BOARD_WINFASTVC100] = {
+                .name           = "Winfast VC100",
+                .video_inputs   = 3,
+                .audio_inputs   = 0,
+                .svhs           = 1,
+                .tuner          = -1,
+                .muxsel         = { 3, 1, 1, 3}, /* Vid In, SVid In, Vid over SVid in connector */
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .tuner_type     = TUNER_ABSENT,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+        },
+        [BTTV_BOARD_TEV560] = {
+                .name           = "Teppro TEV-560/InterVision IV-560",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 3,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 1, 1, 1, 1, 0},
+                .needs_tvaudio  = 1,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_35,
+        },
+
+                /* ---- card 0x74 ---------------------------------- */
+        [BTTV_BOARD_SIMUS_GVC1100] = {
+                .name           = "SIMUS GVC1100",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .muxsel         = { 2, 2, 2, 2},
+                .gpiomask       = 0x3F,
+                .muxsel_hook    = gvc1100_muxsel,
+        },
+        [BTTV_BOARD_NGSTV_PLUS] = {
+                /* Carlos Silva r3pek@r3pek.homelinux.org || card 0x75 */
+                .name           = "NGS NGSTV+",
+                .video_inputs   = 3,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x008007,
+                .muxsel         = {2, 3, 0, 0},
+                .audiomux       = {0, 0, 0, 0, 0x000003, 0},
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,
+        },
+        [BTTV_BOARD_LMLBT4] = {
+                /* http://linuxmedialabs.com */
+                .name           = "LMLBT4",
+                .video_inputs   = 4, /* IN1,IN2,IN3,IN4 */
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .muxsel         = { 2, 3, 1, 0 },
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .needs_tvaudio  = 0,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_TEKRAM_M205] = {
+                /* Helmroos Harri <harri.helmroos@pp.inet.fi> */
+                .name           = "Tekram M205 PRO",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .svhs           = 2,
+                .needs_tvaudio  = 0,
+                .gpiomask       = 0x68,
+                .muxsel         = { 2, 3, 1},
+                .audiomux       = { 0x68, 0x68, 0x61, 0x61, 0x00 },
+                .pll            = PLL_28,
+        },
+
+                /* ---- card 0x78 ---------------------------------- */
+        [BTTV_BOARD_CONTVFMI] = {
+                /* Javier Cendan Ares <jcendan@lycos.es> */
+                /* bt878 TV + FM without subsystem ID */
+                .name           = "Conceptronic CONTVFMi",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x008007,
+                .muxsel         = { 2, 3, 1, 1 },
+                .audiomux       = { 0, 1, 2, 2, 3 },
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_PICOLO_TETRA_CHIP] = {
+                /*Eric DEBIEF <debief@telemsa.com>*/
+                /*EURESYS Picolo Tetra : 4 Conexant Fusion 878A, no audio, video input set with analog multiplexers GPIO controled*/
+                /* adds picolo_tetra_muxsel(), picolo_tetra_init(), the folowing declaration strucure, and #define BTTV_BOARD_PICOLO_TETRA_CHIP*/
+                /*0x79 in bttv.h*/
+                .name           = "Euresys Picolo Tetra",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .gpiomask       = 0,
+                .gpiomask2      = 0x3C<<16,/*Set the GPIO[18]->GPIO[21] as output pin.==> drive the video inputs through analog multiplexers*/
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .muxsel         = {2,2,2,2},/*878A input is always MUX0, see above.*/
+                .audiomux       = { 0, 0, 0, 0, 0, 0 }, /* card has no audio */
+                .pll            = PLL_28,
+                .needs_tvaudio  = 0,
+                .muxsel_hook    = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_SPIRIT_TV] = {
+                /* Spirit TV Tuner from http://spiritmodems.com.au */
+                /* Stafford Goodsell <surge@goliath.homeunix.org> */
+                .name           = "Spirit TV Tuner",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x0000000f,
+                .muxsel         = { 2, 1, 1 },
+                .audiomux       = { 0x02, 0x00, 0x00, 0x00, 0x00},
+                .tuner_type     = TUNER_TEMIC_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+        },
+        [BTTV_BOARD_AVDVBT_771] = {
+                /* Wolfram Joost <wojo@frokaschwei.de> */
+                .name           = "AVerMedia AVerTV DVB-T 771",
+                .video_inputs   = 2,
+                .svhs           = 1,
+                .tuner          = -1,
+                .tuner_type     = TUNER_ABSENT,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .muxsel         = { 3 , 3 },
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .pll            = PLL_28,
+                .has_dvb        = 1,
+                .no_gpioirq     = 1,
+                .has_remote     = 1,
+        },
+                /* ---- card 0x7c ---------------------------------- */
+        [BTTV_BOARD_AVDVBT_761] = {
+                /* Matt Jesson <dvb@jesson.eclipse.co.uk> */
+                /* Based on the Nebula card data - added remote and new card number - BTTV_BOARD_AVDVBT_761, see also ir-kbd-gpio.c */
+                .name           = "AverMedia AverTV DVB-T 761",
+                .video_inputs   = 2,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 3, 1, 2, 0}, /* Comp0, S-Video, ?, ? */
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_dvb        = 1,
+                .no_gpioirq     = 1,
+                .has_remote     = 1,
+        },
+        [BTTV_BOARD_MATRIX_VISIONSQ] = {
+                /* andre.schwarz@matrix-vision.de */
+                .name             = "MATRIX Vision Sigma-SQ",
+                .video_inputs     = 16,
+                .audio_inputs     = 0,
+                .tuner            = -1,
+                .svhs             = -1,
+                .gpiomask         = 0x0,
+                .muxsel           = { 2, 2, 2, 2, 2, 2, 2, 2,
+                                3, 3, 3, 3, 3, 3, 3, 3 },
+                .muxsel_hook      = sigmaSQ_muxsel,
+                .audiomux         = { 0 },
+                .no_msp34xx       = 1,
+                .pll              = PLL_28,
+                .tuner_type       = -1,
+                .tuner_addr       = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_MATRIX_VISIONSLC] = {
+                /* andre.schwarz@matrix-vision.de */
+                .name             = "MATRIX Vision Sigma-SLC",
+                .video_inputs     = 4,
+                .audio_inputs     = 0,
+                .tuner            = -1,
+                .svhs             = -1,
+                .gpiomask         = 0x0,
+                .muxsel           = { 2, 2, 2, 2 },
+                .muxsel_hook      = sigmaSLC_muxsel,
+                .audiomux         = { 0 },
+                .no_msp34xx       = 1,
+                .pll              = PLL_28,
+                .tuner_type       = -1,
+                .tuner_addr       = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+                /* BTTV_BOARD_APAC_VIEWCOMP */
+        [BTTV_BOARD_APAC_VIEWCOMP] = {
+                /* Attila Kondoros <attila.kondoros@chello.hu> */
+                /* bt878 TV + FM 0x00000000 subsystem ID */
+                .name           = "APAC Viewcomp 878(AMAX)",
+                .video_inputs   = 2,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = -1,
+                .gpiomask       = 0xFF,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 2, 0, 0, 0, 10},
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,   /* miniremote works, see ir-kbd-gpio.c */
+                .has_radio      = 1,   /* not every card has radio */
+        },
+
+                /* ---- card 0x80 ---------------------------------- */
+        [BTTV_BOARD_DVICO_DVBT_LITE] = {
+                /* Chris Pascoe <c.pascoe@itee.uq.edu.au> */
+                .name           = "DViCO FusionHDTV DVB-T Lite",
+                .tuner          = -1,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .pll            = PLL_28,
+                .no_video       = 1,
+                .has_dvb        = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+        [BTTV_BOARD_VGEAR_MYVCD] = {
+                /* Steven <photon38@pchome.com.tw> */
+                .name           = "V-Gear MyVCD",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x3f,
+                .muxsel         = {2, 3, 1, 0},
+                .audiomux       = {0x31, 0x31, 0x31, 0x31, 0x31, 0x31},
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_PHILIPS_NTSC_M,
+                .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> */
+                .name           = "Super TV Tuner",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1, 0},
+                .tuner_type     = TUNER_PHILIPS_NTSC,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x008007,
+                .audiomux       = { 0, 0x000001,0,0, 0},
+                .needs_tvaudio  = 1,
+                .has_radio      = 1,
+        },
+        [BTTV_BOARD_TIBET_CS16] = {
+                /* Chris Fanning <video4linux@haydon.net> */
+                .name           = "Tibet Systems 'Progress DVR' CS16",
+                .video_inputs   = 16,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .svhs           = -1,
+                .muxsel         = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
+                .pll            = PLL_28,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .muxsel_hook    = tibetCS16_muxsel,
+        },
+        [BTTV_BOARD_KODICOM_4400R] = {
+                /* Bill Brack <wbrack@mmm.com.hk> */
+                /*
+                * Note that, because of the card's wiring, the "master"
+                * BT878A chip (i.e. the one which controls the analog switch
+                * and must use this card type) is the 2nd one detected.  The
+                * other 3 chips should use card type 0x85, whose description
+                * follows this one.  There is a EEPROM on the card (which is
+                * connected to the I2C of one of those other chips), but is
+                * not currently handled.  There is also a facility for a
+                * "monitor", which is also not currently implemented.
+                */
+                .name           = "Kodicom 4400R (master)",
+                .video_inputs   = 16,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .svhs           = -1,
+                /* GPIO bits 0-9 used for analog switch:
+                *   00 - 03:    camera selector
+                *   04 - 06:    channel (controller) selector
+                *   07: data (1->on, 0->off)
+                *   08: strobe
+                *   09: reset
+                * bit 16 is input from sync separator for the channel
+                */
+                .gpiomask       = 0x0003ff,
+                .no_gpioirq     = 1,
+                .muxsel         = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
+                .pll            = PLL_28,
+                .no_msp34xx     = 1,
+                .no_tda7432     = 1,
+                .no_tda9875     = 1,
+                .muxsel_hook    = kodicom4400r_muxsel,
+        },
+        [BTTV_BOARD_KODICOM_4400R_SL] = {
+                /* Bill Brack <wbrack@mmm.com.hk> */
+                /* Note that, for reasons unknown, the "master" BT878A chip (i.e. the
+                * one which controls the analog switch, and must use the card type)
+                * is the 2nd one detected.  The other 3 chips should use this card
+                * type
+                */
+                .name           = "Kodicom 4400R (slave)",
+                .video_inputs   = 16,
+                .audio_inputs   = 0,
+                .tuner          = -1,
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .svhs           = -1,
+                .gpiomask       = 0x010000,
+                .no_gpioirq     = 1,
+                .muxsel         = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
+                .pll            = PLL_28,
+                .no_msp34xx     = 1,
+                .no_tda7432     = 1,
+                .no_tda9875     = 1,
+                .muxsel_hook    = kodicom4400r_muxsel,
+        },
+                /* ---- card 0x86---------------------------------- */
+        [BTTV_BOARD_ADLINK_RTV24] = {
+                /* Michael Henson <mhenson@clarityvi.com> */
+                /* Adlink RTV24 with special unlock codes */
+                .name           = "Adlink RTV24",
+                .video_inputs   = 4,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1, 0},
+                .tuner_type     = -1,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+        },
+                /* ---- card 0x87---------------------------------- */
+        [BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE] = {
+                /* Michael Krufky <mkrufky@m1k.net> */
+                .name           = "DViCO FusionHDTV 5 Lite",
+                .tuner          = 0,
+                .tuner_type     = TUNER_LG_TDVS_H062F,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .svhs           = 2,
+                .muxsel         = { 2, 3, 1 },
+                .gpiomask       = 0x00e00007,
+                .audiomux       = { 0x00400005, 0, 0x00000001, 0, 0x00c00007, 0 },
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+                .has_dvb        = 1,
+        },
+                /* ---- card 0x88---------------------------------- */
+        [BTTV_BOARD_ACORP_Y878F] = {
+                /* Mauro Carvalho Chehab <mchehab@brturbo.com.br> */
+                .name           = "Acorp Y878F",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x01fe00,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = { 0x001e00, 0, 0x018000, 0x014000, 0x002000, 0 },
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_YMEC_TVF66T5_B_DFF,
+                .tuner_addr     = 0xc1 >>1,
+                .radio_addr     = 0xc1 >>1,
+                .has_radio      = 1,
+        },
+                /* ---- card 0x89 ---------------------------------- */
+        [BTTV_BOARD_CONCEPTRONIC_CTVFMI2] = {
+                .name           = "Conceptronic CTVFMi v2",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x001c0007,
+                .muxsel         = { 2, 3, 1, 1 },
+                .audiomux       = { 0, 1, 2, 2, 3 },
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_TENA_9533_DI,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote     = 1,
+                .has_radio      = 1,
+        },
+                /* ---- card 0x8a ---------------------------------- */
+        [BTTV_BOARD_PV_BT878P_2E] = {
+                .name          = "Prolink Pixelview PV-BT878P+ (Rev.2E)",
+                .video_inputs  = 5,
+                .audio_inputs  = 1,
+                .tuner         = 0,
+                .svhs          = 3,
+                .gpiomask      = 0x01fe00,
+                .muxsel        = { 2,3,1,1,-1 },
+                .digital_mode  = DIGITAL_MODE_CAMERA,
+                .audiomux      = { 0x00400, 0x10400, 0x04400, 0x80000, 0x12400, 0x46000  },
+                .no_msp34xx    = 1,
+                .pll           = PLL_28,
+                .tuner_type    = TUNER_LG_PAL_FM,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_remote    = 1,
+        },
+                /* ---- card 0x8b ---------------------------------- */
+        [BTTV_BOARD_PV_M4900] = {
+                /* Sérgio Fortier <sergiofortier@yahoo.com.br> */
+                .name           = "Prolink PixelView PlayTV MPEG2 PV-M4900",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 0x3f,
+                .muxsel         = { 2, 3, 1, 1 },
+                .audiomux       = { 0x21, 0x20, 0x24, 0x2c, 0x29, 0x29 },
+                .no_msp34xx     = 1,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_YMEC_TVF_5533MF,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .has_radio      = 1,
+                .has_remote     = 1,
+        },
+                /* ---- card 0x8c ---------------------------------- */
+        [BTTV_BOARD_OSPREY440]  = {
+                .name           = "Osprey 440",
+                .video_inputs   = 1,
+                .audio_inputs   = 1,
+                .tuner          = -1,
+                .svhs           = 1,
+                .muxsel         = { 2 },
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .no_msp34xx     = 1,
+                .no_tda9875     = 1,
+                .no_tda7432     = 1,
+        },
+                /* ---- card 0x8d ---------------------------------- */
+        [BTTV_BOARD_ASOUND_SKYEYE] = {
+                .name           = "Asound Skyeye PCTV",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                .gpiomask       = 15,
+                .muxsel         = { 2, 3, 1, 1},
+                .audiomux       = {2,0,0,0,1},
+                .needs_tvaudio  = 1,
+                .pll            = PLL_28,
+                .tuner_type     = 2,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+
+};
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
 
@@ -2461,7 +2840,7 @@ void __devinit bttv_idcard(struct bttv *btv)
                                btv->c.nr, btv->cardid & 0xffff,
                                (btv->cardid >> 16) & 0xffff);
                         printk(KERN_DEBUG "please mail id, board name and "
-                               "the correct card= insmod option to kraxel@bytesex.org\n");
+                               "the correct card= insmod option to video4linux-list@redhat.com\n");
                 }
         }
 
@@ -2510,11 +2889,11 @@ void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256])
         int type = -1;
 
         if (0 == strncmp(eeprom_data,"GET MM20xPCTV",13))
-                type = BTTV_MODTEC_205;
+                type = BTTV_BOARD_MODTEC_205;
         else if (0 == strncmp(eeprom_data+20,"Picolo",7))
-                type = BTTV_EURESYS_PICOLO;
+                type = BTTV_BOARD_EURESYS_PICOLO;
         else if (eeprom_data[0] == 0x84 && eeprom_data[2]== 0)
-                type = BTTV_HAUPPAUGE; /* old bt848 */
+                type = BTTV_BOARD_HAUPPAUGE; /* old bt848 */
 
         if (-1 != type) {
                 btv->c.type = type;
@@ -2548,7 +2927,7 @@ static void flyvideo_gpio(struct bttv *btv)
         switch(ttype) {
         case 0x0: tuner=2; /* NTSC, e.g. TPI8NSR11P */
                 break;
-        case 0x2: tuner=39;/* LG NTSC (newer TAPC series) TAPC-H701P */
+        case 0x2: tuner=39;/* LG NTSC (newer TAPC series) TAPC-H701P */
                 break;
         case 0x4: tuner=5; /* Philips PAL TPI8PSB02P, TPI8PSB12P, TPI8PSB12D or FI1216, FM1216 */
                 break;
@@ -2564,7 +2943,7 @@ static void flyvideo_gpio(struct bttv *btv)
         has_radio           =   gpio & 0x400000;
         /*   unknown                   0x200000;
          *   unknown2                  0x100000; */
-        is_capture_only     = !(gpio & 0x008000); /* GPIO15 */
+        is_capture_only     = !(gpio & 0x008000); /* GPIO15 */
         has_tda9820_tda9821 = !(gpio & 0x004000);
         is_lr90             = !(gpio & 0x002000); /* else LR26/LR50 (LR38/LR51 f. capture only) */
         /*
@@ -2601,7 +2980,7 @@ static void miro_pinnacle_gpio(struct bttv *btv)
         char *info;
 
         gpio_inout(0xffffff, 0);
-        gpio = gpio_read();
+        gpio = gpio_read();
         id   = ((gpio>>10) & 63) -1;
         msp  = bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx");
         if (id < 32) {
@@ -2620,10 +2999,10 @@ static void miro_pinnacle_gpio(struct bttv *btv)
                         btv->has_radio = 0;
                 }
                 if (-1 != msp) {
-                        if (btv->c.type == BTTV_MIRO)
-                                btv->c.type = BTTV_MIROPRO;
-                        if (btv->c.type == BTTV_PINNACLE)
-                                btv->c.type = BTTV_PINNACLEPRO;
+                        if (btv->c.type == BTTV_BOARD_MIRO)
+                                btv->c.type = BTTV_BOARD_MIROPRO;
+                        if (btv->c.type == BTTV_BOARD_PINNACLE)
+                                btv->c.type = BTTV_BOARD_PINNACLEPRO;
                 }
                 printk(KERN_INFO
                        "bttv%d: miro: id=%d tuner=%d radio=%s stereo=%s\n",
@@ -2664,7 +3043,7 @@ static void miro_pinnacle_gpio(struct bttv *btv)
                         break;
                 }
                 if (-1 != msp)
-                        btv->c.type = BTTV_PINNACLEPRO;
+                        btv->c.type = BTTV_BOARD_PINNACLEPRO;
                 printk(KERN_INFO
                        "bttv%d: pinnacle/mt: id=%d info=\"%s\" radio=%s\n",
                        btv->c.nr, id, info, btv->has_radio ? "yes" : "no");
@@ -2712,7 +3091,7 @@ static void eagle_muxsel(struct bttv *btv, unsigned int input)
 
 static void gvc1100_muxsel(struct bttv *btv, unsigned int input)
 {
-        static const int masks[] = {0x30, 0x01, 0x12, 0x23};
+        static const int masks[] = {0x30, 0x01, 0x12, 0x23};
         gpio_write(masks[input%4]);
 }
 
@@ -2778,26 +3157,27 @@ static void bttv_reset_audio(struct bttv *btv)
 void __devinit bttv_init_card1(struct bttv *btv)
 {
         switch (btv->c.type) {
-        case BTTV_HAUPPAUGE:
-        case BTTV_HAUPPAUGE878:
-                boot_msp34xx(btv,5);
+        case BTTV_BOARD_HAUPPAUGE:
+        case BTTV_BOARD_HAUPPAUGE878:
+                boot_msp34xx(btv,5);
                 break;
-        case BTTV_VOODOOTV_FM:
-                boot_msp34xx(btv,20);
+        case BTTV_BOARD_VOODOOTV_FM:
+                boot_msp34xx(btv,20);
                 break;
-        case BTTV_AVERMEDIA98:
+        case BTTV_BOARD_AVERMEDIA98:
                 boot_msp34xx(btv,11);
                 break;
-        case BTTV_HAUPPAUGEPVR:
+        case BTTV_BOARD_HAUPPAUGEPVR:
                 pvr_boot(btv);
                 break;
-        case BTTV_TWINHAN_DST:
-        case BTTV_AVDVBT_771:
+        case BTTV_BOARD_TWINHAN_DST:
+        case BTTV_BOARD_AVDVBT_771:
+        case BTTV_BOARD_PINNACLESAT:
                 btv->use_i2c_hw = 1;
                 break;
-        case BTTV_ADLINK_RTV24:
-                init_RTV24( btv );
-                break;
+        case BTTV_BOARD_ADLINK_RTV24:
+                init_RTV24( btv );
+                break;
 
         }
         if (!bttv_tvcards[btv->c.type].has_dvb)
@@ -2810,53 +3190,53 @@ void __devinit bttv_init_card2(struct bttv *btv)
         int tda9887;
         int addr=ADDR_UNSET;
 
-        btv->tuner_type = -1;
+        btv->tuner_type = -1;
 
-        if (BTTV_UNKNOWN == btv->c.type) {
+        if (BTTV_BOARD_UNKNOWN == btv->c.type) {
                 bttv_readee(btv,eeprom_data,0xa0);
                 identify_by_eeprom(btv,eeprom_data);
         }
 
         switch (btv->c.type) {
-        case BTTV_MIRO:
-        case BTTV_MIROPRO:
-        case BTTV_PINNACLE:
-        case BTTV_PINNACLEPRO:
+        case BTTV_BOARD_MIRO:
+        case BTTV_BOARD_MIROPRO:
+        case BTTV_BOARD_PINNACLE:
+        case BTTV_BOARD_PINNACLEPRO:
                 /* miro/pinnacle */
                 miro_pinnacle_gpio(btv);
                 break;
-        case BTTV_FLYVIDEO_98:
-        case BTTV_MAXI:
-        case BTTV_LIFE_FLYKIT:
-        case BTTV_FLYVIDEO:
-        case BTTV_TYPHOON_TVIEW:
-        case BTTV_CHRONOS_VS2:
-        case BTTV_FLYVIDEO_98FM:
-        case BTTV_FLYVIDEO2000:
-        case BTTV_FLYVIDEO98EZ:
-        case BTTV_CONFERENCETV:
-        case BTTV_LIFETEC_9415:
+        case BTTV_BOARD_FLYVIDEO_98:
+        case BTTV_BOARD_MAXI:
+        case BTTV_BOARD_LIFE_FLYKIT:
+        case BTTV_BOARD_FLYVIDEO:
+        case BTTV_BOARD_TYPHOON_TVIEW:
+        case BTTV_BOARD_CHRONOS_VS2:
+        case BTTV_BOARD_FLYVIDEO_98FM:
+        case BTTV_BOARD_FLYVIDEO2000:
+        case BTTV_BOARD_FLYVIDEO98EZ:
+        case BTTV_BOARD_CONFERENCETV:
+        case BTTV_BOARD_LIFETEC_9415:
                 flyvideo_gpio(btv);
                 break;
-        case BTTV_HAUPPAUGE:
-        case BTTV_HAUPPAUGE878:
-        case BTTV_HAUPPAUGEPVR:
+        case BTTV_BOARD_HAUPPAUGE:
+        case BTTV_BOARD_HAUPPAUGE878:
+        case BTTV_BOARD_HAUPPAUGEPVR:
                 /* pick up some config infos from the eeprom */
                 bttv_readee(btv,eeprom_data,0xa0);
-                hauppauge_eeprom(btv);
+                hauppauge_eeprom(btv);
                 break;
-        case BTTV_AVERMEDIA98:
-        case BTTV_AVPHONE98:
+        case BTTV_BOARD_AVERMEDIA98:
+        case BTTV_BOARD_AVPHONE98:
                 bttv_readee(btv,eeprom_data,0xa0);
                 avermedia_eeprom(btv);
                 break;
-        case BTTV_PXC200:
+        case BTTV_BOARD_PXC200:
                 init_PXC200(btv);
                 break;
-        case BTTV_PICOLO_TETRA_CHIP:
+        case BTTV_BOARD_PICOLO_TETRA_CHIP:
                 picolo_tetra_init(btv);
                 break;
-        case BTTV_VHX:
+        case BTTV_BOARD_VHX:
                 btv->has_radio    = 1;
                 btv->has_matchbox = 1;
                 btv->mbox_we      = 0x20;
@@ -2865,58 +3245,58 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 btv->mbox_data    = 0x10;
                 btv->mbox_mask    = 0x38;
                 break;
-        case BTTV_VOBIS_BOOSTAR:
-        case BTTV_TERRATV:
+        case BTTV_BOARD_VOBIS_BOOSTAR:
+        case BTTV_BOARD_TERRATV:
                 terratec_active_radio_upgrade(btv);
                 break;
-        case BTTV_MAGICTVIEW061:
+        case BTTV_BOARD_MAGICTVIEW061:
                 if (btv->cardid == 0x3002144f) {
                         btv->has_radio=1;
                         printk("bttv%d: radio detected by subsystem id (CPH05x)\n",btv->c.nr);
                 }
                 break;
-       case BTTV_STB2:
-                if (btv->cardid == 0x3060121a) {
+       case BTTV_BOARD_STB2:
+                if (btv->cardid == 0x3060121a) {
                         /* Fix up entry for 3DFX VoodooTV 100,
                            which is an OEM STB card variant. */
                         btv->has_radio=0;
                         btv->tuner_type=TUNER_TEMIC_NTSC;
                 }
                 break;
-        case BTTV_OSPREY1x0:
-        case BTTV_OSPREY1x0_848:
-        case BTTV_OSPREY101_848:
-        case BTTV_OSPREY1x1:
-        case BTTV_OSPREY1x1_SVID:
-        case BTTV_OSPREY2xx:
-        case BTTV_OSPREY2x0_SVID:
-        case BTTV_OSPREY2x0:
-        case BTTV_OSPREY500:
-        case BTTV_OSPREY540:
-        case BTTV_OSPREY2000:
+        case BTTV_BOARD_OSPREY1x0:
+        case BTTV_BOARD_OSPREY1x0_848:
+        case BTTV_BOARD_OSPREY101_848:
+        case BTTV_BOARD_OSPREY1x1:
+        case BTTV_BOARD_OSPREY1x1_SVID:
+        case BTTV_BOARD_OSPREY2xx:
+        case BTTV_BOARD_OSPREY2x0_SVID:
+        case BTTV_BOARD_OSPREY2x0:
+        case BTTV_BOARD_OSPREY500:
+        case BTTV_BOARD_OSPREY540:
+        case BTTV_BOARD_OSPREY2000:
                 bttv_readee(btv,eeprom_data,0xa0);
-                osprey_eeprom(btv);
+                osprey_eeprom(btv);
                 break;
-        case BTTV_IDS_EAGLE:
+        case BTTV_BOARD_IDS_EAGLE:
                 init_ids_eagle(btv);
                 break;
-        case BTTV_MODTEC_205:
+        case BTTV_BOARD_MODTEC_205:
                 bttv_readee(btv,eeprom_data,0xa0);
                 modtec_eeprom(btv);
                 break;
-        case BTTV_LMLBT4:
+        case BTTV_BOARD_LMLBT4:
                 init_lmlbt4x(btv);
                 break;
-        case BTTV_TIBET_CS16:
+        case BTTV_BOARD_TIBET_CS16:
                 tibetCS16_init(btv);
                 break;
-        case BTTV_KODICOM_4400R:
+        case BTTV_BOARD_KODICOM_4400R:
                 kodicom4400r_init(btv);
                 break;
         }
 
         /* pll configuration */
-        if (!(btv->id==848 && btv->revision==0x11)) {
+        if (!(btv->id==848 && btv->revision==0x11)) {
                 /* defaults from card list */
                 if (PLL_28 == bttv_tvcards[btv->c.type].pll) {
                         btv->pll.pll_ifreq=28636363;
@@ -2927,26 +3307,26 @@ void __devinit bttv_init_card2(struct bttv *btv)
                         btv->pll.pll_crystal=BT848_IFORM_XT1;
                 }
                 /* insmod options can override */
-                switch (pll[btv->c.nr]) {
-                case 0: /* none */
+                switch (pll[btv->c.nr]) {
+                case 0: /* none */
                         btv->pll.pll_crystal = 0;
                         btv->pll.pll_ifreq   = 0;
                         btv->pll.pll_ofreq   = 0;
-                        break;
-                case 1: /* 28 MHz */
+                        break;
+                case 1: /* 28 MHz */
                 case 28:
-                        btv->pll.pll_ifreq   = 28636363;
+                        btv->pll.pll_ifreq   = 28636363;
                         btv->pll.pll_ofreq   = 0;
-                        btv->pll.pll_crystal = BT848_IFORM_XT0;
-                        break;
-                case 2: /* 35 MHz */
+                        btv->pll.pll_crystal = BT848_IFORM_XT0;
+                        break;
+                case 2: /* 35 MHz */
                 case 35:
-                        btv->pll.pll_ifreq   = 35468950;
+                        btv->pll.pll_ifreq   = 35468950;
                         btv->pll.pll_ofreq   = 0;
-                        btv->pll.pll_crystal = BT848_IFORM_XT1;
-                        break;
-                }
-        }
+                        btv->pll.pll_crystal = BT848_IFORM_XT1;
+                        break;
+                }
+        }
         btv->pll.pll_current = -1;
 
         /* tuner configuration (from card list / autodetect / insmod option) */
@@ -2955,23 +3335,26 @@ void __devinit bttv_init_card2(struct bttv *btv)
 
         if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
                 if(UNSET == btv->tuner_type)
-                        btv->tuner_type = bttv_tvcards[btv->c.type].tuner_type;
+                        btv->tuner_type = bttv_tvcards[btv->c.type].tuner_type;
         if (UNSET != tuner[btv->c.nr])
                 btv->tuner_type = tuner[btv->c.nr];
         printk("bttv%d: using tuner=%d\n",btv->c.nr,btv->tuner_type);
-        if (btv->pinnacle_id != UNSET)
-                bttv_call_i2c_clients(btv, AUDC_CONFIG_PINNACLE,
-                                      &btv->pinnacle_id);
+
         if (btv->tuner_type != UNSET) {
-                struct tuner_setup tun_setup;
+                struct tuner_setup tun_setup;
 
-                tun_setup.mode_mask = T_RADIO | T_ANALOG_TV | T_DIGITAL_TV;
+                tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
                 tun_setup.type = btv->tuner_type;
                 tun_setup.addr = addr;
 
                 bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
         }
 
+        if (btv->pinnacle_id != UNSET) {
+                bttv_call_i2c_clients(btv, AUDC_CONFIG_PINNACLE,
+                                                        &btv->pinnacle_id);
+        }
+
         btv->svhs = bttv_tvcards[btv->c.type].svhs;
         if (svhs[btv->c.nr] != UNSET)
                 btv->svhs = svhs[btv->c.nr];
@@ -2982,8 +3365,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 btv->has_radio=1;
         if (bttv_tvcards[btv->c.type].has_remote)
                 btv->has_remote=1;
-        if (bttv_tvcards[btv->c.type].no_gpioirq)
-                btv->gpioirq=0;
+        if (!bttv_tvcards[btv->c.type].no_gpioirq)
+                btv->gpioirq=1;
         if (bttv_tvcards[btv->c.type].audio_hook)
                 btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook;
 
@@ -3024,6 +3407,9 @@ void __devinit bttv_init_card2(struct bttv *btv)
         if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb &&
             bttv_I2CRead(btv, I2C_TDA9887, "TDA9887") >=0)
                 tda9887 = 1;
+        /* Hybrid DVB card, DOES have a tda9887 */
+        if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)
+                tda9887 = 1;
         if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) ||
            (btv->tuner_type == TUNER_PHILIPS_FM1236_MK3) ||
            (btv->tuner_type == TUNER_PHILIPS_FM1256_IH3) ||
@@ -3045,11 +3431,11 @@ static void modtec_eeprom(struct bttv *btv)
         } else if (strncmp(&(eeprom_data[0x1e]),"Alps TSBB5",10) ==0) {
                 btv->tuner_type=TUNER_ALPS_TSBB5_PAL_I;
                 printk("bttv%d: Modtec: Tuner autodetected by eeprom: %s\n",
-                       btv->c.nr,&eeprom_data[0x1e]);
-        } else if (strncmp(&(eeprom_data[0x1e]),"Philips FM1246",14) ==0) {
-                btv->tuner_type=TUNER_PHILIPS_NTSC;
-                printk("bttv%d: Modtec: Tuner autodetected by eeprom: %s\n",
-                       btv->c.nr,&eeprom_data[0x1e]);
+                       btv->c.nr,&eeprom_data[0x1e]);
+        } else if (strncmp(&(eeprom_data[0x1e]),"Philips FM1246",14) ==0) {
+                btv->tuner_type=TUNER_PHILIPS_NTSC;
+                printk("bttv%d: Modtec: Tuner autodetected by eeprom: %s\n",
+                       btv->c.nr,&eeprom_data[0x1e]);
         } else {
                 printk("bttv%d: Modtec: Unknown TunerString: %s\n",
                        btv->c.nr,&eeprom_data[0x1e]);
@@ -3114,7 +3500,7 @@ static int terratec_active_radio_upgrade(struct bttv *btv)
 static int __devinit pvr_altera_load(struct bttv *btv, u8 *micro, u32 microlen)
 {
         u32 n;
-        u8 bits;
+        u8 bits;
         int i;
 
         gpio_inout(0xffffff,BTTV_ALT_DATA|BTTV_ALT_DCLK|BTTV_ALT_NCONFIG);
@@ -3150,19 +3536,19 @@ static int __devinit pvr_altera_load(struct bttv *btv, u8 *micro, u32 microlen)
 
 static int __devinit pvr_boot(struct bttv *btv)
 {
-        const struct firmware *fw_entry;
+        const struct firmware *fw_entry;
         int rc;
 
         rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev);
         if (rc != 0) {
                 printk(KERN_WARNING "bttv%d: no altera firmware [via hotplug]\n",
                        btv->c.nr);
-                return rc;
-        }
+                return rc;
+        }
         rc = pvr_altera_load(btv, fw_entry->data, fw_entry->size);
         printk(KERN_INFO "bttv%d: altera firmware upload %s\n",
                btv->c.nr, (rc < 0) ? "failed" : "ok");
-        release_firmware(fw_entry);
+        release_firmware(fw_entry);
         return rc;
 }
 
@@ -3176,33 +3562,33 @@ static void __devinit osprey_eeprom(struct bttv *btv)
        unsigned long serial = 0;
 
        if (btv->c.type == 0) {
-               /* this might be an antique... check for MMAC label in eeprom */
-               if ((ee[0]=='M') && (ee[1]=='M') && (ee[2]=='A') && (ee[3]=='C')) {
-                       unsigned char checksum = 0;
-                       for (i =0; i<21; i++)
+               /* this might be an antique... check for MMAC label in eeprom */
+               if ((ee[0]=='M') && (ee[1]=='M') && (ee[2]=='A') && (ee[3]=='C')) {
+                       unsigned char checksum = 0;
+                       for (i =0; i<21; i++)
                                checksum += ee[i];
-                       if (checksum != ee[21])
+                       if (checksum != ee[21])
                                return;
-                       btv->c.type = BTTV_OSPREY1x0_848;
+                       btv->c.type = BTTV_BOARD_OSPREY1x0_848;
                        for (i = 12; i < 21; i++)
                                serial *= 10, serial += ee[i] - '0';
-               }
+               }
        } else {
                unsigned short type;
-               int offset = 4*16;
-
-               for(; offset < 8*16; offset += 16) {
-                       unsigned short checksum = 0;
-                       /* verify the checksum */
-                       for(i = 0; i<14; i++) checksum += ee[i+offset];
-                               checksum = ~checksum;  /* no idea why */
-                               if ((((checksum>>8)&0x0FF) == ee[offset+14]) &&
-                                   ((checksum & 0x0FF) == ee[offset+15])) {
-                               break;
-                       }
-               }
-
-               if (offset >= 8*16)
+               int offset = 4*16;
+
+               for(; offset < 8*16; offset += 16) {
+                       unsigned short checksum = 0;
+                       /* verify the checksum */
+                       for(i = 0; i<14; i++) checksum += ee[i+offset];
+                               checksum = ~checksum;  /* no idea why */
+                               if ((((checksum>>8)&0x0FF) == ee[offset+14]) &&
+                                   ((checksum & 0x0FF) == ee[offset+15])) {
+                               break;
+                       }
+               }
+
+               if (offset >= 8*16)
                        return;
 
                /* found a valid descriptor */
@@ -3212,47 +3598,47 @@ static void __devinit osprey_eeprom(struct bttv *btv)
 
                /* 848 based */
                case 0x0004:
-                       btv->c.type = BTTV_OSPREY1x0_848;
+                       btv->c.type = BTTV_BOARD_OSPREY1x0_848;
                        break;
                case 0x0005:
-                       btv->c.type = BTTV_OSPREY101_848;
+                       btv->c.type = BTTV_BOARD_OSPREY101_848;
                        break;
 
-               /* 878 based */
+               /* 878 based */
                case 0x0012:
                case 0x0013:
-                       btv->c.type = BTTV_OSPREY1x0;
+                       btv->c.type = BTTV_BOARD_OSPREY1x0;
                        break;
                case 0x0014:
                case 0x0015:
-                       btv->c.type = BTTV_OSPREY1x1;
+                       btv->c.type = BTTV_BOARD_OSPREY1x1;
                        break;
                case 0x0016:
                case 0x0017:
                case 0x0020:
-                       btv->c.type = BTTV_OSPREY1x1_SVID;
+                       btv->c.type = BTTV_BOARD_OSPREY1x1_SVID;
                        break;
                case 0x0018:
                case 0x0019:
                case 0x001E:
                case 0x001F:
-                       btv->c.type = BTTV_OSPREY2xx;
+                       btv->c.type = BTTV_BOARD_OSPREY2xx;
                        break;
                case 0x001A:
                case 0x001B:
-                       btv->c.type = BTTV_OSPREY2x0_SVID;
+                       btv->c.type = BTTV_BOARD_OSPREY2x0_SVID;
                        break;
                case 0x0040:
-                       btv->c.type = BTTV_OSPREY500;
+                       btv->c.type = BTTV_BOARD_OSPREY500;
                        break;
                case 0x0050:
                case 0x0056:
-                       btv->c.type = BTTV_OSPREY540;
+                       btv->c.type = BTTV_BOARD_OSPREY540;
                        /* bttv_osprey_540_init(btv); */
                        break;
                case 0x0060:
                case 0x0070:
-                       btv->c.type = BTTV_OSPREY2x0;
+                       btv->c.type = BTTV_BOARD_OSPREY2x0;
                        /* enable output on select control lines */
                        gpio_inout(0xffffff,0x000303);
                        break;
@@ -3274,27 +3660,27 @@ static void __devinit osprey_eeprom(struct bttv *btv)
 /* AVermedia specific stuff, from  bktr_card.c                             */
 
 static int tuner_0_table[] = {
-        TUNER_PHILIPS_NTSC,  TUNER_PHILIPS_PAL /* PAL-BG*/,
-        TUNER_PHILIPS_PAL,   TUNER_PHILIPS_PAL /* PAL-I*/,
-        TUNER_PHILIPS_PAL,   TUNER_PHILIPS_PAL,
-        TUNER_PHILIPS_SECAM, TUNER_PHILIPS_SECAM,
-        TUNER_PHILIPS_SECAM, TUNER_PHILIPS_PAL,
+        TUNER_PHILIPS_NTSC,  TUNER_PHILIPS_PAL /* PAL-BG*/,
+        TUNER_PHILIPS_PAL,   TUNER_PHILIPS_PAL /* PAL-I*/,
+        TUNER_PHILIPS_PAL,   TUNER_PHILIPS_PAL,
+        TUNER_PHILIPS_SECAM, TUNER_PHILIPS_SECAM,
+        TUNER_PHILIPS_SECAM, TUNER_PHILIPS_PAL,
         TUNER_PHILIPS_FM1216ME_MK3 };
 
 static int tuner_1_table[] = {
-        TUNER_TEMIC_NTSC,  TUNER_TEMIC_PAL,
+        TUNER_TEMIC_NTSC,  TUNER_TEMIC_PAL,
         TUNER_TEMIC_PAL,   TUNER_TEMIC_PAL,
         TUNER_TEMIC_PAL,   TUNER_TEMIC_PAL,
-        TUNER_TEMIC_4012FY5, TUNER_TEMIC_4012FY5, /* TUNER_TEMIC_SECAM */
-        TUNER_TEMIC_4012FY5, TUNER_TEMIC_PAL};
+        TUNER_TEMIC_4012FY5, TUNER_TEMIC_4012FY5, /* TUNER_TEMIC_SECAM */
+        TUNER_TEMIC_4012FY5, TUNER_TEMIC_PAL};
 
 static void __devinit avermedia_eeprom(struct bttv *btv)
 {
-        int tuner_make,tuner_tv_fm,tuner_format,tuner=0;
+        int tuner_make,tuner_tv_fm,tuner_format,tuner=0;
 
         tuner_make      = (eeprom_data[0x41] & 0x7);
-        tuner_tv_fm     = (eeprom_data[0x41] & 0x18) >> 3;
-        tuner_format    = (eeprom_data[0x42] & 0xf0) >> 4;
+        tuner_tv_fm     = (eeprom_data[0x41] & 0x18) >> 3;
+        tuner_format    = (eeprom_data[0x42] & 0xf0) >> 4;
         btv->has_remote = (eeprom_data[0x42] & 0x01);
 
         if (tuner_make == 0 || tuner_make == 2)
@@ -3325,13 +3711,13 @@ void bttv_tda9880_setnorm(struct bttv *btv, int norm)
 {
         /* fix up our card entry */
         if(norm==VIDEO_MODE_NTSC) {
-                bttv_tvcards[BTTV_VOODOOTV_FM].audiomux[0]=0x957fff;
-                bttv_tvcards[BTTV_VOODOOTV_FM].audiomux[4]=0x957fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[0]=0x957fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[4]=0x957fff;
                 dprintk("bttv_tda9880_setnorm to NTSC\n");
         }
         else {
-                bttv_tvcards[BTTV_VOODOOTV_FM].audiomux[0]=0x947fff;
-                bttv_tvcards[BTTV_VOODOOTV_FM].audiomux[4]=0x947fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[0]=0x947fff;
+                bttv_tvcards[BTTV_BOARD_VOODOOTV_FM].audiomux[4]=0x947fff;
                 dprintk("bttv_tda9880_setnorm to PAL\n");
         }
         /* set GPIO according */
@@ -3342,7 +3728,7 @@ void bttv_tda9880_setnorm(struct bttv *btv, int norm)
 
 /*
  * reset/enable the MSP on some Hauppauge cards
- * Thanks to Kyösti Mälkki (kmalkki@cc.hut.fi)!
+ * Thanks to Kyösti Mälkki (kmalkki@cc.hut.fi)!
  *
  * Hauppauge:  pin  5
  * Voodoo:     pin 20
@@ -3353,7 +3739,7 @@ static void __devinit boot_msp34xx(struct bttv *btv, int pin)
 
         gpio_inout(mask,mask);
         gpio_bits(mask,0);
-        udelay(2500);
+        udelay(2500);
         gpio_bits(mask,mask);
 
         if (bttv_gpio)
@@ -3429,7 +3815,7 @@ static void __devinit init_PXC200(struct bttv *btv)
         udelay(10);
         gpio_write(1<<2);
 
-        for (i = 0; i < ARRAY_SIZE(vals); i++) {
+        for (i = 0; i < ARRAY_SIZE(vals); i++) {
                 tmp=bttv_I2CWrite(btv,0x1E,0,vals[i],1);
                 if (tmp != -1) {
                         printk(KERN_INFO
@@ -3872,30 +4258,30 @@ avermedia_tv_stereo_audio(struct bttv *btv, struct video_audio *v, int set)
 static void
 lt9415_audio(struct bttv *btv, struct video_audio *v, int set)
 {
-        int val = 0;
+        int val = 0;
 
-        if (gpio_read() & 0x4000) {
+        if (gpio_read() & 0x4000) {
                 v->mode = VIDEO_SOUND_MONO;
                 return;
         }
 
-        if (set) {
-                if (v->mode & VIDEO_SOUND_LANG2)  /* A2 SAP */
-                        val = 0x0080;
+        if (set) {
+                if (v->mode & VIDEO_SOUND_LANG2)  /* A2 SAP */
+                        val = 0x0080;
                 if (v->mode & VIDEO_SOUND_STEREO) /* A2 stereo */
-                        val = 0x0880;
-                if ((v->mode & VIDEO_SOUND_LANG1) ||
+                        val = 0x0880;
+                if ((v->mode & VIDEO_SOUND_LANG1) ||
                     (v->mode & VIDEO_SOUND_MONO))
                         val = 0;
                 gpio_bits(0x0880, val);
-                if (bttv_gpio)
-                        bttv_gpio_tracking(btv,"lt9415");
-        } else {
+                if (bttv_gpio)
+                        bttv_gpio_tracking(btv,"lt9415");
+        } else {
                 /* autodetect doesn't work with this card :-( */
-                v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO |
+                v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO |
                         VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
-                return;
-        }
+                return;
+        }
 }
 
 /* TDA9821 on TerraTV+ Bt848, Bt878 */
@@ -4018,26 +4404,26 @@ fv2000s_audio(struct bttv *btv, struct video_audio *v, int set)
 static void
 windvr_audio(struct bttv *btv, struct video_audio *v, int set)
 {
-        unsigned long val = 0;
-
-        if (set) {
-                if (v->mode & VIDEO_SOUND_MONO)
-                        val = 0x040000;
-                if (v->mode & VIDEO_SOUND_LANG1)
-                        val = 0;
-                if (v->mode & VIDEO_SOUND_LANG2)
-                        val = 0x100000;
-                if (v->mode & VIDEO_SOUND_STEREO)
-                        val = 0;
-                if (val) {
+        unsigned long val = 0;
+
+        if (set) {
+                if (v->mode & VIDEO_SOUND_MONO)
+                        val = 0x040000;
+                if (v->mode & VIDEO_SOUND_LANG1)
+                        val = 0;
+                if (v->mode & VIDEO_SOUND_LANG2)
+                        val = 0x100000;
+                if (v->mode & VIDEO_SOUND_STEREO)
+                        val = 0;
+                if (val) {
                         gpio_bits(0x140000, val);
-                        if (bttv_gpio)
-                                bttv_gpio_tracking(btv,"windvr");
-                }
-        } else {
-                v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO |
-                          VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
-        }
+                        if (bttv_gpio)
+                                bttv_gpio_tracking(btv,"windvr");
+                }
+        } else {
+                v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO |
+                          VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
+        }
 }
 
 /*
@@ -4280,10 +4666,10 @@ static void kodicom4400r_init(struct bttv *btv)
 static void xguard_muxsel(struct bttv *btv, unsigned int input)
 {
         static const int masks[] = {
-                ENB0, ENB0|IN00, ENB0|IN10, ENB0|IN00|IN10,
-                ENA0, ENA0|IN00, ENA0|IN10, ENA0|IN00|IN10,
-                ENB1, ENB1|IN01, ENB1|IN11, ENB1|IN01|IN11,
-                ENA1, ENA1|IN01, ENA1|IN11, ENA1|IN01|IN11,
+                ENB0, ENB0|IN00, ENB0|IN10, ENB0|IN00|IN10,
+                ENA0, ENA0|IN00, ENA0|IN10, ENA0|IN00|IN10,
+                ENB1, ENB1|IN01, ENB1|IN11, ENB1|IN01|IN11,
+                ENA1, ENA1|IN01, ENA1|IN11, ENA1|IN01|IN11,
         };
         gpio_write(masks[input%16]);
 }
@@ -4388,10 +4774,10 @@ static void ivc120_muxsel(struct bttv *btv, unsigned int input)
 
 static void PXC200_muxsel(struct bttv *btv, unsigned int input)
 {
-        int rc;
+        int rc;
         long mux;
         int bitmask;
-        unsigned char buf[2];
+        unsigned char buf[2];
 
         /* Read PIC config to determine if this is a PXC200F */
         /* PX_I2C_CMD_CFG*/
@@ -4421,14 +4807,14 @@ static void PXC200_muxsel(struct bttv *btv, unsigned int input)
         /* bitmask=0x30f; */
         bitmask=0x302;
         /* check whether we have a PXC200A */
-        if (btv->cardid == PX_PXC200A_CARDID)  {
+        if (btv->cardid == PX_PXC200A_CARDID)  {
            bitmask ^= 0x180; /* use 7 and 9, not 8 and 9 */
            bitmask |= 7<<4; /* the DAC */
         }
         btwrite(bitmask, BT848_GPIO_OUT_EN);
 
         bitmask = btread(BT848_GPIO_DATA);
-        if (btv->cardid == PX_PXC200A_CARDID)
+        if (btv->cardid == PX_PXC200A_CARDID)
           bitmask = (bitmask & ~0x280) | ((mux & 2) << 8) | ((mux & 1) << 7);
         else /* older device */
           bitmask = (bitmask & ~0x300) | ((mux & 3) << 8);
@@ -4441,7 +4827,7 @@ static void PXC200_muxsel(struct bttv *btv, unsigned int input)
          *
          * needed because bttv-driver sets mux before calling this function
          */
-        if (btv->cardid == PX_PXC200A_CARDID)
+        if (btv->cardid == PX_PXC200A_CARDID)
           btaor(2<<5, ~BT848_IFORM_MUXSEL, BT848_IFORM);
         else /* older device */
           btand(~BT848_IFORM_MUXSEL,BT848_IFORM);
@@ -4485,10 +4871,9 @@ void __devinit bttv_check_chipset(void)
         }
         if (UNSET != latency)
                 printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency);
-
-        while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL,
+        while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                       PCI_DEVICE_ID_INTEL_82441, dev))) {
-                unsigned char b;
+                unsigned char b;
                 pci_read_config_byte(dev, 0x53, &b);
                 if (bttv_debug)
                         printk(KERN_INFO "bttv: Host bridge: 82441FX Natoma, "
@@ -4498,7 +4883,7 @@ void __devinit bttv_check_chipset(void)
 
 int __devinit bttv_handle_chipset(struct bttv *btv)
 {
-        unsigned char command;
+        unsigned char command;
 
         if (!triton1 && !vsfx && UNSET == latency)
                 return 0;
@@ -4519,13 +4904,13 @@ int __devinit bttv_handle_chipset(struct bttv *btv)
                         btv->triton1 = BT848_INT_ETBF;
         } else {
                 /* bt878 has a bit in the pci config space for it */
-                pci_read_config_byte(btv->c.pci, BT878_DEVCTRL, &command);
+                pci_read_config_byte(btv->c.pci, BT878_DEVCTRL, &command);
                 if (triton1)
                         command |= BT878_EN_TBFX;
                 if (vsfx)
                         command |= BT878_EN_VSFX;
-                pci_write_config_byte(btv->c.pci, BT878_DEVCTRL, command);
-        }
+                pci_write_config_byte(btv->c.pci, BT878_DEVCTRL, command);
+        }
         if (UNSET != latency)
                 pci_write_config_byte(btv->c.pci, PCI_LATENCY_TIMER, latency);
         return 0;
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index d538a994ff04..0005741d5514 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -3,7 +3,7 @@
     bttv - Bt848 frame grabber driver
 
     Copyright (C) 1996,97,98 Ralph  Metzler <rjkm@thp.uni-koeln.de>
-                           & Marcus Metzler <mocm@thp.uni-koeln.de>
+                           & Marcus Metzler <mocm@thp.uni-koeln.de>
     (c) 1999-2002 Gerd Knorr <kraxel@bytesex.org>
 
     some v4l2 code lines are taken from Justin's bttv2 driver which is
@@ -192,8 +192,8 @@ static u8 SRAM_Table[][60] =
 
 const struct bttv_tvnorm bttv_tvnorms[] = {
         /* PAL-BDGHI */
-        /* max. active video is actually 922, but 924 is divisible by 4 and 3! */
-        /* actually, max active PAL with HSCALE=0 is 948, NTSC is 768 - nil */
+        /* max. active video is actually 922, but 924 is divisible by 4 and 3! */
+        /* actually, max active PAL with HSCALE=0 is 948, NTSC is 768 - nil */
         {
                 .v4l2_id        = V4L2_STD_PAL,
                 .name           = "PAL",
@@ -806,9 +806,9 @@ static void bt848A_set_timing(struct bttv *btv)
                         btv->c.nr,table_idx);
 
                 /* timing change...reset timing generator address */
-                btwrite(0x00, BT848_TGCTRL);
-                btwrite(0x02, BT848_TGCTRL);
-                btwrite(0x00, BT848_TGCTRL);
+                btwrite(0x00, BT848_TGCTRL);
+                btwrite(0x02, BT848_TGCTRL);
+                btwrite(0x00, BT848_TGCTRL);
 
                 len=SRAM_Table[table_idx][0];
                 for(i = 1; i <= len; i++)
@@ -847,7 +847,7 @@ static void bt848_hue(struct bttv *btv, int hue)
 
         /* -128 to 127 */
         value = (hue >> 8) - 128;
-        btwrite(value & 0xff, BT848_HUE);
+        btwrite(value & 0xff, BT848_HUE);
 }
 
 static void bt848_contrast(struct bttv *btv, int cont)
@@ -859,9 +859,9 @@ static void bt848_contrast(struct bttv *btv, int cont)
         /* 0-511 */
         value = (cont  >> 7);
         hibit = (value >> 6) & 4;
-        btwrite(value & 0xff, BT848_CONTRAST_LO);
-        btaor(hibit, ~4, BT848_E_CONTROL);
-        btaor(hibit, ~4, BT848_O_CONTROL);
+        btwrite(value & 0xff, BT848_CONTRAST_LO);
+        btaor(hibit, ~4, BT848_E_CONTROL);
+        btaor(hibit, ~4, BT848_O_CONTROL);
 }
 
 static void bt848_sat(struct bttv *btv, int color)
@@ -873,12 +873,12 @@ static void bt848_sat(struct bttv *btv, int color)
         /* 0-511 for the color */
         val_u   = ((color * btv->opt_uv_ratio) / 50) >> 7;
         val_v   = (((color * (100 - btv->opt_uv_ratio) / 50) >>7)*180L)/254;
-        hibits  = (val_u >> 7) & 2;
+        hibits  = (val_u >> 7) & 2;
         hibits |= (val_v >> 8) & 1;
-        btwrite(val_u & 0xff, BT848_SAT_U_LO);
-        btwrite(val_v & 0xff, BT848_SAT_V_LO);
-        btaor(hibits, ~3, BT848_E_CONTROL);
-        btaor(hibits, ~3, BT848_O_CONTROL);
+        btwrite(val_u & 0xff, BT848_SAT_U_LO);
+        btwrite(val_v & 0xff, BT848_SAT_V_LO);
+        btaor(hibits, ~3, BT848_E_CONTROL);
+        btaor(hibits, ~3, BT848_O_CONTROL);
 }
 
 /* ----------------------------------------------------------------------- */
@@ -891,7 +891,7 @@ video_mux(struct bttv *btv, unsigned int input)
         if (input >= bttv_tvcards[btv->c.type].video_inputs)
                 return -EINVAL;
 
-        /* needed by RemoteVideo MX */
+        /* needed by RemoteVideo MX */
         mask2 = bttv_tvcards[btv->c.type].gpiomask2;
         if (mask2)
                 gpio_inout(mask2,mask2);
@@ -964,7 +964,7 @@ i2c_vidiocschan(struct bttv *btv)
         c.norm    = btv->tvnorm;
         c.channel = btv->input;
         bttv_call_i2c_clients(btv,VIDIOCSCHAN,&c);
-        if (btv->c.type == BTTV_VOODOOTV_FM)
+        if (btv->c.type == BTTV_BOARD_VOODOOTV_FM)
                 bttv_tda9880_setnorm(btv,c.norm);
 }
 
@@ -988,7 +988,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
         bt848A_set_timing(btv);
 
         switch (btv->c.type) {
-        case BTTV_VOODOOTV_FM:
+        case BTTV_BOARD_VOODOOTV_FM:
                 bttv_tda9880_setnorm(btv,norm);
                 break;
         }
@@ -1055,22 +1055,22 @@ static void init_bt848(struct bttv *btv)
         btwrite(BT848_COLOR_CTL_GAMMA, BT848_COLOR_CTL);
         btwrite(BT848_IFORM_XTAUTO | BT848_IFORM_AUTO, BT848_IFORM);
 
-        /* set planar and packed mode trigger points and         */
-        /* set rising edge of inverted GPINTR pin as irq trigger */
-        btwrite(BT848_GPIO_DMA_CTL_PKTP_32|
-                BT848_GPIO_DMA_CTL_PLTP1_16|
-                BT848_GPIO_DMA_CTL_PLTP23_16|
-                BT848_GPIO_DMA_CTL_GPINTC|
-                BT848_GPIO_DMA_CTL_GPINTI,
-                BT848_GPIO_DMA_CTL);
+        /* set planar and packed mode trigger points and         */
+        /* set rising edge of inverted GPINTR pin as irq trigger */
+        btwrite(BT848_GPIO_DMA_CTL_PKTP_32|
+                BT848_GPIO_DMA_CTL_PLTP1_16|
+                BT848_GPIO_DMA_CTL_PLTP23_16|
+                BT848_GPIO_DMA_CTL_GPINTC|
+                BT848_GPIO_DMA_CTL_GPINTI,
+                BT848_GPIO_DMA_CTL);
 
         val = btv->opt_chroma_agc ? BT848_SCLOOP_CAGC : 0;
-        btwrite(val, BT848_E_SCLOOP);
-        btwrite(val, BT848_O_SCLOOP);
+        btwrite(val, BT848_E_SCLOOP);
+        btwrite(val, BT848_O_SCLOOP);
 
-        btwrite(0x20, BT848_E_VSCALE_HI);
-        btwrite(0x20, BT848_O_VSCALE_HI);
-        btwrite(BT848_ADC_RESERVED | (btv->opt_adc_crush ? BT848_ADC_CRUSH : 0),
+        btwrite(0x20, BT848_E_VSCALE_HI);
+        btwrite(0x20, BT848_O_VSCALE_HI);
+        btwrite(BT848_ADC_RESERVED | (btv->opt_adc_crush ? BT848_ADC_CRUSH : 0),
                 BT848_ADC);
 
         btwrite(whitecrush_upper, BT848_WC_UP);
@@ -1089,7 +1089,7 @@ static void init_bt848(struct bttv *btv)
         bt848_contrast(btv, btv->contrast);
         bt848_sat(btv,      btv->saturation);
 
-        /* interrupt */
+        /* interrupt */
         init_irqreg(btv);
 }
 
@@ -1105,7 +1105,7 @@ static void bttv_reinit_bt848(struct bttv *btv)
         spin_unlock_irqrestore(&btv->s_lock,flags);
 
         init_bt848(btv);
-        btv->pll.pll_current = -1;
+        btv->pll.pll_current = -1;
         set_input(btv,btv->input);
 }
 
@@ -1398,7 +1398,7 @@ bttv_switch_overlay(struct bttv *btv, struct bttv_fh *fh,
 /* video4linux (1) interface                                               */
 
 static int bttv_prepare_buffer(struct bttv *btv, struct bttv_buffer *buf,
-                               const struct bttv_format *fmt,
+                               const struct bttv_format *fmt,
                                unsigned int width, unsigned int height,
                                enum v4l2_field field)
 {
@@ -1521,8 +1521,8 @@ static const char *v4l1_ioctls[] = {
 static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
 {
         switch (cmd) {
-        case BTTV_VERSION:
-                return BTTV_VERSION_CODE;
+        case BTTV_VERSION:
+                return BTTV_VERSION_CODE;
 
         /* ***  v4l1  *** ************************************************ */
         case VIDIOCGFREQ:
@@ -1576,32 +1576,32 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 return 0;
         }
 
-        case VIDIOCGCHAN:
-        {
-                struct video_channel *v = arg;
+        case VIDIOCGCHAN:
+        {
+                struct video_channel *v = arg;
                 unsigned int channel = v->channel;
 
-                if (channel >= bttv_tvcards[btv->c.type].video_inputs)
-                        return -EINVAL;
-                v->tuners=0;
-                v->flags = VIDEO_VC_AUDIO;
-                v->type = VIDEO_TYPE_CAMERA;
-                v->norm = btv->tvnorm;
+                if (channel >= bttv_tvcards[btv->c.type].video_inputs)
+                        return -EINVAL;
+                v->tuners=0;
+                v->flags = VIDEO_VC_AUDIO;
+                v->type = VIDEO_TYPE_CAMERA;
+                v->norm = btv->tvnorm;
                 if (channel == bttv_tvcards[btv->c.type].tuner)  {
-                        strcpy(v->name,"Television");
-                        v->flags|=VIDEO_VC_TUNER;
-                        v->type=VIDEO_TYPE_TV;
-                        v->tuners=1;
-                } else if (channel == btv->svhs) {
-                        strcpy(v->name,"S-Video");
-                } else {
-                        sprintf(v->name,"Composite%d",channel);
+                        strcpy(v->name,"Television");
+                        v->flags|=VIDEO_VC_TUNER;
+                        v->type=VIDEO_TYPE_TV;
+                        v->tuners=1;
+                } else if (channel == btv->svhs) {
+                        strcpy(v->name,"S-Video");
+                } else {
+                        sprintf(v->name,"Composite%d",channel);
                 }
                 return 0;
-        }
-        case VIDIOCSCHAN:
-        {
-                struct video_channel *v = arg;
+        }
+        case VIDIOCSCHAN:
+        {
+                struct video_channel *v = arg;
                 unsigned int channel = v->channel;
 
                 if (channel >= bttv_tvcards[btv->c.type].video_inputs)
@@ -1623,7 +1623,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 return 0;
         }
 
-        case VIDIOCGAUDIO:
+        case VIDIOCGAUDIO:
         {
                 struct video_audio *v = arg;
 
@@ -1728,7 +1728,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 } else if (i->index == btv->svhs) {
                         sprintf(i->name, "S-Video");
                 } else {
-                        sprintf(i->name,"Composite%d",i->index);
+                        sprintf(i->name,"Composite%d",i->index);
                 }
                 if (i->index == btv->input) {
                         __u32 dstatus = btread(BT848_DSTATUS);
@@ -1851,6 +1851,11 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 up(&btv->lock);
                 return 0;
         }
+        case VIDIOC_LOG_STATUS:
+        {
+                bttv_call_i2c_clients(btv, VIDIOC_LOG_STATUS, 0);
+                return 0;
+        }
 
         default:
                 return -ENOIOCTLCMD;
@@ -2163,7 +2168,7 @@ static int bttv_s_fmt(struct bttv_fh *fh, struct bttv *btv,
                 if (0 != retval)
                         return retval;
                 if (locked_btres(fh->btv, RESOURCE_VBI))
-                        return -EBUSY;
+                        return -EBUSY;
                 bttv_vbi_try_fmt(fh,f);
                 bttv_vbi_setlines(fh,btv,f->fmt.vbi.count[0]);
                 bttv_vbi_get_fmt(fh,f);
@@ -2201,9 +2206,9 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 bttv_reinit_bt848(btv);
 
         switch (cmd) {
-        case VIDIOCSFREQ:
-        case VIDIOCSTUNER:
-        case VIDIOCSCHAN:
+        case VIDIOCSFREQ:
+        case VIDIOCSTUNER:
+        case VIDIOCSCHAN:
         case VIDIOC_S_CTRL:
         case VIDIOC_S_STD:
         case VIDIOC_S_INPUT:
@@ -2219,10 +2224,10 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
         /* ***  v4l1  *** ************************************************ */
         case VIDIOCGCAP:
         {
-                struct video_capability *cap = arg;
+                struct video_capability *cap = arg;
 
                 memset(cap,0,sizeof(*cap));
-                strcpy(cap->name,btv->video_dev->name);
+                strcpy(cap->name,btv->video_dev->name);
                 if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {
                         /* vbi */
                         cap->type = VID_TYPE_TUNER|VID_TYPE_TELETEXT;
@@ -2242,7 +2247,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 }
                 cap->channels  = bttv_tvcards[btv->c.type].video_inputs;
                 cap->audios    = bttv_tvcards[btv->c.type].audio_inputs;
-                return 0;
+                return 0;
         }
 
         case VIDIOCGPICT:
@@ -2291,7 +2296,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 bt848_hue(btv,pic->hue);
                 bt848_sat(btv,pic->colour);
                 up(&fh->cap.lock);
-                return 0;
+                return 0;
         }
 
         case VIDIOCGWIN:
@@ -2352,8 +2357,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 unsigned long end;
 
                 if(!capable(CAP_SYS_ADMIN) &&
-                   !capable(CAP_SYS_RAWIO))
-                        return -EPERM;
+                   !capable(CAP_SYS_RAWIO))
+                        return -EPERM;
                 end = (unsigned long)fbuf->base +
                         fbuf->height * fbuf->bytesperline;
                 down(&fh->cap.lock);
@@ -2427,7 +2432,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 }
 
                 /* switch over */
-                retval = bttv_switch_overlay(btv,fh,new);
+                retval = bttv_switch_overlay(btv,fh,new);
                 up(&fh->cap.lock);
                 return retval;
         }
@@ -2566,13 +2571,13 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 return 0;
         }
 
-        case BTTV_VERSION:
-        case VIDIOCGFREQ:
-        case VIDIOCSFREQ:
-        case VIDIOCGTUNER:
-        case VIDIOCSTUNER:
-        case VIDIOCGCHAN:
-        case VIDIOCSCHAN:
+        case BTTV_VERSION:
+        case VIDIOCGFREQ:
+        case VIDIOCSFREQ:
+        case VIDIOCGTUNER:
+        case VIDIOCSTUNER:
+        case VIDIOCGCHAN:
+        case VIDIOCSCHAN:
         case VIDIOCGAUDIO:
         case VIDIOCSAUDIO:
                 return bttv_common_ioctls(btv,cmd,arg);
@@ -2584,8 +2589,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
 
                 if (0 == v4l2)
                         return -EINVAL;
-                strcpy(cap->driver,"bttv");
-                strlcpy(cap->card,btv->video_dev->name,sizeof(cap->card));
+                strcpy(cap->driver,"bttv");
+                strlcpy(cap->card,btv->video_dev->name,sizeof(cap->card));
                 sprintf(cap->bus_info,"PCI:%s",pci_name(btv->c.pci));
                 cap->version = BTTV_VERSION_CODE;
                 cap->capabilities =
@@ -2856,6 +2861,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_S_TUNER:
         case VIDIOC_G_FREQUENCY:
         case VIDIOC_S_FREQUENCY:
+        case VIDIOC_LOG_STATUS:
                 return bttv_common_ioctls(btv,cmd,arg);
 
         default:
@@ -3091,7 +3097,7 @@ static struct video_device bttv_video_template =
 {
         .name     = "UNSET",
         .type     = VID_TYPE_CAPTURE|VID_TYPE_TUNER|
-                    VID_TYPE_CLIPPING|VID_TYPE_SCALES,
+                    VID_TYPE_CLIPPING|VID_TYPE_SCALES,
         .hardware = VID_HARDWARE_BT848,
         .fops     = &bttv_fops,
         .minor    = -1,
@@ -3137,7 +3143,7 @@ static int radio_open(struct inode *inode, struct file *file)
         audio_mux(btv,AUDIO_RADIO);
 
         up(&btv->lock);
-        return 0;
+        return 0;
 }
 
 static int radio_release(struct inode *inode, struct file *file)
@@ -3160,34 +3166,34 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
         switch (cmd) {
         case VIDIOCGCAP:
         {
-                struct video_capability *cap = arg;
+                struct video_capability *cap = arg;
 
                 memset(cap,0,sizeof(*cap));
-                strcpy(cap->name,btv->radio_dev->name);
-                cap->type = VID_TYPE_TUNER;
+                strcpy(cap->name,btv->radio_dev->name);
+                cap->type = VID_TYPE_TUNER;
                 cap->channels = 1;
                 cap->audios = 1;
-                return 0;
+                return 0;
         }
 
-        case VIDIOCGTUNER:
-        {
-                struct video_tuner *v = arg;
+        case VIDIOCGTUNER:
+        {
+                struct video_tuner *v = arg;
 
-                if(v->tuner)
-                        return -EINVAL;
+                if(v->tuner)
+                        return -EINVAL;
                 memset(v,0,sizeof(*v));
-                strcpy(v->name, "Radio");
-                bttv_call_i2c_clients(btv,cmd,v);
-                return 0;
-        }
-        case VIDIOCSTUNER:
+                strcpy(v->name, "Radio");
+                bttv_call_i2c_clients(btv,cmd,v);
+                return 0;
+        }
+        case VIDIOCSTUNER:
                 /* nothing to do */
                 return 0;
 
         case BTTV_VERSION:
-        case VIDIOCGFREQ:
-        case VIDIOCSFREQ:
+        case VIDIOCGFREQ:
+        case VIDIOCSFREQ:
         case VIDIOCGAUDIO:
         case VIDIOCSAUDIO:
                 return bttv_common_ioctls(btv,cmd,arg);
@@ -3693,7 +3699,7 @@ static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs)
                 }
 
                 if (astat&BT848_INT_VSYNC)
-                        btv->field_count++;
+                        btv->field_count++;
 
                 if (astat & BT848_INT_GPINT) {
                         wake_up(&btv->gpioq);
@@ -3705,13 +3711,13 @@ static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs)
                         wake_up(&btv->i2c_queue);
                 }
 
-                if ((astat & BT848_INT_RISCI)  &&  (stat & (4<<28)))
+                if ((astat & BT848_INT_RISCI)  &&  (stat & (4<<28)))
                         bttv_irq_switch_vbi(btv);
 
-                if ((astat & BT848_INT_RISCI)  &&  (stat & (2<<28)))
+                if ((astat & BT848_INT_RISCI)  &&  (stat & (2<<28)))
                         bttv_irq_wakeup_top(btv);
 
-                if ((astat & BT848_INT_RISCI)  &&  (stat & (1<<28)))
+                if ((astat & BT848_INT_RISCI)  &&  (stat & (1<<28)))
                         bttv_irq_switch_video(btv);
 
                 if ((astat & BT848_INT_HLOCK)  &&  btv->opt_automute)
@@ -3736,10 +3742,22 @@ static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs)
 
                 count++;
                 if (count > 4) {
-                        btwrite(0, BT848_INT_MASK);
-                        printk(KERN_ERR
-                               "bttv%d: IRQ lockup, cleared int mask [", btv->c.nr);
+
+                        if (count > 8 || !(astat & BT848_INT_GPINT)) {
+                                btwrite(0, BT848_INT_MASK);
+
+                                printk(KERN_ERR
+                                           "bttv%d: IRQ lockup, cleared int mask [", btv->c.nr);
+                        } else {
+                                printk(KERN_ERR
+                                           "bttv%d: IRQ lockup, clearing GPINT from int mask [", btv->c.nr);
+
+                                btwrite(btread(BT848_INT_MASK) & (-1 ^ BT848_INT_GPINT),
+                                                BT848_INT_MASK);
+                        };
+
                         bttv_print_irqbits(stat,astat);
+
                         printk("]\n");
                 }
         }
@@ -3808,7 +3826,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
 
         /* video */
         btv->video_dev = vdev_init(btv, &bttv_video_template, "video");
-        if (NULL == btv->video_dev)
+        if (NULL == btv->video_dev)
                 goto err;
         if (video_register_device(btv->video_dev,VFL_TYPE_GRABBER,video_nr)<0)
                 goto err;
@@ -3818,18 +3836,18 @@ static int __devinit bttv_register_video(struct bttv *btv)
 
         /* vbi */
         btv->vbi_dev = vdev_init(btv, &bttv_vbi_template, "vbi");
-        if (NULL == btv->vbi_dev)
+        if (NULL == btv->vbi_dev)
                 goto err;
-        if (video_register_device(btv->vbi_dev,VFL_TYPE_VBI,vbi_nr)<0)
+        if (video_register_device(btv->vbi_dev,VFL_TYPE_VBI,vbi_nr)<0)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device vbi%d\n",
                btv->c.nr,btv->vbi_dev->minor & 0x1f);
 
-        if (!btv->has_radio)
+        if (!btv->has_radio)
                 return 0;
         /* radio */
         btv->radio_dev = vdev_init(btv, &radio_template, "radio");
-        if (NULL == btv->radio_dev)
+        if (NULL == btv->radio_dev)
                 goto err;
         if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0)
                 goto err;
@@ -3850,11 +3868,11 @@ static int __devinit bttv_register_video(struct bttv *btv)
 static void pci_set_command(struct pci_dev *dev)
 {
 #if defined(__powerpc__)
-        unsigned int cmd;
+        unsigned int cmd;
 
-        pci_read_config_dword(dev, PCI_COMMAND, &cmd);
-        cmd = (cmd | PCI_COMMAND_MEMORY );
-        pci_write_config_dword(dev, PCI_COMMAND, cmd);
+        pci_read_config_dword(dev, PCI_COMMAND, &cmd);
+        cmd = (cmd | PCI_COMMAND_MEMORY );
+        pci_write_config_dword(dev, PCI_COMMAND, cmd);
 #endif
 }
 
@@ -3868,63 +3886,62 @@ static int __devinit bttv_probe(struct pci_dev *dev,
         if (bttv_num == BTTV_MAX)
                 return -ENOMEM;
         printk(KERN_INFO "bttv: Bt8xx card found (%d).\n", bttv_num);
-        btv=&bttvs[bttv_num];
+        btv=&bttvs[bttv_num];
         memset(btv,0,sizeof(*btv));
         btv->c.nr  = bttv_num;
         sprintf(btv->c.name,"bttv%d",btv->c.nr);
 
         /* initialize structs / fill in defaults */
-        init_MUTEX(&btv->lock);
-        init_MUTEX(&btv->reslock);
-        spin_lock_init(&btv->s_lock);
-        spin_lock_init(&btv->gpio_lock);
-        init_waitqueue_head(&btv->gpioq);
-        init_waitqueue_head(&btv->i2c_queue);
-        INIT_LIST_HEAD(&btv->c.subs);
-        INIT_LIST_HEAD(&btv->capture);
-        INIT_LIST_HEAD(&btv->vcapture);
+        init_MUTEX(&btv->lock);
+        init_MUTEX(&btv->reslock);
+        spin_lock_init(&btv->s_lock);
+        spin_lock_init(&btv->gpio_lock);
+        init_waitqueue_head(&btv->gpioq);
+        init_waitqueue_head(&btv->i2c_queue);
+        INIT_LIST_HEAD(&btv->c.subs);
+        INIT_LIST_HEAD(&btv->capture);
+        INIT_LIST_HEAD(&btv->vcapture);
         v4l2_prio_init(&btv->prio);
 
         init_timer(&btv->timeout);
         btv->timeout.function = bttv_irq_timeout;
         btv->timeout.data     = (unsigned long)btv;
 
-        btv->i2c_rc = -1;
-        btv->tuner_type  = UNSET;
-        btv->pinnacle_id = UNSET;
+        btv->i2c_rc = -1;
+        btv->tuner_type  = UNSET;
+        btv->pinnacle_id = UNSET;
         btv->new_input   = UNSET;
-        btv->gpioirq     = 1;
         btv->has_radio=radio[btv->c.nr];
 
         /* pci stuff (init, get irq/mmio, ... */
         btv->c.pci = dev;
-        btv->id  = dev->device;
+        btv->id  = dev->device;
         if (pci_enable_device(dev)) {
-                printk(KERN_WARNING "bttv%d: Can't enable device.\n",
+                printk(KERN_WARNING "bttv%d: Can't enable device.\n",
                        btv->c.nr);
                 return -EIO;
         }
-        if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
-                printk(KERN_WARNING "bttv%d: No suitable DMA available.\n",
+        if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
+                printk(KERN_WARNING "bttv%d: No suitable DMA available.\n",
                        btv->c.nr);
                 return -EIO;
-        }
+        }
         if (!request_mem_region(pci_resource_start(dev,0),
                                 pci_resource_len(dev,0),
                                 btv->c.name)) {
-                printk(KERN_WARNING "bttv%d: can't request iomem (0x%lx).\n",
+                printk(KERN_WARNING "bttv%d: can't request iomem (0x%lx).\n",
                        btv->c.nr, pci_resource_start(dev,0));
                 return -EBUSY;
         }
-        pci_set_master(dev);
+        pci_set_master(dev);
         pci_set_command(dev);
         pci_set_drvdata(dev,btv);
 
-        pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision);
-        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
-        printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ",
-               bttv_num,btv->id, btv->revision, pci_name(dev));
-        printk("irq: %d, latency: %d, mmio: 0x%lx\n",
+        pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision);
+        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
+        printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ",
+               bttv_num,btv->id, btv->revision, pci_name(dev));
+        printk("irq: %d, latency: %d, mmio: 0x%lx\n",
                btv->c.pci->irq, lat, pci_resource_start(dev,0));
         schedule();
 
@@ -3935,23 +3952,23 @@ static int __devinit bttv_probe(struct pci_dev *dev,
                 goto fail1;
         }
 
-        /* identify card */
+        /* identify card */
         bttv_idcard(btv);
 
-        /* disable irqs, register irq handler */
+        /* disable irqs, register irq handler */
         btwrite(0, BT848_INT_MASK);
-        result = request_irq(btv->c.pci->irq, bttv_irq,
-                             SA_SHIRQ | SA_INTERRUPT,btv->c.name,(void *)btv);
-        if (result < 0) {
-                printk(KERN_ERR "bttv%d: can't get IRQ %d\n",
+        result = request_irq(btv->c.pci->irq, bttv_irq,
+                             SA_SHIRQ | SA_INTERRUPT,btv->c.name,(void *)btv);
+        if (result < 0) {
+                printk(KERN_ERR "bttv%d: can't get IRQ %d\n",
                        bttv_num,btv->c.pci->irq);
                 goto fail1;
-        }
+        }
 
         if (0 != bttv_handle_chipset(btv)) {
                 result = -EIO;
                 goto fail2;
-        }
+        }
 
         /* init options from insmod args */
         btv->opt_combfilter = combfilter;
@@ -3977,29 +3994,29 @@ static int __devinit bttv_probe(struct pci_dev *dev,
         btv->input = 0;
 
         /* initialize hardware */
-        if (bttv_gpio)
-                bttv_gpio_tracking(btv,"pre-init");
+        if (bttv_gpio)
+                bttv_gpio_tracking(btv,"pre-init");
 
         bttv_risc_init_main(btv);
         init_bt848(btv);
 
         /* gpio */
-        btwrite(0x00, BT848_GPIO_REG_INP);
-        btwrite(0x00, BT848_GPIO_OUT_EN);
-        if (bttv_verbose)
-                bttv_gpio_tracking(btv,"init");
+        btwrite(0x00, BT848_GPIO_REG_INP);
+        btwrite(0x00, BT848_GPIO_OUT_EN);
+        if (bttv_verbose)
+                bttv_gpio_tracking(btv,"init");
 
-        /* needs to be done before i2c is registered */
-        bttv_init_card1(btv);
+        /* needs to be done before i2c is registered */
+        bttv_init_card1(btv);
 
-        /* register i2c + gpio */
-        init_bttv_i2c(btv);
+        /* register i2c + gpio */
+        init_bttv_i2c(btv);
 
-        /* some card-specific stuff (needs working i2c) */
-        bttv_init_card2(btv);
+        /* some card-specific stuff (needs working i2c) */
+        bttv_init_card2(btv);
         init_irqreg(btv);
 
-        /* register video4linux + input */
+        /* register video4linux + input */
         if (!bttv_tvcards[btv->c.type].no_video) {
                 bttv_register_video(btv);
                 bt848_bright(btv,32768);
@@ -4018,10 +4035,10 @@ static int __devinit bttv_probe(struct pci_dev *dev,
 
         /* everything is fine */
         bttv_num++;
-        return 0;
+        return 0;
 
  fail2:
-        free_irq(btv->c.pci->irq,btv);
+        free_irq(btv->c.pci->irq,btv);
 
  fail1:
         if (btv->bt848_mmio)
@@ -4034,12 +4051,12 @@ static int __devinit bttv_probe(struct pci_dev *dev,
 
 static void __devexit bttv_remove(struct pci_dev *pci_dev)
 {
-        struct bttv *btv = pci_get_drvdata(pci_dev);
+        struct bttv *btv = pci_get_drvdata(pci_dev);
 
         if (bttv_verbose)
                 printk("bttv%d: unloading\n",btv->c.nr);
 
-        /* shutdown everything (DMA+IRQs) */
+        /* shutdown everything (DMA+IRQs) */
         btand(~15, BT848_GPIO_DMA_CTL);
         btwrite(0, BT848_INT_MASK);
         btwrite(~0x0, BT848_INT_STAT);
@@ -4052,7 +4069,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
         wake_up(&btv->gpioq);
         bttv_sub_del_devices(&btv->c);
 
-        /* unregister i2c_bus + input */
+        /* unregister i2c_bus + input */
         fini_bttv_i2c(btv);
 
         /* unregister video4linux */
@@ -4062,18 +4079,18 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
         btcx_riscmem_free(btv->c.pci,&btv->main);
 
         /* free ressources */
-        free_irq(btv->c.pci->irq,btv);
+        free_irq(btv->c.pci->irq,btv);
         iounmap(btv->bt848_mmio);
-        release_mem_region(pci_resource_start(btv->c.pci,0),
-                           pci_resource_len(btv->c.pci,0));
+        release_mem_region(pci_resource_start(btv->c.pci,0),
+                           pci_resource_len(btv->c.pci,0));
 
         pci_set_drvdata(pci_dev, NULL);
-        return;
+        return;
 }
 
 static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
 {
-        struct bttv *btv = pci_get_drvdata(pci_dev);
+        struct bttv *btv = pci_get_drvdata(pci_dev);
         struct bttv_buffer_set idle;
         unsigned long flags;
 
@@ -4108,7 +4125,7 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
 
 static int bttv_resume(struct pci_dev *pci_dev)
 {
-        struct bttv *btv = pci_get_drvdata(pci_dev);
+        struct bttv *btv = pci_get_drvdata(pci_dev);
         unsigned long flags;
         int err;
 
@@ -4153,24 +4170,24 @@ static int bttv_resume(struct pci_dev *pci_dev)
 }
 
 static struct pci_device_id bttv_pci_tbl[] = {
-        {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT878,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT879,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0,}
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {0,}
 };
 
 MODULE_DEVICE_TABLE(pci, bttv_pci_tbl);
 
 static struct pci_driver bttv_pci_driver = {
-        .name     = "bttv",
-        .id_table = bttv_pci_tbl,
-        .probe    = bttv_probe,
-        .remove   = __devexit_p(bttv_remove),
+        .name     = "bttv",
+        .id_table = bttv_pci_tbl,
+        .probe    = bttv_probe,
+        .remove   = __devexit_p(bttv_remove),
         .suspend  = bttv_suspend,
         .resume   = bttv_resume,
 };
diff --git a/drivers/media/video/bttv-gpio.c b/drivers/media/video/bttv-gpio.c
index 6b280c03e398..575ce8b8e714 100644
--- a/drivers/media/video/bttv-gpio.c
+++ b/drivers/media/video/bttv-gpio.c
@@ -7,7 +7,7 @@
 
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
-                           & Marcus Metzler (mocm@thp.uni-koeln.de)
+                           & Marcus Metzler (mocm@thp.uni-koeln.de)
     (c) 1999-2003 Gerd Knorr <kraxel@bytesex.org>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index e684df37eb0e..77619eb131f6 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -5,7 +5,7 @@
     bttv - Bt848 frame grabber driver
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
-                           & Marcus Metzler (mocm@thp.uni-koeln.de)
+                           & Marcus Metzler (mocm@thp.uni-koeln.de)
     (c) 1999-2003 Gerd Knorr <kraxel@bytesex.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -237,7 +237,7 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last)
  err:
         if (i2c_debug)
                 printk(" ERR: %d\n",retval);
-        return retval;
+        return retval;
 }
 
 static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
@@ -290,7 +290,13 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
 
 static int attach_inform(struct i2c_client *client)
 {
-        struct bttv *btv = i2c_get_adapdata(client->adapter);
+        struct bttv *btv = i2c_get_adapdata(client->adapter);
+        int addr=ADDR_UNSET;
+
+
+        if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
+                addr = bttv_tvcards[btv->c.type].tuner_addr;
+
 
         if (bttv_debug)
                 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
@@ -300,19 +306,20 @@ static int attach_inform(struct i2c_client *client)
                 return 0;
 
         if (btv->tuner_type != UNSET) {
-                struct tuner_setup tun_setup;
+                struct tuner_setup tun_setup;
+
+                if ((addr==ADDR_UNSET) ||
+                                (addr==client->addr)) {
 
-                tun_setup.mode_mask = T_RADIO | T_ANALOG_TV | T_DIGITAL_TV;
-                tun_setup.type = btv->tuner_type;
-                tun_setup.addr = ADDR_UNSET;
+                        tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO;
+                        tun_setup.type = btv->tuner_type;
+                        tun_setup.addr = addr;
+                        bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
+                }
 
-                client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
         }
 
-        if (btv->pinnacle_id != UNSET)
-                client->driver->command(client,AUDC_CONFIG_PINNACLE,
-                                      &btv->pinnacle_id);
-        return 0;
+        return 0;
 }
 
 void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
@@ -330,43 +337,43 @@ static struct i2c_client bttv_i2c_client_template = {
 /* read I2C */
 int bttv_I2CRead(struct bttv *btv, unsigned char addr, char *probe_for)
 {
-        unsigned char buffer = 0;
+        unsigned char buffer = 0;
 
         if (0 != btv->i2c_rc)
                 return -1;
         if (bttv_verbose && NULL != probe_for)
                 printk(KERN_INFO "bttv%d: i2c: checking for %s @ 0x%02x... ",
                        btv->c.nr,probe_for,addr);
-        btv->i2c_client.addr = addr >> 1;
-        if (1 != i2c_master_recv(&btv->i2c_client, &buffer, 1)) {
+        btv->i2c_client.addr = addr >> 1;
+        if (1 != i2c_master_recv(&btv->i2c_client, &buffer, 1)) {
                 if (NULL != probe_for) {
                         if (bttv_verbose)
                                 printk("not found\n");
                 } else
                         printk(KERN_WARNING "bttv%d: i2c read 0x%x: error\n",
                                btv->c.nr,addr);
-                return -1;
+                return -1;
         }
         if (bttv_verbose && NULL != probe_for)
                 printk("found\n");
-        return buffer;
+        return buffer;
 }
 
 /* write I2C */
 int bttv_I2CWrite(struct bttv *btv, unsigned char addr, unsigned char b1,
-                    unsigned char b2, int both)
+                    unsigned char b2, int both)
 {
-        unsigned char buffer[2];
-        int bytes = both ? 2 : 1;
+        unsigned char buffer[2];
+        int bytes = both ? 2 : 1;
 
         if (0 != btv->i2c_rc)
                 return -1;
-        btv->i2c_client.addr = addr >> 1;
-        buffer[0] = b1;
-        buffer[1] = b2;
-        if (bytes != i2c_master_send(&btv->i2c_client, buffer, bytes))
+        btv->i2c_client.addr = addr >> 1;
+        buffer[0] = b1;
+        buffer[1] = b2;
+        if (bytes != i2c_master_send(&btv->i2c_client, buffer, bytes))
                 return -1;
-        return 0;
+        return 0;
 }
 
 /* read EEPROM content */
@@ -431,8 +438,8 @@ int __devinit init_bttv_i2c(struct bttv *btv)
                  "bt%d #%d [%s]", btv->id, btv->c.nr,
                  btv->use_i2c_hw ? "hw" : "sw");
 
-        i2c_set_adapdata(&btv->c.i2c_adap, btv);
-        btv->i2c_client.adapter = &btv->c.i2c_adap;
+        i2c_set_adapdata(&btv->c.i2c_adap, btv);
+        btv->i2c_client.adapter = &btv->c.i2c_adap;
 
 #ifdef I2C_CLASS_TV_ANALOG
         if (bttv_tvcards[btv->c.type].no_video)
diff --git a/drivers/media/video/bttv-if.c b/drivers/media/video/bttv-if.c
index e8aada772b89..19b564ab0e92 100644
--- a/drivers/media/video/bttv-if.c
+++ b/drivers/media/video/bttv-if.c
@@ -1,13 +1,13 @@
 /*
 
     bttv-if.c  --  old gpio interface to other kernel modules
-                   don't use in new code, will go away in 2.7
+                   don't use in new code, will go away in 2.7
                    have a look at bttv-gpio.c instead.
 
     bttv - Bt848 frame grabber driver
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
-                           & Marcus Metzler (mocm@thp.uni-koeln.de)
+                           & Marcus Metzler (mocm@thp.uni-koeln.de)
     (c) 1999-2003 Gerd Knorr <kraxel@bytesex.org>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bttv-risc.c
index a5ed99b89445..b40e9734bf08 100644
--- a/drivers/media/video/bttv-risc.c
+++ b/drivers/media/video/bttv-risc.c
@@ -74,27 +74,27 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
                 }
                 if (bpl <= sg_dma_len(sg)-offset) {
                         /* fits into current chunk */
-                        *(rp++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_SOL|
+                        *(rp++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_SOL|
                                             BT848_RISC_EOL|bpl);
-                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
-                        offset+=bpl;
+                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
+                        offset+=bpl;
                 } else {
                         /* scanline needs to be splitted */
-                        todo = bpl;
-                        *(rp++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_SOL|
+                        todo = bpl;
+                        *(rp++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_SOL|
                                             (sg_dma_len(sg)-offset));
-                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
-                        todo -= (sg_dma_len(sg)-offset);
-                        offset = 0;
-                        sg++;
-                        while (todo > sg_dma_len(sg)) {
-                                *(rp++)=cpu_to_le32(BT848_RISC_WRITE|
+                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
+                        todo -= (sg_dma_len(sg)-offset);
+                        offset = 0;
+                        sg++;
+                        while (todo > sg_dma_len(sg)) {
+                                *(rp++)=cpu_to_le32(BT848_RISC_WRITE|
                                                     sg_dma_len(sg));
-                                *(rp++)=cpu_to_le32(sg_dma_address(sg));
+                                *(rp++)=cpu_to_le32(sg_dma_address(sg));
                                 todo -= sg_dma_len(sg);
                                 sg++;
                         }
-                        *(rp++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_EOL|
+                        *(rp++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_EOL|
                                             todo);
                         *(rp++)=cpu_to_le32(sg_dma_address(sg));
                         offset += todo;
@@ -201,8 +201,8 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
                                 ri |= BT848_RISC_EOL;
 
                         /* write risc instruction */
-                        *(rp++)=cpu_to_le32(ri | ylen);
-                        *(rp++)=cpu_to_le32(((ylen >> hshift) << 16) |
+                        *(rp++)=cpu_to_le32(ri | ylen);
+                        *(rp++)=cpu_to_le32(((ylen >> hshift) << 16) |
                                             (ylen >> hshift));
                         *(rp++)=cpu_to_le32(sg_dma_address(ysg)+yoffset);
                         yoffset += ylen;
@@ -319,7 +319,7 @@ bttv_calc_geo(struct bttv *btv, struct bttv_geometry *geo,
               int width, int height, int interleaved, int norm)
 {
         const struct bttv_tvnorm *tvnorm = &bttv_tvnorms[norm];
-        u32 xsf, sr;
+        u32 xsf, sr;
         int vdelay;
 
         int swidth       = tvnorm->swidth;
@@ -334,52 +334,52 @@ bttv_calc_geo(struct bttv *btv, struct bttv_geometry *geo,
 
         vdelay = tvnorm->vdelay;
 
-        xsf = (width*scaledtwidth)/swidth;
-        geo->hscale =  ((totalwidth*4096UL)/xsf-4096);
-        geo->hdelay =  tvnorm->hdelayx1;
-        geo->hdelay =  (geo->hdelay*width)/swidth;
-        geo->hdelay &= 0x3fe;
-        sr = ((tvnorm->sheight >> (interleaved?0:1))*512)/height - 512;
-        geo->vscale =  (0x10000UL-sr) & 0x1fff;
-        geo->crop   =  ((width>>8)&0x03) | ((geo->hdelay>>6)&0x0c) |
-                ((tvnorm->sheight>>4)&0x30) | ((vdelay>>2)&0xc0);
-        geo->vscale |= interleaved ? (BT848_VSCALE_INT<<8) : 0;
-        geo->vdelay  =  vdelay;
-        geo->width   =  width;
-        geo->sheight =  tvnorm->sheight;
+        xsf = (width*scaledtwidth)/swidth;
+        geo->hscale =  ((totalwidth*4096UL)/xsf-4096);
+        geo->hdelay =  tvnorm->hdelayx1;
+        geo->hdelay =  (geo->hdelay*width)/swidth;
+        geo->hdelay &= 0x3fe;
+        sr = ((tvnorm->sheight >> (interleaved?0:1))*512)/height - 512;
+        geo->vscale =  (0x10000UL-sr) & 0x1fff;
+        geo->crop   =  ((width>>8)&0x03) | ((geo->hdelay>>6)&0x0c) |
+                ((tvnorm->sheight>>4)&0x30) | ((vdelay>>2)&0xc0);
+        geo->vscale |= interleaved ? (BT848_VSCALE_INT<<8) : 0;
+        geo->vdelay  =  vdelay;
+        geo->width   =  width;
+        geo->sheight =  tvnorm->sheight;
         geo->vtotal  =  tvnorm->vtotal;
 
-        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;
-        }
+        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;
+        int off = odd ? 0x80 : 0x00;
 
         if (geo->comb)
                 btor(BT848_VSCALE_COMB, BT848_E_VSCALE_HI+off);
         else
                 btand(~BT848_VSCALE_COMB, BT848_E_VSCALE_HI+off);
 
-        btwrite(geo->vtc,             BT848_E_VTC+off);
-        btwrite(geo->hscale >> 8,     BT848_E_HSCALE_HI+off);
-        btwrite(geo->hscale & 0xff,   BT848_E_HSCALE_LO+off);
-        btaor((geo->vscale>>8), 0xe0, BT848_E_VSCALE_HI+off);
-        btwrite(geo->vscale & 0xff,   BT848_E_VSCALE_LO+off);
-        btwrite(geo->width & 0xff,    BT848_E_HACTIVE_LO+off);
-        btwrite(geo->hdelay & 0xff,   BT848_E_HDELAY_LO+off);
-        btwrite(geo->sheight & 0xff,  BT848_E_VACTIVE_LO+off);
-        btwrite(geo->vdelay & 0xff,   BT848_E_VDELAY_LO+off);
-        btwrite(geo->crop,            BT848_E_CROP+off);
+        btwrite(geo->vtc,             BT848_E_VTC+off);
+        btwrite(geo->hscale >> 8,     BT848_E_HSCALE_HI+off);
+        btwrite(geo->hscale & 0xff,   BT848_E_HSCALE_LO+off);
+        btaor((geo->vscale>>8), 0xe0, BT848_E_VSCALE_HI+off);
+        btwrite(geo->vscale & 0xff,   BT848_E_VSCALE_LO+off);
+        btwrite(geo->width & 0xff,    BT848_E_HACTIVE_LO+off);
+        btwrite(geo->hdelay & 0xff,   BT848_E_HDELAY_LO+off);
+        btwrite(geo->sheight & 0xff,  BT848_E_VACTIVE_LO+off);
+        btwrite(geo->vdelay & 0xff,   BT848_E_VDELAY_LO+off);
+        btwrite(geo->crop,            BT848_E_CROP+off);
         btwrite(geo->vtotal>>8,       BT848_VTOTAL_HI);
-        btwrite(geo->vtotal & 0xff,   BT848_VTOTAL_LO);
+        btwrite(geo->vtotal & 0xff,   BT848_VTOTAL_LO);
 }
 
 /* ---------------------------------------------------------- */
@@ -420,7 +420,7 @@ bttv_set_dma(struct bttv *btv, int override)
         } else {
                 del_timer(&btv->timeout);
         }
-        btv->main.cpu[RISC_SLOT_LOOP] = cpu_to_le32(cmd);
+        btv->main.cpu[RISC_SLOT_LOOP] = cpu_to_le32(cmd);
 
         btaor(capctl, ~0x0f, BT848_CAP_CTL);
         if (capctl) {
@@ -432,7 +432,7 @@ bttv_set_dma(struct bttv *btv, int override)
         } else {
                 if (!btv->dma_on)
                         return;
-                btand(~3, BT848_GPIO_DMA_CTL);
+                btand(~3, BT848_GPIO_DMA_CTL);
                 btv->dma_on = 0;
         }
         return;
@@ -460,19 +460,19 @@ bttv_risc_init_main(struct bttv *btv)
         btv->main.cpu[6] = cpu_to_le32(BT848_RISC_JUMP);
         btv->main.cpu[7] = cpu_to_le32(btv->main.dma + (8<<2));
 
-        btv->main.cpu[8] = cpu_to_le32(BT848_RISC_SYNC | BT848_RISC_RESYNC |
+        btv->main.cpu[8] = cpu_to_le32(BT848_RISC_SYNC | BT848_RISC_RESYNC |
                                        BT848_FIFO_STATUS_VRO);
-        btv->main.cpu[9] = cpu_to_le32(0);
+        btv->main.cpu[9] = cpu_to_le32(0);
 
         /* bottom field */
-        btv->main.cpu[10] = cpu_to_le32(BT848_RISC_JUMP);
+        btv->main.cpu[10] = cpu_to_le32(BT848_RISC_JUMP);
         btv->main.cpu[11] = cpu_to_le32(btv->main.dma + (12<<2));
-        btv->main.cpu[12] = cpu_to_le32(BT848_RISC_JUMP);
+        btv->main.cpu[12] = cpu_to_le32(BT848_RISC_JUMP);
         btv->main.cpu[13] = cpu_to_le32(btv->main.dma + (14<<2));
 
         /* jump back to top field */
         btv->main.cpu[14] = cpu_to_le32(BT848_RISC_JUMP);
-        btv->main.cpu[15] = cpu_to_le32(btv->main.dma + (0<<2));
+        btv->main.cpu[15] = cpu_to_le32(btv->main.dma + (0<<2));
 
         return 0;
 }
diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bttv.h
index d254e90e3bb9..124ea41dada4 100644
--- a/drivers/media/video/bttv.h
+++ b/drivers/media/video/bttv.h
@@ -20,123 +20,148 @@
 /* ---------------------------------------------------------- */
 /* exported by bttv-cards.c                                   */
 
-#define BTTV_UNKNOWN       0x00
-#define BTTV_MIRO          0x01
-#define BTTV_HAUPPAUGE     0x02
-#define BTTV_STB           0x03
-#define BTTV_INTEL         0x04
-#define BTTV_DIAMOND       0x05
-#define BTTV_AVERMEDIA     0x06
-#define BTTV_MATRIX_VISION 0x07
-#define BTTV_FLYVIDEO      0x08
-#define BTTV_TURBOTV       0x09
-#define BTTV_HAUPPAUGE878  0x0a
-#define BTTV_MIROPRO       0x0b
-#define BTTV_ADSTECH_TV    0x0c
-#define BTTV_AVERMEDIA98   0x0d
-#define BTTV_VHX           0x0e
-#define BTTV_ZOLTRIX       0x0f
-#define BTTV_PIXVIEWPLAYTV 0x10
-#define BTTV_WINVIEW_601   0x11
-#define BTTV_AVEC_INTERCAP 0x12
-#define BTTV_LIFE_FLYKIT   0x13
-#define BTTV_CEI_RAFFLES   0x14
-#define BTTV_CONFERENCETV  0x15
-#define BTTV_PHOEBE_TVMAS  0x16
-#define BTTV_MODTEC_205    0x17
-#define BTTV_MAGICTVIEW061 0x18
-#define BTTV_VOBIS_BOOSTAR 0x19
-#define BTTV_HAUPPAUG_WCAM 0x1a
-#define BTTV_MAXI          0x1b
-#define BTTV_TERRATV       0x1c
-#define BTTV_PXC200        0x1d
-#define BTTV_FLYVIDEO_98   0x1e
-#define BTTV_IPROTV        0x1f
-#define BTTV_INTEL_C_S_PCI 0x20
-#define BTTV_TERRATVALUE   0x21
-#define BTTV_WINFAST2000   0x22
-#define BTTV_CHRONOS_VS2   0x23
-#define BTTV_TYPHOON_TVIEW 0x24
-#define BTTV_PXELVWPLTVPRO 0x25
-#define BTTV_MAGICTVIEW063 0x26
-#define BTTV_PINNACLE      0x27
-#define BTTV_STB2          0x28
-#define BTTV_AVPHONE98     0x29
-#define BTTV_PV951         0x2a
-#define BTTV_ONAIR_TV      0x2b
-#define BTTV_SIGMA_TVII_FM 0x2c
-#define BTTV_MATRIX_VISION2 0x2d
-#define BTTV_ZOLTRIX_GENIE 0x2e
-#define BTTV_TERRATVRADIO  0x2f
-#define BTTV_DYNALINK      0x30
-#define BTTV_GVBCTV3PCI    0x31
-#define BTTV_PXELVWPLTVPAK 0x32
-#define BTTV_EAGLE         0x33
-#define BTTV_PINNACLEPRO   0x34
-#define BTTV_TVIEW_RDS_FM  0x35
-#define BTTV_LIFETEC_9415  0x36
-#define BTTV_BESTBUY_EASYTV 0x37
-#define BTTV_FLYVIDEO_98FM 0x38
-#define BTTV_GMV1          0x3d
-#define BTTV_BESTBUY_EASYTV2 0x3e
-#define BTTV_ATI_TVWONDER  0x3f
-#define BTTV_ATI_TVWONDERVE 0x40
-#define BTTV_FLYVIDEO2000   0x41
-#define BTTV_TERRATVALUER   0x42
-#define BTTV_GVBCTV4PCI     0x43
-#define BTTV_VOODOOTV_FM    0x44
-#define BTTV_AIMMS          0x45
-#define BTTV_PV_BT878P_PLUS 0x46
-#define BTTV_FLYVIDEO98EZ   0x47
-#define BTTV_PV_BT878P_9B   0x48
-#define BTTV_SENSORAY311    0x49
-#define BTTV_RV605          0x4a
-#define BTTV_WINDVR         0x4c
-#define BTTV_GRANDTEC       0x4d
-#define BTTV_KWORLD         0x4e
-#define BTTV_HAUPPAUGEPVR   0x50
-#define BTTV_GVBCTV5PCI     0x51
-#define BTTV_OSPREY1x0      0x52
-#define BTTV_OSPREY1x0_848  0x53
-#define BTTV_OSPREY101_848  0x54
-#define BTTV_OSPREY1x1      0x55
-#define BTTV_OSPREY1x1_SVID 0x56
-#define BTTV_OSPREY2xx      0x57
-#define BTTV_OSPREY2x0_SVID 0x58
-#define BTTV_OSPREY2x0      0x59
-#define BTTV_OSPREY500      0x5a
-#define BTTV_OSPREY540      0x5b
-#define BTTV_OSPREY2000     0x5c
-#define BTTV_IDS_EAGLE      0x5d
-#define BTTV_PINNACLESAT    0x5e
-#define BTTV_FORMAC_PROTV   0x5f
-#define BTTV_EURESYS_PICOLO 0x61
-#define BTTV_PV150          0x62
-#define BTTV_AD_TVK503      0x63
-#define BTTV_IVC200         0x66
-#define BTTV_XGUARD         0x67
-#define BTTV_NEBULA_DIGITV  0x68
-#define BTTV_PV143          0x69
-#define BTTV_IVC100         0x6e
-#define BTTV_IVC120         0x6f
-#define BTTV_PC_HDTV        0x70
-#define BTTV_TWINHAN_DST    0x71
-#define BTTV_WINFASTVC100   0x72
-#define BTTV_SIMUS_GVC1100  0x74
-#define BTTV_NGSTV_PLUS     0x75
-#define BTTV_LMLBT4         0x76
-#define BTTV_PICOLO_TETRA_CHIP 0x79
-#define BTTV_AVDVBT_771     0x7b
-#define BTTV_AVDVBT_761     0x7c
-#define BTTV_MATRIX_VISIONSQ  0x7d
-#define BTTV_MATRIX_VISIONSLC 0x7e
-#define BTTV_APAC_VIEWCOMP  0x7f
-#define BTTV_DVICO_DVBT_LITE  0x80
-#define BTTV_TIBET_CS16  0x83
-#define BTTV_KODICOM_4400R  0x84
-#define BTTV_ADLINK_RTV24   0x86
-#define BTTV_DVICO_FUSIONHDTV_5_LITE 0x87
-#define BTTV_ACORP_Y878F   0x88
+#define BTTV_BOARD_UNKNOWN                 0x00
+#define BTTV_BOARD_MIRO                    0x01
+#define BTTV_BOARD_HAUPPAUGE               0x02
+#define BTTV_BOARD_STB                     0x03
+#define BTTV_BOARD_INTEL                   0x04
+#define BTTV_BOARD_DIAMOND                 0x05
+#define BTTV_BOARD_AVERMEDIA               0x06
+#define BTTV_BOARD_MATRIX_VISION           0x07
+#define BTTV_BOARD_FLYVIDEO                0x08
+#define BTTV_BOARD_TURBOTV                 0x09
+#define BTTV_BOARD_HAUPPAUGE878            0x0a
+#define BTTV_BOARD_MIROPRO                 0x0b
+#define BTTV_BOARD_ADSTECH_TV              0x0c
+#define BTTV_BOARD_AVERMEDIA98             0x0d
+#define BTTV_BOARD_VHX                     0x0e
+#define BTTV_BOARD_ZOLTRIX                 0x0f
+#define BTTV_BOARD_PIXVIEWPLAYTV           0x10
+#define BTTV_BOARD_WINVIEW_601             0x11
+#define BTTV_BOARD_AVEC_INTERCAP           0x12
+#define BTTV_BOARD_LIFE_FLYKIT             0x13
+#define BTTV_BOARD_CEI_RAFFLES             0x14
+#define BTTV_BOARD_CONFERENCETV            0x15
+#define BTTV_BOARD_PHOEBE_TVMAS            0x16
+#define BTTV_BOARD_MODTEC_205              0x17
+#define BTTV_BOARD_MAGICTVIEW061           0x18
+#define BTTV_BOARD_VOBIS_BOOSTAR           0x19
+#define BTTV_BOARD_HAUPPAUG_WCAM           0x1a
+#define BTTV_BOARD_MAXI                    0x1b
+#define BTTV_BOARD_TERRATV                 0x1c
+#define BTTV_BOARD_PXC200                  0x1d
+#define BTTV_BOARD_FLYVIDEO_98             0x1e
+#define BTTV_BOARD_IPROTV                  0x1f
+#define BTTV_BOARD_INTEL_C_S_PCI           0x20
+#define BTTV_BOARD_TERRATVALUE             0x21
+#define BTTV_BOARD_WINFAST2000             0x22
+#define BTTV_BOARD_CHRONOS_VS2             0x23
+#define BTTV_BOARD_TYPHOON_TVIEW           0x24
+#define BTTV_BOARD_PXELVWPLTVPRO           0x25
+#define BTTV_BOARD_MAGICTVIEW063           0x26
+#define BTTV_BOARD_PINNACLE                0x27
+#define BTTV_BOARD_STB2                    0x28
+#define BTTV_BOARD_AVPHONE98               0x29
+#define BTTV_BOARD_PV951                   0x2a
+#define BTTV_BOARD_ONAIR_TV                0x2b
+#define BTTV_BOARD_SIGMA_TVII_FM           0x2c
+#define BTTV_BOARD_MATRIX_VISION2          0x2d
+#define BTTV_BOARD_ZOLTRIX_GENIE           0x2e
+#define BTTV_BOARD_TERRATVRADIO            0x2f
+#define BTTV_BOARD_DYNALINK                0x30
+#define BTTV_BOARD_GVBCTV3PCI              0x31
+#define BTTV_BOARD_PXELVWPLTVPAK           0x32
+#define BTTV_BOARD_EAGLE                   0x33
+#define BTTV_BOARD_PINNACLEPRO             0x34
+#define BTTV_BOARD_TVIEW_RDS_FM            0x35
+#define BTTV_BOARD_LIFETEC_9415            0x36
+#define BTTV_BOARD_BESTBUY_EASYTV          0x37
+#define BTTV_BOARD_FLYVIDEO_98FM           0x38
+#define BTTV_BOARD_GRANDTEC                0x39
+#define BTTV_BOARD_ASKEY_CPH060            0x3a
+#define BTTV_BOARD_ASKEY_CPH03X            0x3b
+#define BTTV_BOARD_MM100PCTV               0x3c
+#define BTTV_BOARD_GMV1                    0x3d
+#define BTTV_BOARD_BESTBUY_EASYTV2         0x3e
+#define BTTV_BOARD_ATI_TVWONDER            0x3f
+#define BTTV_BOARD_ATI_TVWONDERVE          0x40
+#define BTTV_BOARD_FLYVIDEO2000            0x41
+#define BTTV_BOARD_TERRATVALUER            0x42
+#define BTTV_BOARD_GVBCTV4PCI              0x43
+#define BTTV_BOARD_VOODOOTV_FM             0x44
+#define BTTV_BOARD_AIMMS                   0x45
+#define BTTV_BOARD_PV_BT878P_PLUS          0x46
+#define BTTV_BOARD_FLYVIDEO98EZ            0x47
+#define BTTV_BOARD_PV_BT878P_9B            0x48
+#define BTTV_BOARD_SENSORAY311             0x49
+#define BTTV_BOARD_RV605                   0x4a
+#define BTTV_BOARD_POWERCLR_MTV878         0x4b
+#define BTTV_BOARD_WINDVR                  0x4c
+#define BTTV_BOARD_GRANDTEC_MULTI          0x4d
+#define BTTV_BOARD_KWORLD                  0x4e
+#define BTTV_BOARD_DSP_TCVIDEO             0x4f
+#define BTTV_BOARD_HAUPPAUGEPVR            0x50
+#define BTTV_BOARD_GVBCTV5PCI              0x51
+#define BTTV_BOARD_OSPREY1x0               0x52
+#define BTTV_BOARD_OSPREY1x0_848           0x53
+#define BTTV_BOARD_OSPREY101_848           0x54
+#define BTTV_BOARD_OSPREY1x1               0x55
+#define BTTV_BOARD_OSPREY1x1_SVID          0x56
+#define BTTV_BOARD_OSPREY2xx               0x57
+#define BTTV_BOARD_OSPREY2x0_SVID          0x58
+#define BTTV_BOARD_OSPREY2x0               0x59
+#define BTTV_BOARD_OSPREY500               0x5a
+#define BTTV_BOARD_OSPREY540               0x5b
+#define BTTV_BOARD_OSPREY2000              0x5c
+#define BTTV_BOARD_IDS_EAGLE               0x5d
+#define BTTV_BOARD_PINNACLESAT             0x5e
+#define BTTV_BOARD_FORMAC_PROTV            0x5f
+#define BTTV_BOARD_MACHTV                  0x60
+#define BTTV_BOARD_EURESYS_PICOLO          0x61
+#define BTTV_BOARD_PV150                   0x62
+#define BTTV_BOARD_AD_TVK503               0x63
+#define BTTV_BOARD_HERCULES_SM_TV          0x64
+#define BTTV_BOARD_PACETV                  0x65
+#define BTTV_BOARD_IVC200                  0x66
+#define BTTV_BOARD_XGUARD                  0x67
+#define BTTV_BOARD_NEBULA_DIGITV           0x68
+#define BTTV_BOARD_PV143                   0x69
+#define BTTV_BOARD_VD009X1_MINIDIN         0x6a
+#define BTTV_BOARD_VD009X1_COMBI           0x6b
+#define BTTV_BOARD_VD009_MINIDIN           0x6c
+#define BTTV_BOARD_VD009_COMBI             0x6d
+#define BTTV_BOARD_IVC100                  0x6e
+#define BTTV_BOARD_IVC120                  0x6f
+#define BTTV_BOARD_PC_HDTV                 0x70
+#define BTTV_BOARD_TWINHAN_DST             0x71
+#define BTTV_BOARD_WINFASTVC100            0x72
+#define BTTV_BOARD_TEV560                  0x73
+#define BTTV_BOARD_SIMUS_GVC1100           0x74
+#define BTTV_BOARD_NGSTV_PLUS              0x75
+#define BTTV_BOARD_LMLBT4                  0x76
+#define BTTV_BOARD_TEKRAM_M205             0x77
+#define BTTV_BOARD_CONTVFMI                0x78
+#define BTTV_BOARD_PICOLO_TETRA_CHIP       0x79
+#define BTTV_BOARD_SPIRIT_TV               0x7a
+#define BTTV_BOARD_AVDVBT_771              0x7b
+#define BTTV_BOARD_AVDVBT_761              0x7c
+#define BTTV_BOARD_MATRIX_VISIONSQ         0x7d
+#define BTTV_BOARD_MATRIX_VISIONSLC        0x7e
+#define BTTV_BOARD_APAC_VIEWCOMP           0x7f
+#define BTTV_BOARD_DVICO_DVBT_LITE         0x80
+#define BTTV_BOARD_VGEAR_MYVCD             0x81
+#define BTTV_BOARD_SUPER_TV                0x82
+#define BTTV_BOARD_TIBET_CS16              0x83
+#define BTTV_BOARD_KODICOM_4400R           0x84
+#define BTTV_BOARD_KODICOM_4400R_SL        0x85
+#define BTTV_BOARD_ADLINK_RTV24            0x86
+#define BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE 0x87
+#define BTTV_BOARD_ACORP_Y878F             0x88
+#define BTTV_BOARD_CONCEPTRONIC_CTVFMI2    0x89
+#define BTTV_BOARD_PV_BT878P_2E            0x8a
+#define BTTV_BOARD_PV_M4900                0x8b
+#define BTTV_BOARD_OSPREY440               0x8c
+#define BTTV_BOARD_ASOUND_SKYEYE           0x8d
 
 /* i2c address list */
 #define I2C_TSA5522        0xc2
@@ -177,7 +202,7 @@ struct bttv_core {
         struct list_head     subs;     /* struct bttv_sub_device */
 
         /* device config */
-        unsigned int         nr;       /* dev nr (for printk("bttv%d: ...");  */
+        unsigned int         nr;       /* dev nr (for printk("bttv%d: ...");  */
         unsigned int         type;     /* card type (pointer into tvcards[])  */
         char                 name[8];  /* dev name */
 };
@@ -186,16 +211,16 @@ struct bttv;
 
 struct tvcard
 {
-        char *name;
-        unsigned int video_inputs;
-        unsigned int audio_inputs;
-        unsigned int tuner;
-        unsigned int svhs;
+        char *name;
+        unsigned int video_inputs;
+        unsigned int audio_inputs;
+        unsigned int tuner;
+        unsigned int svhs;
         unsigned int digital_mode; // DIGITAL_MODE_CAMERA or DIGITAL_MODE_VIDEO
-        u32 gpiomask;
-        u32 muxsel[16];
-        u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */
-        u32 gpiomask2;   /* GPIO MUX mask */
+        u32 gpiomask;
+        u32 muxsel[16];
+        u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */
+        u32 gpiomask2;   /* GPIO MUX mask */
 
         /* i2c audio flags */
         unsigned int no_msp34xx:1;
@@ -218,6 +243,7 @@ struct tvcard
 
         unsigned int tuner_type;
         unsigned int tuner_addr;
+        unsigned int radio_addr;
 
         unsigned int has_radio;
         void (*audio_hook)(struct bttv *btv, struct video_audio *v, int set);
@@ -246,7 +272,7 @@ extern int bttv_handle_chipset(struct bttv *btv);
    interface below for new code */
 
 /* returns card type + card ID (for bt878-based ones)
-   for possible values see lines below beginning with #define BTTV_UNKNOWN
+   for possible values see lines below beginning with #define BTTV_BOARD_UNKNOWN
    returns negative value if error occurred
 */
 extern int bttv_get_cardinfo(unsigned int card, int *type,
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index e0e7c7a84bc5..386f546f7d11 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -77,14 +77,14 @@
 struct bttv_tvnorm {
         int   v4l2_id;
         char  *name;
-        u32   Fsc;
-        u16   swidth, sheight; /* scaled standard width, height */
+        u32   Fsc;
+        u16   swidth, sheight; /* scaled standard width, height */
         u16   totalwidth;
         u8    adelay, bdelay, iform;
         u32   scaledtwidth;
         u16   hdelayx1, hactivex1;
         u16   vdelay;
-        u8    vbipack;
+        u8    vbipack;
         u16   vtotal;
         int   sram;
 };
@@ -267,8 +267,8 @@ struct bttv {
 
         /* card configuration info */
         unsigned int cardid;   /* pci subsystem id (bt878 based ones) */
-        unsigned int tuner_type;  /* tuner chip type */
-        unsigned int pinnacle_id;
+        unsigned int tuner_type;  /* tuner chip type */
+        unsigned int pinnacle_id;
         unsigned int svhs;
         struct bttv_pll_info pll;
         int triton1;
@@ -301,9 +301,9 @@ struct bttv {
 
         /* locking */
         spinlock_t s_lock;
-        struct semaphore lock;
+        struct semaphore lock;
         int resources;
-        struct semaphore reslock;
+        struct semaphore reslock;
 #ifdef VIDIOC_G_PRIORITY
         struct v4l2_prio_state prio;
 #endif
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
new file mode 100644
index 000000000000..780b352ec119
--- /dev/null
+++ b/drivers/media/video/cs53l32a.c
@@ -0,0 +1,240 @@
+/*
+ * cs53l32a (Adaptec AVC-2010 and AVC-2410) i2c ivtv driver.
+ * Copyright (C) 2005  Martin Vaughan
+ *
+ * Audio source switching for Adaptec AVC-2410 added by Trev Jackson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <asm/uaccess.h>
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
+#include <linux/videodev.h>
+#include <media/audiochip.h>
+
+MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
+MODULE_AUTHOR("Martin Vaughan");
+MODULE_LICENSE("GPL");
+
+static int debug = 0;
+
+module_param(debug, bool, 0644);
+
+MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
+
+#define cs53l32a_dbg(fmt, arg...) \
+        do { \
+                if (debug) \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                               i2c_adapter_id(client->adapter), client->addr , ## arg); \
+        } while (0)
+
+#define cs53l32a_err(fmt, arg...) do { \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+#define cs53l32a_info(fmt, arg...) do { \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+
+static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
+
+
+I2C_CLIENT_INSMOD;
+
+/* ----------------------------------------------------------------------- */
+
+static int cs53l32a_write(struct i2c_client *client, u8 reg, u8 value)
+{
+        return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+static int cs53l32a_read(struct i2c_client *client, u8 reg)
+{
+        return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int cs53l32a_command(struct i2c_client *client, unsigned int cmd,
+                            void *arg)
+{
+        int *input = arg;
+
+        switch (cmd) {
+        case AUDC_SET_INPUT:
+                switch (*input) {
+                case AUDIO_TUNER:
+                        cs53l32a_write(client, 0x01, 0x01);
+                        break;
+                case AUDIO_EXTERN:
+                        cs53l32a_write(client, 0x01, 0x21);
+                        break;
+                case AUDIO_MUTE:
+                        cs53l32a_write(client, 0x03, 0xF0);
+                        break;
+                case AUDIO_UNMUTE:
+                        cs53l32a_write(client, 0x03, 0x30);
+                        break;
+                default:
+                        cs53l32a_err("Invalid input %d.\n", *input);
+                        return -EINVAL;
+                }
+                break;
+
+        case VIDIOC_S_CTRL:
+                {
+                        struct v4l2_control *ctrl = arg;
+
+                        if (ctrl->id != V4L2_CID_AUDIO_VOLUME)
+                                return -EINVAL;
+                        if (ctrl->value > 12 || ctrl->value < -90)
+                                return -EINVAL;
+                        cs53l32a_write(client, 0x04, (u8) ctrl->value);
+                        cs53l32a_write(client, 0x05, (u8) ctrl->value);
+                        break;
+                }
+
+        case VIDIOC_LOG_STATUS:
+                {
+                        u8 v = cs53l32a_read(client, 0x01);
+                        u8 m = cs53l32a_read(client, 0x03);
+
+                        cs53l32a_info("Input: %s%s\n",
+                                      v == 0x21 ? "external line in" : "tuner",
+                                      (m & 0xC0) ? " (muted)" : "");
+                        break;
+                }
+
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+
+/* i2c implementation */
+
+/*
+ * Generic i2c probe
+ * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
+ */
+
+static struct i2c_driver i2c_driver;
+
+static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        int i;
+
+        /* Check if the adapter supports the needed features */
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                return 0;
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (client == 0)
+                return -ENOMEM;
+
+        memset(client, 0, sizeof(struct i2c_client));
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &i2c_driver;
+        client->flags = I2C_CLIENT_ALLOW_USE;
+        snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
+
+        cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
+
+        for (i = 1; i <= 7; i++) {
+                u8 v = cs53l32a_read(client, i);
+
+                cs53l32a_dbg("Read Reg %d %02x\n", i, v);
+        }
+
+        /* Set cs53l32a internal register for Adaptec 2010/2410 setup */
+
+        cs53l32a_write(client, 0x01, (u8) 0x21);
+        cs53l32a_write(client, 0x02, (u8) 0x29);
+        cs53l32a_write(client, 0x03, (u8) 0x30);
+        cs53l32a_write(client, 0x04, (u8) 0x00);
+        cs53l32a_write(client, 0x05, (u8) 0x00);
+        cs53l32a_write(client, 0x06, (u8) 0x00);
+        cs53l32a_write(client, 0x07, (u8) 0x00);
+
+        /* Display results, should be 0x21,0x29,0x30,0x00,0x00,0x00,0x00 */
+
+        for (i = 1; i <= 7; i++) {
+                u8 v = cs53l32a_read(client, i);
+
+                cs53l32a_dbg("Read Reg %d %02x\n", i, v);
+        }
+
+        i2c_attach_client(client);
+
+        return 0;
+}
+
+static int cs53l32a_probe(struct i2c_adapter *adapter)
+{
+#ifdef I2C_CLASS_TV_ANALOG
+        if (adapter->class & I2C_CLASS_TV_ANALOG)
+#else
+        if (adapter->id == I2C_HW_B_BT848)
+#endif
+                return i2c_probe(adapter, &addr_data, cs53l32a_attach);
+        return 0;
+}
+
+static int cs53l32a_detach(struct i2c_client *client)
+{
+        int err;
+
+        err = i2c_detach_client(client);
+        if (err) {
+                return err;
+        }
+        kfree(client);
+
+        return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+
+/* i2c implementation */
+static struct i2c_driver i2c_driver = {
+        .name = "cs53l32a",
+        .id = I2C_DRIVERID_CS53L32A,
+        .flags = I2C_DF_NOTIFY,
+        .attach_adapter = cs53l32a_probe,
+        .detach_client = cs53l32a_detach,
+        .command = cs53l32a_command,
+        .owner = THIS_MODULE,
+};
+
+
+static int __init cs53l32a_init_module(void)
+{
+        return i2c_add_driver(&i2c_driver);
+}
+
+static void __exit cs53l32a_cleanup_module(void)
+{
+        i2c_del_driver(&i2c_driver);
+}
+
+module_init(cs53l32a_init_module);
+module_exit(cs53l32a_cleanup_module);
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
new file mode 100644
index 000000000000..41818b6205b3
--- /dev/null
+++ b/drivers/media/video/cx88/Kconfig
@@ -0,0 +1,91 @@
+config VIDEO_CX88
+        tristate "Conexant 2388x (bt878 successor) support"
+        depends on VIDEO_DEV && PCI && I2C
+        select I2C_ALGOBIT
+        select FW_LOADER
+        select VIDEO_BTCX
+        select VIDEO_BUF
+        select VIDEO_TUNER
+        select VIDEO_TVEEPROM
+        select VIDEO_IR
+        ---help---
+          This is a video4linux driver for Conexant 2388x based
+          TV cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cx8800
+
+config VIDEO_CX88_DVB
+        tristate "DVB/ATSC Support for cx2388x based TV cards"
+        depends on VIDEO_CX88 && DVB_CORE
+        select VIDEO_BUF_DVB
+        ---help---
+          This adds support for DVB/ATSC cards based on the
+          Connexant 2388x chip.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cx88-dvb.
+
+          You must also select one or more DVB/ATSC demodulators.
+          If you are unsure which you need, choose all of them.
+
+config VIDEO_CX88_DVB_ALL_FRONTENDS
+        bool "Build all supported frontends for cx2388x based TV cards"
+        default y
+        depends on VIDEO_CX88_DVB
+        select DVB_MT352
+        select DVB_OR51132
+        select DVB_CX22702
+        select DVB_LGDT330X
+        select DVB_NXT200X
+        ---help---
+          This builds cx88-dvb with all currently supported frontend
+          demodulators.  If you wish to tweak your configuration, and
+          only include support for the hardware that you need, choose N here.
+
+          If you are unsure, choose Y.
+
+config VIDEO_CX88_DVB_MT352
+        tristate "Zarlink MT352 DVB-T Support"
+        default m
+        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
+        select DVB_MT352
+        ---help---
+          This adds DVB-T support for cards based on the
+          Connexant 2388x chip and the MT352 demodulator.
+
+config VIDEO_CX88_DVB_OR51132
+        tristate "OR51132 ATSC Support"
+        default m
+        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
+        select DVB_OR51132
+        ---help---
+          This adds ATSC 8VSB and QAM64/256 support for cards based on the
+          Connexant 2388x chip and the OR51132 demodulator.
+
+config VIDEO_CX88_DVB_CX22702
+        tristate "Conexant CX22702 DVB-T Support"
+        default m
+        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
+        select DVB_CX22702
+        ---help---
+          This adds DVB-T support for cards based on the
+          Connexant 2388x chip and the CX22702 demodulator.
+
+config VIDEO_CX88_DVB_LGDT330X
+        tristate "LG Electronics DT3302/DT3303 ATSC Support"
+        default m
+        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
+        select DVB_LGDT330X
+        ---help---
+          This adds ATSC 8VSB and QAM64/256 support for cards based on the
+          Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator.
+
+config VIDEO_CX88_DVB_NXT200X
+        tristate "NXT2002/NXT2004 ATSC Support"
+        default m
+        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
+        select DVB_NXT200X
+        ---help---
+          This adds ATSC 8VSB and QAM64/256 support for cards based on the
+          Connexant 2388x chip and the NXT2002/NXT2004 demodulator.
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index 107e48645e3a..0df40b773454 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -9,6 +9,9 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
 EXTRA_CFLAGS += -I$(src)/..
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+ifneq ($(CONFIG_VIDEO_BUF_DVB),n)
+ EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
+endif
 ifneq ($(CONFIG_DVB_CX22702),n)
  EXTRA_CFLAGS += -DHAVE_CX22702=1
 endif
@@ -21,3 +24,6 @@ endif
 ifneq ($(CONFIG_DVB_MT352),n)
  EXTRA_CFLAGS += -DHAVE_MT352=1
 endif
+ifneq ($(CONFIG_DVB_NXT200X),n)
+ EXTRA_CFLAGS += -DHAVE_NXT200X=1
+endif
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 0c0c59e94774..4ae3f78cccf2 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -38,7 +38,7 @@ MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
 
-static unsigned int mpegbufs = 8;
+static unsigned int mpegbufs = 32;
 module_param(mpegbufs,int,0644);
 MODULE_PARM_DESC(mpegbufs,"number of mpeg buffers, range 2-32");
 
@@ -436,7 +436,7 @@ static int memory_write(struct cx88_core *core, u32 address, u32 value)
 
 static int memory_read(struct cx88_core *core, u32 address, u32 *value)
 {
-        int retval;
+        int retval;
         u32 val;
 
         /* Warning: address is dword address (4 bytes) */
@@ -605,11 +605,11 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
         u32 *dataptr;
 
         retval  = register_write(dev->core, IVTV_REG_VPU, 0xFFFFFFED);
-        retval |= register_write(dev->core, IVTV_REG_HW_BLOCKS, IVTV_CMD_HW_BLOCKS_RST);
-        retval |= register_write(dev->core, IVTV_REG_ENC_SDRAM_REFRESH, 0x80000640);
-        retval |= register_write(dev->core, IVTV_REG_ENC_SDRAM_PRECHARGE, 0x1A);
+        retval |= register_write(dev->core, IVTV_REG_HW_BLOCKS, IVTV_CMD_HW_BLOCKS_RST);
+        retval |= register_write(dev->core, IVTV_REG_ENC_SDRAM_REFRESH, 0x80000640);
+        retval |= register_write(dev->core, IVTV_REG_ENC_SDRAM_PRECHARGE, 0x1A);
         msleep(1);
-        retval |= register_write(dev->core, IVTV_REG_APU, 0);
+        retval |= register_write(dev->core, IVTV_REG_APU, 0);
 
         if (retval < 0)
                 dprintk(0, "Error with register_write\n");
@@ -657,13 +657,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
         release_firmware(firmware);
         dprintk(0, "Firmware upload successful.\n");
 
-        retval |= register_write(dev->core, IVTV_REG_HW_BLOCKS, IVTV_CMD_HW_BLOCKS_RST);
-        retval |= register_read(dev->core, IVTV_REG_SPU, &value);
-        retval |= register_write(dev->core, IVTV_REG_SPU, value & 0xFFFFFFFE);
+        retval |= register_write(dev->core, IVTV_REG_HW_BLOCKS, IVTV_CMD_HW_BLOCKS_RST);
+        retval |= register_read(dev->core, IVTV_REG_SPU, &value);
+        retval |= register_write(dev->core, IVTV_REG_SPU, value & 0xFFFFFFFE);
         msleep(1);
 
         retval |= register_read(dev->core, IVTV_REG_VPU, &value);
-        retval |= register_write(dev->core, IVTV_REG_VPU, value & 0xFFFFFFE8);
+        retval |= register_write(dev->core, IVTV_REG_VPU, value & 0xFFFFFFE8);
 
         if (retval < 0)
                 dprintk(0, "Error with register_write\n");
@@ -683,84 +683,560 @@ DB* DVD | MPEG2 | 720x576PAL | CBR     | 600 :Good    | 6000 Kbps  | 25fps   | M
 =================================================================================================================
 *DB: "DirectBurn"
 */
-static void blackbird_codec_settings(struct cx8802_dev *dev)
+
+static struct blackbird_dnr default_dnr_params = {
+        .mode     = BLACKBIRD_DNR_BITS_MANUAL,
+        .type     = BLACKBIRD_MEDIAN_FILTER_DISABLED,
+        .spatial  = 0,
+        .temporal = 0
+};
+static struct v4l2_mpeg_compression default_mpeg_params = {
+        .st_type          = V4L2_MPEG_PS_2,
+        .st_bitrate       = {
+                .mode     = V4L2_BITRATE_CBR,
+                .min      = 0,
+                .target   = 0,
+                .max      = 0
+        },
+        .ts_pid_pmt       = 16,
+        .ts_pid_audio     = 260,
+        .ts_pid_video     = 256,
+        .ts_pid_pcr       = 259,
+        .ps_size          = 0,
+        .au_type          = V4L2_MPEG_AU_2_II,
+        .au_bitrate       = {
+                .mode     = V4L2_BITRATE_CBR,
+                .min      = 224,
+                .target   = 224,
+                .max      = 224
+        },
+        .au_sample_rate    = 44100,
+        .au_pesid          = 0,
+        .vi_type           = V4L2_MPEG_VI_2,
+        .vi_aspect_ratio   = V4L2_MPEG_ASPECT_4_3,
+        .vi_bitrate        = {
+                .mode      = V4L2_BITRATE_CBR,
+                .min       = 4000,
+                .target    = 4500,
+                .max       = 6000
+        },
+        .vi_frame_rate     = 25,
+        .vi_frames_per_gop = 15,
+        .vi_bframes_count  = 2,
+        .vi_pesid          = 0,
+        .closed_gops       = 0,
+        .pulldown          = 0
+};
+
+static enum blackbird_stream_type mpeg_stream_types[] = {
+        [V4L2_MPEG_SS_1]   = BLACKBIRD_STREAM_MPEG1,
+        [V4L2_MPEG_PS_2]   = BLACKBIRD_STREAM_PROGRAM,
+        [V4L2_MPEG_TS_2]   = BLACKBIRD_STREAM_TRANSPORT,
+        [V4L2_MPEG_PS_DVD] = BLACKBIRD_STREAM_DVD,
+};
+static enum blackbird_aspect_ratio mpeg_stream_ratios[] = {
+        [V4L2_MPEG_ASPECT_SQUARE] = BLACKBIRD_ASPECT_RATIO_1_1_SQUARE,
+        [V4L2_MPEG_ASPECT_4_3]    = BLACKBIRD_ASPECT_RATIO_4_3,
+        [V4L2_MPEG_ASPECT_16_9]   = BLACKBIRD_ASPECT_RATIO_16_9,
+        [V4L2_MPEG_ASPECT_1_221]  = BLACKBIRD_ASPECT_RATIO_221_100,
+};
+static enum blackbird_video_bitrate_type mpeg_video_bitrates[] = {
+        [V4L2_BITRATE_NONE] = BLACKBIRD_VIDEO_CBR,
+        [V4L2_BITRATE_CBR]  = BLACKBIRD_VIDEO_CBR,
+        [V4L2_BITRATE_VBR]  = BLACKBIRD_VIDEO_VBR,
+};
+/* find the best layer I/II bitrate to fit a given numeric value */
+struct bitrate_bits {
+        u32 bits; /* layer bits for the best fit */
+        u32 rate; /* actual numeric value for the layer best fit */
+};
+struct bitrate_approximation {
+        u32                 target;   /* numeric value of the rate we want */
+        struct bitrate_bits layer[2];
+};
+static struct bitrate_approximation mpeg_audio_bitrates[] = {
+        /* target  layer[0].bits           layer[0].rate       layer[1].bits           layer[1].rate */
+        {   0, { {                                0,   0, }, {                                0,   0, }, }, },
+        {  32, { { BLACKBIRD_AUDIO_BITS_LAYER_1_32 ,  32, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_32 ,  32, }, }, },
+        {  48, { { BLACKBIRD_AUDIO_BITS_LAYER_1_64 ,  64, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_48 ,  48, }, }, },
+        {  56, { { BLACKBIRD_AUDIO_BITS_LAYER_1_64 ,  64, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_56 ,  56, }, }, },
+        {  64, { { BLACKBIRD_AUDIO_BITS_LAYER_1_64 ,  64, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_64 ,  64, }, }, },
+        {  80, { { BLACKBIRD_AUDIO_BITS_LAYER_1_96 ,  96, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_80 ,  80, }, }, },
+        {  96, { { BLACKBIRD_AUDIO_BITS_LAYER_1_96 ,  96, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_96 ,  96, }, }, },
+        { 112, { { BLACKBIRD_AUDIO_BITS_LAYER_1_128, 128, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_112, 112, }, }, },
+        { 128, { { BLACKBIRD_AUDIO_BITS_LAYER_1_128, 128, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_128, 128, }, }, },
+        { 160, { { BLACKBIRD_AUDIO_BITS_LAYER_1_160, 160, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_160, 160, }, }, },
+        { 192, { { BLACKBIRD_AUDIO_BITS_LAYER_1_192, 192, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_192, 192, }, }, },
+        { 224, { { BLACKBIRD_AUDIO_BITS_LAYER_1_224, 224, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_224, 224, }, }, },
+        { 256, { { BLACKBIRD_AUDIO_BITS_LAYER_1_256, 256, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_256, 256, }, }, },
+        { 288, { { BLACKBIRD_AUDIO_BITS_LAYER_1_288, 288, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_320, 320, }, }, },
+        { 320, { { BLACKBIRD_AUDIO_BITS_LAYER_1_320, 320, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_320, 320, }, }, },
+        { 352, { { BLACKBIRD_AUDIO_BITS_LAYER_1_352, 352, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },
+        { 384, { { BLACKBIRD_AUDIO_BITS_LAYER_1_384, 384, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },
+        { 416, { { BLACKBIRD_AUDIO_BITS_LAYER_1_416, 416, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },
+        { 448, { { BLACKBIRD_AUDIO_BITS_LAYER_1_448, 448, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },
+};
+static const int BITRATES_SIZE = ARRAY_SIZE(mpeg_audio_bitrates);
+
+static void blackbird_set_default_params(struct cx8802_dev *dev)
 {
-        int bitrate_mode = 1;
-        int bitrate = 7500000;
-        int bitrate_peak = 7500000;
-        bitrate_mode = BLACKBIRD_VIDEO_CBR;
-        bitrate = 4000*1024;
-        bitrate_peak = 4000*1024;
+        struct v4l2_mpeg_compression *params = &dev->params;
+        u32 au_params;
 
         /* assign stream type */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0, BLACKBIRD_STREAM_PROGRAM);
-
-        /* assign output port */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_OUTPUT_PORT, 1, 0, BLACKBIRD_OUTPUT_PORT_STREAMING); /* Host */
+        if( params->st_type >= ARRAY_SIZE(mpeg_stream_types) )
+                params->st_type = V4L2_MPEG_PS_2;
+        if( params->st_type == V4L2_MPEG_SS_1 )
+                params->vi_type = V4L2_MPEG_VI_1;
+        else
+                params->vi_type = V4L2_MPEG_VI_2;
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0, mpeg_stream_types[params->st_type]);
 
         /* assign framerate */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_PAL_25);
-
-        /* assign frame size */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_RESOLUTION, 2, 0,
-                          dev->height, dev->width);
+        if( params->vi_frame_rate <= 25 )
+        {
+                params->vi_frame_rate = 25;
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_PAL_25);
+        }
+        else
+        {
+                params->vi_frame_rate = 30;
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_NTSC_30);
+        }
 
         /* assign aspect ratio */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_ASPECT_RATIO, 1, 0, BLACKBIRD_ASPECT_RATIO_4_3);
-
-        /* assign bitrates */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_VIDEO_BITRATE, 5, 0,
-                         bitrate_mode,         /* mode */
-                         bitrate,              /* bps */
-                         bitrate_peak / BLACKBIRD_PEAK_RATE_DIVISOR,   /* peak/400 */
-                         BLACKBIRD_MUX_RATE_DEFAULT /*, 0x70*/);             /* encoding buffer, ckennedy */
+        if( params->vi_aspect_ratio >= ARRAY_SIZE(mpeg_stream_ratios) )
+                params->vi_aspect_ratio = V4L2_MPEG_ASPECT_4_3;
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_ASPECT_RATIO, 1, 0, mpeg_stream_ratios[params->vi_aspect_ratio]);
 
         /* assign gop properties */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, 15, 3);
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, params->vi_frames_per_gop, params->vi_bframes_count+1);
+
+        /* assign gop closure */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0, params->closed_gops);
 
         /* assign 3 2 pulldown */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0, BLACKBIRD_3_2_PULLDOWN_DISABLED);
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0, params->pulldown);
+
+        /* make sure the params are within bounds */
+        if( params->st_bitrate.mode >= ARRAY_SIZE(mpeg_video_bitrates) )
+                params->vi_bitrate.mode = V4L2_BITRATE_NONE;
+        if( params->vi_bitrate.mode >= ARRAY_SIZE(mpeg_video_bitrates) )
+                params->vi_bitrate.mode = V4L2_BITRATE_NONE;
+        if( params->au_bitrate.mode >= ARRAY_SIZE(mpeg_video_bitrates) )
+                params->au_bitrate.mode = V4L2_BITRATE_NONE;
 
         /* assign audio properties */
         /* note: it's not necessary to set the samplerate, the mpeg encoder seems to autodetect/adjust */
-        /* blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0, (2<<2) | (8<<4));
-           blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0, 0 | (2 << 2) | (14 << 4)); */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_AUDIO_PARAMS, 1, 0,
-                        BLACKBIRD_AUDIO_BITS_44100HZ |
-                        BLACKBIRD_AUDIO_BITS_LAYER_2 |
-                        BLACKBIRD_AUDIO_BITS_LAYER_2_224 |
-                        BLACKBIRD_AUDIO_BITS_STEREO |
+        au_params = BLACKBIRD_AUDIO_BITS_STEREO |
                         /* BLACKBIRD_AUDIO_BITS_BOUND_4 | */
                         BLACKBIRD_AUDIO_BITS_EMPHASIS_NONE |
                         BLACKBIRD_AUDIO_BITS_CRC_OFF |
                         BLACKBIRD_AUDIO_BITS_COPYRIGHT_OFF |
-                        BLACKBIRD_AUDIO_BITS_COPY
-                );
+                        BLACKBIRD_AUDIO_BITS_COPY |
+                        0;
+        if( params->au_sample_rate <= 32000 )
+        {
+                params->au_sample_rate = 32000;
+                au_params |= BLACKBIRD_AUDIO_BITS_32000HZ;
+        }
+        else if( params->au_sample_rate <= 44100 )
+        {
+                params->au_sample_rate = 44100;
+                au_params |= BLACKBIRD_AUDIO_BITS_44100HZ;
+        }
+        else
+        {
+                params->au_sample_rate = 48000;
+                au_params |= BLACKBIRD_AUDIO_BITS_48000HZ;
+        }
+        if( params->au_type == V4L2_MPEG_AU_2_I )
+        {
+                au_params |= BLACKBIRD_AUDIO_BITS_LAYER_1;
+        }
+        else
+        {
+                /* TODO: try to handle the other formats more gracefully */
+                params->au_type = V4L2_MPEG_AU_2_II;
+                au_params |= BLACKBIRD_AUDIO_BITS_LAYER_2;
+        }
+        if( params->au_bitrate.mode )
+        {
+                int layer;
+
+                if( params->au_bitrate.mode == V4L2_BITRATE_CBR )
+                        params->au_bitrate.max = params->vi_bitrate.target;
+                else
+                        params->au_bitrate.target = params->vi_bitrate.max;
+
+                layer = params->au_type;
+                if( params->au_bitrate.target == 0 )
+                {
+                        /* TODO: use the minimum possible bitrate instead of 0 ? */
+                        au_params |= 0;
+                }
+                else if( params->au_bitrate.target >=
+                         mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate )
+                {
+                        /* clamp the bitrate to the max supported by the standard */
+                        params->au_bitrate.target = mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate;
+                        params->au_bitrate.max = params->au_bitrate.target;
+                        au_params |= mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].bits;
+                }
+                else
+                {
+                        /* round up to the nearest supported bitrate */
+                        int i;
+                        for(i = 1; i < BITRATES_SIZE; i++)
+                        {
+                                if( params->au_bitrate.target > mpeg_audio_bitrates[i-1].layer[layer].rate &&
+                                    params->au_bitrate.target <= mpeg_audio_bitrates[i].layer[layer].rate )
+                                {
+                                        params->au_bitrate.target = mpeg_audio_bitrates[i].layer[layer].rate;
+                                        params->au_bitrate.max = params->au_bitrate.target;
+                                        au_params |= mpeg_audio_bitrates[i].layer[layer].bits;
+                                        break;
+                                }
+                        }
+                }
+        }
+        else
+        {
+                /* TODO: ??? */
+                params->au_bitrate.target = params->au_bitrate.max = 0;
+                au_params |= 0;
+        }
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_AUDIO_PARAMS, 1, 0, au_params );
+
+        /* assign bitrates */
+        if( params->vi_bitrate.mode )
+        {
+                /* bitrate is set, let's figure out the cbr/vbr mess */
+                if( params->vi_bitrate.max < params->vi_bitrate.target )
+                {
+                        if( params->vi_bitrate.mode == V4L2_BITRATE_CBR )
+                                params->vi_bitrate.max = params->vi_bitrate.target;
+                        else
+                                params->vi_bitrate.target = params->vi_bitrate.max;
+                }
+        }
+        else
+        {
+                if( params->st_bitrate.max < params->st_bitrate.target )
+                {
+                        if( params->st_bitrate.mode == V4L2_BITRATE_VBR )
+                                params->st_bitrate.target = params->st_bitrate.max;
+                        else
+                                params->st_bitrate.max = params->st_bitrate.target;
+                }
+                /* calculate vi_bitrate = st_bitrate - au_bitrate */
+                params->vi_bitrate.max = params->st_bitrate.max - params->au_bitrate.max;
+                params->vi_bitrate.target = params->st_bitrate.target - params->au_bitrate.target;
+        }
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_VIDEO_BITRATE, 4, 0,
+                                mpeg_video_bitrates[params->vi_bitrate.mode],
+                                params->vi_bitrate.target * 1000, /* kbps -> bps */
+                                params->vi_bitrate.max * 1000 / BLACKBIRD_PEAK_RATE_DIVISOR, /* peak/400 */
+                                BLACKBIRD_MUX_RATE_DEFAULT /*, 0x70*/); /* encoding buffer, ckennedy */
+
+        /* TODO: implement the stream ID stuff:
+                ts_pid_pmt, ts_pid_audio, ts_pid_video, ts_pid_pcr,
+                ps_size, au_pesid, vi_pesid
+        */
+}
+#define CHECK_PARAM( name ) ( dev->params.name != params->name )
+#define IF_PARAM( name ) if( CHECK_PARAM( name ) )
+#define UPDATE_PARAM( name ) dev->params.name = params->name
+void blackbird_set_params(struct cx8802_dev *dev, struct v4l2_mpeg_compression *params)
+{
+        u32 au_params;
+
+        /* assign stream type */
+        if( params->st_type >= ARRAY_SIZE(mpeg_stream_types) )
+                params->st_type = V4L2_MPEG_PS_2;
+        if( params->st_type == V4L2_MPEG_SS_1 )
+                params->vi_type = V4L2_MPEG_VI_1;
+        else
+                params->vi_type = V4L2_MPEG_VI_2;
+        if( CHECK_PARAM( st_type ) || CHECK_PARAM( vi_type ) )
+        {
+                UPDATE_PARAM( st_type );
+                UPDATE_PARAM( vi_type );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0, mpeg_stream_types[params->st_type]);
+        }
+
+        /* assign framerate */
+        if( params->vi_frame_rate <= 25 )
+                params->vi_frame_rate = 25;
+        else
+                params->vi_frame_rate = 30;
+        IF_PARAM( vi_frame_rate )
+        {
+                UPDATE_PARAM( vi_frame_rate );
+                if( params->vi_frame_rate == 25 )
+                        blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_PAL_25);
+                else
+                        blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_NTSC_30);
+        }
+
+        /* assign aspect ratio */
+        if( params->vi_aspect_ratio >= ARRAY_SIZE(mpeg_stream_ratios) )
+                params->vi_aspect_ratio = V4L2_MPEG_ASPECT_4_3;
+        IF_PARAM( vi_aspect_ratio )
+        {
+                UPDATE_PARAM( vi_aspect_ratio );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_ASPECT_RATIO, 1, 0, mpeg_stream_ratios[params->vi_aspect_ratio]);
+        }
+
+        /* assign gop properties */
+        if( CHECK_PARAM( vi_frames_per_gop ) || CHECK_PARAM( vi_bframes_count ) )
+        {
+                UPDATE_PARAM( vi_frames_per_gop );
+                UPDATE_PARAM( vi_bframes_count );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, params->vi_frames_per_gop, params->vi_bframes_count+1);
+        }
 
         /* assign gop closure */
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0, BLACKBIRD_GOP_CLOSURE_OFF);
+        IF_PARAM( closed_gops )
+        {
+                UPDATE_PARAM( closed_gops );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0, params->closed_gops);
+        }
+
+        /* assign 3 2 pulldown */
+        IF_PARAM( pulldown )
+        {
+                UPDATE_PARAM( pulldown );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0, params->pulldown);
+        }
+
+        /* make sure the params are within bounds */
+        if( params->st_bitrate.mode >= ARRAY_SIZE(mpeg_video_bitrates) )
+                params->vi_bitrate.mode = V4L2_BITRATE_NONE;
+        if( params->vi_bitrate.mode >= ARRAY_SIZE(mpeg_video_bitrates) )
+                params->vi_bitrate.mode = V4L2_BITRATE_NONE;
+        if( params->au_bitrate.mode >= ARRAY_SIZE(mpeg_video_bitrates) )
+                params->au_bitrate.mode = V4L2_BITRATE_NONE;
+
+        /* assign audio properties */
+        /* note: it's not necessary to set the samplerate, the mpeg encoder seems to autodetect/adjust */
+        au_params = BLACKBIRD_AUDIO_BITS_STEREO |
+                        /* BLACKBIRD_AUDIO_BITS_BOUND_4 | */
+        BLACKBIRD_AUDIO_BITS_EMPHASIS_NONE |
+                BLACKBIRD_AUDIO_BITS_CRC_OFF |
+                BLACKBIRD_AUDIO_BITS_COPYRIGHT_OFF |
+                BLACKBIRD_AUDIO_BITS_COPY |
+                0;
+        if( params->au_sample_rate < 32000 )
+        {
+                params->au_sample_rate = 32000;
+                au_params |= BLACKBIRD_AUDIO_BITS_32000HZ;
+        }
+        else if( params->au_sample_rate < 44100 )
+        {
+                params->au_sample_rate = 44100;
+                au_params |= BLACKBIRD_AUDIO_BITS_44100HZ;
+        }
+        else
+        {
+                params->au_sample_rate = 48000;
+                au_params |= BLACKBIRD_AUDIO_BITS_48000HZ;
+        }
+        if( params->au_type == V4L2_MPEG_AU_2_I )
+        {
+                au_params |= BLACKBIRD_AUDIO_BITS_LAYER_1;
+        }
+        else
+        {
+                /* TODO: try to handle the other formats more gracefully */
+                params->au_type = V4L2_MPEG_AU_2_II;
+                au_params |= BLACKBIRD_AUDIO_BITS_LAYER_2;
+        }
+        if( params->au_bitrate.mode )
+        {
+                int layer;
+
+                if( params->au_bitrate.mode == V4L2_BITRATE_CBR )
+                        params->au_bitrate.max = params->vi_bitrate.target;
+                else
+                        params->au_bitrate.target = params->vi_bitrate.max;
+
+                layer = params->au_type;
+                if( params->au_bitrate.target == 0 )
+                {
+                        /* TODO: use the minimum possible bitrate instead of 0 ? */
+                        au_params |= 0;
+                }
+                else if( params->au_bitrate.target >=
+                         mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate )
+                {
+                        /* clamp the bitrate to the max supported by the standard */
+                        params->au_bitrate.target = mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate;
+                        params->au_bitrate.max = params->au_bitrate.target;
+                        au_params |= mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].bits;
+                }
+                else
+                {
+                        /* round up to the nearest supported bitrate */
+                        int i;
+                        for(i = 1; i < BITRATES_SIZE; i++)
+                        {
+                                if( params->au_bitrate.target > mpeg_audio_bitrates[i-1].layer[layer].rate &&
+                                    params->au_bitrate.target <= mpeg_audio_bitrates[i].layer[layer].rate )
+                                {
+                                        params->au_bitrate.target = mpeg_audio_bitrates[i].layer[layer].rate;
+                                        params->au_bitrate.max = params->au_bitrate.target;
+                                        au_params |= mpeg_audio_bitrates[i].layer[layer].bits;
+                                        break;
+                                }
+                        }
+                }
+        }
+        else
+        {
+                /* TODO: ??? */
+                params->au_bitrate.target = params->au_bitrate.max = 0;
+                au_params |= 0;
+        }
+        if( CHECK_PARAM( au_type ) || CHECK_PARAM( au_sample_rate )
+                || CHECK_PARAM( au_bitrate.mode ) || CHECK_PARAM( au_bitrate.max )
+                || CHECK_PARAM( au_bitrate.target )
+        )
+        {
+                UPDATE_PARAM( au_type );
+                UPDATE_PARAM( au_sample_rate );
+                UPDATE_PARAM( au_bitrate );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_AUDIO_PARAMS, 1, 0, au_params );
+        }
+
+        /* assign bitrates */
+        if( params->vi_bitrate.mode )
+        {
+                /* bitrate is set, let's figure out the cbr/vbr mess */
+                if( params->vi_bitrate.max < params->vi_bitrate.target )
+                {
+                        if( params->vi_bitrate.mode == V4L2_BITRATE_CBR )
+                                params->vi_bitrate.max = params->vi_bitrate.target;
+                        else
+                                params->vi_bitrate.target = params->vi_bitrate.max;
+                }
+        }
+        else
+        {
+                if( params->st_bitrate.max < params->st_bitrate.target )
+                {
+                        if( params->st_bitrate.mode == V4L2_BITRATE_VBR )
+                                params->st_bitrate.target = params->st_bitrate.max;
+                        else
+                                params->st_bitrate.max = params->st_bitrate.target;
+                }
+                /* calculate vi_bitrate = st_bitrate - au_bitrate */
+                params->vi_bitrate.max = params->st_bitrate.max - params->au_bitrate.max;
+                params->vi_bitrate.target = params->st_bitrate.target - params->au_bitrate.target;
+        }
+        UPDATE_PARAM( st_bitrate );
+        if( CHECK_PARAM( vi_bitrate.mode ) || CHECK_PARAM( vi_bitrate.max )
+                || CHECK_PARAM( vi_bitrate.target )
+        )
+        {
+                UPDATE_PARAM( vi_bitrate );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_VIDEO_BITRATE, 4, 0,
+                                mpeg_video_bitrates[params->vi_bitrate.mode],
+                                params->vi_bitrate.target * 1000, /* kbps -> bps */
+                                params->vi_bitrate.max * 1000 / BLACKBIRD_PEAK_RATE_DIVISOR, /* peak/400 */
+                                BLACKBIRD_MUX_RATE_DEFAULT /*, 0x70*/); /* encoding buffer, ckennedy */
+        }
 
+        /* TODO: implement the stream ID stuff:
+                ts_pid_pmt, ts_pid_audio, ts_pid_video, ts_pid_pcr,
+                ps_size, au_pesid, vi_pesid
+        */
+        UPDATE_PARAM( ts_pid_pmt );
+        UPDATE_PARAM( ts_pid_audio );
+        UPDATE_PARAM( ts_pid_video );
+        UPDATE_PARAM( ts_pid_pcr );
+        UPDATE_PARAM( ps_size );
+        UPDATE_PARAM( au_pesid );
+        UPDATE_PARAM( vi_pesid );
+}
 
+static void blackbird_set_default_dnr_params(struct cx8802_dev *dev)
+{
         /* assign dnr filter mode */
+        if( dev->dnr_params.mode > BLACKBIRD_DNR_BITS_AUTO )
+                dev->dnr_params.mode = BLACKBIRD_DNR_BITS_MANUAL;
+        if( dev->dnr_params.type > BLACKBIRD_MEDIAN_FILTER_DIAGONAL )
+                dev->dnr_params.type = BLACKBIRD_MEDIAN_FILTER_DISABLED;
         blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MODE, 2, 0,
-                        BLACKBIRD_DNR_BITS_MANUAL,
-                        BLACKBIRD_MEDIAN_FILTER_DISABLED
-                );
+                                dev->dnr_params.mode,
+                                dev->dnr_params.type
+                        );
 
         /* assign dnr filter props*/
-        blackbird_api_cmd(dev, BLACKBIRD_API_SET_MANUAL_DNR, 2, 0, 0, 0);
+        if( dev->dnr_params.spatial > 15 )
+                dev->dnr_params.spatial = 15;
+        if( dev->dnr_params.temporal > 31 )
+                dev->dnr_params.temporal = 31;
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_MANUAL_DNR, 2, 0,
+                                dev->dnr_params.spatial,
+                                dev->dnr_params.temporal
+                        );
+}
+#define CHECK_DNR_PARAM( name ) ( dev->dnr_params.name != dnr_params->name )
+#define UPDATE_DNR_PARAM( name ) dev->dnr_params.name = dnr_params->name
+void blackbird_set_dnr_params(struct cx8802_dev *dev, struct blackbird_dnr* dnr_params)
+{
+        /* assign dnr filter mode */
+        /* clamp values */
+        if( dnr_params->mode > BLACKBIRD_DNR_BITS_AUTO )
+                dnr_params->mode = BLACKBIRD_DNR_BITS_MANUAL;
+        if( dnr_params->type > BLACKBIRD_MEDIAN_FILTER_DIAGONAL )
+                dnr_params->type = BLACKBIRD_MEDIAN_FILTER_DISABLED;
+        /* check if the params actually changed */
+        if( CHECK_DNR_PARAM( mode ) || CHECK_DNR_PARAM( type ) )
+        {
+                UPDATE_DNR_PARAM( mode );
+                UPDATE_DNR_PARAM( type );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MODE, 2, 0, dnr_params->mode, dnr_params->type);
+        }
+
+        /* assign dnr filter props*/
+        if( dnr_params->spatial > 15 )
+                dnr_params->spatial = 15;
+        if( dnr_params->temporal > 31 )
+                dnr_params->temporal = 31;
+        if( CHECK_DNR_PARAM( spatial ) || CHECK_DNR_PARAM( temporal ) )
+        {
+                UPDATE_DNR_PARAM( spatial );
+                UPDATE_DNR_PARAM( temporal );
+                blackbird_api_cmd(dev, BLACKBIRD_API_SET_MANUAL_DNR, 2, 0, dnr_params->spatial, dnr_params->temporal);
+        }
+}
+
+static void blackbird_codec_settings(struct cx8802_dev *dev)
+{
+
+        /* assign output port */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_OUTPUT_PORT, 1, 0, BLACKBIRD_OUTPUT_PORT_STREAMING); /* Host */
+
+        /* assign frame size */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_RESOLUTION, 2, 0,
+                                dev->height, dev->width);
 
         /* assign coring levels (luma_h, luma_l, chroma_h, chroma_l) */
         blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MEDIAN, 4, 0, 0, 255, 0, 255);
 
         /* assign spatial filter type: luma_t: horiz_only, chroma_t: horiz_only */
         blackbird_api_cmd(dev, BLACKBIRD_API_SET_SPATIAL_FILTER, 2, 0,
-                        BLACKBIRD_SPATIAL_FILTER_LUMA_1D_HORIZ,
-                        BLACKBIRD_SPATIAL_FILTER_CHROMA_1D_HORIZ
-                );
+                                BLACKBIRD_SPATIAL_FILTER_LUMA_1D_HORIZ,
+                                BLACKBIRD_SPATIAL_FILTER_CHROMA_1D_HORIZ
+                        );
 
         /* assign frame drop rate */
         /* blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAME_DROP_RATE, 1, 0, 0); */
+
+        blackbird_set_default_params(dev);
+        blackbird_set_default_dnr_params(dev);
 }
 
 static int blackbird_initialize_codec(struct cx8802_dev *dev)
@@ -851,15 +1327,10 @@ static int bb_buf_setup(struct videobuf_queue *q,
         struct cx8802_fh *fh = q->priv_data;
 
         fh->dev->ts_packet_size  = 188 * 4; /* was: 512 */
-        fh->dev->ts_packet_count = 32; /* was: 100 */
+        fh->dev->ts_packet_count = mpegbufs; /* was: 100 */
 
         *size = fh->dev->ts_packet_size * fh->dev->ts_packet_count;
-        if (0 == *count)
-                *count = mpegbufs;
-        if (*count < 2)
-                *count = 2;
-        if (*count > 32)
-                *count = 32;
+        *count = fh->dev->ts_packet_count;
         return 0;
 }
 
@@ -868,7 +1339,7 @@ bb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                enum v4l2_field field)
 {
         struct cx8802_fh *fh = q->priv_data;
-        return cx8802_buf_prepare(fh->dev, (struct cx88_buffer*)vb);
+        return cx8802_buf_prepare(fh->dev, (struct cx88_buffer*)vb, field);
 }
 
 static void
@@ -920,8 +1391,6 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
                         V4L2_CAP_VIDEO_CAPTURE |
                         V4L2_CAP_READWRITE     |
                         V4L2_CAP_STREAMING     |
-                        V4L2_CAP_VBI_CAPTURE   |
-                        V4L2_CAP_VIDEO_OVERLAY |
                         0;
                 if (UNSET != core->tuner_type)
                         cap->capabilities |= V4L2_CAP_TUNER;
@@ -941,27 +1410,52 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
 
                 memset(f,0,sizeof(*f));
                 f->index = index;
-                strlcpy(f->description, "MPEG TS", sizeof(f->description));
+                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:
-        case VIDIOC_S_FMT:
-        case VIDIOC_TRY_FMT:
         {
-                /* FIXME -- quick'n'dirty for exactly one size ... */
                 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.field        = V4L2_FIELD_NONE;
                 f->fmt.pix.bytesperline = 0;
-                f->fmt.pix.sizeimage    = 188 * 4 * 1024; /* 1024 * 512 */ /* FIXME: BUFFER_SIZE */;
+                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;
         }
 
@@ -985,6 +1479,22 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_STREAMOFF:
                 return videobuf_streamoff(&fh->mpegq);
 
+        /* --- mpeg compression -------------------------------------- */
+        case VIDIOC_G_MPEGCOMP:
+        {
+                struct v4l2_mpeg_compression *f = arg;
+
+                memcpy(f,&dev->params,sizeof(*f));
+                return 0;
+        }
+        case VIDIOC_S_MPEGCOMP:
+        {
+                struct v4l2_mpeg_compression *f = arg;
+
+                blackbird_set_params(dev, f);
+                return 0;
+        }
+
         default:
                 return cx88_do_ioctl( inode, file, 0, dev->core, cmd, arg, cx88_ioctl_hook );
         }
@@ -1034,16 +1544,17 @@ static int mpeg_open(struct inode *inode, struct file *file)
         file->private_data = fh;
         fh->dev      = dev;
 
-        /* FIXME: locking against other video device */
-        cx88_set_scale(dev->core, dev->width, dev->height,
-                       V4L2_FIELD_INTERLACED);
-
         videobuf_queue_init(&fh->mpegq, &blackbird_qops,
                             dev->pci, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                            V4L2_FIELD_TOP,
+                            V4L2_FIELD_INTERLACED,
                             sizeof(struct cx88_buffer),
                             fh);
+
+        /* FIXME: locking against other video device */
+        cx88_set_scale(dev->core, dev->width, dev->height,
+                        fh->mpegq.field);
+
         return 0;
 }
 
@@ -1173,6 +1684,8 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
         dev->core = core;
         dev->width = 720;
         dev->height = 576;
+        memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params));
+        memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params));
 
         err = cx8802_init_common(dev);
         if (0 != err)
@@ -1199,7 +1712,7 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
 
 static void __devexit blackbird_remove(struct pci_dev *pci_dev)
 {
-        struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
+        struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
 
         /* blackbird */
         blackbird_unregister_video(dev);
@@ -1215,8 +1728,8 @@ static struct pci_device_id cx8802_pci_tbl[] = {
         {
                 .vendor       = 0x14f1,
                 .device       = 0x8802,
-                .subvendor    = PCI_ANY_ID,
-                .subdevice    = PCI_ANY_ID,
+                .subvendor    = PCI_ANY_ID,
+                .subdevice    = PCI_ANY_ID,
         },{
                 /* --- end of list --- */
         }
@@ -1224,10 +1737,10 @@ static struct pci_device_id cx8802_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, cx8802_pci_tbl);
 
 static struct pci_driver blackbird_pci_driver = {
-        .name     = "cx88-blackbird",
-        .id_table = cx8802_pci_tbl,
-        .probe    = blackbird_probe,
-        .remove   = __devexit_p(blackbird_remove),
+        .name     = "cx88-blackbird",
+        .id_table = cx8802_pci_tbl,
+        .probe    = blackbird_probe,
+        .remove   = __devexit_p(blackbird_remove),
         .suspend  = cx8802_suspend_common,
         .resume   = cx8802_resume_common,
 };
@@ -1257,6 +1770,8 @@ module_exit(blackbird_fini);
 
 EXPORT_SYMBOL(cx88_ioctl_hook);
 EXPORT_SYMBOL(cx88_ioctl_translator);
+EXPORT_SYMBOL(blackbird_set_params);
+EXPORT_SYMBOL(blackbird_set_dnr_params);
 
 /* ----------------------------------------------------------- */
 /*
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 4da91d535a5b..f2268631b7c0 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -126,27 +126,27 @@ struct cx88_board cx88_boards[] = {
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
-                        .gpio0  = 0x03ff,
+                        .gpio0  = 0x03ff,
                 },{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
-                        .gpio0  = 0x03fe,
+                        .gpio0  = 0x03fe,
                 },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
-                        .gpio0  = 0x03fe,
+                        .gpio0  = 0x03fe,
                 }},
         },
-        [CX88_BOARD_WINFAST2000XP_EXPERT] = {
-                .name           = "Leadtek Winfast 2000XP Expert",
-                .tuner_type     = TUNER_PHILIPS_4IN1,
+        [CX88_BOARD_WINFAST2000XP_EXPERT] = {
+                .name           = "Leadtek Winfast 2000XP Expert",
+                .tuner_type     = TUNER_PHILIPS_4IN1,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
                         .gpio0  = 0x00F5e700,
                         .gpio1  = 0x00003004,
                         .gpio2  = 0x00F5e700,
@@ -165,16 +165,16 @@ struct cx88_board cx88_boards[] = {
                         .gpio1  = 0x00003004,
                         .gpio2  = 0x00F5c700,
                         .gpio3  = 0x02000000,
-                }},
-                .radio = {
-                        .type   = CX88_RADIO,
+                }},
+                .radio = {
+                        .type   = CX88_RADIO,
                         .gpio0  = 0x00F5d700,
                         .gpio1  = 0x00003004,
                         .gpio2  = 0x00F5d700,
                         .gpio3  = 0x02000000,
-                },
-        },
-        [CX88_BOARD_AVERTV_303] = {
+                },
+        },
+        [CX88_BOARD_AVERTV_STUDIO_303] = {
                 .name           = "AverTV Studio 303 (M126)",
                 .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
                 .radio_type     = UNSET,
@@ -206,7 +206,7 @@ struct cx88_board cx88_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .tda9887_conf   = TDA9887_PRESENT,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER_NTSC,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -214,32 +214,32 @@ struct cx88_board cx88_boards[] = {
                         .gpio1  = 0x000080c0,
                         .gpio2  = 0x0000ff40,
                 },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
                         .gpio0  = 0x000040bf,
                         .gpio1  = 0x000080c0,
                         .gpio2  = 0x0000ff40,
                 },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
                         .gpio0  = 0x000040bf,
                         .gpio1  = 0x000080c0,
                         .gpio2  = 0x0000ff40,
-                }},
-                .radio = {
+                }},
+                .radio = {
                          .type   = CX88_RADIO,
-                },
+                },
         },
         [CX88_BOARD_WINFAST_DV2000] = {
-                .name           = "Leadtek Winfast DV2000",
-                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .name           = "Leadtek Winfast DV2000",
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
                         .gpio0  = 0x0035e700,
                         .gpio1  = 0x00003004,
                         .gpio2  = 0x0035e700,
@@ -260,14 +260,14 @@ struct cx88_board cx88_boards[] = {
                         .gpio2  = 0x02000000,
                         .gpio3  = 0x02000000,
                 }},
-                .radio = {
+                .radio = {
                         .type   = CX88_RADIO,
                         .gpio0  = 0x0035d700,
                         .gpio1  = 0x00007004,
                         .gpio2  = 0x0035d700,
                         .gpio3  = 0x02000000,
                  },
-        },
+        },
         [CX88_BOARD_LEADTEK_PVR2000] = {
                 // gpio values for PAL version from regspy by DScaler
                 .name           = "Leadtek PVR 2000",
@@ -296,25 +296,25 @@ struct cx88_board cx88_boards[] = {
                 .blackbird = 1,
         },
         [CX88_BOARD_IODATA_GVVCP3PCI] = {
-                .name           = "IODATA GV-VCP3/PCI",
+                .name           = "IODATA GV-VCP3/PCI",
                 .tuner_type     = TUNER_ABSENT,
-                .radio_type     = UNSET,
+                .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .input          = {{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 0,
-                },{
-                        .type   = CX88_VMUX_COMPOSITE2,
-                        .vmux   = 1,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                }},
-        },
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 0,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE2,
+                        .vmux   = 1,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                }},
+        },
         [CX88_BOARD_PROLINK_PLAYTVPVR] = {
-                .name           = "Prolink PlayTV PVR",
-                .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
+                .name           = "Prolink PlayTV PVR",
+                .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -348,15 +348,15 @@ struct cx88_board cx88_boards[] = {
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
                         .gpio0  = 0x0000fde6,
-                },{
+                },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
                         .gpio0  = 0x0000fde6, // 0x0000fda6 L,R RCA audio in?
                 }},
-                .radio = {
-                        .type   = CX88_RADIO,
+                .radio = {
+                        .type   = CX88_RADIO,
                         .gpio0  = 0x0000fde2,
-                },
+                },
                 .blackbird = 1,
         },
         [CX88_BOARD_MSI_TVANYWHERE] = {
@@ -372,34 +372,34 @@ struct cx88_board cx88_boards[] = {
                         .gpio0  = 0x00000fbf,
                         .gpio2  = 0x0000fc08,
                 },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
                         .gpio0  = 0x00000fbf,
                         .gpio2  = 0x0000fc68,
                 },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
                         .gpio0  = 0x00000fbf,
                         .gpio2  = 0x0000fc68,
-                }},
+                }},
         },
-        [CX88_BOARD_KWORLD_DVB_T] = {
-                .name           = "KWorld/VStream XPert DVB-T",
+        [CX88_BOARD_KWORLD_DVB_T] = {
+                .name           = "KWorld/VStream XPert DVB-T",
                 .tuner_type     = TUNER_ABSENT,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .input          = {{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
+                .input          = {{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
                         .gpio0  = 0x0700,
                         .gpio2  = 0x0101,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
                         .gpio0  = 0x0700,
                         .gpio2  = 0x0101,
-                }},
+                }},
                 .dvb            = 1,
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = {
@@ -425,27 +425,27 @@ struct cx88_board cx88_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
-                        .gpio0  = 0x07f8,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x07f8,
                 },{
                         .type   = CX88_VMUX_DEBUG,
                         .vmux   = 0,
                         .gpio0  = 0x07f9,  // mono from tuner chip
-                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                        .gpio0  = 0x000007fa,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                        .gpio0  = 0x000007fa,
-                }},
-                .radio = {
-                        .type   = CX88_RADIO,
-                        .gpio0  = 0x000007f8,
-                },
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x000007fa,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x000007fa,
+                }},
+                .radio = {
+                        .type   = CX88_RADIO,
+                        .gpio0  = 0x000007f8,
+                },
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q] = {
                 .name           = "DViCO FusionHDTV 3 Gold-Q",
@@ -489,28 +489,28 @@ struct cx88_board cx88_boards[] = {
                 }},
                 .dvb            = 1,
         },
-        [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
+        [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
                 .name           = "Hauppauge Nova-T DVB-T",
                 .tuner_type     = TUNER_ABSENT,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .input          = {{
-                        .type   = CX88_VMUX_DVB,
-                        .vmux   = 0,
-                }},
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                }},
                 .dvb            = 1,
         },
-        [CX88_BOARD_CONEXANT_DVB_T1] = {
+        [CX88_BOARD_CONEXANT_DVB_T1] = {
                 .name           = "Conexant DVB-T reference design",
                 .tuner_type     = TUNER_ABSENT,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .input          = {{
-                        .type   = CX88_VMUX_DVB,
-                        .vmux   = 0,
-                }},
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                }},
                 .dvb            = 1,
         },
         [CX88_BOARD_PROVIDEO_PV259] = {
@@ -543,12 +543,12 @@ struct cx88_board cx88_boards[] = {
                 .dvb            = 1,
         },
         [CX88_BOARD_DNTV_LIVE_DVB_T] = {
-                .name           = "digitalnow DNTV Live! DVB-T",
+                .name           = "digitalnow DNTV Live! DVB-T",
                 .tuner_type     = TUNER_ABSENT,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .input          = {{
+                .input          = {{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
                         .gpio0  = 0x00000700,
@@ -705,44 +705,44 @@ struct cx88_board cx88_boards[] = {
                          .gpio0 = 0xbf60,
                  },
         },
-        [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
+        [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
                 .name           = "DViCO FusionHDTV 3 Gold-T",
                 .tuner_type     = TUNER_THOMSON_DTT7611,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
-                        .gpio0  = 0x97ed,
-                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                        .gpio0  = 0x97e9,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                        .gpio0  = 0x97e9,
-                }},
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x97ed,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x97e9,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x97e9,
+                }},
                 .dvb            = 1,
-        },
-        [CX88_BOARD_ADSTECH_DVB_T_PCI] = {
-                .name           = "ADS Tech Instant TV DVB-T PCI",
+        },
+        [CX88_BOARD_ADSTECH_DVB_T_PCI] = {
+                .name           = "ADS Tech Instant TV DVB-T PCI",
                 .tuner_type     = TUNER_ABSENT,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .input          = {{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
                         .gpio0  = 0x0700,
                         .gpio2  = 0x0101,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
                         .gpio0  = 0x0700,
                         .gpio2  = 0x0101,
-                }},
+                }},
                 .dvb            = 1,
         },
         [CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1] = {
@@ -762,20 +762,139 @@ struct cx88_board cx88_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
-                        .gpio0  = 0x87fd,
-                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                        .gpio0  = 0x87f9,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                        .gpio0  = 0x87f9,
-                }},
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x87fd,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x87f9,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x87f9,
+                }},
+                .dvb            = 1,
+        },
+        [CX88_BOARD_AVERMEDIA_ULTRATV_MC_550] = {
+                .name           = "AverMedia UltraTV Media Center PCI 550",
+                .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .blackbird      = 1,
+                .input          = {{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 0,
+                        .gpio0  = 0x0000cd73,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 1,
+                        .gpio0  = 0x0000cd73,
+                },{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 3,
+                        .gpio0  = 0x0000cdb3,
+                }},
+                .radio = {
+                        .type   = CX88_RADIO,
+                        .vmux   = 2,
+                        .gpio0  = 0x0000cdf3,
+                },
+        },
+        [CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD] = {
+                 /* Alexander Wold <awold@bigfoot.com> */
+                 .name           = "Kworld V-Stream Xpert DVD",
+                 .tuner_type     = UNSET,
+                 .input          = {{
+                         .type   = CX88_VMUX_COMPOSITE1,
+                         .vmux   = 1,
+                         .gpio0  = 0x03000000,
+                         .gpio1  = 0x01000000,
+                         .gpio2  = 0x02000000,
+                         .gpio3  = 0x00100000,
+                 },{
+                         .type   = CX88_VMUX_SVIDEO,
+                         .vmux   = 2,
+                         .gpio0  = 0x03000000,
+                         .gpio1  = 0x01000000,
+                         .gpio2  = 0x02000000,
+                         .gpio3  = 0x00100000,
+                 }},
+        },
+        [CX88_BOARD_ATI_HDTVWONDER] = {
+                .name           = "ATI HDTV Wonder",
+                .tuner_type     = TUNER_PHILIPS_TUV1236D,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x00000ff7,
+                        .gpio1  = 0x000000ff,
+                        .gpio2  = 0x00000001,
+                        .gpio3  = 0x00000000,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x00000ffe,
+                        .gpio1  = 0x000000ff,
+                        .gpio2  = 0x00000001,
+                        .gpio3  = 0x00000000,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x00000ffe,
+                        .gpio1  = 0x000000ff,
+                        .gpio2  = 0x00000001,
+                        .gpio3  = 0x00000000,
+                }},
                 .dvb            = 1,
         },
+        [CX88_BOARD_WINFAST_DTV1000] = {
+                .name           = "WinFast DTV1000-T",
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                }},
+                .dvb            = 1,
+        },
+        [CX88_BOARD_AVERTV_303] = {
+                .name           = "AVerTV 303 (M126)",
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x00ff,
+                        .gpio1  = 0xe09f,
+                        .gpio2  = 0x0010,
+                        .gpio3  = 0x0000,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x00ff,
+                        .gpio1  = 0xe05f,
+                        .gpio2  = 0x0010,
+                        .gpio3  = 0x0000,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x00ff,
+                        .gpio1  = 0xe05f,
+                        .gpio2  = 0x0010,
+                        .gpio3  = 0x0000,
+                }},
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -804,41 +923,41 @@ struct cx88_subid cx88_subids[] = {
                 .subdevice = 0x00f8,
                 .card      = CX88_BOARD_ATI_WONDER_PRO,
         },{
-                .subvendor = 0x107d,
-                .subdevice = 0x6611,
-                .card      = CX88_BOARD_WINFAST2000XP_EXPERT,
+                .subvendor = 0x107d,
+                .subdevice = 0x6611,
+                .card      = CX88_BOARD_WINFAST2000XP_EXPERT,
+        },{
+                .subvendor = 0x107d,
+                .subdevice = 0x6613,    /* NTSC */
+                .card      = CX88_BOARD_WINFAST2000XP_EXPERT,
         },{
-                .subvendor = 0x107d,
-                .subdevice = 0x6613,    /* NTSC */
-                .card      = CX88_BOARD_WINFAST2000XP_EXPERT,
+                .subvendor = 0x107d,
+                .subdevice = 0x6620,
+                .card      = CX88_BOARD_WINFAST_DV2000,
+        },{
+                .subvendor = 0x107d,
+                .subdevice = 0x663b,
+                .card      = CX88_BOARD_LEADTEK_PVR2000,
         },{
                 .subvendor = 0x107d,
-                .subdevice = 0x6620,
-                .card      = CX88_BOARD_WINFAST_DV2000,
-        },{
-                .subvendor = 0x107d,
-                .subdevice = 0x663b,
-                .card      = CX88_BOARD_LEADTEK_PVR2000,
-        },{
-                .subvendor = 0x107d,
-                .subdevice = 0x663C,
-                .card      = CX88_BOARD_LEADTEK_PVR2000,
-        },{
+                .subdevice = 0x663C,
+                .card      = CX88_BOARD_LEADTEK_PVR2000,
+        },{
                 .subvendor = 0x1461,
                 .subdevice = 0x000b,
-                .card      = CX88_BOARD_AVERTV_303,
+                .card      = CX88_BOARD_AVERTV_STUDIO_303,
         },{
                 .subvendor = 0x1462,
                 .subdevice = 0x8606,
                 .card      = CX88_BOARD_MSI_TVANYWHERE_MASTER,
         },{
-                .subvendor = 0x10fc,
-                .subdevice = 0xd003,
-                .card      = CX88_BOARD_IODATA_GVVCP3PCI,
+                .subvendor = 0x10fc,
+                .subdevice = 0xd003,
+                .card      = CX88_BOARD_IODATA_GVVCP3PCI,
         },{
-                .subvendor = 0x1043,
-                .subdevice = 0x4823,  /* with mpeg encoder */
-                .card      = CX88_BOARD_ASUS_PVR_416,
+                .subvendor = 0x1043,
+                .subdevice = 0x4823,  /* with mpeg encoder */
+                .card      = CX88_BOARD_ASUS_PVR_416,
         },{
                 .subvendor = 0x17de,
                 .subdevice = 0x08a6,
@@ -852,43 +971,43 @@ struct cx88_subid cx88_subids[] = {
                 .subdevice = 0xd820,
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T,
         },{
-                .subvendor = 0x18AC,
-                .subdevice = 0xDB00,
+                .subvendor = 0x18ac,
+                .subdevice = 0xdb00,
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1,
-        },{
+        },{
                 .subvendor = 0x0070,
                 .subdevice = 0x9002,
                 .card      = CX88_BOARD_HAUPPAUGE_DVB_T1,
-        },{
+        },{
                 .subvendor = 0x14f1,
                 .subdevice = 0x0187,
                 .card      = CX88_BOARD_CONEXANT_DVB_T1,
-        },{
+        },{
                 .subvendor = 0x1540,
                 .subdevice = 0x2580,
                 .card      = CX88_BOARD_PROVIDEO_PV259,
         },{
-                .subvendor = 0x18AC,
-                .subdevice = 0xDB10,
+                .subvendor = 0x18ac,
+                .subdevice = 0xdb10,
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS,
         },{
-                .subvendor = 0x1554,
-                .subdevice = 0x4811,
-                .card      = CX88_BOARD_PIXELVIEW,
+                .subvendor = 0x1554,
+                .subdevice = 0x4811,
+                .card      = CX88_BOARD_PIXELVIEW,
         },{
                 .subvendor = 0x7063,
                 .subdevice = 0x3000, /* HD-3000 card */
                 .card      = CX88_BOARD_PCHDTV_HD3000,
         },{
-                .subvendor = 0x17DE,
-                .subdevice = 0xA8A6,
+                .subvendor = 0x17de,
+                .subdevice = 0xa8a6,
                 .card      = CX88_BOARD_DNTV_LIVE_DVB_T,
         },{
                 .subvendor = 0x0070,
                 .subdevice = 0x2801,
                 .card      = CX88_BOARD_HAUPPAUGE_ROSLYN,
         },{
-                .subvendor = 0x14F1,
+                .subvendor = 0x14f1,
                 .subdevice = 0x0342,
                 .card      = CX88_BOARD_DIGITALLOGIC_MEC,
         },{
@@ -899,14 +1018,30 @@ struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x1421,
                 .subdevice = 0x0334,
                 .card      = CX88_BOARD_ADSTECH_DVB_T_PCI,
-        },{
+        },{
                 .subvendor = 0x153b,
                 .subdevice = 0x1166,
                 .card      = CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1,
-        },{
+        },{
                 .subvendor = 0x18ac,
                 .subdevice = 0xd500,
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD,
+        },{
+                .subvendor = 0x1461,
+                .subdevice = 0x8011,
+                .card      = CX88_BOARD_AVERMEDIA_ULTRATV_MC_550,
+        },{
+                .subvendor = PCI_VENDOR_ID_ATI,
+                .subdevice = 0xa101,
+                .card      = CX88_BOARD_ATI_HDTVWONDER,
+        },{
+                .subvendor = 0x107d,
+                .subdevice = 0x665f,
+                .card      = CX88_BOARD_WINFAST_DTV1000,
+        },{
+                .subvendor = 0x1461,
+                .subdevice = 0x000a,
+                .card      = CX88_BOARD_AVERTV_303,
         },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
@@ -1108,6 +1243,19 @@ void cx88_card_setup(struct cx88_core *core)
                 cx_clear(MO_GP0_IO, 0x00000007);
                 cx_set(MO_GP2_IO, 0x00000101);
                 break;
+        case CX88_BOARD_ATI_HDTVWONDER:
+                if (0 == core->i2c_rc) {
+                        /* enable tuner */
+                        int i;
+                        u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 };
+                        core->i2c_client.addr = 0x0a;
+
+                        for (i = 0; i < 5; i++)
+                                if (2 != i2c_master_send(&core->i2c_client,&buffer[i*2],2))
+                                        printk(KERN_WARNING "%s: Unable to enable tuner(%i).\n",
+                                                core->name, i);
+                }
+                break;
         }
         if (cx88_boards[core->board].radio.type == CX88_RADIO)
                 core->has_radio = 1;
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index dc5c5c1f3461..eb806af17182 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 
 #include "cx88.h"
 
@@ -153,26 +153,26 @@ static u32* cx88_risc_field(u32 *rp, struct scatterlist *sglist,
                 }
                 if (bpl <= sg_dma_len(sg)-offset) {
                         /* fits into current chunk */
-                        *(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|RISC_EOL|bpl);
-                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
-                        offset+=bpl;
+                        *(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|RISC_EOL|bpl);
+                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
+                        offset+=bpl;
                 } else {
                         /* scanline needs to be splitted */
-                        todo = bpl;
-                        *(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|
+                        todo = bpl;
+                        *(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|
                                             (sg_dma_len(sg)-offset));
-                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
-                        todo -= (sg_dma_len(sg)-offset);
-                        offset = 0;
-                        sg++;
-                        while (todo > sg_dma_len(sg)) {
-                                *(rp++)=cpu_to_le32(RISC_WRITE|
+                        *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
+                        todo -= (sg_dma_len(sg)-offset);
+                        offset = 0;
+                        sg++;
+                        while (todo > sg_dma_len(sg)) {
+                                *(rp++)=cpu_to_le32(RISC_WRITE|
                                                     sg_dma_len(sg));
-                                *(rp++)=cpu_to_le32(sg_dma_address(sg));
+                                *(rp++)=cpu_to_le32(sg_dma_address(sg));
                                 todo -= sg_dma_len(sg);
                                 sg++;
                         }
-                        *(rp++)=cpu_to_le32(RISC_WRITE|RISC_EOL|todo);
+                        *(rp++)=cpu_to_le32(RISC_WRITE|RISC_EOL|todo);
                         *(rp++)=cpu_to_le32(sg_dma_address(sg));
                         offset += todo;
                 }
@@ -309,7 +309,7 @@ struct sram_channel cx88_sram_channels[] = {
                 .name       = "video y / packed",
                 .cmds_start = 0x180040,
                 .ctrl_start = 0x180400,
-                .cdt        = 0x180400 + 64,
+                .cdt        = 0x180400 + 64,
                 .fifo_start = 0x180c00,
                 .fifo_size  = 0x002800,
                 .ptr1_reg   = MO_DMA21_PTR1,
@@ -321,7 +321,7 @@ struct sram_channel cx88_sram_channels[] = {
                 .name       = "video u",
                 .cmds_start = 0x180080,
                 .ctrl_start = 0x1804a0,
-                .cdt        = 0x1804a0 + 64,
+                .cdt        = 0x1804a0 + 64,
                 .fifo_start = 0x183400,
                 .fifo_size  = 0x000800,
                 .ptr1_reg   = MO_DMA22_PTR1,
@@ -333,7 +333,7 @@ struct sram_channel cx88_sram_channels[] = {
                 .name       = "video v",
                 .cmds_start = 0x1800c0,
                 .ctrl_start = 0x180540,
-                .cdt        = 0x180540 + 64,
+                .cdt        = 0x180540 + 64,
                 .fifo_start = 0x183c00,
                 .fifo_size  = 0x000800,
                 .ptr1_reg   = MO_DMA23_PTR1,
@@ -345,7 +345,7 @@ struct sram_channel cx88_sram_channels[] = {
                 .name       = "vbi",
                 .cmds_start = 0x180100,
                 .ctrl_start = 0x1805e0,
-                .cdt        = 0x1805e0 + 64,
+                .cdt        = 0x1805e0 + 64,
                 .fifo_start = 0x184400,
                 .fifo_size  = 0x001000,
                 .ptr1_reg   = MO_DMA24_PTR1,
@@ -357,7 +357,7 @@ struct sram_channel cx88_sram_channels[] = {
                 .name       = "audio from",
                 .cmds_start = 0x180140,
                 .ctrl_start = 0x180680,
-                .cdt        = 0x180680 + 64,
+                .cdt        = 0x180680 + 64,
                 .fifo_start = 0x185400,
                 .fifo_size  = 0x000200,
                 .ptr1_reg   = MO_DMA25_PTR1,
@@ -369,7 +369,7 @@ struct sram_channel cx88_sram_channels[] = {
                 .name       = "audio to",
                 .cmds_start = 0x180180,
                 .ctrl_start = 0x180720,
-                .cdt        = 0x180680 + 64,  /* same as audio IN */
+                .cdt        = 0x180680 + 64,  /* same as audio IN */
                 .fifo_start = 0x185400,       /* same as audio IN */
                 .fifo_size  = 0x000200,       /* same as audio IN */
                 .ptr1_reg   = MO_DMA26_PTR1,
@@ -431,7 +431,7 @@ int cx88_sram_channel_setup(struct cx88_core *core,
 /* ------------------------------------------------------------------ */
 /* debug helper code                                                  */
 
-int cx88_risc_decode(u32 risc)
+static int cx88_risc_decode(u32 risc)
 {
         static char *instr[16] = {
                 [ RISC_SYNC    >> 28 ] = "sync",
@@ -845,19 +845,19 @@ static int set_tvaudio(struct cx88_core *core)
                 return 0;
 
         if (V4L2_STD_PAL_BG & norm->id) {
-                core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_BG;
+                core->tvaudio = WW_BG;
 
         } else if (V4L2_STD_PAL_DK & norm->id) {
-                core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_DK;
+                core->tvaudio = WW_DK;
 
         } else if (V4L2_STD_PAL_I & norm->id) {
-                core->tvaudio = WW_NICAM_I;
+                core->tvaudio = WW_I;
 
         } else if (V4L2_STD_SECAM_L & norm->id) {
-                core->tvaudio = WW_SYSTEM_L_AM;
+                core->tvaudio = WW_L;
 
         } else if (V4L2_STD_SECAM_DK & norm->id) {
-                core->tvaudio = WW_A2_DK;
+                core->tvaudio = WW_DK;
 
         } else if ((V4L2_STD_NTSC_M & norm->id) ||
                    (V4L2_STD_PAL_M  & norm->id)) {
@@ -1137,7 +1137,7 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
         if (!core->radio_addr)
                 core->radio_addr = cx88_boards[core->board].radio_addr;
 
-        printk(KERN_INFO "TV tuner %d at 0x%02x, Radio tuner %d at 0x%02x\n",
+        printk(KERN_INFO "TV tuner %d at 0x%02x, Radio tuner %d at 0x%02x\n",
                 core->tuner_type, core->tuner_addr<<1,
                 core->radio_type, core->radio_addr<<1);
 
@@ -1146,6 +1146,7 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
         /* init hardware */
         cx88_reset(core);
         cx88_i2c_init(core,pci);
+        cx88_call_i2c_clients (core, TUNER_SET_STANDBY, NULL);
         cx88_card_setup(core);
         cx88_ir_init(core,pci);
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 4334744652de..9cce91ec334b 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -29,7 +29,6 @@
 #include <linux/file.h>
 #include <linux/suspend.h>
 
-
 #include "cx88.h"
 #include "dvb-pll.h"
 
@@ -46,6 +45,9 @@
 #ifdef HAVE_LGDT330X
 # include "lgdt330x.h"
 #endif
+#ifdef HAVE_NXT200X
+# include "nxt200x.h"
+#endif
 
 MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
@@ -78,7 +80,7 @@ static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                            enum v4l2_field field)
 {
         struct cx8802_dev *dev = q->priv_data;
-        return cx8802_buf_prepare(dev, (struct cx88_buffer*)vb);
+        return cx8802_buf_prepare(dev, (struct cx88_buffer*)vb,field);
 }
 
 static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
@@ -129,7 +131,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)
         static u8 reset []         = { 0x50, 0x80 };
         static u8 adc_ctl_1_cfg [] = { 0x8E, 0x40 };
         static u8 agc_cfg []       = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF,
-                                       0x00, 0xFF, 0x00, 0x40, 0x40 };
+                                       0x00, 0xFF, 0x00, 0x40, 0x40 };
         static u8 dntv_extra[]     = { 0xB5, 0x7A };
         static u8 capt_range_cfg[] = { 0x75, 0x32 };
 
@@ -285,6 +287,33 @@ static struct lgdt330x_config fusionhdtv_5_gold = {
 };
 #endif
 
+#ifdef HAVE_NXT200X
+static int nxt200x_set_ts_param(struct dvb_frontend* fe,
+                                int is_punctured)
+{
+        struct cx8802_dev *dev= fe->dvb->priv;
+        dev->ts_gen_cntrl = is_punctured ? 0x04 : 0x00;
+        return 0;
+}
+
+static int nxt200x_set_pll_input(u8* buf, int input)
+{
+        if (input)
+                buf[3] |= 0x08;
+        else
+                buf[3] &= ~0x08;
+        return 0;
+}
+
+static struct nxt200x_config ati_hdtvwonder = {
+        .demod_address    = 0x0a,
+        .pll_address      = 0x61,
+        .pll_desc         = &dvb_pll_tuv1236d,
+        .set_pll_input    = nxt200x_set_pll_input,
+        .set_ts_params    = nxt200x_set_ts_param,
+};
+#endif
+
 static int dvb_register(struct cx8802_dev *dev)
 {
         /* init struct videobuf_dvb */
@@ -300,6 +329,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 break;
         case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
         case CX88_BOARD_CONEXANT_DVB_T1:
+        case CX88_BOARD_WINFAST_DTV1000:
                 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
                                                    &dev->core->i2c_adap);
                 break;
@@ -385,6 +415,12 @@ static int dvb_register(struct cx8802_dev *dev)
                 }
                 break;
 #endif
+#ifdef HAVE_NXT200X
+        case CX88_BOARD_ATI_HDTVWONDER:
+                dev->dvb.frontend = nxt200x_attach(&ati_hdtvwonder,
+                                                 &dev->core->i2c_adap);
+                break;
+#endif
         default:
                 printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
                        dev->core->name);
@@ -403,6 +439,9 @@ static int dvb_register(struct cx8802_dev *dev)
         /* Put the analog decoder in standby to keep it quiet */
         cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
 
+        /* Put the analog decoder in standby to keep it quiet */
+        cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
+
         /* register everything */
         return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
 }
@@ -461,7 +500,7 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev,
 
 static void __devexit dvb_remove(struct pci_dev *pci_dev)
 {
-        struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
+        struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
 
         /* dvb */
         videobuf_dvb_unregister(&dev->dvb);
@@ -476,8 +515,8 @@ static struct pci_device_id cx8802_pci_tbl[] = {
         {
                 .vendor       = 0x14f1,
                 .device       = 0x8802,
-                .subvendor    = PCI_ANY_ID,
-                .subdevice    = PCI_ANY_ID,
+                .subvendor    = PCI_ANY_ID,
+                .subdevice    = PCI_ANY_ID,
         },{
                 /* --- end of list --- */
         }
@@ -485,10 +524,10 @@ static struct pci_device_id cx8802_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, cx8802_pci_tbl);
 
 static struct pci_driver dvb_pci_driver = {
-        .name     = "cx88-dvb",
-        .id_table = cx8802_pci_tbl,
-        .probe    = dvb_probe,
-        .remove   = __devexit_p(dvb_remove),
+        .name     = "cx88-dvb",
+        .id_table = cx8802_pci_tbl,
+        .probe    = dvb_probe,
+        .remove   = __devexit_p(dvb_remove),
         .suspend  = cx8802_suspend_common,
         .resume   = cx8802_resume_common,
 };
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 761cebd40dbd..9790d412f192 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -3,7 +3,7 @@
     cx88-i2c.c  --  all the i2c code is here
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
-                           & Marcus Metzler (mocm@thp.uni-koeln.de)
+                           & Marcus Metzler (mocm@thp.uni-koeln.de)
     (c) 2002 Yurij Sysoev <yurij@naturesoft.net>
     (c) 1999-2003 Gerd Knorr <kraxel@bytesex.org>
 
@@ -90,7 +90,7 @@ static int cx8800_bit_getsda(void *data)
 
 static int attach_inform(struct i2c_client *client)
 {
-        struct tuner_setup tun_setup;
+        struct tuner_setup tun_setup;
         struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
         dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
@@ -98,7 +98,7 @@ static int attach_inform(struct i2c_client *client)
         if (!client->driver->command)
                 return 0;
 
-        if (core->radio_type != UNSET) {
+        if (core->radio_type != UNSET) {
                 if ((core->radio_addr==ADDR_UNSET)||(core->radio_addr==client->addr)) {
                         tun_setup.mode_mask = T_RADIO;
                         tun_setup.type = core->radio_type;
@@ -106,8 +106,8 @@ static int attach_inform(struct i2c_client *client)
 
                         client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
-        }
-        if (core->tuner_type != UNSET) {
+        }
+        if (core->tuner_type != UNSET) {
                 if ((core->tuner_addr==ADDR_UNSET)||(core->tuner_addr==client->addr)) {
 
                         tun_setup.mode_mask = T_ANALOG_TV;
@@ -116,7 +116,7 @@ static int attach_inform(struct i2c_client *client)
 
                         client->driver->command (client,TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
-        }
+        }
 
         if (core->tda9887_conf)
                 client->driver->command(client, TDA9887_SET_CONFIG, &core->tda9887_conf);
@@ -159,7 +159,7 @@ static struct i2c_adapter cx8800_i2c_adap_template = {
 };
 
 static struct i2c_client cx8800_i2c_client_template = {
-        .name   = "cx88xx internal",
+        .name   = "cx88xx internal",
 };
 
 static char *i2c_devs[128] = {
@@ -202,10 +202,10 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 
         core->i2c_adap.dev.parent = &pci->dev;
         strlcpy(core->i2c_adap.name,core->name,sizeof(core->i2c_adap.name));
-        core->i2c_algo.data = core;
-        i2c_set_adapdata(&core->i2c_adap,core);
-        core->i2c_adap.algo_data = &core->i2c_algo;
-        core->i2c_client.adapter = &core->i2c_adap;
+        core->i2c_algo.data = core;
+        i2c_set_adapdata(&core->i2c_adap,core);
+        core->i2c_adap.algo_data = &core->i2c_algo;
+        core->i2c_client.adapter = &core->i2c_adap;
 
         cx8800_bit_setscl(core,1);
         cx8800_bit_setsda(core,1);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index c27fe4c36f69..38b12ebaa49e 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -553,7 +553,7 @@ void cx88_ir_irq(struct cx88_core *core)
 
                 if ((ircode & 0xffff) != 0xeb04) { /* wrong address */
                         ir_dprintk("pulse distance decoded wrong address\n");
-                        break;
+                        break;
                 }
 
                 if (((~ircode >> 24) & 0xff) != ((ircode >> 16) & 0xff)) { /* wrong checksum */
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index ee2300e1ae0b..35e6d0c2b872 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -54,7 +54,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
 {
         struct cx88_core *core = dev->core;
 
-        dprintk(0, "cx8802_start_dma %d\n", buf->vb.width);
+        dprintk(0, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev->width, dev->height, buf->vb.field);
 
         /* setup fifo + format */
         cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28],
@@ -158,7 +158,8 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
 
 /* ------------------------------------------------------------------ */
 
-int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf)
+int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
+                        enum v4l2_field field)
 {
         int size = dev->ts_packet_size * dev->ts_packet_count;
         int rc;
@@ -171,7 +172,7 @@ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf)
                 buf->vb.width  = dev->ts_packet_size;
                 buf->vb.height = dev->ts_packet_count;
                 buf->vb.size   = size;
-                buf->vb.field  = V4L2_FIELD_TOP;
+                buf->vb.field  = field /*V4L2_FIELD_TOP*/;
 
                 if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL)))
                         goto fail;
@@ -315,14 +316,14 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev)
                 spin_unlock(&dev->slock);
         }
 
-        /* other general errors */
-        if (status & 0x1f0100) {
+        /* other general errors */
+        if (status & 0x1f0100) {
                 dprintk( 0, "general errors: 0x%08x\n", status & 0x1f0100 );
-                spin_lock(&dev->slock);
+                spin_lock(&dev->slock);
                 cx8802_stop_dma(dev);
-                cx8802_restart_queue(dev,&dev->mpegq);
-                spin_unlock(&dev->slock);
-        }
+                cx8802_restart_queue(dev,&dev->mpegq);
+                spin_unlock(&dev->slock);
+        }
 }
 
 #define MAX_IRQ_LOOP 10
@@ -378,8 +379,8 @@ int cx8802_init_common(struct cx8802_dev *dev)
         }
 
         pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev);
-        pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER,  &dev->pci_lat);
-        printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, "
+        pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER,  &dev->pci_lat);
+        printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, "
                "latency: %d, mmio: 0x%lx\n", dev->core->name,
                pci_name(dev->pci), dev->pci_rev, dev->pci->irq,
                dev->pci_lat,pci_resource_start(dev->pci,0));
@@ -429,7 +430,7 @@ void cx8802_fini_common(struct cx8802_dev *dev)
 
 int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state)
 {
-        struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
+        struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
         struct cx88_core *core = dev->core;
 
         /* stop mpeg dma */
diff --git a/drivers/media/video/cx88/cx88-reg.h b/drivers/media/video/cx88/cx88-reg.h
index 0a3a62fc9bbb..d3bf5b17b1d4 100644
--- a/drivers/media/video/cx88/cx88-reg.h
+++ b/drivers/media/video/cx88/cx88-reg.h
@@ -3,9 +3,9 @@
     cx88x-hw.h - CX2388x register offsets
 
     Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de)
-                  2001 Michael Eskin
-                  2002 Yurij Sysoev <yurij@naturesoft.net>
-                  2003 Gerd Knorr <kraxel@bytesex.org>
+                  2001 Michael Eskin
+                  2002 Yurij Sysoev <yurij@naturesoft.net>
+                  2003 Gerd Knorr <kraxel@bytesex.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
@@ -728,13 +728,13 @@
 #define ColorFormatGamma         0x1000
 
 #define Interlaced               0x1
-#define NonInterlaced            0x0
+#define NonInterlaced            0x0
 
 #define FieldEven                0x1
 #define FieldOdd                 0x0
 
-#define TGReadWriteMode          0x0
-#define TGEnableMode             0x1
+#define TGReadWriteMode          0x0
+#define TGEnableMode             0x1
 
 #define DV_CbAlign               0x0
 #define DV_Y0Align               0x1
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 2765acee0285..6d9bec1c583b 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -57,39 +57,38 @@
 #include "cx88.h"
 
 static unsigned int audio_debug = 0;
-module_param(audio_debug,int,0644);
-MODULE_PARM_DESC(audio_debug,"enable debug messages [audio]");
+module_param(audio_debug, int, 0644);
+MODULE_PARM_DESC(audio_debug, "enable debug messages [audio]");
 
 #define dprintk(fmt, arg...)    if (audio_debug) \
         printk(KERN_DEBUG "%s/0: " fmt, core->name , ## arg)
 
 /* ----------------------------------------------------------- */
 
-static char *aud_ctl_names[64] =
-{
-        [ EN_BTSC_FORCE_MONO       ] = "BTSC_FORCE_MONO",
-        [ EN_BTSC_FORCE_STEREO     ] = "BTSC_FORCE_STEREO",
-        [ EN_BTSC_FORCE_SAP        ] = "BTSC_FORCE_SAP",
-        [ EN_BTSC_AUTO_STEREO      ] = "BTSC_AUTO_STEREO",
-        [ EN_BTSC_AUTO_SAP         ] = "BTSC_AUTO_SAP",
-        [ EN_A2_FORCE_MONO1        ] = "A2_FORCE_MONO1",
-        [ EN_A2_FORCE_MONO2        ] = "A2_FORCE_MONO2",
-        [ EN_A2_FORCE_STEREO       ] = "A2_FORCE_STEREO",
-        [ EN_A2_AUTO_MONO2         ] = "A2_AUTO_MONO2",
-        [ EN_A2_AUTO_STEREO        ] = "A2_AUTO_STEREO",
-        [ EN_EIAJ_FORCE_MONO1      ] = "EIAJ_FORCE_MONO1",
-        [ EN_EIAJ_FORCE_MONO2      ] = "EIAJ_FORCE_MONO2",
-        [ EN_EIAJ_FORCE_STEREO     ] = "EIAJ_FORCE_STEREO",
-        [ EN_EIAJ_AUTO_MONO2       ] = "EIAJ_AUTO_MONO2",
-        [ EN_EIAJ_AUTO_STEREO      ] = "EIAJ_AUTO_STEREO",
-        [ EN_NICAM_FORCE_MONO1     ] = "NICAM_FORCE_MONO1",
-        [ EN_NICAM_FORCE_MONO2     ] = "NICAM_FORCE_MONO2",
-        [ EN_NICAM_FORCE_STEREO    ] = "NICAM_FORCE_STEREO",
-        [ EN_NICAM_AUTO_MONO2      ] = "NICAM_AUTO_MONO2",
-        [ EN_NICAM_AUTO_STEREO     ] = "NICAM_AUTO_STEREO",
-        [ EN_FMRADIO_FORCE_MONO    ] = "FMRADIO_FORCE_MONO",
-        [ EN_FMRADIO_FORCE_STEREO  ] = "FMRADIO_FORCE_STEREO",
-        [ EN_FMRADIO_AUTO_STEREO   ] = "FMRADIO_AUTO_STEREO",
+static char *aud_ctl_names[64] = {
+        [EN_BTSC_FORCE_MONO] = "BTSC_FORCE_MONO",
+        [EN_BTSC_FORCE_STEREO] = "BTSC_FORCE_STEREO",
+        [EN_BTSC_FORCE_SAP] = "BTSC_FORCE_SAP",
+        [EN_BTSC_AUTO_STEREO] = "BTSC_AUTO_STEREO",
+        [EN_BTSC_AUTO_SAP] = "BTSC_AUTO_SAP",
+        [EN_A2_FORCE_MONO1] = "A2_FORCE_MONO1",
+        [EN_A2_FORCE_MONO2] = "A2_FORCE_MONO2",
+        [EN_A2_FORCE_STEREO] = "A2_FORCE_STEREO",
+        [EN_A2_AUTO_MONO2] = "A2_AUTO_MONO2",
+        [EN_A2_AUTO_STEREO] = "A2_AUTO_STEREO",
+        [EN_EIAJ_FORCE_MONO1] = "EIAJ_FORCE_MONO1",
+        [EN_EIAJ_FORCE_MONO2] = "EIAJ_FORCE_MONO2",
+        [EN_EIAJ_FORCE_STEREO] = "EIAJ_FORCE_STEREO",
+        [EN_EIAJ_AUTO_MONO2] = "EIAJ_AUTO_MONO2",
+        [EN_EIAJ_AUTO_STEREO] = "EIAJ_AUTO_STEREO",
+        [EN_NICAM_FORCE_MONO1] = "NICAM_FORCE_MONO1",
+        [EN_NICAM_FORCE_MONO2] = "NICAM_FORCE_MONO2",
+        [EN_NICAM_FORCE_STEREO] = "NICAM_FORCE_STEREO",
+        [EN_NICAM_AUTO_MONO2] = "NICAM_AUTO_MONO2",
+        [EN_NICAM_AUTO_STEREO] = "NICAM_AUTO_STEREO",
+        [EN_FMRADIO_FORCE_MONO] = "FMRADIO_FORCE_MONO",
+        [EN_FMRADIO_FORCE_STEREO] = "FMRADIO_FORCE_STEREO",
+        [EN_FMRADIO_AUTO_STEREO] = "FMRADIO_AUTO_STEREO",
 };
 
 struct rlist {
@@ -97,8 +96,7 @@ struct rlist {
         u32 val;
 };
 
-static void set_audio_registers(struct cx88_core *core,
-                                const struct rlist *l)
+static void set_audio_registers(struct cx88_core *core, const struct rlist *l)
 {
         int i;
 
@@ -119,17 +117,18 @@ static void set_audio_registers(struct cx88_core *core,
         }
 }
 
-static void set_audio_start(struct cx88_core *core,
-                        u32 mode)
+static void set_audio_start(struct cx88_core *core, u32 mode)
 {
         // mute
-        cx_write(AUD_VOL_CTL,       (1 << 6));
+        cx_write(AUD_VOL_CTL, (1 << 6));
 
         // start programming
-        cx_write(AUD_CTL,           0x0000);
-        cx_write(AUD_INIT,          mode);
-        cx_write(AUD_INIT_LD,       0x0001);
-        cx_write(AUD_SOFT_RESET,    0x0001);
+        cx_write(MO_AUD_DMACNTRL, 0x0000);
+        msleep(100);
+        //cx_write(AUD_CTL, 0x0000);
+        cx_write(AUD_INIT, mode);
+        cx_write(AUD_INIT_LD, 0x0001);
+        cx_write(AUD_SOFT_RESET, 0x0001);
 }
 
 static void set_audio_finish(struct cx88_core *core, u32 ctl)
@@ -148,12 +147,13 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
                 cx_write(AUD_I2SCNTL, 0);
                 //cx_write(AUD_APB_IN_RATE_ADJ, 0);
         } else {
-        ctl |= EN_DAC_ENABLE;
-        cx_write(AUD_CTL, ctl);
+                ctl |= EN_DAC_ENABLE;
+                cx_write(AUD_CTL, ctl);
         }
 
         /* finish programming */
         cx_write(AUD_SOFT_RESET, 0x0000);
+        cx_write(MO_AUD_DMACNTRL, 0x0003);
 
         /* unmute */
         volume = cx_sread(SHADOW_AUD_VOL_CTL);
@@ -162,486 +162,463 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 
 /* ----------------------------------------------------------- */
 
-static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap, u32 mode)
+static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap,
+                                    u32 mode)
 {
         static const struct rlist btsc[] = {
-        { AUD_AFE_12DB_EN,             0x00000001 },
-                { AUD_OUT1_SEL,                0x00000013 },
-                { AUD_OUT1_SHIFT,              0x00000000 },
-                { AUD_POLY0_DDS_CONSTANT,      0x0012010c },
-                { AUD_DMD_RA_DDS,              0x00c3e7aa },
-                { AUD_DBX_IN_GAIN,             0x00004734 },
-                { AUD_DBX_WBE_GAIN,            0x00004640 },
-                { AUD_DBX_SE_GAIN,             0x00008d31 },
-                { AUD_DCOC_0_SRC,              0x0000001a },
-                { AUD_IIR1_4_SEL,              0x00000021 },
-                { AUD_DCOC_PASS_IN,            0x00000003 },
-                { AUD_DCOC_0_SHIFT_IN0,        0x0000000a },
-                { AUD_DCOC_0_SHIFT_IN1,        0x00000008 },
-                { AUD_DCOC_1_SHIFT_IN0,        0x0000000a },
-                { AUD_DCOC_1_SHIFT_IN1,        0x00000008 },
-                { AUD_DN0_FREQ,                0x0000283b },
-                { AUD_DN2_SRC_SEL,             0x00000008 },
-                { AUD_DN2_FREQ,                0x00003000 },
-                { AUD_DN2_AFC,                 0x00000002 },
-                { AUD_DN2_SHFT,                0x00000000 },
-                { AUD_IIR2_2_SEL,              0x00000020 },
-                { AUD_IIR2_2_SHIFT,            0x00000000 },
-                { AUD_IIR2_3_SEL,              0x0000001f },
-                { AUD_IIR2_3_SHIFT,            0x00000000 },
-                { AUD_CRDC1_SRC_SEL,           0x000003ce },
-                { AUD_CRDC1_SHIFT,             0x00000000 },
-                { AUD_CORDIC_SHIFT_1,          0x00000007 },
-                { AUD_DCOC_1_SRC,              0x0000001b },
-                { AUD_DCOC1_SHIFT,             0x00000000 },
-                { AUD_RDSI_SEL,                0x00000008 },
-                { AUD_RDSQ_SEL,                0x00000008 },
-                { AUD_RDSI_SHIFT,              0x00000000 },
-                { AUD_RDSQ_SHIFT,              0x00000000 },
-                { AUD_POLYPH80SCALEFAC,        0x00000003 },
+                {AUD_AFE_12DB_EN, 0x00000001},
+                {AUD_OUT1_SEL, 0x00000013},
+                {AUD_OUT1_SHIFT, 0x00000000},
+                {AUD_POLY0_DDS_CONSTANT, 0x0012010c},
+                {AUD_DMD_RA_DDS, 0x00c3e7aa},
+                {AUD_DBX_IN_GAIN, 0x00004734},
+                {AUD_DBX_WBE_GAIN, 0x00004640},
+                {AUD_DBX_SE_GAIN, 0x00008d31},
+                {AUD_DCOC_0_SRC, 0x0000001a},
+                {AUD_IIR1_4_SEL, 0x00000021},
+                {AUD_DCOC_PASS_IN, 0x00000003},
+                {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+                {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+                {AUD_DN0_FREQ, 0x0000283b},
+                {AUD_DN2_SRC_SEL, 0x00000008},
+                {AUD_DN2_FREQ, 0x00003000},
+                {AUD_DN2_AFC, 0x00000002},
+                {AUD_DN2_SHFT, 0x00000000},
+                {AUD_IIR2_2_SEL, 0x00000020},
+                {AUD_IIR2_2_SHIFT, 0x00000000},
+                {AUD_IIR2_3_SEL, 0x0000001f},
+                {AUD_IIR2_3_SHIFT, 0x00000000},
+                {AUD_CRDC1_SRC_SEL, 0x000003ce},
+                {AUD_CRDC1_SHIFT, 0x00000000},
+                {AUD_CORDIC_SHIFT_1, 0x00000007},
+                {AUD_DCOC_1_SRC, 0x0000001b},
+                {AUD_DCOC1_SHIFT, 0x00000000},
+                {AUD_RDSI_SEL, 0x00000008},
+                {AUD_RDSQ_SEL, 0x00000008},
+                {AUD_RDSI_SHIFT, 0x00000000},
+                {AUD_RDSQ_SHIFT, 0x00000000},
+                {AUD_POLYPH80SCALEFAC, 0x00000003},
                 { /* end of list */ },
         };
         static const struct rlist btsc_sap[] = {
-        { AUD_AFE_12DB_EN,             0x00000001 },
-                { AUD_DBX_IN_GAIN,             0x00007200 },
-                { AUD_DBX_WBE_GAIN,            0x00006200 },
-                { AUD_DBX_SE_GAIN,             0x00006200 },
-                { AUD_IIR1_1_SEL,              0x00000000 },
-                { AUD_IIR1_3_SEL,              0x00000001 },
-                { AUD_DN1_SRC_SEL,             0x00000007 },
-                { AUD_IIR1_4_SHIFT,            0x00000006 },
-                { AUD_IIR2_1_SHIFT,            0x00000000 },
-                { AUD_IIR2_2_SHIFT,            0x00000000 },
-                { AUD_IIR3_0_SHIFT,            0x00000000 },
-                { AUD_IIR3_1_SHIFT,            0x00000000 },
-                { AUD_IIR3_0_SEL,              0x0000000d },
-                { AUD_IIR3_1_SEL,              0x0000000e },
-                { AUD_DEEMPH1_SRC_SEL,         0x00000014 },
-                { AUD_DEEMPH1_SHIFT,           0x00000000 },
-                { AUD_DEEMPH1_G0,              0x00004000 },
-                { AUD_DEEMPH1_A0,              0x00000000 },
-                { AUD_DEEMPH1_B0,              0x00000000 },
-                { AUD_DEEMPH1_A1,              0x00000000 },
-                { AUD_DEEMPH1_B1,              0x00000000 },
-                { AUD_OUT0_SEL,                0x0000003f },
-                { AUD_OUT1_SEL,                0x0000003f },
-                { AUD_DN1_AFC,                 0x00000002 },
-                { AUD_DCOC_0_SHIFT_IN0,        0x0000000a },
-                { AUD_DCOC_0_SHIFT_IN1,        0x00000008 },
-                { AUD_DCOC_1_SHIFT_IN0,        0x0000000a },
-                { AUD_DCOC_1_SHIFT_IN1,        0x00000008 },
-                { AUD_IIR1_0_SEL,              0x0000001d },
-                { AUD_IIR1_2_SEL,              0x0000001e },
-                { AUD_IIR2_1_SEL,              0x00000002 },
-                { AUD_IIR2_2_SEL,              0x00000004 },
-                { AUD_IIR3_2_SEL,              0x0000000f },
-                { AUD_DCOC2_SHIFT,             0x00000001 },
-                { AUD_IIR3_2_SHIFT,            0x00000001 },
-                { AUD_DEEMPH0_SRC_SEL,         0x00000014 },
-                { AUD_CORDIC_SHIFT_1,          0x00000006 },
-                { AUD_POLY0_DDS_CONSTANT,      0x000e4db2 },
-                { AUD_DMD_RA_DDS,              0x00f696e6 },
-                { AUD_IIR2_3_SEL,              0x00000025 },
-                { AUD_IIR1_4_SEL,              0x00000021 },
-                { AUD_DN1_FREQ,                0x0000c965 },
-                { AUD_DCOC_PASS_IN,            0x00000003 },
-                { AUD_DCOC_0_SRC,              0x0000001a },
-                { AUD_DCOC_1_SRC,              0x0000001b },
-                { AUD_DCOC1_SHIFT,             0x00000000 },
-                { AUD_RDSI_SEL,                0x00000009 },
-                { AUD_RDSQ_SEL,                0x00000009 },
-                { AUD_RDSI_SHIFT,              0x00000000 },
-                { AUD_RDSQ_SHIFT,              0x00000000 },
-                { AUD_POLYPH80SCALEFAC,        0x00000003 },
+                {AUD_AFE_12DB_EN, 0x00000001},
+                {AUD_DBX_IN_GAIN, 0x00007200},
+                {AUD_DBX_WBE_GAIN, 0x00006200},
+                {AUD_DBX_SE_GAIN, 0x00006200},
+                {AUD_IIR1_1_SEL, 0x00000000},
+                {AUD_IIR1_3_SEL, 0x00000001},
+                {AUD_DN1_SRC_SEL, 0x00000007},
+                {AUD_IIR1_4_SHIFT, 0x00000006},
+                {AUD_IIR2_1_SHIFT, 0x00000000},
+                {AUD_IIR2_2_SHIFT, 0x00000000},
+                {AUD_IIR3_0_SHIFT, 0x00000000},
+                {AUD_IIR3_1_SHIFT, 0x00000000},
+                {AUD_IIR3_0_SEL, 0x0000000d},
+                {AUD_IIR3_1_SEL, 0x0000000e},
+                {AUD_DEEMPH1_SRC_SEL, 0x00000014},
+                {AUD_DEEMPH1_SHIFT, 0x00000000},
+                {AUD_DEEMPH1_G0, 0x00004000},
+                {AUD_DEEMPH1_A0, 0x00000000},
+                {AUD_DEEMPH1_B0, 0x00000000},
+                {AUD_DEEMPH1_A1, 0x00000000},
+                {AUD_DEEMPH1_B1, 0x00000000},
+                {AUD_OUT0_SEL, 0x0000003f},
+                {AUD_OUT1_SEL, 0x0000003f},
+                {AUD_DN1_AFC, 0x00000002},
+                {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+                {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+                {AUD_IIR1_0_SEL, 0x0000001d},
+                {AUD_IIR1_2_SEL, 0x0000001e},
+                {AUD_IIR2_1_SEL, 0x00000002},
+                {AUD_IIR2_2_SEL, 0x00000004},
+                {AUD_IIR3_2_SEL, 0x0000000f},
+                {AUD_DCOC2_SHIFT, 0x00000001},
+                {AUD_IIR3_2_SHIFT, 0x00000001},
+                {AUD_DEEMPH0_SRC_SEL, 0x00000014},
+                {AUD_CORDIC_SHIFT_1, 0x00000006},
+                {AUD_POLY0_DDS_CONSTANT, 0x000e4db2},
+                {AUD_DMD_RA_DDS, 0x00f696e6},
+                {AUD_IIR2_3_SEL, 0x00000025},
+                {AUD_IIR1_4_SEL, 0x00000021},
+                {AUD_DN1_FREQ, 0x0000c965},
+                {AUD_DCOC_PASS_IN, 0x00000003},
+                {AUD_DCOC_0_SRC, 0x0000001a},
+                {AUD_DCOC_1_SRC, 0x0000001b},
+                {AUD_DCOC1_SHIFT, 0x00000000},
+                {AUD_RDSI_SEL, 0x00000009},
+                {AUD_RDSQ_SEL, 0x00000009},
+                {AUD_RDSI_SHIFT, 0x00000000},
+                {AUD_RDSQ_SHIFT, 0x00000000},
+                {AUD_POLYPH80SCALEFAC, 0x00000003},
                 { /* end of list */ },
         };
 
         mode |= EN_FMRADIO_EN_RDS;
 
         if (sap) {
-                dprintk("%s SAP (status: unknown)\n",__FUNCTION__);
-        set_audio_start(core, SEL_SAP);
+                dprintk("%s SAP (status: unknown)\n", __FUNCTION__);
+                set_audio_start(core, SEL_SAP);
                 set_audio_registers(core, btsc_sap);
                 set_audio_finish(core, mode);
         } else {
-                dprintk("%s (status: known-good)\n",__FUNCTION__);
-        set_audio_start(core, SEL_BTSC);
+                dprintk("%s (status: known-good)\n", __FUNCTION__);
+                set_audio_start(core, SEL_BTSC);
                 set_audio_registers(core, btsc);
                 set_audio_finish(core, mode);
         }
 }
 
-
-static void set_audio_standard_NICAM_L(struct cx88_core *core, int stereo)
+static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
 {
-        /* This is probably weird..
-        * Let's operate and find out. */
-
-        static const struct rlist nicam_l_mono[] = {
-                { AUD_ERRLOGPERIOD_R,     0x00000064 },
-                { AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF },
-                { AUD_ERRINTRPTTHSHLD2_R, 0x0000001F },
-                { AUD_ERRINTRPTTHSHLD3_R, 0x0000000F },
-
-                { AUD_PDF_DDS_CNST_BYTE2, 0x48 },
-                { AUD_PDF_DDS_CNST_BYTE1, 0x3D },
-                { AUD_QAM_MODE,           0x00 },
-                { AUD_PDF_DDS_CNST_BYTE0, 0xf5 },
-                { AUD_PHACC_FREQ_8MSB,    0x3a },
-                { AUD_PHACC_FREQ_8LSB,    0x4a },
-
-                { AUD_DEEMPHGAIN_R, 0x6680 },
-                { AUD_DEEMPHNUMER1_R, 0x353DE },
-                { AUD_DEEMPHNUMER2_R, 0x1B1 },
-                { AUD_DEEMPHDENOM1_R, 0x0F3D0 },
-                { AUD_DEEMPHDENOM2_R, 0x0 },
-                { AUD_FM_MODE_ENABLE, 0x7 },
-                { AUD_POLYPH80SCALEFAC, 0x3 },
-                { AUD_AFE_12DB_EN, 0x1 },
-                { AAGC_GAIN, 0x0 },
-                { AAGC_HYST, 0x18 },
-                { AAGC_DEF, 0x20 },
-                { AUD_DN0_FREQ, 0x0 },
-                { AUD_POLY0_DDS_CONSTANT, 0x0E4DB2 },
-                { AUD_DCOC_0_SRC, 0x21 },
-                { AUD_IIR1_0_SEL, 0x0 },
-                { AUD_IIR1_0_SHIFT, 0x7 },
-                { AUD_IIR1_1_SEL, 0x2 },
-                { AUD_IIR1_1_SHIFT, 0x0 },
-                { AUD_DCOC_1_SRC, 0x3 },
-                { AUD_DCOC1_SHIFT, 0x0 },
-                { AUD_DCOC_PASS_IN, 0x0 },
-                { AUD_IIR1_2_SEL, 0x23 },
-                { AUD_IIR1_2_SHIFT, 0x0 },
-                { AUD_IIR1_3_SEL, 0x4 },
-                { AUD_IIR1_3_SHIFT, 0x7 },
-                { AUD_IIR1_4_SEL, 0x5 },
-                { AUD_IIR1_4_SHIFT, 0x7 },
-                { AUD_IIR3_0_SEL, 0x7 },
-                { AUD_IIR3_0_SHIFT, 0x0 },
-                { AUD_DEEMPH0_SRC_SEL, 0x11 },
-                { AUD_DEEMPH0_SHIFT, 0x0 },
-                { AUD_DEEMPH0_G0, 0x7000 },
-                { AUD_DEEMPH0_A0, 0x0 },
-                { AUD_DEEMPH0_B0, 0x0 },
-                { AUD_DEEMPH0_A1, 0x0 },
-                { AUD_DEEMPH0_B1, 0x0 },
-                { AUD_DEEMPH1_SRC_SEL, 0x11 },
-                { AUD_DEEMPH1_SHIFT, 0x0 },
-                { AUD_DEEMPH1_G0, 0x7000 },
-                { AUD_DEEMPH1_A0, 0x0 },
-                { AUD_DEEMPH1_B0, 0x0 },
-                { AUD_DEEMPH1_A1, 0x0 },
-                { AUD_DEEMPH1_B1, 0x0 },
-                { AUD_OUT0_SEL, 0x3F },
-                { AUD_OUT1_SEL, 0x3F },
-                { AUD_DMD_RA_DDS, 0x0F5C285 },
-                { AUD_PLL_INT, 0x1E },
-                { AUD_PLL_DDS, 0x0 },
-                { AUD_PLL_FRAC, 0x0E542 },
-
-                // setup QAM registers
-                { AUD_RATE_ADJ1,      0x00000100 },
-                { AUD_RATE_ADJ2,      0x00000200 },
-                { AUD_RATE_ADJ3,      0x00000300 },
-                { AUD_RATE_ADJ4,      0x00000400 },
-                { AUD_RATE_ADJ5,      0x00000500 },
-                { AUD_RATE_THRES_DMD, 0x000000C0 },
+        static const struct rlist nicam_l[] = {
+                {AUD_AFE_12DB_EN, 0x00000001},
+                {AUD_RATE_ADJ1, 0x00000060},
+                {AUD_RATE_ADJ2, 0x000000F9},
+                {AUD_RATE_ADJ3, 0x000001CC},
+                {AUD_RATE_ADJ4, 0x000002B3},
+                {AUD_RATE_ADJ5, 0x00000726},
+                {AUD_DEEMPHDENOM1_R, 0x0000F3D0},
+                {AUD_DEEMPHDENOM2_R, 0x00000000},
+                {AUD_ERRLOGPERIOD_R, 0x00000064},
+                {AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF},
+                {AUD_ERRINTRPTTHSHLD2_R, 0x0000001F},
+                {AUD_ERRINTRPTTHSHLD3_R, 0x0000000F},
+                {AUD_POLYPH80SCALEFAC, 0x00000003},
+                {AUD_DMD_RA_DDS, 0x00C00000},
+                {AUD_PLL_INT, 0x0000001E},
+                {AUD_PLL_DDS, 0x00000000},
+                {AUD_PLL_FRAC, 0x0000E542},
+                {AUD_START_TIMER, 0x00000000},
+                {AUD_DEEMPHNUMER1_R, 0x000353DE},
+                {AUD_DEEMPHNUMER2_R, 0x000001B1},
+                {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+                {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+                {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+                {AUD_QAM_MODE, 0x05},
+                {AUD_PHACC_FREQ_8MSB, 0x34},
+                {AUD_PHACC_FREQ_8LSB, 0x4C},
+                {AUD_DEEMPHGAIN_R, 0x00006680},
+                {AUD_RATE_THRES_DMD, 0x000000C0},
                 { /* end of list */ },
         };
 
-        static const struct rlist nicam_l[] = {
-                // setup QAM registers
-                { AUD_RATE_ADJ1, 0x00000060 },
-                { AUD_RATE_ADJ2, 0x000000F9 },
-                { AUD_RATE_ADJ3, 0x000001CC },
-                { AUD_RATE_ADJ4, 0x000002B3 },
-                { AUD_RATE_ADJ5, 0x00000726 },
-                { AUD_DEEMPHDENOM1_R, 0x0000F3D0 },
-                { AUD_DEEMPHDENOM2_R, 0x00000000 },
-                { AUD_ERRLOGPERIOD_R, 0x00000064 },
-                { AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF },
-                { AUD_ERRINTRPTTHSHLD2_R, 0x0000001F },
-                { AUD_ERRINTRPTTHSHLD3_R, 0x0000000F },
-                { AUD_POLYPH80SCALEFAC, 0x00000003 },
-                { AUD_DMD_RA_DDS, 0x00C00000 },
-                { AUD_PLL_INT, 0x0000001E },
-                { AUD_PLL_DDS, 0x00000000 },
-                { AUD_PLL_FRAC, 0x0000E542 },
-                { AUD_START_TIMER, 0x00000000 },
-                { AUD_DEEMPHNUMER1_R, 0x000353DE },
-                { AUD_DEEMPHNUMER2_R, 0x000001B1 },
-                { AUD_PDF_DDS_CNST_BYTE2, 0x06 },
-                { AUD_PDF_DDS_CNST_BYTE1, 0x82 },
-                { AUD_QAM_MODE, 0x05 },
-                { AUD_PDF_DDS_CNST_BYTE0, 0x12 },
-                { AUD_PHACC_FREQ_8MSB, 0x34 },
-                { AUD_PHACC_FREQ_8LSB, 0x4C },
-                { AUD_DEEMPHGAIN_R, 0x00006680 },
-                { AUD_RATE_THRES_DMD, 0x000000C0  },
+        static const struct rlist nicam_bgdki_common[] = {
+                {AUD_AFE_12DB_EN, 0x00000001},
+                {AUD_RATE_ADJ1, 0x00000010},
+                {AUD_RATE_ADJ2, 0x00000040},
+                {AUD_RATE_ADJ3, 0x00000100},
+                {AUD_RATE_ADJ4, 0x00000400},
+                {AUD_RATE_ADJ5, 0x00001000},
+                //{ AUD_DMD_RA_DDS,        0x00c0d5ce },
+                {AUD_ERRLOGPERIOD_R, 0x00000fff},
+                {AUD_ERRINTRPTTHSHLD1_R, 0x000003ff},
+                {AUD_ERRINTRPTTHSHLD2_R, 0x000000ff},
+                {AUD_ERRINTRPTTHSHLD3_R, 0x0000003f},
+                {AUD_POLYPH80SCALEFAC, 0x00000003},
+                {AUD_DEEMPHGAIN_R, 0x000023c2},
+                {AUD_DEEMPHNUMER1_R, 0x0002a7bc},
+                {AUD_DEEMPHNUMER2_R, 0x0003023e},
+                {AUD_DEEMPHDENOM1_R, 0x0000f3d0},
+                {AUD_DEEMPHDENOM2_R, 0x00000000},
+                {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+                {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+                {AUD_QAM_MODE, 0x05},
                 { /* end of list */ },
-        } ;
-        dprintk("%s (status: devel), stereo : %d\n",__FUNCTION__,stereo);
-
-        if (!stereo) {
-        /* AM Mono */
-                set_audio_start(core, SEL_A2);
-                set_audio_registers(core, nicam_l_mono);
-        set_audio_finish(core, EN_A2_FORCE_MONO1);
-        } else {
-        /* Nicam Stereo */
-                set_audio_start(core, SEL_NICAM);
-                set_audio_registers(core, nicam_l);
-        set_audio_finish(core, 0x1924); /* FIXME */
-        }
-}
+        };
 
-static void set_audio_standard_PAL_I(struct cx88_core *core, int stereo)
-{
-       static const struct rlist pal_i_fm_mono[] = {
-        {AUD_ERRLOGPERIOD_R,       0x00000064},
-        {AUD_ERRINTRPTTHSHLD1_R,   0x00000fff},
-        {AUD_ERRINTRPTTHSHLD2_R,   0x0000001f},
-        {AUD_ERRINTRPTTHSHLD3_R,   0x0000000f},
-        {AUD_PDF_DDS_CNST_BYTE2,   0x06},
-        {AUD_PDF_DDS_CNST_BYTE1,   0x82},
-        {AUD_PDF_DDS_CNST_BYTE0,   0x12},
-        {AUD_QAM_MODE,             0x05},
-        {AUD_PHACC_FREQ_8MSB,      0x3a},
-        {AUD_PHACC_FREQ_8LSB,      0x93},
-        {AUD_DMD_RA_DDS,           0x002a4f2f},
-        {AUD_PLL_INT,              0x0000001e},
-        {AUD_PLL_DDS,              0x00000004},
-        {AUD_PLL_FRAC,             0x0000e542},
-        {AUD_RATE_ADJ1,            0x00000100},
-        {AUD_RATE_ADJ2,            0x00000200},
-        {AUD_RATE_ADJ3,            0x00000300},
-        {AUD_RATE_ADJ4,            0x00000400},
-        {AUD_RATE_ADJ5,            0x00000500},
-        {AUD_THR_FR,               0x00000000},
-        {AUD_PILOT_BQD_1_K0,       0x0000755b},
-        {AUD_PILOT_BQD_1_K1,       0x00551340},
-        {AUD_PILOT_BQD_1_K2,       0x006d30be},
-        {AUD_PILOT_BQD_1_K3,       0xffd394af},
-        {AUD_PILOT_BQD_1_K4,       0x00400000},
-        {AUD_PILOT_BQD_2_K0,       0x00040000},
-        {AUD_PILOT_BQD_2_K1,       0x002a4841},
-        {AUD_PILOT_BQD_2_K2,       0x00400000},
-        {AUD_PILOT_BQD_2_K3,       0x00000000},
-        {AUD_PILOT_BQD_2_K4,       0x00000000},
-        {AUD_MODE_CHG_TIMER,       0x00000060},
-        {AUD_AFE_12DB_EN,          0x00000001},
-        {AAGC_HYST,                0x0000000a},
-        {AUD_CORDIC_SHIFT_0,       0x00000007},
-        {AUD_CORDIC_SHIFT_1,       0x00000007},
-        {AUD_C1_UP_THR,            0x00007000},
-        {AUD_C1_LO_THR,            0x00005400},
-        {AUD_C2_UP_THR,            0x00005400},
-        {AUD_C2_LO_THR,            0x00003000},
-        {AUD_DCOC_0_SRC,           0x0000001a},
-        {AUD_DCOC0_SHIFT,          0x00000000},
-        {AUD_DCOC_0_SHIFT_IN0,     0x0000000a},
-        {AUD_DCOC_0_SHIFT_IN1,     0x00000008},
-        {AUD_DCOC_PASS_IN,         0x00000003},
-        {AUD_IIR3_0_SEL,           0x00000021},
-        {AUD_DN2_AFC,              0x00000002},
-        {AUD_DCOC_1_SRC,           0x0000001b},
-        {AUD_DCOC1_SHIFT,          0x00000000},
-        {AUD_DCOC_1_SHIFT_IN0,     0x0000000a},
-        {AUD_DCOC_1_SHIFT_IN1,     0x00000008},
-        {AUD_IIR3_1_SEL,           0x00000023},
-        {AUD_DN0_FREQ,             0x000035a3},
-        {AUD_DN2_FREQ,             0x000029c7},
-        {AUD_CRDC0_SRC_SEL,        0x00000511},
-        {AUD_IIR1_0_SEL,           0x00000001},
-        {AUD_IIR1_1_SEL,           0x00000000},
-        {AUD_IIR3_2_SEL,           0x00000003},
-        {AUD_IIR3_2_SHIFT,         0x00000000},
-        {AUD_IIR3_0_SEL,           0x00000002},
-        {AUD_IIR2_0_SEL,           0x00000021},
-        {AUD_IIR2_0_SHIFT,         0x00000002},
-        {AUD_DEEMPH0_SRC_SEL,      0x0000000b},
-        {AUD_DEEMPH1_SRC_SEL,      0x0000000b},
-        {AUD_POLYPH80SCALEFAC,     0x00000001},
-        {AUD_START_TIMER,          0x00000000},
-        { /* end of list */ },
-       };
-
-       static const struct rlist pal_i_nicam[] = {
-        { AUD_RATE_ADJ1,           0x00000010 },
-        { AUD_RATE_ADJ2,           0x00000040 },
-        { AUD_RATE_ADJ3,           0x00000100 },
-        { AUD_RATE_ADJ4,           0x00000400 },
-        { AUD_RATE_ADJ5,           0x00001000 },
-        //     { AUD_DMD_RA_DDS,          0x00c0d5ce },
-        { AUD_DEEMPHGAIN_R,        0x000023c2 },
-        { AUD_DEEMPHNUMER1_R,      0x0002a7bc },
-        { AUD_DEEMPHNUMER2_R,      0x0003023e },
-        { AUD_DEEMPHDENOM1_R,      0x0000f3d0 },
-        { AUD_DEEMPHDENOM2_R,      0x00000000 },
-        { AUD_DEEMPHDENOM2_R,      0x00000000 },
-        { AUD_ERRLOGPERIOD_R,      0x00000fff },
-        { AUD_ERRINTRPTTHSHLD1_R,  0x000003ff },
-        { AUD_ERRINTRPTTHSHLD2_R,  0x000000ff },
-        { AUD_ERRINTRPTTHSHLD3_R,  0x0000003f },
-        { AUD_POLYPH80SCALEFAC,    0x00000003 },
-        { AUD_PDF_DDS_CNST_BYTE2,  0x06 },
-        { AUD_PDF_DDS_CNST_BYTE1,  0x82 },
-        { AUD_PDF_DDS_CNST_BYTE0,  0x16 },
-        { AUD_QAM_MODE,            0x05 },
-        { AUD_PDF_DDS_CNST_BYTE0,  0x12 },
-        { AUD_PHACC_FREQ_8MSB,     0x3a },
-        { AUD_PHACC_FREQ_8LSB,     0x93 },
-        { /* end of list */ },
+        static const struct rlist nicam_i[] = {
+                {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+                {AUD_PHACC_FREQ_8MSB, 0x3a},
+                {AUD_PHACC_FREQ_8LSB, 0x93},
+                { /* end of list */ },
         };
 
-        dprintk("%s (status: devel), stereo : %d\n",__FUNCTION__,stereo);
+        static const struct rlist nicam_default[] = {
+                {AUD_PDF_DDS_CNST_BYTE0, 0x16},
+                {AUD_PHACC_FREQ_8MSB, 0x34},
+                {AUD_PHACC_FREQ_8LSB, 0x4c},
+                { /* end of list */ },
+        };
 
-        if (!stereo) {
-        /* FM Mono */
-        set_audio_start(core, SEL_A2);
-                set_audio_registers(core, pal_i_fm_mono);
-                set_audio_finish(core, EN_DMTRX_SUMDIFF | EN_A2_FORCE_MONO1);
-        } else {
-        /* Nicam Stereo */
-        set_audio_start(core, SEL_NICAM);
-                set_audio_registers(core, pal_i_nicam);
-                set_audio_finish(core, EN_DMTRX_LR | EN_DMTRX_BYPASS | EN_NICAM_AUTO_STEREO);
-        }
+        set_audio_start(core,SEL_NICAM);
+        switch (core->tvaudio) {
+        case WW_L:
+                dprintk("%s SECAM-L NICAM (status: devel)\n", __FUNCTION__);
+                set_audio_registers(core, nicam_l);
+                break;
+        case WW_I:
+                dprintk("%s PAL-I NICAM (status: devel)\n", __FUNCTION__);
+                set_audio_registers(core, nicam_bgdki_common);
+                set_audio_registers(core, nicam_i);
+                break;
+        default:
+                dprintk("%s PAL-BGDK NICAM (status: unknown)\n", __FUNCTION__);
+                set_audio_registers(core, nicam_bgdki_common);
+                set_audio_registers(core, nicam_default);
+                break;
+        };
+
+        mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS;
+        set_audio_finish(core, mode);
 }
 
 static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
 {
-        static const struct rlist a2_common[] = {
-        {AUD_ERRLOGPERIOD_R,            0x00000064},
-        {AUD_ERRINTRPTTHSHLD1_R,        0x00000fff},
-        {AUD_ERRINTRPTTHSHLD2_R,        0x0000001f},
-        {AUD_ERRINTRPTTHSHLD3_R,        0x0000000f},
-        {AUD_PDF_DDS_CNST_BYTE2,        0x06},
-        {AUD_PDF_DDS_CNST_BYTE1,        0x82},
-        {AUD_PDF_DDS_CNST_BYTE0,        0x12},
-        {AUD_QAM_MODE,                  0x05},
-        {AUD_PHACC_FREQ_8MSB,           0x34},
-        {AUD_PHACC_FREQ_8LSB,           0x4c},
-        {AUD_RATE_ADJ1,                 0x00000100},
-        {AUD_RATE_ADJ2,                 0x00000200},
-        {AUD_RATE_ADJ3,                 0x00000300},
-        {AUD_RATE_ADJ4,                 0x00000400},
-        {AUD_RATE_ADJ5,                 0x00000500},
-        {AUD_THR_FR,                    0x00000000},
-        {AAGC_HYST,                     0x0000001a},
-        {AUD_PILOT_BQD_1_K0,            0x0000755b},
-        {AUD_PILOT_BQD_1_K1,            0x00551340},
-        {AUD_PILOT_BQD_1_K2,            0x006d30be},
-        {AUD_PILOT_BQD_1_K3,            0xffd394af},
-        {AUD_PILOT_BQD_1_K4,            0x00400000},
-        {AUD_PILOT_BQD_2_K0,            0x00040000},
-        {AUD_PILOT_BQD_2_K1,            0x002a4841},
-        {AUD_PILOT_BQD_2_K2,            0x00400000},
-        {AUD_PILOT_BQD_2_K3,            0x00000000},
-        {AUD_PILOT_BQD_2_K4,            0x00000000},
-        {AUD_MODE_CHG_TIMER,            0x00000040},
-        {AUD_AFE_12DB_EN,               0x00000001},
-        {AUD_CORDIC_SHIFT_0,            0x00000007},
-        {AUD_CORDIC_SHIFT_1,            0x00000007},
-        {AUD_DEEMPH0_G0,                0x00000380},
-        {AUD_DEEMPH1_G0,                0x00000380},
-        {AUD_DCOC_0_SRC,                0x0000001a},
-        {AUD_DCOC0_SHIFT,               0x00000000},
-        {AUD_DCOC_0_SHIFT_IN0,          0x0000000a},
-        {AUD_DCOC_0_SHIFT_IN1,          0x00000008},
-        {AUD_DCOC_PASS_IN,              0x00000003},
-        {AUD_IIR3_0_SEL,                0x00000021},
-        {AUD_DN2_AFC,                   0x00000002},
-        {AUD_DCOC_1_SRC,                0x0000001b},
-        {AUD_DCOC1_SHIFT,               0x00000000},
-        {AUD_DCOC_1_SHIFT_IN0,          0x0000000a},
-        {AUD_DCOC_1_SHIFT_IN1,          0x00000008},
-        {AUD_IIR3_1_SEL,                0x00000023},
-        {AUD_RDSI_SEL,                  0x00000017},
-        {AUD_RDSI_SHIFT,                0x00000000},
-        {AUD_RDSQ_SEL,                  0x00000017},
-        {AUD_RDSQ_SHIFT,                0x00000000},
-        {AUD_PLL_INT,                   0x0000001e},
-        {AUD_PLL_DDS,                   0x00000000},
-        {AUD_PLL_FRAC,                  0x0000e542},
-        {AUD_POLYPH80SCALEFAC,          0x00000001},
-        {AUD_START_TIMER,               0x00000000},
-        { /* end of list */ },
+        static const struct rlist a2_bgdk_common[] = {
+                {AUD_ERRLOGPERIOD_R, 0x00000064},
+                {AUD_ERRINTRPTTHSHLD1_R, 0x00000fff},
+                {AUD_ERRINTRPTTHSHLD2_R, 0x0000001f},
+                {AUD_ERRINTRPTTHSHLD3_R, 0x0000000f},
+                {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+                {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+                {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+                {AUD_QAM_MODE, 0x05},
+                {AUD_PHACC_FREQ_8MSB, 0x34},
+                {AUD_PHACC_FREQ_8LSB, 0x4c},
+                {AUD_RATE_ADJ1, 0x00000100},
+                {AUD_RATE_ADJ2, 0x00000200},
+                {AUD_RATE_ADJ3, 0x00000300},
+                {AUD_RATE_ADJ4, 0x00000400},
+                {AUD_RATE_ADJ5, 0x00000500},
+                {AUD_THR_FR, 0x00000000},
+                {AAGC_HYST, 0x0000001a},
+                {AUD_PILOT_BQD_1_K0, 0x0000755b},
+                {AUD_PILOT_BQD_1_K1, 0x00551340},
+                {AUD_PILOT_BQD_1_K2, 0x006d30be},
+                {AUD_PILOT_BQD_1_K3, 0xffd394af},
+                {AUD_PILOT_BQD_1_K4, 0x00400000},
+                {AUD_PILOT_BQD_2_K0, 0x00040000},
+                {AUD_PILOT_BQD_2_K1, 0x002a4841},
+                {AUD_PILOT_BQD_2_K2, 0x00400000},
+                {AUD_PILOT_BQD_2_K3, 0x00000000},
+                {AUD_PILOT_BQD_2_K4, 0x00000000},
+                {AUD_MODE_CHG_TIMER, 0x00000040},
+                {AUD_AFE_12DB_EN, 0x00000001},
+                {AUD_CORDIC_SHIFT_0, 0x00000007},
+                {AUD_CORDIC_SHIFT_1, 0x00000007},
+                {AUD_DEEMPH0_G0, 0x00000380},
+                {AUD_DEEMPH1_G0, 0x00000380},
+                {AUD_DCOC_0_SRC, 0x0000001a},
+                {AUD_DCOC0_SHIFT, 0x00000000},
+                {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+                {AUD_DCOC_PASS_IN, 0x00000003},
+                {AUD_IIR3_0_SEL, 0x00000021},
+                {AUD_DN2_AFC, 0x00000002},
+                {AUD_DCOC_1_SRC, 0x0000001b},
+                {AUD_DCOC1_SHIFT, 0x00000000},
+                {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+                {AUD_IIR3_1_SEL, 0x00000023},
+                {AUD_RDSI_SEL, 0x00000017},
+                {AUD_RDSI_SHIFT, 0x00000000},
+                {AUD_RDSQ_SEL, 0x00000017},
+                {AUD_RDSQ_SHIFT, 0x00000000},
+                {AUD_PLL_INT, 0x0000001e},
+                {AUD_PLL_DDS, 0x00000000},
+                {AUD_PLL_FRAC, 0x0000e542},
+                {AUD_POLYPH80SCALEFAC, 0x00000001},
+                {AUD_START_TIMER, 0x00000000},
+                { /* end of list */ },
         };
 
         static const struct rlist a2_bg[] = {
-        {AUD_DMD_RA_DDS,                0x002a4f2f},
-        {AUD_C1_UP_THR,                 0x00007000},
-        {AUD_C1_LO_THR,                 0x00005400},
-        {AUD_C2_UP_THR,                 0x00005400},
-        {AUD_C2_LO_THR,                 0x00003000},
+                {AUD_DMD_RA_DDS, 0x002a4f2f},
+                {AUD_C1_UP_THR, 0x00007000},
+                {AUD_C1_LO_THR, 0x00005400},
+                {AUD_C2_UP_THR, 0x00005400},
+                {AUD_C2_LO_THR, 0x00003000},
                 { /* end of list */ },
         };
 
         static const struct rlist a2_dk[] = {
-        {AUD_DMD_RA_DDS,                0x002a4f2f},
-        {AUD_C1_UP_THR,                 0x00007000},
-        {AUD_C1_LO_THR,                 0x00005400},
-        {AUD_C2_UP_THR,                 0x00005400},
-        {AUD_C2_LO_THR,                 0x00003000},
-        {AUD_DN0_FREQ,                  0x00003a1c},
-        {AUD_DN2_FREQ,                  0x0000d2e0},
+                {AUD_DMD_RA_DDS, 0x002a4f2f},
+                {AUD_C1_UP_THR, 0x00007000},
+                {AUD_C1_LO_THR, 0x00005400},
+                {AUD_C2_UP_THR, 0x00005400},
+                {AUD_C2_LO_THR, 0x00003000},
+                {AUD_DN0_FREQ, 0x00003a1c},
+                {AUD_DN2_FREQ, 0x0000d2e0},
                 { /* end of list */ },
         };
-/* unknown, probably NTSC-M */
-        static const struct rlist a2_m[] = {
-        {AUD_DMD_RA_DDS,                0x002a0425},
-        {AUD_C1_UP_THR,                 0x00003c00},
-        {AUD_C1_LO_THR,                 0x00003000},
-        {AUD_C2_UP_THR,                 0x00006000},
-        {AUD_C2_LO_THR,                 0x00003c00},
-        {AUD_DEEMPH0_A0,                0x00007a80},
-        {AUD_DEEMPH1_A0,                0x00007a80},
-        {AUD_DEEMPH0_G0,                0x00001200},
-        {AUD_DEEMPH1_G0,                0x00001200},
-        {AUD_DN0_FREQ,                  0x0000283b},
-        {AUD_DN1_FREQ,                  0x00003418},
-        {AUD_DN2_FREQ,                  0x000029c7},
-        {AUD_POLY0_DDS_CONSTANT,        0x000a7540},
+
+        static const struct rlist a1_i[] = {
+                {AUD_ERRLOGPERIOD_R, 0x00000064},
+                {AUD_ERRINTRPTTHSHLD1_R, 0x00000fff},
+                {AUD_ERRINTRPTTHSHLD2_R, 0x0000001f},
+                {AUD_ERRINTRPTTHSHLD3_R, 0x0000000f},
+                {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+                {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+                {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+                {AUD_QAM_MODE, 0x05},
+                {AUD_PHACC_FREQ_8MSB, 0x3a},
+                {AUD_PHACC_FREQ_8LSB, 0x93},
+                {AUD_DMD_RA_DDS, 0x002a4f2f},
+                {AUD_PLL_INT, 0x0000001e},
+                {AUD_PLL_DDS, 0x00000004},
+                {AUD_PLL_FRAC, 0x0000e542},
+                {AUD_RATE_ADJ1, 0x00000100},
+                {AUD_RATE_ADJ2, 0x00000200},
+                {AUD_RATE_ADJ3, 0x00000300},
+                {AUD_RATE_ADJ4, 0x00000400},
+                {AUD_RATE_ADJ5, 0x00000500},
+                {AUD_THR_FR, 0x00000000},
+                {AUD_PILOT_BQD_1_K0, 0x0000755b},
+                {AUD_PILOT_BQD_1_K1, 0x00551340},
+                {AUD_PILOT_BQD_1_K2, 0x006d30be},
+                {AUD_PILOT_BQD_1_K3, 0xffd394af},
+                {AUD_PILOT_BQD_1_K4, 0x00400000},
+                {AUD_PILOT_BQD_2_K0, 0x00040000},
+                {AUD_PILOT_BQD_2_K1, 0x002a4841},
+                {AUD_PILOT_BQD_2_K2, 0x00400000},
+                {AUD_PILOT_BQD_2_K3, 0x00000000},
+                {AUD_PILOT_BQD_2_K4, 0x00000000},
+                {AUD_MODE_CHG_TIMER, 0x00000060},
+                {AUD_AFE_12DB_EN, 0x00000001},
+                {AAGC_HYST, 0x0000000a},
+                {AUD_CORDIC_SHIFT_0, 0x00000007},
+                {AUD_CORDIC_SHIFT_1, 0x00000007},
+                {AUD_C1_UP_THR, 0x00007000},
+                {AUD_C1_LO_THR, 0x00005400},
+                {AUD_C2_UP_THR, 0x00005400},
+                {AUD_C2_LO_THR, 0x00003000},
+                {AUD_DCOC_0_SRC, 0x0000001a},
+                {AUD_DCOC0_SHIFT, 0x00000000},
+                {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+                {AUD_DCOC_PASS_IN, 0x00000003},
+                {AUD_IIR3_0_SEL, 0x00000021},
+                {AUD_DN2_AFC, 0x00000002},
+                {AUD_DCOC_1_SRC, 0x0000001b},
+                {AUD_DCOC1_SHIFT, 0x00000000},
+                {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+                {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+                {AUD_IIR3_1_SEL, 0x00000023},
+                {AUD_DN0_FREQ, 0x000035a3},
+                {AUD_DN2_FREQ, 0x000029c7},
+                {AUD_CRDC0_SRC_SEL, 0x00000511},
+                {AUD_IIR1_0_SEL, 0x00000001},
+                {AUD_IIR1_1_SEL, 0x00000000},
+                {AUD_IIR3_2_SEL, 0x00000003},
+                {AUD_IIR3_2_SHIFT, 0x00000000},
+                {AUD_IIR3_0_SEL, 0x00000002},
+                {AUD_IIR2_0_SEL, 0x00000021},
+                {AUD_IIR2_0_SHIFT, 0x00000002},
+                {AUD_DEEMPH0_SRC_SEL, 0x0000000b},
+                {AUD_DEEMPH1_SRC_SEL, 0x0000000b},
+                {AUD_POLYPH80SCALEFAC, 0x00000001},
+                {AUD_START_TIMER, 0x00000000},
                 { /* end of list */ },
         };
 
-        static const struct rlist a2_deemph50[] = {
-        {AUD_DEEMPH0_G0,                0x00000380},
-        {AUD_DEEMPH1_G0,                0x00000380},
-        {AUD_DEEMPHGAIN_R,              0x000011e1},
-        {AUD_DEEMPHNUMER1_R,            0x0002a7bc},
-        {AUD_DEEMPHNUMER2_R,            0x0003023c},
-        { /* end of list */ },
+        static const struct rlist am_l[] = {
+                {AUD_ERRLOGPERIOD_R, 0x00000064},
+                {AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF},
+                {AUD_ERRINTRPTTHSHLD2_R, 0x0000001F},
+                {AUD_ERRINTRPTTHSHLD3_R, 0x0000000F},
+                {AUD_PDF_DDS_CNST_BYTE2, 0x48},
+                {AUD_PDF_DDS_CNST_BYTE1, 0x3D},
+                {AUD_QAM_MODE, 0x00},
+                {AUD_PDF_DDS_CNST_BYTE0, 0xf5},
+                {AUD_PHACC_FREQ_8MSB, 0x3a},
+                {AUD_PHACC_FREQ_8LSB, 0x4a},
+                {AUD_DEEMPHGAIN_R, 0x00006680},
+                {AUD_DEEMPHNUMER1_R, 0x000353DE},
+                {AUD_DEEMPHNUMER2_R, 0x000001B1},
+                {AUD_DEEMPHDENOM1_R, 0x0000F3D0},
+                {AUD_DEEMPHDENOM2_R, 0x00000000},
+                {AUD_FM_MODE_ENABLE, 0x00000007},
+                {AUD_POLYPH80SCALEFAC, 0x00000003},
+                {AUD_AFE_12DB_EN, 0x00000001},
+                {AAGC_GAIN, 0x00000000},
+                {AAGC_HYST, 0x00000018},
+                {AAGC_DEF, 0x00000020},
+                {AUD_DN0_FREQ, 0x00000000},
+                {AUD_POLY0_DDS_CONSTANT, 0x000E4DB2},
+                {AUD_DCOC_0_SRC, 0x00000021},
+                {AUD_IIR1_0_SEL, 0x00000000},
+                {AUD_IIR1_0_SHIFT, 0x00000007},
+                {AUD_IIR1_1_SEL, 0x00000002},
+                {AUD_IIR1_1_SHIFT, 0x00000000},
+                {AUD_DCOC_1_SRC, 0x00000003},
+                {AUD_DCOC1_SHIFT, 0x00000000},
+                {AUD_DCOC_PASS_IN, 0x00000000},
+                {AUD_IIR1_2_SEL, 0x00000023},
+                {AUD_IIR1_2_SHIFT, 0x00000000},
+                {AUD_IIR1_3_SEL, 0x00000004},
+                {AUD_IIR1_3_SHIFT, 0x00000007},
+                {AUD_IIR1_4_SEL, 0x00000005},
+                {AUD_IIR1_4_SHIFT, 0x00000007},
+                {AUD_IIR3_0_SEL, 0x00000007},
+                {AUD_IIR3_0_SHIFT, 0x00000000},
+                {AUD_DEEMPH0_SRC_SEL, 0x00000011},
+                {AUD_DEEMPH0_SHIFT, 0x00000000},
+                {AUD_DEEMPH0_G0, 0x00007000},
+                {AUD_DEEMPH0_A0, 0x00000000},
+                {AUD_DEEMPH0_B0, 0x00000000},
+                {AUD_DEEMPH0_A1, 0x00000000},
+                {AUD_DEEMPH0_B1, 0x00000000},
+                {AUD_DEEMPH1_SRC_SEL, 0x00000011},
+                {AUD_DEEMPH1_SHIFT, 0x00000000},
+                {AUD_DEEMPH1_G0, 0x00007000},
+                {AUD_DEEMPH1_A0, 0x00000000},
+                {AUD_DEEMPH1_B0, 0x00000000},
+                {AUD_DEEMPH1_A1, 0x00000000},
+                {AUD_DEEMPH1_B1, 0x00000000},
+                {AUD_OUT0_SEL, 0x0000003F},
+                {AUD_OUT1_SEL, 0x0000003F},
+                {AUD_DMD_RA_DDS, 0x00F5C285},
+                {AUD_PLL_INT, 0x0000001E},
+                {AUD_PLL_DDS, 0x00000000},
+                {AUD_PLL_FRAC, 0x0000E542},
+                {AUD_RATE_ADJ1, 0x00000100},
+                {AUD_RATE_ADJ2, 0x00000200},
+                {AUD_RATE_ADJ3, 0x00000300},
+                {AUD_RATE_ADJ4, 0x00000400},
+                {AUD_RATE_ADJ5, 0x00000500},
+                {AUD_RATE_THRES_DMD, 0x000000C0},
+                { /* end of list */ },
         };
 
-        static const struct rlist a2_deemph75[] = {
-        {AUD_DEEMPH0_G0,                0x00000480},
-        {AUD_DEEMPH1_G0,                0x00000480},
-        {AUD_DEEMPHGAIN_R,              0x00009000},
-        {AUD_DEEMPHNUMER1_R,            0x000353de},
-        {AUD_DEEMPHNUMER2_R,            0x000001b1},
+        static const struct rlist a2_deemph50[] = {
+                {AUD_DEEMPH0_G0, 0x00000380},
+                {AUD_DEEMPH1_G0, 0x00000380},
+                {AUD_DEEMPHGAIN_R, 0x000011e1},
+                {AUD_DEEMPHNUMER1_R, 0x0002a7bc},
+                {AUD_DEEMPHNUMER2_R, 0x0003023c},
                 { /* end of list */ },
         };
 
         set_audio_start(core, SEL_A2);
-        set_audio_registers(core, a2_common);
         switch (core->tvaudio) {
-        case WW_A2_BG:
-                dprintk("%s PAL-BG A2 (status: known-good)\n",__FUNCTION__);
-        set_audio_registers(core, a2_bg);
-        set_audio_registers(core, a2_deemph50);
+        case WW_BG:
+                dprintk("%s PAL-BG A1/2 (status: known-good)\n", __FUNCTION__);
+                set_audio_registers(core, a2_bgdk_common);
+                set_audio_registers(core, a2_bg);
+                set_audio_registers(core, a2_deemph50);
                 break;
-        case WW_A2_DK:
-                dprintk("%s PAL-DK A2 (status: known-good)\n",__FUNCTION__);
-        set_audio_registers(core, a2_dk);
-        set_audio_registers(core, a2_deemph50);
+        case WW_DK:
+                dprintk("%s PAL-DK A1/2 (status: known-good)\n", __FUNCTION__);
+                set_audio_registers(core, a2_bgdk_common);
+                set_audio_registers(core, a2_dk);
+                set_audio_registers(core, a2_deemph50);
                 break;
-        case WW_A2_M:
-                dprintk("%s NTSC-M A2 (status: unknown)\n",__FUNCTION__);
-        set_audio_registers(core, a2_m);
-        set_audio_registers(core, a2_deemph75);
+        case WW_I:
+                dprintk("%s PAL-I A1 (status: known-good)\n", __FUNCTION__);
+                set_audio_registers(core, a1_i);
+                set_audio_registers(core, a2_deemph50);
+                break;
+        case WW_L:
+                dprintk("%s AM-L (status: devel)\n", __FUNCTION__);
+                set_audio_registers(core, am_l);
+                break;
+        default:
+                dprintk("%s Warning: wrong value\n", __FUNCTION__);
+                return;
                 break;
         };
 
@@ -656,71 +633,71 @@ static void set_audio_standard_EIAJ(struct cx88_core *core)
 
                 { /* end of list */ },
         };
-        dprintk("%s (status: unknown)\n",__FUNCTION__);
+        dprintk("%s (status: unknown)\n", __FUNCTION__);
 
         set_audio_start(core, SEL_EIAJ);
         set_audio_registers(core, eiaj);
         set_audio_finish(core, EN_EIAJ_AUTO_STEREO);
 }
 
-static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type deemph)
+static void set_audio_standard_FM(struct cx88_core *core,
+                                  enum cx88_deemph_type deemph)
 {
         static const struct rlist fm_deemph_50[] = {
-                { AUD_DEEMPH0_G0,       0x0C45 },
-                { AUD_DEEMPH0_A0,       0x6262 },
-                { AUD_DEEMPH0_B0,       0x1C29 },
-                { AUD_DEEMPH0_A1,       0x3FC66},
-                { AUD_DEEMPH0_B1,       0x399A },
-
-                { AUD_DEEMPH1_G0,       0x0D80 },
-                { AUD_DEEMPH1_A0,       0x6262 },
-                { AUD_DEEMPH1_B0,       0x1C29 },
-                { AUD_DEEMPH1_A1,       0x3FC66},
-                { AUD_DEEMPH1_B1,       0x399A},
-
-                { AUD_POLYPH80SCALEFAC, 0x0003},
+                {AUD_DEEMPH0_G0, 0x0C45},
+                {AUD_DEEMPH0_A0, 0x6262},
+                {AUD_DEEMPH0_B0, 0x1C29},
+                {AUD_DEEMPH0_A1, 0x3FC66},
+                {AUD_DEEMPH0_B1, 0x399A},
+
+                {AUD_DEEMPH1_G0, 0x0D80},
+                {AUD_DEEMPH1_A0, 0x6262},
+                {AUD_DEEMPH1_B0, 0x1C29},
+                {AUD_DEEMPH1_A1, 0x3FC66},
+                {AUD_DEEMPH1_B1, 0x399A},
+
+                {AUD_POLYPH80SCALEFAC, 0x0003},
                 { /* end of list */ },
         };
         static const struct rlist fm_deemph_75[] = {
-                { AUD_DEEMPH0_G0,       0x091B },
-                { AUD_DEEMPH0_A0,       0x6B68 },
-                { AUD_DEEMPH0_B0,       0x11EC },
-                { AUD_DEEMPH0_A1,       0x3FC66},
-                { AUD_DEEMPH0_B1,       0x399A },
-
-                { AUD_DEEMPH1_G0,       0x0AA0 },
-                { AUD_DEEMPH1_A0,       0x6B68 },
-                { AUD_DEEMPH1_B0,       0x11EC },
-                { AUD_DEEMPH1_A1,       0x3FC66},
-                { AUD_DEEMPH1_B1,       0x399A},
-
-                { AUD_POLYPH80SCALEFAC, 0x0003},
+                {AUD_DEEMPH0_G0, 0x091B},
+                {AUD_DEEMPH0_A0, 0x6B68},
+                {AUD_DEEMPH0_B0, 0x11EC},
+                {AUD_DEEMPH0_A1, 0x3FC66},
+                {AUD_DEEMPH0_B1, 0x399A},
+
+                {AUD_DEEMPH1_G0, 0x0AA0},
+                {AUD_DEEMPH1_A0, 0x6B68},
+                {AUD_DEEMPH1_B0, 0x11EC},
+                {AUD_DEEMPH1_A1, 0x3FC66},
+                {AUD_DEEMPH1_B1, 0x399A},
+
+                {AUD_POLYPH80SCALEFAC, 0x0003},
                 { /* end of list */ },
         };
 
         /* It is enough to leave default values? */
         static const struct rlist fm_no_deemph[] = {
 
-                { AUD_POLYPH80SCALEFAC, 0x0003},
+                {AUD_POLYPH80SCALEFAC, 0x0003},
                 { /* end of list */ },
         };
 
-        dprintk("%s (status: unknown)\n",__FUNCTION__);
+        dprintk("%s (status: unknown)\n", __FUNCTION__);
         set_audio_start(core, SEL_FMRADIO);
 
-        switch (deemph)
-        {
-                case FM_NO_DEEMPH:
-                        set_audio_registers(core, fm_no_deemph);
-                        break;
+        switch (deemph) {
+        case FM_NO_DEEMPH:
+                set_audio_registers(core, fm_no_deemph);
+                break;
 
-                case FM_DEEMPH_50:
-                        set_audio_registers(core, fm_deemph_50);
-                        break;
+        case FM_DEEMPH_50:
+                set_audio_registers(core, fm_deemph_50);
+                break;
 
-                case FM_DEEMPH_75:
-                        set_audio_registers(core, fm_deemph_75);
-                        break;
+        case FM_DEEMPH_75:
+                set_audio_registers(core, fm_deemph_75);
+                break;
         }
 
         set_audio_finish(core, EN_FMRADIO_AUTO_STEREO);
@@ -728,36 +705,64 @@ static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type
 
 /* ----------------------------------------------------------- */
 
+int cx88_detect_nicam(struct cx88_core *core)
+{
+        int i, j = 0;
+
+        dprintk("start nicam autodetect.\n");
+
+        for (i = 0; i < 6; i++) {
+                /* if bit1=1 then nicam is detected */
+                j += ((cx_read(AUD_NICAM_STATUS2) & 0x02) >> 1);
+
+                /* 3x detected: absolutly sure now */
+                if (j == 3) {
+                        dprintk("nicam is detected.\n");
+                        return 1;
+                }
+
+                /* wait a little bit for next reading status */
+                msleep(10);
+        }
+
+        dprintk("nicam is not detected.\n");
+        return 0;
+}
+
 void cx88_set_tvaudio(struct cx88_core *core)
 {
         switch (core->tvaudio) {
         case WW_BTSC:
                 set_audio_standard_BTSC(core, 0, EN_BTSC_AUTO_STEREO);
                 break;
-        case WW_NICAM_BGDKL:
-                set_audio_standard_NICAM_L(core,0);
-                break;
-        case WW_NICAM_I:
-                set_audio_standard_PAL_I(core,0);
-                break;
-        case WW_A2_BG:
-        case WW_A2_DK:
-        case WW_A2_M:
-        set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+        case WW_BG:
+        case WW_DK:
+        case WW_I:
+        case WW_L:
+                /* prepare all dsp registers */
+                set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+
+                /* set nicam mode - otherwise
+                   AUD_NICAM_STATUS2 contains wrong values */
+                set_audio_standard_NICAM(core, EN_NICAM_AUTO_STEREO);
+                if (0 == cx88_detect_nicam(core)) {
+                        /* fall back to fm / am mono */
+                        set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+                        core->use_nicam = 0;
+                } else {
+                        core->use_nicam = 1;
+                }
                 break;
         case WW_EIAJ:
                 set_audio_standard_EIAJ(core);
                 break;
         case WW_FM:
-                set_audio_standard_FM(core,FM_NO_DEEMPH);
-                break;
-        case WW_SYSTEM_L_AM:
-                set_audio_standard_NICAM_L(core, 1);
+                set_audio_standard_FM(core, FM_NO_DEEMPH);
                 break;
         case WW_NONE:
         default:
                 printk("%s/0: unknown tv audio mode [%d]\n",
-                core->name, core->tvaudio);
+                       core->name, core->tvaudio);
                 break;
         }
         return;
@@ -766,24 +771,16 @@ void cx88_set_tvaudio(struct cx88_core *core)
 void cx88_newstation(struct cx88_core *core)
 {
         core->audiomode_manual = UNSET;
-
-        switch (core->tvaudio) {
-        case WW_SYSTEM_L_AM:
-                /* try nicam ... */
-                core->audiomode_current = V4L2_TUNER_MODE_STEREO;
-                set_audio_standard_NICAM_L(core, 1);
-                break;
-        }
 }
 
 void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
 {
-        static char *m[] = {"stereo", "dual mono", "mono", "sap"};
-        static char *p[] = {"no pilot", "pilot c1", "pilot c2", "?"};
-        u32 reg,mode,pilot;
+        static char *m[] = { "stereo", "dual mono", "mono", "sap" };
+        static char *p[] = { "no pilot", "pilot c1", "pilot c2", "?" };
+        u32 reg, mode, pilot;
 
-        reg   = cx_read(AUD_STATUS);
-        mode  = reg & 0x03;
+        reg = cx_read(AUD_STATUS);
+        mode = reg & 0x03;
         pilot = (reg >> 2) & 0x03;
 
         if (core->astat != reg)
@@ -800,14 +797,13 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
 
 # if 0
         t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP |
-                V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
+            V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
         t->rxsubchans = V4L2_TUNER_SUB_MONO;
-        t->audmode    = V4L2_TUNER_MODE_MONO;
+        t->audmode = V4L2_TUNER_MODE_MONO;
 
         switch (core->tvaudio) {
         case WW_BTSC:
-                t->capability = V4L2_TUNER_CAP_STEREO |
-                        V4L2_TUNER_CAP_SAP;
+                t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP;
                 t->rxsubchans = V4L2_TUNER_SUB_STEREO;
                 if (1 == pilot) {
                         /* SAP */
@@ -819,13 +815,15 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
         case WW_A2_M:
                 if (1 == pilot) {
                         /* stereo */
-                        t->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_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->rxsubchans =
+                            V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
                         t->audmode = V4L2_TUNER_MODE_LANG1;
                 }
                 break;
@@ -840,7 +838,7 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
                         t->audmode = V4L2_TUNER_MODE_STEREO;
                         t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
                 }
-                break ;
+                break;
         default:
                 /* nothing */
                 break;
@@ -851,7 +849,7 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
 
 void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
 {
-        u32 ctl  = UNSET;
+        u32 ctl = UNSET;
         u32 mask = UNSET;
 
         if (manual) {
@@ -879,68 +877,58 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
                         break;
                 }
                 break;
-        case WW_A2_BG:
-        case WW_A2_DK:
-        case WW_A2_M:
-                switch (mode) {
-                case V4L2_TUNER_MODE_MONO:
-                case V4L2_TUNER_MODE_LANG1:
-                set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
-                        break;
-                case V4L2_TUNER_MODE_LANG2:
-                set_audio_standard_A2(core, EN_A2_FORCE_MONO2);
-                        break;
-                case V4L2_TUNER_MODE_STEREO:
-                set_audio_standard_A2(core, EN_A2_FORCE_STEREO);
-                        break;
-                }
-                break;
-        case WW_NICAM_BGDKL:
-                switch (mode) {
-                case V4L2_TUNER_MODE_MONO:
-                        ctl  = EN_NICAM_FORCE_MONO1;
-                        mask = 0x3f;
-                        break;
-                case V4L2_TUNER_MODE_LANG1:
-                        ctl  = EN_NICAM_AUTO_MONO2;
-                        mask = 0x3f;
-                        break;
-                case V4L2_TUNER_MODE_STEREO:
-                        ctl  = EN_NICAM_FORCE_STEREO | EN_DMTRX_LR;
-                        mask = 0x93f;
-                        break;
-                }
-                break;
-        case WW_SYSTEM_L_AM:
-                switch (mode) {
-                case V4L2_TUNER_MODE_MONO:
-                case V4L2_TUNER_MODE_LANG1:  /* FIXME */
-                        set_audio_standard_NICAM_L(core, 0);
-                        break;
-                case V4L2_TUNER_MODE_STEREO:
-                        set_audio_standard_NICAM_L(core, 1);
-                        break;
-                }
-                break;
-        case WW_NICAM_I:
-                switch (mode) {
-                case V4L2_TUNER_MODE_MONO:
-                case V4L2_TUNER_MODE_LANG1:
-                        set_audio_standard_PAL_I(core, 0);
-                        break;
-                case V4L2_TUNER_MODE_STEREO:
-                        set_audio_standard_PAL_I(core, 1);
-                        break;
+        case WW_BG:
+        case WW_DK:
+        case WW_I:
+        case WW_L:
+                if (1 == core->use_nicam) {
+                        switch (mode) {
+                        case V4L2_TUNER_MODE_MONO:
+                        case V4L2_TUNER_MODE_LANG1:
+                                set_audio_standard_NICAM(core,
+                                                         EN_NICAM_FORCE_MONO1);
+                                break;
+                        case V4L2_TUNER_MODE_LANG2:
+                                set_audio_standard_NICAM(core,
+                                                         EN_NICAM_FORCE_MONO2);
+                                break;
+                        case V4L2_TUNER_MODE_STEREO:
+                                set_audio_standard_NICAM(core,
+                                                         EN_NICAM_FORCE_STEREO);
+                                break;
+                        }
+                } else {
+                        if ((core->tvaudio == WW_I) || (core->tvaudio == WW_L)) {
+                                /* fall back to fm / am mono */
+                                set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+                        } else {
+                                /* TODO: Add A2 autodection */
+                                switch (mode) {
+                                case V4L2_TUNER_MODE_MONO:
+                                case V4L2_TUNER_MODE_LANG1:
+                                        set_audio_standard_A2(core,
+                                                              EN_A2_FORCE_MONO1);
+                                        break;
+                                case V4L2_TUNER_MODE_LANG2:
+                                        set_audio_standard_A2(core,
+                                                              EN_A2_FORCE_MONO2);
+                                        break;
+                                case V4L2_TUNER_MODE_STEREO:
+                                        set_audio_standard_A2(core,
+                                                              EN_A2_FORCE_STEREO);
+                                        break;
+                                }
+                        }
                 }
                 break;
         case WW_FM:
                 switch (mode) {
                 case V4L2_TUNER_MODE_MONO:
-                        ctl  = EN_FMRADIO_FORCE_MONO;
+                        ctl = EN_FMRADIO_FORCE_MONO;
                         mask = 0x3f;
                         break;
                 case V4L2_TUNER_MODE_STEREO:
-                        ctl  = EN_FMRADIO_AUTO_STEREO;
+                        ctl = EN_FMRADIO_AUTO_STEREO;
                         mask = 0x3f;
                         break;
                 }
@@ -970,8 +958,8 @@ int cx88_audio_thread(void *data)
                         break;
 
                 /* just monitor the audio status for now ... */
-                memset(&t,0,sizeof(t));
-                cx88_get_stereo(core,&t);
+                memset(&t, 0, sizeof(t));
+                cx88_get_stereo(core, &t);
 
                 if (UNSET != core->audiomode_manual)
                         /* manually set, don't do anything. */
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 3dbc074fb515..24a48f8a48c1 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -34,6 +34,9 @@
 
 #include "cx88.h"
 
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+
 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
@@ -100,7 +103,7 @@ static struct cx88_tvnorm tvnorms[] = {
                 .id        = V4L2_STD_PAL_I,
                 .cxiformat = VideoFormatPAL,
                 .cxoformat = 0x181f0008,
-        },{
+        },{
                 .name      = "PAL-M",
                 .id        = V4L2_STD_PAL_M,
                 .cxiformat = VideoFormatPALM,
@@ -470,7 +473,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,
         struct list_head *item;
 
         if (!list_empty(&q->active)) {
-                buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
+                buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
                 dprintk(2,"restart_queue [%p/%d]: restart dma\n",
                         buf, buf->vb.i);
                 start_video_dma(dev, q, buf);
@@ -486,7 +489,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,
         for (;;) {
                 if (list_empty(&q->queued))
                         return 0;
-                buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
+                buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
                 if (NULL == prev) {
                         list_del(&buf->vb.queue);
                         list_add_tail(&buf->vb.queue,&q->active);
@@ -783,11 +786,11 @@ static int video_open(struct inode *inode, struct file *file)
                 cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL);
         }
 
-        return 0;
+        return 0;
 }
 
 static ssize_t
-video_read(struct file *file, char *data, size_t count, loff_t *ppos)
+video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
 {
         struct cx8800_fh *fh = file->private_data;
 
@@ -922,7 +925,7 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
 {
         /* struct cx88_core *core = dev->core; */
         struct cx88_ctrl *c = NULL;
-        u32 v_sat_value;
+        u32 v_sat_value;
         u32 value;
         int i;
 
@@ -1187,7 +1190,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_format *f = arg;
                 return cx8800_try_fmt(dev,fh,f);
         }
-
+#ifdef HAVE_V4L1
         /* --- streaming capture ------------------------------------- */
         case VIDIOCGMBUF:
         {
@@ -1213,6 +1216,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 }
                 return 0;
         }
+#endif
         case VIDIOC_REQBUFS:
                 return videobuf_reqbufs(get_queue(fh), arg);
 
@@ -1244,7 +1248,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 res_free(dev,fh,res);
                 return 0;
         }
-
         default:
                 return cx88_do_ioctl( inode, file, fh->radio, core, cmd, arg, video_do_ioctl );
         }
@@ -1252,15 +1255,13 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
 }
 
 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)
+                  struct cx88_core *core, unsigned int cmd, void *arg, v4l2_kioctl driver_ioctl)
 {
         int err;
 
+        dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
         if (video_debug > 1)
                 cx88_print_ioctl(core->name,cmd);
-        printk( KERN_INFO "CORE IOCTL: 0x%x\n", cmd );
-        cx88_print_ioctl(core->name,cmd);
-        dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
 
         switch (cmd) {
         /* ---------- tv norms ---------- */
@@ -1401,7 +1402,7 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 
                 cx88_get_stereo(core ,t);
                 reg = cx_read(MO_DEVICE_STATUS);
-                t->signal = (reg & (1<<5)) ? 0xffff : 0x0000;
+                t->signal = (reg & (1<<5)) ? 0xffff : 0x0000;
                 return 0;
         }
         case VIDIOC_S_TUNER:
@@ -1488,7 +1489,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_capability *cap = arg;
 
                 memset(cap,0,sizeof(*cap));
-                strcpy(cap->driver, "cx8800");
+                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));
@@ -1505,6 +1506,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
 
                 memset(t,0,sizeof(*t));
                 strcpy(t->name, "Radio");
+                t->type = V4L2_TUNER_RADIO;
 
                 cx88_call_i2c_clients(core,VIDIOC_G_TUNER,t);
                 return 0;
@@ -1539,6 +1541,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 *id = 0;
                 return 0;
         }
+#ifdef HAVE_V4L1
         case VIDIOCSTUNER:
         {
                 struct video_tuner *v = arg;
@@ -1549,6 +1552,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 cx88_call_i2c_clients(core,VIDIOCSTUNER,v);
                 return 0;
         }
+#endif
         case VIDIOC_S_TUNER:
         {
                 struct v4l2_tuner *t = arg;
@@ -1829,8 +1833,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 
         /* print pci info */
         pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
-        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
-        printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
+        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
+        printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
                "latency: %d, mmio: 0x%lx\n", core->name,
                pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
                dev->pci_lat,pci_resource_start(pci_dev,0));
@@ -1946,7 +1950,7 @@ fail_free:
 
 static void __devexit cx8800_finidev(struct pci_dev *pci_dev)
 {
-        struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
+        struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
         struct cx88_core *core = dev->core;
 
         /* stop thread */
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index f48dd4353568..b19d3a9e2298 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -22,7 +22,7 @@
 #include <linux/pci.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/kdev_t.h>
 
 #include <media/tuner.h>
@@ -148,7 +148,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_PIXELVIEW                3
 #define CX88_BOARD_ATI_WONDER_PRO           4
 #define CX88_BOARD_WINFAST2000XP_EXPERT     5
-#define CX88_BOARD_AVERTV_303               6
+#define CX88_BOARD_AVERTV_STUDIO_303        6
 #define CX88_BOARD_MSI_TVANYWHERE_MASTER    7
 #define CX88_BOARD_WINFAST_DV2000           8
 #define CX88_BOARD_LEADTEK_PVR2000          9
@@ -174,6 +174,11 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_ADSTECH_DVB_T_PCI          29
 #define CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1  30
 #define CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD 31
+#define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32
+#define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33
+#define CX88_BOARD_ATI_HDTVWONDER          34
+#define CX88_BOARD_WINFAST_DTV1000         35
+#define CX88_BOARD_AVERTV_303              36
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,
@@ -203,8 +208,8 @@ struct cx88_board {
         int                     tda9887_conf;
         struct cx88_input       input[MAX_CX88_INPUT];
         struct cx88_input       radio;
-        int                     blackbird:1;
-        int                     dvb:1;
+        unsigned int            blackbird:1;
+        unsigned int            dvb:1;
 };
 
 struct cx88_subid {
@@ -255,8 +260,8 @@ struct cx88_core {
         /* pci stuff */
         int                        pci_bus;
         int                        pci_slot;
-        u32                        __iomem *lmmio;
-        u8                         __iomem *bmmio;
+        u32                        __iomem *lmmio;
+        u8                         __iomem *bmmio;
         u32                        shadow[SHADOW_MAX];
         int                        pci_irqmask;
 
@@ -287,6 +292,7 @@ struct cx88_core {
         u32                        audiomode_current;
         u32                        input;
         u32                        astat;
+        u32                        use_nicam;
 
         /* IR remote control state */
         struct cx88_IR             *ir;
@@ -370,6 +376,14 @@ struct cx8802_suspend_state {
         int                        disabled;
 };
 
+/* TODO: move this to struct v4l2_mpeg_compression ? */
+struct blackbird_dnr {
+        u32                       mode;
+        u32                       type;
+        u32                       spatial;
+        u32                       temporal;
+};
+
 struct cx8802_dev {
         struct cx88_core           *core;
         spinlock_t                 slock;
@@ -400,6 +414,10 @@ struct cx8802_dev {
 
         /* for switching modulation types */
         unsigned char              ts_gen_cntrl;
+
+        /* mpeg params */
+        struct v4l2_mpeg_compression params;
+        struct blackbird_dnr       dnr_params;
 };
 
 /* ----------------------------------------------------------- */
@@ -514,22 +532,20 @@ extern void cx88_card_setup(struct cx88_core *core);
 
 #define WW_NONE          1
 #define WW_BTSC          2
-#define WW_NICAM_I       3
-#define WW_NICAM_BGDKL   4
-#define WW_A1            5
-#define WW_A2_BG         6
-#define WW_A2_DK         7
-#define WW_A2_M          8
-#define WW_EIAJ          9
-#define WW_SYSTEM_L_AM  10
-#define WW_I2SPT        11
-#define WW_FM           12
+#define WW_BG            3
+#define WW_DK            4
+#define WW_I             5
+#define WW_L             6
+#define WW_EIAJ          7
+#define WW_I2SPT         8
+#define WW_FM            9
 
 void cx88_set_tvaudio(struct cx88_core *core);
 void cx88_newstation(struct cx88_core *core);
 void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t);
 void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual);
 int cx88_audio_thread(void *data);
+int cx88_detect_nicam(struct cx88_core *core);
 
 /* ----------------------------------------------------------- */
 /* cx88-input.c                                                */
@@ -541,7 +557,8 @@ void cx88_ir_irq(struct cx88_core *core);
 /* ----------------------------------------------------------- */
 /* cx88-mpeg.c                                                 */
 
-int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf);
+int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
+                        enum v4l2_field field);
 void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf);
 void cx8802_cancel_buffers(struct cx8802_dev *dev);
 
@@ -562,6 +579,10 @@ extern int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 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);
+void blackbird_set_params(struct cx8802_dev *dev,
+                                struct v4l2_mpeg_compression *params);
+void blackbird_set_dnr_params(struct cx8802_dev *dev,
+                                struct blackbird_dnr* dnr_params);
 
 /*
  * Local variables:
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
new file mode 100644
index 000000000000..885fd0170086
--- /dev/null
+++ b/drivers/media/video/em28xx/Kconfig
@@ -0,0 +1,12 @@
+config VIDEO_EM28XX
+        tristate "Empia EM2800/2820/2840 USB video capture support"
+        depends on VIDEO_DEV && USB && I2C
+        select VIDEO_BUF
+        select VIDEO_TUNER
+        select VIDEO_TVEEPROM
+        select VIDEO_IR
+        ---help---
+          This is a video4linux driver for Empia 28xx based TV cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called em28xx
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
new file mode 100644
index 000000000000..da457a05b0dd
--- /dev/null
+++ b/drivers/media/video/em28xx/Makefile
@@ -0,0 +1,6 @@
+em28xx-objs     := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
+                   em28xx-input.o
+
+obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o
+
+EXTRA_CFLAGS += -I$(src)/..
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
new file mode 100644
index 000000000000..57779e63f35d
--- /dev/null
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -0,0 +1,292 @@
+/*
+   em28xx-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+
+   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
+                      Markus Rechberger <mrechberger@gmail.com>
+                      Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+                      Sascha Sommer <saschasommer@freenet.de>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/usb.h>
+#include <media/tuner.h>
+#include <media/audiochip.h>
+#include <media/tveeprom.h>
+#include "msp3400.h"
+
+#include "em28xx.h"
+
+struct em28xx_board em28xx_boards[] = {
+        [EM2800_BOARD_UNKNOWN] = {
+                .name         = "Unknown EM2800 video grabber",
+                .is_em2800    = 1,
+                .vchannels    = 2,
+                .norm         = VIDEO_MODE_PAL,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_SAA7113,
+                .input           = {{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2820_BOARD_UNKNOWN] = {
+                .name         = "Unknown EM2820/2840 video grabber",
+                .is_em2800    = 0,
+                .vchannels    = 2,
+                .norm         = VIDEO_MODE_PAL,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_SAA7113,
+                .input           = {{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2820_BOARD_TERRATEC_CINERGY_250] = {
+                .name         = "Terratec Cinergy 250 USB",
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_SAA7113,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 2,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2820_BOARD_PINNACLE_USB_2] = {
+                .name         = "Pinnacle PCTV USB 2",
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_SAA7113,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 2,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2820_BOARD_HAUPPAUGE_WINTV_USB_2] = {
+                .name         = "Hauppauge WinTV USB 2",
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_NTSC,
+                .tuner_type   = TUNER_PHILIPS_FM1236_MK3,
+                .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_TVP5150,
+                .has_msp34xx  = 1,
+                /*FIXME: S-Video not tested */
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 0,
+                        .amux     = 6,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 2,
+                        .amux     = 1,
+                }},
+        },
+        [EM2820_BOARD_MSI_VOX_USB_2] = {
+                .name           = "MSI VOX USB 2.0",
+                .vchannels      = 3,
+                .norm           = VIDEO_MODE_PAL,
+                .tuner_type     = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf   = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
+                .has_tuner      = 1,
+                .decoder        = EM28XX_SAA7114,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 4,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2800_BOARD_TERRATEC_CINERGY_200] = {
+                .name         = "Terratec Cinergy 200 USB",
+                .is_em2800    = 1,
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_SAA7113,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 2,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2800_BOARD_LEADTEK_WINFAST_USBII] = {
+                .name         = "Leadtek Winfast USB II",
+                .is_em2800    = 1,
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_SAA7113,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 2,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2800_BOARD_KWORLD_USB2800] = {
+                .name         = "Kworld USB2800",
+                .is_em2800    = 1,
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tuner_type   = TUNER_PHILIPS_ATSC,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_SAA7113,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = 2,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+        [EM2820_BOARD_PINNACLE_DVC_90] = {
+                .name         = "Pinnacle Dazzle DVC 90",
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .has_tuner    = 0,
+                .decoder      = EM28XX_SAA7113,
+                .input          = {{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = 0,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = 9,
+                        .amux     = 1,
+                }},
+        },
+};
+const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
+
+/* table of devices that work with this driver */
+struct usb_device_id em28xx_id_table [] = {
+        { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN },
+        { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 },
+        { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },
+        { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
+        { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
+        { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
+        { },
+};
+
+void em28xx_card_setup(struct em28xx *dev)
+{
+        /* request some modules */
+        if (dev->model == EM2820_BOARD_HAUPPAUGE_WINTV_USB_2) {
+                struct tveeprom tv;
+                struct v4l2_audioout ao;
+#ifdef CONFIG_MODULES
+                request_module("tveeprom");
+                request_module("ir-kbd-i2c");
+                request_module("msp3400");
+#endif
+                /* Call first TVeeprom */
+
+                dev->i2c_client.addr = 0xa0 >> 1;
+                tveeprom_hauppauge_analog(&dev->i2c_client, &tv, dev->eedata);
+
+                dev->tuner_type= tv.tuner_type;
+                if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {
+                        dev->has_msp34xx=1;
+                        memset (&ao,0,sizeof(ao));
+
+                        ao.index=2;
+                        ao.mode=V4L2_AUDMODE_32BITS;
+                        em28xx_i2c_call_clients(dev, VIDIOC_S_AUDOUT, &ao);
+                } else
+                        dev->has_msp34xx=0;
+        }
+}
+
+EXPORT_SYMBOL(em28xx_boards);
+EXPORT_SYMBOL(em28xx_bcount);
+EXPORT_SYMBOL(em28xx_id_table);
+
+MODULE_DEVICE_TABLE (usb, em28xx_id_table);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
new file mode 100644
index 000000000000..d54bc0127484
--- /dev/null
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -0,0 +1,817 @@
+/*
+   em28xx-core.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+
+   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
+                      Markus Rechberger <mrechberger@gmail.com>
+                      Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+                      Sascha Sommer <saschasommer@freenet.de>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/usb.h>
+#include <linux/vmalloc.h>
+
+#include "em28xx.h"
+
+/* #define ENABLE_DEBUG_ISOC_FRAMES */
+
+unsigned int core_debug;
+module_param(core_debug,int,0644);
+MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
+
+#define em28xx_coredbg(fmt, arg...) do {\
+        if (core_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
+
+unsigned int reg_debug;
+module_param(reg_debug,int,0644);
+MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
+
+#define em28xx_regdbg(fmt, arg...) do {\
+        if (reg_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
+
+unsigned int isoc_debug;
+module_param(isoc_debug,int,0644);
+MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
+
+#define em28xx_isocdbg(fmt, arg...) do {\
+        if (isoc_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
+
+static int alt = EM28XX_PINOUT;
+module_param(alt, int, 0644);
+MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
+
+/* ------------------------------------------------------------------ */
+/* debug help functions                                               */
+
+static const char *v4l1_ioctls[] = {
+        "0", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT",
+        "CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ",
+        "SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT",
+        "GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO",
+        "SMICROCODE", "GVBIFMT", "SVBIFMT" };
+#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
+
+static const char *v4l2_ioctls[] = {
+        "QUERYCAP", "1", "ENUM_PIXFMT", "ENUM_FBUFFMT", "G_FMT", "S_FMT",
+        "G_COMP", "S_COMP", "REQBUFS", "QUERYBUF", "G_FBUF", "S_FBUF",
+        "G_WIN", "S_WIN", "PREVIEW", "QBUF", "16", "DQBUF", "STREAMON",
+        "STREAMOFF", "G_PERF", "G_PARM", "S_PARM", "G_STD", "S_STD",
+        "ENUMSTD", "ENUMINPUT", "G_CTRL", "S_CTRL", "G_TUNER", "S_TUNER",
+        "G_FREQ", "S_FREQ", "G_AUDIO", "S_AUDIO", "35", "QUERYCTRL",
+        "QUERYMENU", "G_INPUT", "S_INPUT", "ENUMCVT", "41", "42", "43",
+        "44", "45",  "G_OUTPUT", "S_OUTPUT", "ENUMOUTPUT", "G_AUDOUT",
+        "S_AUDOUT", "ENUMFX", "G_EFFECT", "S_EFFECT", "G_MODULATOR",
+        "S_MODULATOR"
+};
+#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
+
+void em28xx_print_ioctl(char *name, unsigned int cmd)
+{
+        char *dir;
+
+        switch (_IOC_DIR(cmd)) {
+        case _IOC_NONE:              dir = "--"; break;
+        case _IOC_READ:              dir = "r-"; break;
+        case _IOC_WRITE:             dir = "-w"; break;
+        case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
+        default:                     dir = "??"; break;
+        }
+        switch (_IOC_TYPE(cmd)) {
+        case 'v':
+                printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l1, %s, VIDIOC%s)\n",
+                       name, cmd, dir, (_IOC_NR(cmd) < V4L1_IOCTLS) ?
+                       v4l1_ioctls[_IOC_NR(cmd)] : "???");
+                break;
+        case 'V':
+                printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l2, %s, VIDIOC_%s)\n",
+                       name, cmd, dir, (_IOC_NR(cmd) < V4L2_IOCTLS) ?
+                       v4l2_ioctls[_IOC_NR(cmd)] : "???");
+                break;
+        default:
+                printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n",
+                       name, cmd, dir, _IOC_NR(cmd));
+        }
+}
+
+static void *rvmalloc(size_t size)
+{
+        void *mem;
+        unsigned long adr;
+
+        size = PAGE_ALIGN(size);
+
+        mem = vmalloc_32((unsigned long)size);
+        if (!mem)
+                return NULL;
+
+        memset(mem, 0, size);
+
+        adr = (unsigned long)mem;
+        while (size > 0) {
+                SetPageReserved(vmalloc_to_page((void *)adr));
+                adr += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        return mem;
+}
+
+static void rvfree(void *mem, size_t size)
+{
+        unsigned long adr;
+
+        if (!mem)
+                return;
+
+        size = PAGE_ALIGN(size);
+
+        adr = (unsigned long)mem;
+        while (size > 0) {
+                ClearPageReserved(vmalloc_to_page((void *)adr));
+                adr += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        vfree(mem);
+}
+
+/*
+ * em28xx_request_buffers()
+ * allocate a number of buffers
+ */
+u32 em28xx_request_buffers(struct em28xx *dev, u32 count)
+{
+        const size_t imagesize = PAGE_ALIGN(dev->frame_size);   /*needs to be page aligned cause the buffers can be mapped individually! */
+        void *buff = NULL;
+        u32 i;
+        em28xx_coredbg("requested %i buffers with size %i", count, imagesize);
+        if (count > EM28XX_NUM_FRAMES)
+                count = EM28XX_NUM_FRAMES;
+
+        dev->num_frames = count;
+        while (dev->num_frames > 0) {
+                if ((buff = rvmalloc(dev->num_frames * imagesize)))
+                        break;
+                dev->num_frames--;
+        }
+
+        for (i = 0; i < dev->num_frames; i++) {
+                dev->frame[i].bufmem = buff + i * imagesize;
+                dev->frame[i].buf.index = i;
+                dev->frame[i].buf.m.offset = i * imagesize;
+                dev->frame[i].buf.length = dev->frame_size;
+                dev->frame[i].buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                dev->frame[i].buf.sequence = 0;
+                dev->frame[i].buf.field = V4L2_FIELD_NONE;
+                dev->frame[i].buf.memory = V4L2_MEMORY_MMAP;
+                dev->frame[i].buf.flags = 0;
+        }
+        return dev->num_frames;
+}
+
+/*
+ * em28xx_queue_unusedframes()
+ * add all frames that are not currently in use to the inbuffer queue
+ */
+void em28xx_queue_unusedframes(struct em28xx *dev)
+{
+        unsigned long lock_flags;
+        u32 i;
+
+        for (i = 0; i < dev->num_frames; i++)
+                if (dev->frame[i].state == F_UNUSED) {
+                        dev->frame[i].state = F_QUEUED;
+                        spin_lock_irqsave(&dev->queue_lock, lock_flags);
+                        list_add_tail(&dev->frame[i].frame, &dev->inqueue);
+                        spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
+                }
+}
+
+/*
+ * em28xx_release_buffers()
+ * free frame buffers
+ */
+void em28xx_release_buffers(struct em28xx *dev)
+{
+        if (dev->num_frames) {
+                rvfree(dev->frame[0].bufmem,
+                       dev->num_frames * PAGE_ALIGN(dev->frame[0].buf.length));
+                dev->num_frames = 0;
+        }
+}
+
+/*
+ * em28xx_read_reg_req()
+ * reads data from the usb device specifying bRequest
+ */
+int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
+                                   char *buf, int len)
+{
+        int ret, byte;
+
+        em28xx_regdbg("req=%02x, reg=%02x ", req, reg);
+
+        ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
+                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              0x0000, reg, buf, len, HZ);
+
+        if (reg_debug){
+                printk(ret < 0 ? " failed!\n" : "%02x values: ", ret);
+                for (byte = 0; byte < len; byte++) {
+                        printk(" %02x", buf[byte]);
+                }
+                printk("\n");
+        }
+
+        return ret;
+}
+
+/*
+ * em28xx_read_reg_req()
+ * reads data from the usb device specifying bRequest
+ */
+int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg)
+{
+        u8 val;
+        int ret;
+
+        em28xx_regdbg("req=%02x, reg=%02x:", req, reg);
+
+        ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
+                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              0x0000, reg, &val, 1, HZ);
+
+        if (reg_debug)
+                printk(ret < 0 ? " failed!\n" : "%02x\n", val);
+
+        if (ret < 0)
+                return ret;
+
+        return val;
+}
+
+int em28xx_read_reg(struct em28xx *dev, u16 reg)
+{
+        return em28xx_read_reg_req(dev, USB_REQ_GET_STATUS, reg);
+}
+
+/*
+ * em28xx_write_regs_req()
+ * sends data to the usb device, specifying bRequest
+ */
+int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
+                                 int len)
+{
+        int ret;
+
+        /*usb_control_msg seems to expect a kmalloced buffer */
+        unsigned char *bufs = kmalloc(len, GFP_KERNEL);
+
+        em28xx_regdbg("req=%02x reg=%02x:", req, reg);
+
+        if (reg_debug) {
+                int i;
+                for (i = 0; i < len; ++i)
+                        printk (" %02x", (unsigned char)buf[i]);
+                printk ("\n");
+        }
+
+        if (!bufs)
+                return -ENOMEM;
+        memcpy(bufs, buf, len);
+        ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), req,
+                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              0x0000, reg, bufs, len, HZ);
+        mdelay(5);              /* FIXME: magic number */
+        kfree(bufs);
+        return ret;
+}
+
+int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len)
+{
+        return em28xx_write_regs_req(dev, USB_REQ_GET_STATUS, reg, buf, len);
+}
+
+/*
+ * em28xx_write_reg_bits()
+ * sets only some bits (specified by bitmask) of a register, by first reading
+ * the actual value
+ */
+int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
+                                 u8 bitmask)
+{
+        int oldval;
+        u8 newval;
+        if ((oldval = em28xx_read_reg(dev, reg)) < 0)
+                return oldval;
+        newval = (((u8) oldval) & ~bitmask) | (val & bitmask);
+        return em28xx_write_regs(dev, reg, &newval, 1);
+}
+
+/*
+ * em28xx_write_ac97()
+ * write a 16 bit value to the specified AC97 address (LSB first!)
+ */
+int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 * val)
+{
+        int ret;
+        u8 addr = reg & 0x7f;
+        if ((ret = em28xx_write_regs(dev, AC97LSB_REG, val, 2)) < 0)
+                return ret;
+        if ((ret = em28xx_write_regs(dev, AC97ADDR_REG, &addr, 1)) < 0)
+                return ret;
+        if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
+                return ret;
+        else if (((u8) ret) & 0x01) {
+                em28xx_warn ("AC97 command still being exectuted: not handled properly!\n");
+        }
+        return 0;
+}
+
+int em28xx_audio_analog_set(struct em28xx *dev)
+{
+        char s[2] = { 0x00, 0x00 };
+        s[0] |= 0x1f - dev->volume;
+        s[1] |= 0x1f - dev->volume;
+        if (dev->mute)
+                s[1] |= 0x80;
+        return em28xx_write_ac97(dev, MASTER_AC97, s);
+}
+
+
+int em28xx_colorlevels_set_default(struct em28xx *dev)
+{
+        em28xx_write_regs(dev, YGAIN_REG, "\x10", 1);   /* contrast */
+        em28xx_write_regs(dev, YOFFSET_REG, "\x00", 1); /* brightness */
+        em28xx_write_regs(dev, UVGAIN_REG, "\x10", 1);  /* saturation */
+        em28xx_write_regs(dev, UOFFSET_REG, "\x00", 1);
+        em28xx_write_regs(dev, VOFFSET_REG, "\x00", 1);
+        em28xx_write_regs(dev, SHARPNESS_REG, "\x00", 1);
+
+        em28xx_write_regs(dev, GAMMA_REG, "\x20", 1);
+        em28xx_write_regs(dev, RGAIN_REG, "\x20", 1);
+        em28xx_write_regs(dev, GGAIN_REG, "\x20", 1);
+        em28xx_write_regs(dev, BGAIN_REG, "\x20", 1);
+        em28xx_write_regs(dev, ROFFSET_REG, "\x00", 1);
+        em28xx_write_regs(dev, GOFFSET_REG, "\x00", 1);
+        return em28xx_write_regs(dev, BOFFSET_REG, "\x00", 1);
+}
+
+int em28xx_capture_start(struct em28xx *dev, int start)
+{
+        int ret;
+        /* FIXME: which is the best order? */
+        /* video registers are sampled by VREF */
+        if ((ret = em28xx_write_reg_bits(dev, USBSUSP_REG, start ? 0x10 : 0x00,
+                                          0x10)) < 0)
+                return ret;
+        /* enable video capture */
+        return em28xx_write_regs(dev, VINENABLE_REG, start ? "\x67" : "\x27", 1);
+}
+
+int em28xx_outfmt_set_yuv422(struct em28xx *dev)
+{
+        em28xx_write_regs(dev, OUTFMT_REG, "\x34", 1);
+        em28xx_write_regs(dev, VINMODE_REG, "\x10", 1);
+        return em28xx_write_regs(dev, VINCTRL_REG, "\x11", 1);
+}
+
+int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin,
+                                  u8 ymax)
+{
+        em28xx_coredbg("em28xx Scale: (%d,%d)-(%d,%d)\n", xmin, ymin, xmax, ymax);
+
+        em28xx_write_regs(dev, XMIN_REG, &xmin, 1);
+        em28xx_write_regs(dev, XMAX_REG, &xmax, 1);
+        em28xx_write_regs(dev, YMIN_REG, &ymin, 1);
+        return em28xx_write_regs(dev, YMAX_REG, &ymax, 1);
+}
+
+int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
+                                   u16 width, u16 height)
+{
+        u8 cwidth = width;
+        u8 cheight = height;
+        u8 overflow = (height >> 7 & 0x02) | (width >> 8 & 0x01);
+
+        em28xx_coredbg("em28xx Area Set: (%d,%d)\n", (width | (overflow & 2) << 7),
+                        (height | (overflow & 1) << 8));
+
+        em28xx_write_regs(dev, HSTART_REG, &hstart, 1);
+        em28xx_write_regs(dev, VSTART_REG, &vstart, 1);
+        em28xx_write_regs(dev, CWIDTH_REG, &cwidth, 1);
+        em28xx_write_regs(dev, CHEIGHT_REG, &cheight, 1);
+        return em28xx_write_regs(dev, OFLOW_REG, &overflow, 1);
+}
+
+int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v)
+{
+        u8 mode;
+        /* the em2800 scaler only supports scaling down to 50% */
+        if(dev->is_em2800)
+                mode = (v ? 0x20 : 0x00) | (h ? 0x10 : 0x00);
+        else {
+                u8 buf[2];
+                buf[0] = h;
+                buf[1] = h >> 8;
+                em28xx_write_regs(dev, HSCALELOW_REG, (char *)buf, 2);
+                buf[0] = v;
+                buf[1] = v >> 8;
+                em28xx_write_regs(dev, VSCALELOW_REG, (char *)buf, 2);
+                /* it seems that both H and V scalers must be active to work correctly */
+                mode = (h || v)? 0x30: 0x00;
+        }
+        return em28xx_write_reg_bits(dev, COMPR_REG, mode, 0x30);
+}
+
+/* FIXME: this only function read values from dev */
+int em28xx_resolution_set(struct em28xx *dev)
+{
+        int width, height;
+        width = norm_maxw(dev);
+        height = norm_maxh(dev) >> 1;
+
+        em28xx_outfmt_set_yuv422(dev);
+        em28xx_accumulator_set(dev, 1, (width - 4) >> 2, 1, (height - 4) >> 2);
+        em28xx_capture_area_set(dev, 0, 0, width >> 2, height >> 2);
+        return em28xx_scaler_set(dev, dev->hscale, dev->vscale);
+}
+
+
+/******************* isoc transfer handling ****************************/
+
+#ifdef ENABLE_DEBUG_ISOC_FRAMES
+static void em28xx_isoc_dump(struct urb *urb, struct pt_regs *regs)
+{
+        int len = 0;
+        int ntrans = 0;
+        int i;
+
+        printk(KERN_DEBUG "isocIrq: sf=%d np=%d ec=%x\n",
+               urb->start_frame, urb->number_of_packets,
+               urb->error_count);
+        for (i = 0; i < urb->number_of_packets; i++) {
+                unsigned char *buf =
+                                urb->transfer_buffer +
+                                urb->iso_frame_desc[i].offset;
+                int alen = urb->iso_frame_desc[i].actual_length;
+                if (alen > 0) {
+                        if (buf[0] == 0x88) {
+                                ntrans++;
+                                len += alen;
+                        } else if (buf[0] == 0x22) {
+                                printk(KERN_DEBUG
+                                                "= l=%d nt=%d bpp=%d\n",
+                                len - 4 * ntrans, ntrans,
+                                ntrans == 0 ? 0 : len / ntrans);
+                                ntrans = 1;
+                                len = alen;
+                        } else
+                                printk(KERN_DEBUG "!\n");
+                }
+                printk(KERN_DEBUG "   n=%d s=%d al=%d %x\n", i,
+                       urb->iso_frame_desc[i].status,
+                       urb->iso_frame_desc[i].actual_length,
+                       (unsigned int)
+                                       *((unsigned char *)(urb->transfer_buffer +
+                                       urb->iso_frame_desc[i].
+                                       offset)));
+        }
+}
+#endif
+
+static inline int em28xx_isoc_video(struct em28xx *dev,struct em28xx_frame_t **f,
+                                    unsigned long *lock_flags, unsigned char buf)
+{
+        if (!(buf & 0x01)) {
+                if ((*f)->state == F_GRABBING) {
+                        /*previous frame is incomplete */
+                        if ((*f)->fieldbytesused < dev->field_size) {
+                                (*f)->state = F_ERROR;
+                                em28xx_isocdbg ("dropping incomplete bottom field (%i missing bytes)",
+                                         dev->field_size-(*f)->fieldbytesused);
+                        } else {
+                                (*f)->state = F_DONE;
+                                (*f)->buf.bytesused = dev->frame_size;
+                        }
+                }
+                if ((*f)->state == F_DONE || (*f)->state == F_ERROR) {
+                        /* move current frame to outqueue and get next free buffer from inqueue */
+                        spin_lock_irqsave(&dev-> queue_lock, *lock_flags);
+                        list_move_tail(&(*f)->frame, &dev->outqueue);
+                        if (!list_empty(&dev->inqueue))
+                                (*f) = list_entry(dev-> inqueue.next,
+                        struct em28xx_frame_t,frame);
+                        else
+                                (*f) = NULL;
+                        spin_unlock_irqrestore(&dev->queue_lock,*lock_flags);
+                }
+                if (!(*f)) {
+                        em28xx_isocdbg ("new frame but no buffer is free");
+                        return -1;
+                }
+                do_gettimeofday(&(*f)->buf.timestamp);
+                (*f)->buf.sequence = ++dev->frame_count;
+                (*f)->buf.field = V4L2_FIELD_INTERLACED;
+                (*f)->state = F_GRABBING;
+                (*f)->buf.bytesused = 0;
+                (*f)->top_field = 1;
+                (*f)->fieldbytesused = 0;
+        } else {
+                                        /* acquiring bottom field */
+                if ((*f)->state == F_GRABBING) {
+                        if (!(*f)->top_field) {
+                                (*f)->state = F_ERROR;
+                                em28xx_isocdbg ("unexpected begin of bottom field; discarding it");
+                        } else if ((*f)-> fieldbytesused < dev->field_size - 172) {
+                                (*f)->state = F_ERROR;
+                                em28xx_isocdbg ("dropping incomplete top field (%i missing bytes)",
+                                         dev->field_size-(*f)->fieldbytesused);
+                        } else {
+                                (*f)->top_field = 0;
+                                (*f)->fieldbytesused = 0;
+                        }
+                }
+        }
+        return (0);
+}
+
+static inline void em28xx_isoc_video_copy(struct em28xx *dev,
+                                          struct em28xx_frame_t **f, unsigned char *buf, int len)
+{
+        void *fieldstart, *startwrite, *startread;
+        int linesdone, currlinedone, offset, lencopy,remain;
+
+        if(dev->frame_size != (*f)->buf.length){
+                em28xx_err("frame_size %i and buf.length %i are different!!!\n",dev->frame_size,(*f)->buf.length);
+                return;
+        }
+
+        if ((*f)->fieldbytesused + len > dev->field_size)
+                len =dev->field_size - (*f)->fieldbytesused;
+
+        if (buf[0] != 0x88 && buf[0] != 0x22) {
+                em28xx_isocdbg("frame is not complete\n");
+                startread = buf;
+                len+=4;
+        } else
+                startread = buf + 4;
+
+        remain = len;
+
+        if ((*f)->top_field)
+                fieldstart = (*f)->bufmem;
+        else
+                fieldstart = (*f)->bufmem + dev->bytesperline;
+
+        linesdone = (*f)->fieldbytesused / dev->bytesperline;
+        currlinedone = (*f)->fieldbytesused % dev->bytesperline;
+        offset = linesdone * dev->bytesperline * 2 + currlinedone;
+        startwrite = fieldstart + offset;
+        lencopy = dev->bytesperline - currlinedone;
+        lencopy = lencopy > remain ? remain : lencopy;
+
+        memcpy(startwrite, startread, lencopy);
+        remain -= lencopy;
+
+        while (remain > 0) {
+                startwrite += lencopy + dev->bytesperline;
+                startread += lencopy;
+                if (dev->bytesperline > remain)
+                        lencopy = remain;
+                else
+                        lencopy = dev->bytesperline;
+
+                memcpy(startwrite, startread, lencopy);
+                remain -= lencopy;
+        }
+
+        (*f)->fieldbytesused += len;
+}
+
+/*
+ * em28xx_isoIrq()
+ * handles the incoming isoc urbs and fills the frames from our inqueue
+ */
+void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs)
+{
+        struct em28xx *dev = urb->context;
+        int i, status;
+        struct em28xx_frame_t **f;
+        unsigned long lock_flags;
+
+        if (!dev)
+                return;
+#ifdef ENABLE_DEBUG_ISOC_FRAMES
+        if (isoc_debug>1)
+                em28xx_isoc_dump(urb, regs);
+#endif
+
+        if (urb->status == -ENOENT)
+                return;
+
+        f = &dev->frame_current;
+
+        if (dev->stream == STREAM_INTERRUPT) {
+                dev->stream = STREAM_OFF;
+                if ((*f))
+                        (*f)->state = F_QUEUED;
+                em28xx_isocdbg("stream interrupted");
+                wake_up_interruptible(&dev->wait_stream);
+        }
+
+        if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+                return;
+
+        if (dev->stream == STREAM_ON && !list_empty(&dev->inqueue)) {
+                if (!(*f))
+                        (*f) = list_entry(dev->inqueue.next,
+                struct em28xx_frame_t, frame);
+
+                for (i = 0; i < urb->number_of_packets; i++) {
+                        unsigned char *buf = urb->transfer_buffer +
+                                        urb->iso_frame_desc[i].offset;
+                        int len = urb->iso_frame_desc[i].actual_length - 4;
+
+                        if (urb->iso_frame_desc[i].status) {
+                                em28xx_isocdbg("data error: [%d] len=%d, status=%d", i,
+                                        urb->iso_frame_desc[i].actual_length,
+                                        urb->iso_frame_desc[i].status);
+                                if (urb->iso_frame_desc[i].status != -EPROTO)
+                                        continue;
+                        }
+                        if (urb->iso_frame_desc[i].actual_length <= 0) {
+                                em28xx_isocdbg("packet %d is empty",i);
+                                continue;
+                        }
+                        if (urb->iso_frame_desc[i].actual_length >
+                                                 dev->max_pkt_size) {
+                                em28xx_isocdbg("packet bigger than packet size");
+                                continue;
+                        }
+                        /*new frame */
+                        if (buf[0] == 0x22 && buf[1] == 0x5a) {
+                                em28xx_isocdbg("Video frame, length=%i!",len);
+
+                                if (em28xx_isoc_video(dev,f,&lock_flags,buf[2]))
+                                break;
+                        } else if (buf[0]==0x33 && buf[1]==0x95 && buf[2]==0x00) {
+                                em28xx_isocdbg("VBI HEADER!!!");
+                        }
+
+                        /* actual copying */
+                        if ((*f)->state == F_GRABBING) {
+                                em28xx_isoc_video_copy(dev,f,buf, len);
+                        }
+                }
+        }
+
+        for (i = 0; i < urb->number_of_packets; i++) {
+                urb->iso_frame_desc[i].status = 0;
+                urb->iso_frame_desc[i].actual_length = 0;
+        }
+
+        urb->status = 0;
+        if ((status = usb_submit_urb(urb, GFP_ATOMIC))) {
+                em28xx_errdev("resubmit of urb failed (error=%i)\n", status);
+                dev->state |= DEV_MISCONFIGURED;
+        }
+        wake_up_interruptible(&dev->wait_frame);
+        return;
+}
+
+/*
+ * em28xx_uninit_isoc()
+ * deallocates the buffers and urbs allocated during em28xx_init_iosc()
+ */
+void em28xx_uninit_isoc(struct em28xx *dev)
+{
+        int i;
+
+        for (i = 0; i < EM28XX_NUM_BUFS; i++) {
+                if (dev->urb[i]) {
+                        usb_kill_urb(dev->urb[i]);
+                        if (dev->transfer_buffer[i]){
+                                usb_buffer_free(dev->udev,(EM28XX_NUM_PACKETS*dev->max_pkt_size),dev->transfer_buffer[i],dev->urb[i]->transfer_dma);
+                        }
+                        usb_free_urb(dev->urb[i]);
+                }
+                dev->urb[i] = NULL;
+                dev->transfer_buffer[i] = NULL;
+        }
+        em28xx_capture_start(dev, 0);
+}
+
+/*
+ * em28xx_init_isoc()
+ * allocates transfer buffers and submits the urbs for isoc transfer
+ */
+int em28xx_init_isoc(struct em28xx *dev)
+{
+        /* change interface to 3 which allowes the biggest packet sizes */
+        int i, errCode;
+        const int sb_size = EM28XX_NUM_PACKETS * dev->max_pkt_size;
+
+        /* reset streaming vars */
+        dev->frame_current = NULL;
+        dev->frame_count = 0;
+
+        /* allocate urbs */
+        for (i = 0; i < EM28XX_NUM_BUFS; i++) {
+                struct urb *urb;
+                int j, k;
+                /* allocate transfer buffer */
+                urb = usb_alloc_urb(EM28XX_NUM_PACKETS, GFP_KERNEL);
+                if (!urb){
+                        em28xx_errdev("cannot alloc urb %i\n", i);
+                        em28xx_uninit_isoc(dev);
+                        return -ENOMEM;
+                }
+                dev->transfer_buffer[i] = usb_buffer_alloc(dev->udev, sb_size, GFP_KERNEL,&urb->transfer_dma);
+                if (!dev->transfer_buffer[i]) {
+                        em28xx_errdev
+                                        ("unable to allocate %i bytes for transfer buffer %i\n",
+                                         sb_size, i);
+                        em28xx_uninit_isoc(dev);
+                        return -ENOMEM;
+                }
+                memset(dev->transfer_buffer[i], 0, sb_size);
+                urb->dev = dev->udev;
+                urb->context = dev;
+                urb->pipe = usb_rcvisocpipe(dev->udev, 0x82);
+                urb->transfer_flags = URB_ISO_ASAP;
+                urb->interval = 1;
+                urb->transfer_buffer = dev->transfer_buffer[i];
+                urb->complete = em28xx_isocIrq;
+                urb->number_of_packets = EM28XX_NUM_PACKETS;
+                urb->transfer_buffer_length = sb_size;
+                for (j = k = 0; j < EM28XX_NUM_PACKETS;
+                                j++, k += dev->max_pkt_size) {
+                        urb->iso_frame_desc[j].offset = k;
+                        urb->iso_frame_desc[j].length =
+                                dev->max_pkt_size;
+                }
+                dev->urb[i] = urb;
+        }
+
+        /* submit urbs */
+        for (i = 0; i < EM28XX_NUM_BUFS; i++) {
+                errCode = usb_submit_urb(dev->urb[i], GFP_KERNEL);
+                if (errCode) {
+                        em28xx_errdev("submit of urb %i failed (error=%i)\n", i,
+                                      errCode);
+                        em28xx_uninit_isoc(dev);
+                        return errCode;
+                }
+        }
+
+        return 0;
+}
+
+int em28xx_set_alternate(struct em28xx *dev)
+{
+        int errCode, prev_alt = dev->alt;
+        dev->alt = alt;
+        if (dev->alt == 0) {
+                int i;
+                for(i=0;i< dev->num_alt; i++)
+                        if(dev->alt_max_pkt_size[i]>dev->alt_max_pkt_size[dev->alt])
+                                dev->alt=i;
+        }
+
+        if (dev->alt != prev_alt) {
+                dev->max_pkt_size = dev->alt_max_pkt_size[dev->alt];
+                em28xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n", dev->alt,
+                       dev->max_pkt_size);
+                errCode = usb_set_interface(dev->udev, 0, dev->alt);
+                if (errCode < 0) {
+                        em28xx_errdev ("cannot change alternate number to %d (error=%i)\n",
+                                                        dev->alt, errCode);
+                        return errCode;
+                }
+        }
+        return 0;
+}
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
new file mode 100644
index 000000000000..b32d9852f34c
--- /dev/null
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -0,0 +1,586 @@
+/*
+   em28xx-i2c.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+
+   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
+                      Markus Rechberger <mrechberger@gmail.com>
+                      Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+                      Sascha Sommer <saschasommer@freenet.de>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/usb.h>
+#include <linux/i2c.h>
+#include <linux/video_decoder.h>
+
+#include "em28xx.h"
+#include <media/tuner.h>
+
+/* ----------------------------------------------------------- */
+
+static unsigned int i2c_scan = 0;
+module_param(i2c_scan, int, 0444);
+MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
+
+static unsigned int i2c_debug = 0;
+module_param(i2c_debug, int, 0644);
+MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
+
+#define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\
+                        printk(fmt , ##args); } while (0)
+#define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
+                        printk(KERN_DEBUG "%s at %s: " fmt, \
+                        dev->name, __FUNCTION__ , ##args); } while (0)
+
+/*
+ * em2800_i2c_send_max4()
+ * send up to 4 bytes to the i2c device
+ */
+static int em2800_i2c_send_max4(struct em28xx *dev, unsigned char addr,
+                                char *buf, int len)
+{
+        int ret;
+        int write_timeout;
+        unsigned char b2[6];
+        BUG_ON(len < 1 || len > 4);
+        b2[5] = 0x80 + len - 1;
+        b2[4] = addr;
+        b2[3] = buf[0];
+        if (len > 1)
+                b2[2] = buf[1];
+        if (len > 2)
+                b2[1] = buf[2];
+        if (len > 3)
+                b2[0] = buf[3];
+
+        ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len);
+        if (ret != 2 + len) {
+                em28xx_warn("writting to i2c device failed (error=%i)\n", ret);
+                return -EIO;
+        }
+        for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
+             write_timeout -= 5) {
+                ret = dev->em28xx_read_reg(dev, 0x05);
+                if (ret == 0x80 + len - 1)
+                        return len;
+                mdelay(5);
+        }
+        em28xx_warn("i2c write timed out\n");
+        return -EIO;
+}
+
+/*
+ * em2800_i2c_send_bytes()
+ */
+static int em2800_i2c_send_bytes(void *data, unsigned char addr, char *buf,
+                                 short len)
+{
+        char *bufPtr = buf;
+        int ret;
+        int wrcount = 0;
+        int count;
+        int maxLen = 4;
+        struct em28xx *dev = (struct em28xx *)data;
+        while (len > 0) {
+                count = (len > maxLen) ? maxLen : len;
+                ret = em2800_i2c_send_max4(dev, addr, bufPtr, count);
+                if (ret > 0) {
+                        len -= count;
+                        bufPtr += count;
+                        wrcount += count;
+                } else
+                        return (ret < 0) ? ret : -EFAULT;
+        }
+        return wrcount;
+}
+
+/*
+ * em2800_i2c_check_for_device()
+ * check if there is a i2c_device at the supplied address
+ */
+static int em2800_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
+{
+        char msg;
+        int ret;
+        int write_timeout;
+        msg = addr;
+        ret = dev->em28xx_write_regs(dev, 0x04, &msg, 1);
+        if (ret < 0) {
+                em28xx_warn("setting i2c device address failed (error=%i)\n",
+                            ret);
+                return ret;
+        }
+        msg = 0x84;
+        ret = dev->em28xx_write_regs(dev, 0x05, &msg, 1);
+        if (ret < 0) {
+                em28xx_warn("preparing i2c read failed (error=%i)\n", ret);
+                return ret;
+        }
+        for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
+             write_timeout -= 5) {
+                unsigned msg = dev->em28xx_read_reg(dev, 0x5);
+                if (msg == 0x94)
+                        return -ENODEV;
+                else if (msg == 0x84)
+                        return 0;
+                mdelay(5);
+        }
+        return -ENODEV;
+}
+
+/*
+ * em2800_i2c_recv_bytes()
+ * read from the i2c device
+ */
+static int em2800_i2c_recv_bytes(struct em28xx *dev, unsigned char addr,
+                                 char *buf, int len)
+{
+        int ret;
+        /* check for the device and set i2c read address */
+        ret = em2800_i2c_check_for_device(dev, addr);
+        if (ret) {
+                em28xx_warn
+                    ("preparing read at i2c address 0x%x failed (error=%i)\n",
+                     addr, ret);
+                return ret;
+        }
+        ret = dev->em28xx_read_reg_req_len(dev, 0x0, 0x3, buf, len);
+        if (ret < 0) {
+                em28xx_warn("reading from i2c device at 0x%x failed (error=%i)",
+                            addr, ret);
+                return ret;
+        }
+        return ret;
+}
+
+/*
+ * em28xx_i2c_send_bytes()
+ * untested for more than 4 bytes
+ */
+static int em28xx_i2c_send_bytes(void *data, unsigned char addr, char *buf,
+                                 short len, int stop)
+{
+        int wrcount = 0;
+        struct em28xx *dev = (struct em28xx *)data;
+
+        wrcount = dev->em28xx_write_regs_req(dev, stop ? 2 : 3, addr, buf, len);
+
+        return wrcount;
+}
+
+/*
+ * em28xx_i2c_recv_bytes()
+ * read a byte from the i2c device
+ */
+static int em28xx_i2c_recv_bytes(struct em28xx *dev, unsigned char addr,
+                                 char *buf, int len)
+{
+        int ret;
+        ret = dev->em28xx_read_reg_req_len(dev, 2, addr, buf, len);
+        if (ret < 0) {
+                em28xx_warn("reading i2c device failed (error=%i)\n", ret);
+                return ret;
+        }
+        if (dev->em28xx_read_reg(dev, 0x5) != 0)
+                return -ENODEV;
+        return ret;
+}
+
+/*
+ * em28xx_i2c_check_for_device()
+ * check if there is a i2c_device at the supplied address
+ */
+static int em28xx_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
+{
+        char msg;
+        int ret;
+        msg = addr;
+
+        ret = dev->em28xx_read_reg_req(dev, 2, addr);
+        if (ret < 0) {
+                em28xx_warn("reading from i2c device failed (error=%i)\n", ret);
+                return ret;
+        }
+        if (dev->em28xx_read_reg(dev, 0x5) != 0)
+                return -ENODEV;
+        return 0;
+}
+
+/*
+ * em28xx_i2c_xfer()
+ * the main i2c transfer function
+ */
+static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap,
+                           struct i2c_msg msgs[], int num)
+{
+        struct em28xx *dev = i2c_adap->algo_data;
+        int addr, rc, i, byte;
+
+        if (num <= 0)
+                return 0;
+        for (i = 0; i < num; i++) {
+                addr = msgs[i].addr << 1;
+                dprintk2(2,"%s %s addr=%x len=%d:",
+                         (msgs[i].flags & I2C_M_RD) ? "read" : "write",
+                         i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len);
+                if (!msgs[i].len) {     /* no len: check only for device presence */
+                        if (dev->is_em2800)
+                                rc = em2800_i2c_check_for_device(dev, addr);
+                        else
+                                rc = em28xx_i2c_check_for_device(dev, addr);
+                        if (rc < 0) {
+                                dprintk2(2," no device\n");
+                                return rc;
+                        }
+
+                } else if (msgs[i].flags & I2C_M_RD) {
+                        /* read bytes */
+                        if (dev->is_em2800)
+                                rc = em2800_i2c_recv_bytes(dev, addr,
+                                                           msgs[i].buf,
+                                                           msgs[i].len);
+                        else
+                                rc = em28xx_i2c_recv_bytes(dev, addr,
+                                                           msgs[i].buf,
+                                                           msgs[i].len);
+                        if (i2c_debug>=2) {
+                                for (byte = 0; byte < msgs[i].len; byte++) {
+                                        printk(" %02x", msgs[i].buf[byte]);
+                                }
+                        }
+                } else {
+                        /* write bytes */
+                        if (i2c_debug>=2) {
+                                for (byte = 0; byte < msgs[i].len; byte++)
+                                        printk(" %02x", msgs[i].buf[byte]);
+                        }
+                        if (dev->is_em2800)
+                                rc = em2800_i2c_send_bytes(dev, addr,
+                                                           msgs[i].buf,
+                                                           msgs[i].len);
+                        else
+                                rc = em28xx_i2c_send_bytes(dev, addr,
+                                                           msgs[i].buf,
+                                                           msgs[i].len,
+                                                           i == num - 1);
+                        if (rc < 0)
+                                goto err;
+                }
+                if (i2c_debug>=2)
+                        printk("\n");
+        }
+
+        return num;
+      err:
+        dprintk2(2," ERROR: %i\n", rc);
+        return rc;
+}
+
+static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
+{
+        unsigned char buf, *p = eedata;
+        struct em28xx_eeprom *em_eeprom = (void *)eedata;
+        int i, err, size = len, block;
+
+        dev->i2c_client.addr = 0xa0 >> 1;
+
+        /* Check if board has eeprom */
+        err = i2c_master_recv(&dev->i2c_client, &buf, 0);
+        if (err < 0)
+                return -1;
+
+        buf = 0;
+        if (1 != (err = i2c_master_send(&dev->i2c_client, &buf, 1))) {
+                printk(KERN_INFO "%s: Huh, no eeprom present (err=%d)?\n",
+                       dev->name, err);
+                return -1;
+        }
+        while (size > 0) {
+                if (size > 16)
+                        block = 16;
+                else
+                        block = size;
+
+                if (block !=
+                    (err = i2c_master_recv(&dev->i2c_client, p, block))) {
+                        printk(KERN_WARNING
+                               "%s: i2c eeprom read error (err=%d)\n",
+                               dev->name, err);
+                        return -1;
+                }
+                size -= block;
+                p += block;
+        }
+        for (i = 0; i < len; i++) {
+                if (0 == (i % 16))
+                        printk(KERN_INFO "%s: i2c eeprom %02x:", dev->name, i);
+                printk(" %02x", eedata[i]);
+                if (15 == (i % 16))
+                        printk("\n");
+        }
+
+        printk(KERN_INFO "EEPROM ID= 0x%08x\n", em_eeprom->id);
+        printk(KERN_INFO "Vendor/Product ID= %04x:%04x\n", em_eeprom->vendor_ID,
+               em_eeprom->product_ID);
+
+        switch (em_eeprom->chip_conf >> 4 & 0x3) {
+        case 0:
+                printk(KERN_INFO "No audio on board.\n");
+                break;
+        case 1:
+                printk(KERN_INFO "AC97 audio (5 sample rates)\n");
+                break;
+        case 2:
+                printk(KERN_INFO "I2S audio, sample rate=32k\n");
+                break;
+        case 3:
+                printk(KERN_INFO "I2S audio, 3 sample rates\n");
+                break;
+        }
+
+        if (em_eeprom->chip_conf & 1 << 3)
+                printk(KERN_INFO "USB Remote wakeup capable\n");
+
+        if (em_eeprom->chip_conf & 1 << 2)
+                printk(KERN_INFO "USB Self power capable\n");
+
+        switch (em_eeprom->chip_conf & 0x3) {
+        case 0:
+                printk(KERN_INFO "500mA max power\n");
+                break;
+        case 1:
+                printk(KERN_INFO "400mA max power\n");
+                break;
+        case 2:
+                printk(KERN_INFO "300mA max power\n");
+                break;
+        case 3:
+                printk(KERN_INFO "200mA max power\n");
+                break;
+        }
+        printk(KERN_INFO "Table at 0x%02x, strings=0x%04x, 0x%04x, 0x%04x\n",
+                                em_eeprom->string_idx_table,em_eeprom->string1,
+                                em_eeprom->string2,em_eeprom->string3);
+
+        return 0;
+}
+
+/* ----------------------------------------------------------- */
+
+/*
+ * algo_control()
+ */
+static int algo_control(struct i2c_adapter *adapter,
+                        unsigned int cmd, unsigned long arg)
+{
+        return 0;
+}
+
+/*
+ * functionality()
+ */
+static u32 functionality(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_SMBUS_EMUL;
+}
+
+#ifndef I2C_PEC
+static void inc_use(struct i2c_adapter *adap)
+{
+        MOD_INC_USE_COUNT;
+}
+
+static void dec_use(struct i2c_adapter *adap)
+{
+        MOD_DEC_USE_COUNT;
+}
+#endif
+
+static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client)
+{
+        struct em28xx *dev = client->adapter->algo_data;
+        struct tuner_setup tun_setup;
+
+        if (dev->has_tuner) {
+                tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
+                tun_setup.type = dev->tuner_type;
+                tun_setup.addr = dev->tuner_addr;
+
+                em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
+        }
+
+        return (0);
+}
+
+/*
+ * attach_inform()
+ * gets called when a device attaches to the i2c bus
+ * does some basic configuration
+ */
+static int attach_inform(struct i2c_client *client)
+{
+        struct em28xx *dev = client->adapter->algo_data;
+
+        switch (client->addr << 1) {
+                case 0x86:
+                        em28xx_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
+                        break;
+                case 0x42:
+                        dprintk1(1,"attach_inform: saa7114 detected.\n");
+                        break;
+                case 0x4a:
+                        dprintk1(1,"attach_inform: saa7113 detected.\n");
+                        break;
+                case 0xa0:
+                        dprintk1(1,"attach_inform: eeprom detected.\n");
+                        break;
+                case 0x60:
+                case 0x8e:
+                {
+                        struct IR_i2c *ir = i2c_get_clientdata(client);
+                        dprintk1(1,"attach_inform: IR detected (%s).\n",ir->phys);
+                        em28xx_set_ir(dev,ir);
+                        break;
+                }
+                case 0x80:
+                case 0x88:
+                        dprintk1(1,"attach_inform: msp34xx detected.\n");
+                        break;
+                case 0xb8:
+                case 0xba:
+                        dprintk1(1,"attach_inform: tvp5150 detected.\n");
+                        break;
+                default:
+                        dprintk1(1,"attach inform: detected I2C address %x\n", client->addr << 1);
+                        dev->tuner_addr = client->addr;
+                        em28xx_set_tuner(-1, client);
+        }
+
+        return 0;
+}
+
+static struct i2c_algorithm em28xx_algo = {
+        .master_xfer   = em28xx_i2c_xfer,
+        .algo_control  = algo_control,
+        .functionality = functionality,
+};
+
+static struct i2c_adapter em28xx_adap_template = {
+#ifdef I2C_PEC
+        .owner = THIS_MODULE,
+#else
+        .inc_use = inc_use,
+        .dec_use = dec_use,
+#endif
+#ifdef I2C_CLASS_TV_ANALOG
+        .class = I2C_CLASS_TV_ANALOG,
+#endif
+        .name = "em28xx",
+        .id = I2C_HW_B_EM28XX,
+        .algo = &em28xx_algo,
+        .client_register = attach_inform,
+};
+
+static struct i2c_client em28xx_client_template = {
+        .name = "em28xx internal",
+        .flags = I2C_CLIENT_ALLOW_USE,
+};
+
+/* ----------------------------------------------------------- */
+
+/*
+ * i2c_devs
+ * incomplete list of known devices
+ */
+static char *i2c_devs[128] = {
+        [0x4a >> 1] = "saa7113h",
+        [0x60 >> 1] = "remote IR sensor",
+        [0x8e >> 1] = "remote IR sensor",
+        [0x86 >> 1] = "tda9887",
+        [0x80 >> 1] = "msp34xx",
+        [0x88 >> 1] = "msp34xx",
+        [0xa0 >> 1] = "eeprom",
+        [0xb8 >> 1] = "tvp5150a",
+        [0xba >> 1] = "tvp5150a",
+        [0xc0 >> 1] = "tuner (analog)",
+        [0xc2 >> 1] = "tuner (analog)",
+        [0xc4 >> 1] = "tuner (analog)",
+        [0xc6 >> 1] = "tuner (analog)",
+};
+
+/*
+ * do_i2c_scan()
+ * check i2c address range for devices
+ */
+static void do_i2c_scan(char *name, struct i2c_client *c)
+{
+        unsigned char buf;
+        int i, rc;
+
+        for (i = 0; i < 128; i++) {
+                c->addr = i;
+                rc = i2c_master_recv(c, &buf, 0);
+                if (rc < 0)
+                        continue;
+                printk(KERN_INFO "%s: found i2c device @ 0x%x [%s]\n", name,
+                       i << 1, i2c_devs[i] ? i2c_devs[i] : "???");
+        }
+}
+
+/*
+ * em28xx_i2c_call_clients()
+ * send commands to all attached i2c devices
+ */
+void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg)
+{
+        BUG_ON(NULL == dev->i2c_adap.algo_data);
+        i2c_clients_command(&dev->i2c_adap, cmd, arg);
+}
+
+/*
+ * em28xx_i2c_register()
+ * register i2c bus
+ */
+int em28xx_i2c_register(struct em28xx *dev)
+{
+        BUG_ON(!dev->em28xx_write_regs || !dev->em28xx_read_reg);
+        BUG_ON(!dev->em28xx_write_regs_req || !dev->em28xx_read_reg_req);
+        dev->i2c_adap = em28xx_adap_template;
+        dev->i2c_adap.dev.parent = &dev->udev->dev;
+        strcpy(dev->i2c_adap.name, dev->name);
+        dev->i2c_adap.algo_data = dev;
+        i2c_add_adapter(&dev->i2c_adap);
+
+        dev->i2c_client = em28xx_client_template;
+        dev->i2c_client.adapter = &dev->i2c_adap;
+
+        em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+
+        if (i2c_scan)
+                do_i2c_scan(dev->name, &dev->i2c_client);
+        return 0;
+}
+
+/*
+ * em28xx_i2c_unregister()
+ * unregister i2c_bus
+ */
+int em28xx_i2c_unregister(struct em28xx *dev)
+{
+        i2c_del_adapter(&dev->i2c_adap);
+        return 0;
+}
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
new file mode 100644
index 000000000000..32c49df58adc
--- /dev/null
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -0,0 +1,184 @@
+/*
+  handle em28xx IR remotes via linux kernel input layer.
+
+   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
+                      Markus Rechberger <mrechberger@gmail.com>
+                      Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+                      Sascha Sommer <saschasommer@freenet.de>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/usb.h>
+
+#include "em28xx.h"
+
+static unsigned int disable_ir = 0;
+module_param(disable_ir, int, 0444);
+MODULE_PARM_DESC(disable_ir,"disable infrared remote support");
+
+static unsigned int ir_debug = 0;
+module_param(ir_debug, int, 0644);
+MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");
+
+#define dprintk(fmt, arg...)    if (ir_debug) \
+        printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
+
+/* ---------------------------------------------------------------------- */
+
+static IR_KEYTAB_TYPE ir_codes_em_terratec[IR_KEYTAB_SIZE] = {
+        [ 0x01 ] = KEY_CHANNEL,
+        [ 0x02 ] = KEY_SELECT,
+        [ 0x03 ] = KEY_MUTE,
+        [ 0x04 ] = KEY_POWER,
+        [ 0x05 ] = KEY_KP1,
+        [ 0x06 ] = KEY_KP2,
+        [ 0x07 ] = KEY_KP3,
+        [ 0x08 ] = KEY_CHANNELUP,
+        [ 0x09 ] = KEY_KP4,
+        [ 0x0a ] = KEY_KP5,
+        [ 0x0b ] = KEY_KP6,
+        [ 0x0c ] = KEY_CHANNELDOWN,
+        [ 0x0d ] = KEY_KP7,
+        [ 0x0e ] = KEY_KP8,
+        [ 0x0f ] = KEY_KP9,
+        [ 0x10 ] = KEY_VOLUMEUP,
+        [ 0x11 ] = KEY_KP0,
+        [ 0x12 ] = KEY_MENU,
+        [ 0x13 ] = KEY_PRINT,
+        [ 0x14 ] = KEY_VOLUMEDOWN,
+        [ 0x16 ] = KEY_PAUSE,
+        [ 0x18 ] = KEY_RECORD,
+        [ 0x19 ] = KEY_REWIND,
+        [ 0x1a ] = KEY_PLAY,
+        [ 0x1b ] = KEY_FORWARD,
+        [ 0x1c ] = KEY_BACKSPACE,
+        [ 0x1e ] = KEY_STOP,
+        [ 0x40 ] = KEY_ZOOM,
+};
+
+/* ----------------------------------------------------------------------- */
+
+static int get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        unsigned char b;
+
+        /* poll IR chip */
+        if (1 != i2c_master_recv(&ir->c,&b,1)) {
+                dprintk("read error\n");
+                return -EIO;
+        }
+
+        /* it seems that 0xFE indicates that a button is still hold
+           down, while 0xff indicates that no button is hold
+           down. 0xfe sequences are sometimes interrupted by 0xFF */
+
+        dprintk("key %02x\n", b);
+
+        if (b == 0xff)
+                return 0;
+
+        if (b == 0xfe)
+                /* keep old data */
+                return 1;
+
+        *ir_key = b;
+        *ir_raw = b;
+        return 1;
+}
+
+
+static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        unsigned char buf[2];
+        unsigned char code;
+
+        /* poll IR chip */
+        if (2 != i2c_master_recv(&ir->c,buf,2))
+                return -EIO;
+
+        /* Does eliminate repeated parity code */
+        if (buf[1]==0xff)
+                return 0;
+
+        /* avoid fast reapeating */
+        if (buf[1]==ir->old)
+                return 0;
+        ir->old=buf[1];
+
+        /* Rearranges bits to the right order */
+        code=    ((buf[0]&0x01)<<5) | /* 0010 0000 */
+                 ((buf[0]&0x02)<<3) | /* 0001 0000 */
+                 ((buf[0]&0x04)<<1) | /* 0000 1000 */
+                 ((buf[0]&0x08)>>1) | /* 0000 0100 */
+                 ((buf[0]&0x10)>>3) | /* 0000 0010 */
+                 ((buf[0]&0x20)>>5);  /* 0000 0001 */
+
+        dprintk("ir hauppauge (em2840): code=0x%02x (rcv=0x%02x)\n",code,buf[0]);
+
+        /* return key */
+        *ir_key = code;
+        *ir_raw = code;
+        return 1;
+}
+
+/* ----------------------------------------------------------------------- */
+void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir)
+{
+        if (disable_ir) {
+                ir->get_key=NULL;
+                return ;
+        }
+
+        /* detect & configure */
+        switch (dev->model) {
+        case (EM2800_BOARD_UNKNOWN):
+                break;
+        case (EM2820_BOARD_UNKNOWN):
+                break;
+        case (EM2800_BOARD_TERRATEC_CINERGY_200):
+        case (EM2820_BOARD_TERRATEC_CINERGY_250):
+                ir->ir_codes = ir_codes_em_terratec;
+                ir->get_key = get_key_terratec;
+                snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Terratec)");
+                break;
+        case (EM2820_BOARD_PINNACLE_USB_2):
+                break;
+        case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
+                ir->ir_codes = ir_codes_hauppauge_new;
+                ir->get_key = get_key_em_haup;
+                snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM2840 Hauppauge)");
+                break;
+        case (EM2820_BOARD_MSI_VOX_USB_2):
+                break;
+        case (EM2800_BOARD_LEADTEK_WINFAST_USBII):
+                break;
+        case (EM2800_BOARD_KWORLD_USB2800):
+                break;
+        }
+}
+
+/* ----------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
new file mode 100644
index 000000000000..57c1826b928e
--- /dev/null
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -0,0 +1,1933 @@
+/*
+   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+
+   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
+                      Markus Rechberger <mrechberger@gmail.com>
+                      Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+                      Sascha Sommer <saschasommer@freenet.de>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/usb.h>
+#include <linux/i2c.h>
+#include <linux/version.h>
+#include <linux/video_decoder.h>
+
+#include "em28xx.h"
+#include <media/tuner.h>
+
+#define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
+                      "Markus Rechberger <mrechberger@gmail.com>, " \
+                      "Mauro Carvalho Chehab <mchehab@brturbo.com.br>, " \
+                      "Sascha Sommer <saschasommer@freenet.de>"
+
+#define DRIVER_NAME         "em28xx"
+#define DRIVER_DESC         "Empia em28xx based USB video device driver"
+#define EM28XX_VERSION_CODE  KERNEL_VERSION(0, 0, 1)
+
+#define em28xx_videodbg(fmt, arg...) do {\
+        if (video_debug) \
+                printk(KERN_INFO "%s %s :"fmt, \
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+static LIST_HEAD(em28xx_devlist);
+
+static unsigned int card[]     = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
+module_param_array(card,  int, NULL, 0444);
+MODULE_PARM_DESC(card,"card type");
+
+static int tuner = -1;
+module_param(tuner, int, 0444);
+MODULE_PARM_DESC(tuner, "tuner type");
+
+static unsigned int video_debug = 0;
+module_param(video_debug,int,0644);
+MODULE_PARM_DESC(video_debug,"enable debug messages [video]");
+
+/* supported tv norms */
+static struct em28xx_tvnorm tvnorms[] = {
+        {
+                .name = "PAL",
+                .id = V4L2_STD_PAL,
+                .mode = VIDEO_MODE_PAL,
+         }, {
+                .name = "NTSC",
+                .id = V4L2_STD_NTSC,
+                .mode = VIDEO_MODE_NTSC,
+        }, {
+                 .name = "SECAM",
+                 .id = V4L2_STD_SECAM,
+                 .mode = VIDEO_MODE_SECAM,
+        }, {
+                .name = "PAL-M",
+                .id = V4L2_STD_PAL_M,
+                .mode = VIDEO_MODE_PAL,
+        }
+};
+
+static const unsigned char saa7114_i2c_init[] = {
+        0x00,0x00,0x01,0x08,0x02,0xc4,0x03,0x30,0x04,0x90,0x05,0x90,0x06,0xeb,0x07,0xe0,
+        0x08,0x88,0x09,0x40,0x0a,0x80,0x0b,0x44,0x0c,0x40,0x0d,0x00,0x0e,0x81,0x0f,0x2a,
+        0x10,0x06,0x11,0x00,0x12,0xc8,0x13,0x80,0x14,0x00,0x15,0x11,0x16,0x01,0x17,0x42,
+        0x18,0x40,0x19,0x80,0x40,0x00,0x41,0xff,0x42,0xff,0x43,0xff,0x44,0xff,0x45,0xff,
+        0x46,0xff,0x47,0xff,0x48,0xff,0x49,0xff,0x4a,0xff,0x4b,0xff,0x4c,0xff,0x4d,0xff,
+        0x4e,0xff,0x4f,0xff,0x50,0xff,0x51,0xff,0x52,0xff,0x53,0xff,0x54,0x5f,0x55,0xff,
+        0x56,0xff,0x57,0xff,0x58,0x00,0x59,0x47,0x5a,0x03,0x5b,0x03,0x5d,0x3e,0x5e,0x00,
+        0x80,0x1c,0x83,0x01,0x84,0xa5,0x85,0x10,0x86,0x45,0x87,0x41,0x88,0xf0,0x88,0x00,
+        0x88,0xf0,0x90,0x00,0x91,0x08,0x92,0x00,0x93,0x80,0x94,0x08,0x95,0x00,0x96,0xc0,
+        0x97,0x02,0x98,0x13,0x99,0x00,0x9a,0x38,0x9b,0x01,0x9c,0x80,0x9d,0x02,0x9e,0x06,
+        0x9f,0x01,0xa0,0x01,0xa1,0x00,0xa2,0x00,0xa4,0x80,0xa5,0x36,0xa6,0x36,0xa8,0x67,
+        0xa9,0x04,0xaa,0x00,0xac,0x33,0xad,0x02,0xae,0x00,0xb0,0xcd,0xb1,0x04,0xb2,0xcd,
+        0xb3,0x04,0xb4,0x01,0xb8,0x00,0xb9,0x00,0xba,0x00,0xbb,0x00,0xbc,0x00,0xbd,0x00,
+        0xbe,0x00,0xbf,0x00
+};
+
+#define TVNORMS ARRAY_SIZE(tvnorms)
+
+/* supported controls */
+static struct v4l2_queryctrl em28xx_qctrl[] = {
+        {
+                .id = V4L2_CID_BRIGHTNESS,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Brightness",
+                .minimum = -128,
+                .maximum = 127,
+                .step = 1,
+                .default_value = 0,
+                .flags = 0,
+        },{
+                .id = V4L2_CID_CONTRAST,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Contrast",
+                .minimum = 0x0,
+                .maximum = 0x1f,
+                .step = 0x1,
+                .default_value = 0x10,
+                .flags = 0,
+        },{
+                .id = V4L2_CID_SATURATION,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Saturation",
+                .minimum = 0x0,
+                .maximum = 0x1f,
+                .step = 0x1,
+                .default_value = 0x10,
+                .flags = 0,
+        },{
+                .id = V4L2_CID_AUDIO_VOLUME,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Volume",
+                .minimum = 0x0,
+                .maximum = 0x1f,
+                .step = 0x1,
+                .default_value = 0x1f,
+                .flags = 0,
+        },{
+                .id = V4L2_CID_AUDIO_MUTE,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Mute",
+                .minimum = 0,
+                .maximum = 1,
+                .step = 1,
+                .default_value = 1,
+                .flags = 0,
+        },{
+                .id = V4L2_CID_RED_BALANCE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Red chroma balance",
+                .minimum = -128,
+                .maximum = 127,
+                .step = 1,
+                .default_value = 0,
+                .flags = 0,
+        },{
+                .id = V4L2_CID_BLUE_BALANCE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Blue chroma balance",
+                .minimum = -128,
+                .maximum = 127,
+                .step = 1,
+                .default_value = 0,
+                .flags = 0,
+        },{
+                .id = V4L2_CID_GAMMA,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Gamma",
+                .minimum = 0x0,
+                .maximum = 0x3f,
+                .step = 0x1,
+                .default_value = 0x20,
+                .flags = 0,
+         }
+};
+
+static struct usb_driver em28xx_usb_driver;
+
+static DECLARE_MUTEX(em28xx_sysfs_lock);
+static DECLARE_RWSEM(em28xx_disconnect);
+
+/*********************  v4l2 interface  ******************************************/
+
+static inline unsigned long kvirt_to_pa(unsigned long adr)
+{
+        unsigned long kva, ret;
+
+        kva = (unsigned long)page_address(vmalloc_to_page((void *)adr));
+        kva |= adr & (PAGE_SIZE - 1);
+        ret = __pa(kva);
+        return ret;
+}
+
+/*
+ * em28xx_config()
+ * inits registers with sane defaults
+ */
+static int em28xx_config(struct em28xx *dev)
+{
+
+        /* Sets I2C speed to 100 KHz */
+        em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+
+        /* enable vbi capturing */
+        em28xx_audio_usb_mute(dev, 1);
+        dev->mute = 1;          /* maybe not the right place... */
+        dev->volume = 0x1f;
+        em28xx_audio_analog_set(dev);
+        em28xx_audio_analog_setup(dev);
+        em28xx_outfmt_set_yuv422(dev);
+        em28xx_colorlevels_set_default(dev);
+        em28xx_compression_disable(dev);
+
+        return 0;
+}
+
+/*
+ * em28xx_config_i2c()
+ * configure i2c attached devices
+ */
+void em28xx_config_i2c(struct em28xx *dev)
+{
+        struct v4l2_frequency f;
+        struct video_decoder_init em28xx_vdi = {.data = NULL };
+
+
+        /* configure decoder */
+        if(dev->model == EM2820_BOARD_MSI_VOX_USB_2){
+                em28xx_vdi.data=saa7114_i2c_init;
+                em28xx_vdi.len=sizeof(saa7114_i2c_init);
+        }
+
+
+        em28xx_i2c_call_clients(dev, DECODER_INIT, &em28xx_vdi);
+        em28xx_i2c_call_clients(dev, DECODER_SET_INPUT, &dev->ctl_input);
+/*      em28xx_i2c_call_clients(dev,DECODER_SET_PICTURE, &dev->vpic); */
+/*      em28xx_i2c_call_clients(dev,DECODER_SET_NORM,&dev->tvnorm->id); */
+/*      em28xx_i2c_call_clients(dev,DECODER_ENABLE_OUTPUT,&output); */
+/*      em28xx_i2c_call_clients(dev,DECODER_DUMP, NULL); */
+
+        /* configure tuner */
+        f.tuner = 0;
+        f.type = V4L2_TUNER_ANALOG_TV;
+        f.frequency = 9076;     /* FIXME:remove magic number */
+        dev->ctl_freq = f.frequency;
+        em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, &f);
+
+        /* configure tda9887 */
+
+
+/*      em28xx_i2c_call_clients(dev,VIDIOC_S_STD,&dev->tvnorm->id); */
+}
+
+/*
+ * em28xx_empty_framequeues()
+ * prepare queues for incoming and outgoing frames
+ */
+static void em28xx_empty_framequeues(struct em28xx *dev)
+{
+        u32 i;
+
+        INIT_LIST_HEAD(&dev->inqueue);
+        INIT_LIST_HEAD(&dev->outqueue);
+
+        for (i = 0; i < EM28XX_NUM_FRAMES; i++) {
+                dev->frame[i].state = F_UNUSED;
+                dev->frame[i].buf.bytesused = 0;
+        }
+}
+
+static void video_mux(struct em28xx *dev, int index)
+{
+        int input, ainput;
+
+        input = INPUT(index)->vmux;
+        dev->ctl_input = index;
+        dev->ctl_ainput = INPUT(index)->amux;
+
+        em28xx_i2c_call_clients(dev, DECODER_SET_INPUT, &input);
+
+
+        em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev->ctl_ainput);
+
+        if (dev->has_msp34xx) {
+                em28xx_i2c_call_clients(dev, VIDIOC_S_AUDIO, &dev->ctl_ainput);
+                ainput = EM28XX_AUDIO_SRC_TUNER;
+                em28xx_audio_source(dev, ainput);
+        } else {
+                switch (dev->ctl_ainput) {
+                case 0:
+                        ainput = EM28XX_AUDIO_SRC_TUNER;
+                        break;
+                default:
+                        ainput = EM28XX_AUDIO_SRC_LINE;
+                }
+                em28xx_audio_source(dev, ainput);
+        }
+}
+
+/*
+ * em28xx_v4l2_open()
+ * inits the device and starts isoc transfer
+ */
+static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
+{
+        int minor = iminor(inode);
+        int errCode = 0;
+        struct em28xx *h,*dev = NULL;
+        struct list_head *list;
+
+        list_for_each(list,&em28xx_devlist) {
+                h = list_entry(list, struct em28xx, devlist);
+                if (h->vdev->minor == minor) {
+                        dev  = h;
+                }
+        }
+
+        filp->private_data=dev;
+
+
+        em28xx_videodbg("users=%d\n", dev->users);
+
+        if (!down_read_trylock(&em28xx_disconnect))
+                return -ERESTARTSYS;
+
+        if (dev->users) {
+                em28xx_warn("this driver can be opened only once\n");
+                up_read(&em28xx_disconnect);
+                return -EBUSY;
+        }
+
+/*      if(dev->vbi_dev->minor == minor){
+                dev->type=V4L2_BUF_TYPE_VBI_CAPTURE;
+        }*/
+        if (dev->vdev->minor == minor) {
+                dev->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        }
+
+        init_MUTEX(&dev->fileop_lock);  /* to 1 == available */
+        spin_lock_init(&dev->queue_lock);
+        init_waitqueue_head(&dev->wait_frame);
+        init_waitqueue_head(&dev->wait_stream);
+
+        down(&dev->lock);
+
+        em28xx_set_alternate(dev);
+
+        dev->width = norm_maxw(dev);
+        dev->height = norm_maxh(dev);
+        dev->frame_size = dev->width * dev->height * 2;
+        dev->field_size = dev->frame_size >> 1; /*both_fileds ? dev->frame_size>>1 : dev->frame_size; */
+        dev->bytesperline = dev->width * 2;
+        dev->hscale = 0;
+        dev->vscale = 0;
+
+        em28xx_capture_start(dev, 1);
+        em28xx_resolution_set(dev);
+
+        /* start the transfer */
+        errCode = em28xx_init_isoc(dev);
+        if (errCode)
+                goto err;
+
+        dev->users++;
+        filp->private_data = dev;
+        dev->io = IO_NONE;
+        dev->stream = STREAM_OFF;
+        dev->num_frames = 0;
+
+        /* prepare queues */
+        em28xx_empty_framequeues(dev);
+
+        dev->state |= DEV_INITIALIZED;
+
+        video_mux(dev, 0);
+
+      err:
+        up(&dev->lock);
+        up_read(&em28xx_disconnect);
+        return errCode;
+}
+
+/*
+ * em28xx_realease_resources()
+ * unregisters the v4l2,i2c and usb devices
+ * called when the device gets disconected or at module unload
+*/
+static void em28xx_release_resources(struct em28xx *dev)
+{
+        down(&em28xx_sysfs_lock);
+
+        em28xx_info("V4L2 device /dev/video%d deregistered\n",
+                    dev->vdev->minor);
+        list_del(&dev->devlist);
+        video_unregister_device(dev->vdev);
+/*      video_unregister_device(dev->vbi_dev); */
+        em28xx_i2c_unregister(dev);
+        usb_put_dev(dev->udev);
+        up(&em28xx_sysfs_lock);
+}
+
+/*
+ * em28xx_v4l2_close()
+ * stops streaming and deallocates all resources allocated by the v4l2 calls and ioctls
+ */
+static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
+{
+        int errCode;
+        struct em28xx *dev=filp->private_data;
+
+        em28xx_videodbg("users=%d\n", dev->users);
+
+        down(&dev->lock);
+
+        em28xx_uninit_isoc(dev);
+
+        em28xx_release_buffers(dev);
+
+        /* the device is already disconnect, free the remaining resources */
+        if (dev->state & DEV_DISCONNECTED) {
+                em28xx_release_resources(dev);
+                up(&dev->lock);
+                kfree(dev);
+                return 0;
+        }
+
+        /* set alternate 0 */
+        dev->alt = 0;
+        em28xx_videodbg("setting alternate 0\n");
+        errCode = usb_set_interface(dev->udev, 0, 0);
+        if (errCode < 0) {
+                em28xx_errdev ("cannot change alternate number to 0 (error=%i)\n",
+                     errCode);
+        }
+
+        dev->users--;
+        wake_up_interruptible_nr(&dev->open, 1);
+        up(&dev->lock);
+        return 0;
+}
+
+/*
+ * em28xx_v4l2_read()
+ * will allocate buffers when called for the first time
+ */
+static ssize_t
+em28xx_v4l2_read(struct file *filp, char __user * buf, size_t count,
+                 loff_t * f_pos)
+{
+        struct em28xx_frame_t *f, *i;
+        unsigned long lock_flags;
+        int ret = 0;
+        struct em28xx *dev = filp->private_data;
+
+        if (down_interruptible(&dev->fileop_lock))
+                return -ERESTARTSYS;
+
+        if (dev->state & DEV_DISCONNECTED) {
+                em28xx_videodbg("device not present\n");
+                up(&dev->fileop_lock);
+                return -ENODEV;
+        }
+
+        if (dev->state & DEV_MISCONFIGURED) {
+                em28xx_videodbg("device misconfigured; close and open it again\n");
+                up(&dev->fileop_lock);
+                return -EIO;
+        }
+
+        if (dev->io == IO_MMAP) {
+                em28xx_videodbg ("IO method is set to mmap; close and open"
+                                " the device again to choose the read method\n");
+                up(&dev->fileop_lock);
+                return -EINVAL;
+        }
+
+        if (dev->io == IO_NONE) {
+                if (!em28xx_request_buffers(dev, EM28XX_NUM_READ_FRAMES)) {
+                        em28xx_errdev("read failed, not enough memory\n");
+                        up(&dev->fileop_lock);
+                        return -ENOMEM;
+                }
+                dev->io = IO_READ;
+                dev->stream = STREAM_ON;
+                em28xx_queue_unusedframes(dev);
+        }
+
+        if (!count) {
+                up(&dev->fileop_lock);
+                return 0;
+        }
+
+        if (list_empty(&dev->outqueue)) {
+                if (filp->f_flags & O_NONBLOCK) {
+                        up(&dev->fileop_lock);
+                        return -EAGAIN;
+                }
+                ret = wait_event_interruptible
+                    (dev->wait_frame,
+                     (!list_empty(&dev->outqueue)) ||
+                     (dev->state & DEV_DISCONNECTED));
+                if (ret) {
+                        up(&dev->fileop_lock);
+                        return ret;
+                }
+                if (dev->state & DEV_DISCONNECTED) {
+                        up(&dev->fileop_lock);
+                        return -ENODEV;
+                }
+        }
+
+        f = list_entry(dev->outqueue.prev, struct em28xx_frame_t, frame);
+
+        spin_lock_irqsave(&dev->queue_lock, lock_flags);
+        list_for_each_entry(i, &dev->outqueue, frame)
+            i->state = F_UNUSED;
+        INIT_LIST_HEAD(&dev->outqueue);
+        spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
+
+        em28xx_queue_unusedframes(dev);
+
+        if (count > f->buf.length)
+                count = f->buf.length;
+
+        if (copy_to_user(buf, f->bufmem, count)) {
+                up(&dev->fileop_lock);
+                return -EFAULT;
+        }
+        *f_pos += count;
+
+        up(&dev->fileop_lock);
+
+        return count;
+}
+
+/*
+ * em28xx_v4l2_poll()
+ * will allocate buffers when called for the first time
+ */
+static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table * wait)
+{
+        unsigned int mask = 0;
+        struct em28xx *dev = filp->private_data;
+
+        if (down_interruptible(&dev->fileop_lock))
+                return POLLERR;
+
+        if (dev->state & DEV_DISCONNECTED) {
+                em28xx_videodbg("device not present\n");
+        } else if (dev->state & DEV_MISCONFIGURED) {
+                em28xx_videodbg("device is misconfigured; close and open it again\n");
+        } else {
+                if (dev->io == IO_NONE) {
+                        if (!em28xx_request_buffers
+                            (dev, EM28XX_NUM_READ_FRAMES)) {
+                                em28xx_warn
+                                    ("poll() failed, not enough memory\n");
+                        } else {
+                                dev->io = IO_READ;
+                                dev->stream = STREAM_ON;
+                        }
+                }
+
+                if (dev->io == IO_READ) {
+                        em28xx_queue_unusedframes(dev);
+                        poll_wait(filp, &dev->wait_frame, wait);
+
+                        if (!list_empty(&dev->outqueue))
+                                mask |= POLLIN | POLLRDNORM;
+
+                        up(&dev->fileop_lock);
+
+                        return mask;
+                }
+        }
+
+        up(&dev->fileop_lock);
+        return POLLERR;
+}
+
+/*
+ * em28xx_vm_open()
+ */
+static void em28xx_vm_open(struct vm_area_struct *vma)
+{
+        struct em28xx_frame_t *f = vma->vm_private_data;
+        f->vma_use_count++;
+}
+
+/*
+ * em28xx_vm_close()
+ */
+static void em28xx_vm_close(struct vm_area_struct *vma)
+{
+        /* NOTE: buffers are not freed here */
+        struct em28xx_frame_t *f = vma->vm_private_data;
+        f->vma_use_count--;
+}
+
+static struct vm_operations_struct em28xx_vm_ops = {
+        .open = em28xx_vm_open,
+        .close = em28xx_vm_close,
+};
+
+/*
+ * em28xx_v4l2_mmap()
+ */
+static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        unsigned long size = vma->vm_end - vma->vm_start,
+            start = vma->vm_start, pos, page;
+        u32 i;
+
+        struct em28xx *dev = filp->private_data;
+
+        if (down_interruptible(&dev->fileop_lock))
+                return -ERESTARTSYS;
+
+        if (dev->state & DEV_DISCONNECTED) {
+                em28xx_videodbg("mmap: device not present\n");
+                up(&dev->fileop_lock);
+                return -ENODEV;
+        }
+
+        if (dev->state & DEV_MISCONFIGURED) {
+                em28xx_videodbg ("mmap: Device is misconfigured; close and "
+                                                "open it again\n");
+                up(&dev->fileop_lock);
+                return -EIO;
+        }
+
+        if (dev->io != IO_MMAP || !(vma->vm_flags & VM_WRITE) ||
+            size != PAGE_ALIGN(dev->frame[0].buf.length)) {
+                up(&dev->fileop_lock);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < dev->num_frames; i++) {
+                if ((dev->frame[i].buf.m.offset >> PAGE_SHIFT) == vma->vm_pgoff)
+                        break;
+        }
+        if (i == dev->num_frames) {
+                em28xx_videodbg("mmap: user supplied mapping address is out of range\n");
+                up(&dev->fileop_lock);
+                return -EINVAL;
+        }
+
+        /* VM_IO is eventually going to replace PageReserved altogether */
+        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
+
+        pos = (unsigned long)dev->frame[i].bufmem;
+        while (size > 0) {      /* size is page-aligned */
+                page = vmalloc_to_pfn((void *)pos);
+                if (remap_pfn_range(vma, start, page, PAGE_SIZE,
+                                    vma->vm_page_prot)) {
+                        em28xx_videodbg("mmap: rename page map failed\n");
+                        up(&dev->fileop_lock);
+                        return -EAGAIN;
+                }
+                start += PAGE_SIZE;
+                pos += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        vma->vm_ops = &em28xx_vm_ops;
+        vma->vm_private_data = &dev->frame[i];
+
+        em28xx_vm_open(vma);
+        up(&dev->fileop_lock);
+        return 0;
+}
+
+/*
+ * em28xx_get_ctrl()
+ * return the current saturation, brightness or contrast, mute state
+ */
+static int em28xx_get_ctrl(struct em28xx *dev, struct v4l2_control *ctrl)
+{
+        s32 tmp;
+        switch (ctrl->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                ctrl->value = dev->mute;
+                return 0;
+        case V4L2_CID_AUDIO_VOLUME:
+                ctrl->value = dev->volume;
+                return 0;
+        case V4L2_CID_BRIGHTNESS:
+                if ((tmp = em28xx_brightness_get(dev)) < 0)
+                        return -EIO;
+                ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
+                return 0;
+        case V4L2_CID_CONTRAST:
+                if ((ctrl->value = em28xx_contrast_get(dev)) < 0)
+                        return -EIO;
+                return 0;
+        case V4L2_CID_SATURATION:
+                if ((ctrl->value = em28xx_saturation_get(dev)) < 0)
+                        return -EIO;
+                return 0;
+        case V4L2_CID_RED_BALANCE:
+                if ((tmp = em28xx_v_balance_get(dev)) < 0)
+                        return -EIO;
+                ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
+                return 0;
+        case V4L2_CID_BLUE_BALANCE:
+                if ((tmp = em28xx_u_balance_get(dev)) < 0)
+                        return -EIO;
+                ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
+                return 0;
+        case V4L2_CID_GAMMA:
+                if ((ctrl->value = em28xx_gamma_get(dev)) < 0)
+                        return -EIO;
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
+/*
+ * em28xx_set_ctrl()
+ * mute or set new saturation, brightness or contrast
+ */
+static int em28xx_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
+{
+        switch (ctrl->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                if (ctrl->value != dev->mute) {
+                        dev->mute = ctrl->value;
+                        em28xx_audio_usb_mute(dev, ctrl->value);
+                        return em28xx_audio_analog_set(dev);
+                }
+                return 0;
+        case V4L2_CID_AUDIO_VOLUME:
+                dev->volume = ctrl->value;
+                return em28xx_audio_analog_set(dev);
+        case V4L2_CID_BRIGHTNESS:
+                return em28xx_brightness_set(dev, ctrl->value);
+        case V4L2_CID_CONTRAST:
+                return em28xx_contrast_set(dev, ctrl->value);
+        case V4L2_CID_SATURATION:
+                return em28xx_saturation_set(dev, ctrl->value);
+        case V4L2_CID_RED_BALANCE:
+                return em28xx_v_balance_set(dev, ctrl->value);
+        case V4L2_CID_BLUE_BALANCE:
+                return em28xx_u_balance_set(dev, ctrl->value);
+        case V4L2_CID_GAMMA:
+                return em28xx_gamma_set(dev, ctrl->value);
+        default:
+                return -EINVAL;
+        }
+}
+
+/*
+ * em28xx_stream_interrupt()
+ * stops streaming
+ */
+static int em28xx_stream_interrupt(struct em28xx *dev)
+{
+        int ret = 0;
+
+        /* stop reading from the device */
+
+        dev->stream = STREAM_INTERRUPT;
+        ret = wait_event_timeout(dev->wait_stream,
+                                 (dev->stream == STREAM_OFF) ||
+                                 (dev->state & DEV_DISCONNECTED),
+                                 EM28XX_URB_TIMEOUT);
+        if (dev->state & DEV_DISCONNECTED)
+                return -ENODEV;
+        else if (ret) {
+                dev->state |= DEV_MISCONFIGURED;
+                em28xx_videodbg("device is misconfigured; close and "
+                        "open /dev/video%d again\n", dev->vdev->minor);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int em28xx_set_norm(struct em28xx *dev, int width, int height)
+{
+        unsigned int hscale, vscale;
+        unsigned int maxh, maxw;
+
+        maxw = norm_maxw(dev);
+        maxh = norm_maxh(dev);
+
+        /* width must even because of the YUYV format */
+        /* height must be even because of interlacing */
+        height &= 0xfffe;
+        width &= 0xfffe;
+
+        if (height < 32)
+                height = 32;
+        if (height > maxh)
+                height = maxh;
+        if (width < 48)
+                width = 48;
+        if (width > maxw)
+                width = maxw;
+
+        if ((hscale = (((unsigned long)maxw) << 12) / width - 4096L) >= 0x4000)
+                hscale = 0x3fff;
+        width = (((unsigned long)maxw) << 12) / (hscale + 4096L);
+
+        if ((vscale = (((unsigned long)maxh) << 12) / height - 4096L) >= 0x4000)
+                vscale = 0x3fff;
+        height = (((unsigned long)maxh) << 12) / (vscale + 4096L);
+
+        /* set new image size */
+        dev->width = width;
+        dev->height = height;
+        dev->frame_size = dev->width * dev->height * 2;
+        dev->field_size = dev->frame_size >> 1; /*both_fileds ? dev->frame_size>>1 : dev->frame_size; */
+        dev->bytesperline = dev->width * 2;
+        dev->hscale = hscale;
+        dev->vscale = vscale;
+
+        em28xx_resolution_set(dev);
+
+        return 0;
+}
+
+/*
+ * em28xx_v4l2_do_ioctl()
+ * This function is _not_ called directly, but from
+ * em28xx_v4l2_ioctl. Userspace
+ * copying is done already, arg is a kernel pointer.
+ */
+static int em28xx_do_ioctl(struct inode *inode, struct file *filp,
+                           struct em28xx *dev, unsigned int cmd, void *arg,
+                           v4l2_kioctl driver_ioctl)
+{
+        int ret;
+
+        switch (cmd) {
+                /* ---------- tv norms ---------- */
+        case VIDIOC_ENUMSTD:
+                {
+                        struct v4l2_standard *e = arg;
+                        unsigned int i;
+
+                        i = e->index;
+                        if (i >= TVNORMS)
+                                return -EINVAL;
+                        ret = v4l2_video_std_construct(e, tvnorms[e->index].id,
+                                                       tvnorms[e->index].name);
+                        e->index = i;
+                        if (ret < 0)
+                                return ret;
+                        return 0;
+                }
+        case VIDIOC_G_STD:
+                {
+                        v4l2_std_id *id = arg;
+
+                        *id = dev->tvnorm->id;
+                        return 0;
+                }
+        case VIDIOC_S_STD:
+                {
+                        v4l2_std_id *id = arg;
+                        unsigned int i;
+
+                        for (i = 0; i < TVNORMS; i++)
+                                if (*id == tvnorms[i].id)
+                                        break;
+                        if (i == TVNORMS)
+                                for (i = 0; i < TVNORMS; i++)
+                                        if (*id & tvnorms[i].id)
+                                                break;
+                        if (i == TVNORMS)
+                                return -EINVAL;
+
+                        down(&dev->lock);
+                        dev->tvnorm = &tvnorms[i];
+
+                        em28xx_set_norm(dev, dev->width, dev->height);
+
+/*
+                dev->width=norm_maxw(dev);
+                dev->height=norm_maxh(dev);
+                dev->frame_size=dev->width*dev->height*2;
+                dev->field_size=dev->frame_size>>1;
+                dev->bytesperline=dev->width*2;
+                dev->hscale=0;
+                dev->vscale=0;
+
+                em28xx_resolution_set(dev);
+*/
+/*
+                em28xx_uninit_isoc(dev);
+                em28xx_set_alternate(dev);
+                em28xx_capture_start(dev, 1);
+                em28xx_resolution_set(dev);
+                em28xx_init_isoc(dev);
+*/
+                        em28xx_i2c_call_clients(dev, DECODER_SET_NORM,
+                                                &tvnorms[i].mode);
+                        em28xx_i2c_call_clients(dev, VIDIOC_S_STD,
+                                                &dev->tvnorm->id);
+
+                        up(&dev->lock);
+
+                        return 0;
+                }
+
+                /* ------ input switching ---------- */
+        case VIDIOC_ENUMINPUT:
+                {
+                        struct v4l2_input *i = arg;
+                        unsigned int n;
+                        static const char *iname[] = {
+                                [EM28XX_VMUX_COMPOSITE1] = "Composite1",
+                                [EM28XX_VMUX_COMPOSITE2] = "Composite2",
+                                [EM28XX_VMUX_COMPOSITE3] = "Composite3",
+                                [EM28XX_VMUX_COMPOSITE4] = "Composite4",
+                                [EM28XX_VMUX_SVIDEO] = "S-Video",
+                                [EM28XX_VMUX_TELEVISION] = "Television",
+                                [EM28XX_VMUX_CABLE] = "Cable TV",
+                                [EM28XX_VMUX_DVB] = "DVB",
+                                [EM28XX_VMUX_DEBUG] = "for debug only",
+                        };
+
+                        n = i->index;
+                        if (n >= MAX_EM28XX_INPUT)
+                                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 ((EM28XX_VMUX_TELEVISION == INPUT(n)->type) ||
+                            (EM28XX_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:
+                {
+                        int *i = arg;
+                        *i = dev->ctl_input;
+
+                        return 0;
+                }
+
+        case VIDIOC_S_INPUT:
+                {
+                        int *index = arg;
+
+                        if (*index >= MAX_EM28XX_INPUT)
+                                return -EINVAL;
+                        if (0 == INPUT(*index)->type)
+                                return -EINVAL;
+
+                        down(&dev->lock);
+                        video_mux(dev, *index);
+                        up(&dev->lock);
+
+                        return 0;
+                }
+
+        case VIDIOC_G_AUDIO:
+                {
+                        struct v4l2_audio *a = arg;
+                        unsigned int index = a->index;
+
+                        if (a->index > 1)
+                                return -EINVAL;
+                        memset(a, 0, sizeof(*a));
+                        index = dev->ctl_ainput;
+
+                        if (index == 0) {
+                                strcpy(a->name, "Television");
+                        } else {
+                                strcpy(a->name, "Line In");
+                        }
+                        a->capability = V4L2_AUDCAP_STEREO;
+                        a->index = index;
+                        return 0;
+                }
+
+        case VIDIOC_S_AUDIO:
+                {
+                        struct v4l2_audio *a = arg;
+                        if (a->index != dev->ctl_ainput)
+                                return -EINVAL;
+
+                        return 0;
+                }
+
+                /* --- controls ---------------------------------------------- */
+        case VIDIOC_QUERYCTRL:
+                {
+                        struct v4l2_queryctrl *qc = arg;
+                        u8 i, n;
+                        n = sizeof(em28xx_qctrl) / sizeof(em28xx_qctrl[0]);
+                        for (i = 0; i < n; i++)
+                                if (qc->id && qc->id == em28xx_qctrl[i].id) {
+                                        memcpy(qc, &(em28xx_qctrl[i]),
+                                               sizeof(*qc));
+                                        return 0;
+                                }
+
+                        return -EINVAL;
+                }
+
+        case VIDIOC_G_CTRL:
+                {
+                        struct v4l2_control *ctrl = arg;
+
+
+                        return em28xx_get_ctrl(dev, ctrl);
+                }
+
+        case VIDIOC_S_CTRL_OLD: /* ??? */
+        case VIDIOC_S_CTRL:
+                {
+                        struct v4l2_control *ctrl = arg;
+                        u8 i, n;
+
+
+                        n = sizeof(em28xx_qctrl) / sizeof(em28xx_qctrl[0]);
+                        for (i = 0; i < n; i++)
+                                if (ctrl->id == em28xx_qctrl[i].id) {
+                                        if (ctrl->value <
+                                            em28xx_qctrl[i].minimum
+                                            || ctrl->value >
+                                            em28xx_qctrl[i].maximum)
+                                                return -ERANGE;
+
+                                        return em28xx_set_ctrl(dev, ctrl);
+                                }
+                        return -EINVAL;
+                }
+
+                /* --- tuner ioctls ------------------------------------------ */
+        case VIDIOC_G_TUNER:
+                {
+                        struct v4l2_tuner *t = arg;
+                        int status = 0;
+
+                        if (0 != t->index)
+                                return -EINVAL;
+
+                        memset(t, 0, sizeof(*t));
+                        strcpy(t->name, "Tuner");
+                        t->type = V4L2_TUNER_ANALOG_TV;
+                        t->capability = V4L2_TUNER_CAP_NORM;
+                        t->rangehigh = 0xffffffffUL;    /* FIXME: set correct range */
+/*              t->signal = 0xffff;*/
+/*              em28xx_i2c_call_clients(dev,VIDIOC_G_TUNER,t);*/
+                        /* No way to get signal strength? */
+                        down(&dev->lock);
+                        em28xx_i2c_call_clients(dev, DECODER_GET_STATUS,
+                                                &status);
+                        up(&dev->lock);
+                        t->signal =
+                            (status & DECODER_STATUS_GOOD) != 0 ? 0xffff : 0;
+
+                        em28xx_videodbg("VIDIO_G_TUNER: signal=%x, afc=%x\n", t->signal,
+                                 t->afc);
+                        return 0;
+                }
+        case VIDIOC_S_TUNER:
+                {
+                        struct v4l2_tuner *t = arg;
+                        int status = 0;
+
+                        if (0 != t->index)
+                                return -EINVAL;
+                        memset(t, 0, sizeof(*t));
+                        strcpy(t->name, "Tuner");
+                        t->type = V4L2_TUNER_ANALOG_TV;
+                        t->capability = V4L2_TUNER_CAP_NORM;
+                        t->rangehigh = 0xffffffffUL;    /* FIXME: set correct range */
+/*              t->signal = 0xffff; */
+                        /* No way to get signal strength? */
+                        down(&dev->lock);
+                        em28xx_i2c_call_clients(dev, DECODER_GET_STATUS,
+                                                &status);
+                        up(&dev->lock);
+                        t->signal =
+                            (status & DECODER_STATUS_GOOD) != 0 ? 0xffff : 0;
+
+                        em28xx_videodbg("VIDIO_S_TUNER: signal=%x, afc=%x\n",
+                                 t->signal, t->afc);
+                        return 0;
+                }
+        case VIDIOC_G_FREQUENCY:
+                {
+                        struct v4l2_frequency *f = arg;
+
+                        memset(f, 0, sizeof(*f));
+                        f->type = V4L2_TUNER_ANALOG_TV;
+                        f->frequency = dev->ctl_freq;
+
+                        return 0;
+                }
+        case VIDIOC_S_FREQUENCY:
+                {
+                        struct v4l2_frequency *f = arg;
+
+                        if (0 != f->tuner)
+                                return -EINVAL;
+
+                        if (V4L2_TUNER_ANALOG_TV != f->type)
+                                return -EINVAL;
+
+                        down(&dev->lock);
+                        dev->ctl_freq = f->frequency;
+                        em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, f);
+                        up(&dev->lock);
+                        return 0;
+                }
+
+        case VIDIOC_CROPCAP:
+                {
+                        struct v4l2_cropcap *cc = arg;
+
+                        if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                                return -EINVAL;
+                        cc->bounds.left = 0;
+                        cc->bounds.top = 0;
+                        cc->bounds.width = dev->width;
+                        cc->bounds.height = dev->height;
+                        cc->defrect = cc->bounds;
+                        cc->pixelaspect.numerator = 54; /* 4:3 FIXME: remove magic numbers */
+                        cc->pixelaspect.denominator = 59;
+                        return 0;
+                }
+        case VIDIOC_STREAMON:
+                {
+                        int *type = arg;
+
+                        if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE
+                            || dev->io != IO_MMAP)
+                                return -EINVAL;
+
+                        if (list_empty(&dev->inqueue))
+                                return -EINVAL;
+
+                        dev->stream = STREAM_ON;        /* FIXME: Start video capture here? */
+
+                        em28xx_videodbg("VIDIOC_STREAMON: starting stream\n");
+
+                        return 0;
+                }
+        case VIDIOC_STREAMOFF:
+                {
+                        int *type = arg;
+                        int ret;
+
+                        if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE
+                            || dev->io != IO_MMAP)
+                                return -EINVAL;
+
+                        if (dev->stream == STREAM_ON) {
+                                em28xx_videodbg ("VIDIOC_STREAMOFF: interrupting stream\n");
+                                if ((ret = em28xx_stream_interrupt(dev)))
+                                        return ret;
+                        }
+                        em28xx_empty_framequeues(dev);
+
+                        return 0;
+                }
+        default:
+                return v4l_compat_translate_ioctl(inode, filp, cmd, arg,
+                                                  driver_ioctl);
+        }
+        return 0;
+}
+
+/*
+ * em28xx_v4l2_do_ioctl()
+ * This function is _not_ called directly, but from
+ * em28xx_v4l2_ioctl. Userspace
+ * copying is done already, arg is a kernel pointer.
+ */
+static int em28xx_video_do_ioctl(struct inode *inode, struct file *filp,
+                                 unsigned int cmd, void *arg)
+{
+        struct em28xx *dev = filp->private_data;
+
+        if (!dev)
+                return -ENODEV;
+
+        if (video_debug > 1)
+                em28xx_print_ioctl(dev->name,cmd);
+
+        switch (cmd) {
+
+                /* --- capabilities ------------------------------------------ */
+        case VIDIOC_QUERYCAP:
+                {
+                        struct v4l2_capability *cap = arg;
+
+                        memset(cap, 0, sizeof(*cap));
+                        strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
+                        strlcpy(cap->card, em28xx_boards[dev->model].name,
+                                sizeof(cap->card));
+                        strlcpy(cap->bus_info, dev->udev->dev.bus_id,
+                                sizeof(cap->bus_info));
+                        cap->version = EM28XX_VERSION_CODE;
+                        cap->capabilities =
+                            V4L2_CAP_VIDEO_CAPTURE |
+                            V4L2_CAP_AUDIO |
+                            V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+                        if (dev->has_tuner)
+                                cap->capabilities |= V4L2_CAP_TUNER;
+                        return 0;
+                }
+
+                /* --- capture ioctls ---------------------------------------- */
+        case VIDIOC_ENUM_FMT:
+                {
+                        struct v4l2_fmtdesc *fmtd = arg;
+
+                        if (fmtd->index != 0)
+                                return -EINVAL;
+                        memset(fmtd, 0, sizeof(*fmtd));
+                        fmtd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                        strcpy(fmtd->description, "Packed YUY2");
+                        fmtd->pixelformat = V4L2_PIX_FMT_YUYV;
+                        memset(fmtd->reserved, 0, sizeof(fmtd->reserved));
+                        return 0;
+                }
+
+        case VIDIOC_G_FMT:
+                {
+                        struct v4l2_format *format = arg;
+
+                        em28xx_videodbg("VIDIOC_G_FMT: type=%s\n",
+                                 format->type ==
+                                 V4L2_BUF_TYPE_VIDEO_CAPTURE ?
+                                 "V4L2_BUF_TYPE_VIDEO_CAPTURE" : format->type ==
+                                 V4L2_BUF_TYPE_VBI_CAPTURE ?
+                                 "V4L2_BUF_TYPE_VBI_CAPTURE " :
+                                 "not supported");
+
+                        if (format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                                return -EINVAL;
+
+                        format->fmt.pix.width = dev->width;
+                        format->fmt.pix.height = dev->height;
+                        format->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+                        format->fmt.pix.bytesperline = dev->bytesperline;
+                        format->fmt.pix.sizeimage = dev->frame_size;
+                        format->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+                        format->fmt.pix.field = dev->interlaced ? V4L2_FIELD_INTERLACED : V4L2_FIELD_TOP;       /* FIXME: TOP? NONE? BOTTOM? ALTENATE? */
+
+                        em28xx_videodbg("VIDIOC_G_FMT: %dx%d\n", dev->width,
+                                 dev->height);
+                        return 0;
+                }
+
+        case VIDIOC_TRY_FMT:
+        case VIDIOC_S_FMT:
+                {
+                        struct v4l2_format *format = arg;
+                        u32 i;
+                        int ret = 0;
+                        int width = format->fmt.pix.width;
+                        int height = format->fmt.pix.height;
+                        unsigned int hscale, vscale;
+                        unsigned int maxh, maxw;
+
+                        maxw = norm_maxw(dev);
+                        maxh = norm_maxh(dev);
+
+/*              int both_fields; */
+
+                        em28xx_videodbg("%s: type=%s\n",
+                                 cmd ==
+                                 VIDIOC_TRY_FMT ? "VIDIOC_TRY_FMT" :
+                                 "VIDIOC_S_FMT",
+                                 format->type ==
+                                 V4L2_BUF_TYPE_VIDEO_CAPTURE ?
+                                 "V4L2_BUF_TYPE_VIDEO_CAPTURE" : format->type ==
+                                 V4L2_BUF_TYPE_VBI_CAPTURE ?
+                                 "V4L2_BUF_TYPE_VBI_CAPTURE " :
+                                 "not supported");
+
+                        if (format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                                return -EINVAL;
+
+                        em28xx_videodbg("%s: requested %dx%d\n",
+                                 cmd ==
+                                 VIDIOC_TRY_FMT ? "VIDIOC_TRY_FMT" :
+                                 "VIDIOC_S_FMT", format->fmt.pix.width,
+                                 format->fmt.pix.height);
+
+                        /* FIXME: Move some code away from here */
+                        /* width must even because of the YUYV format */
+                        /* height must be even because of interlacing */
+                        height &= 0xfffe;
+                        width &= 0xfffe;
+
+                        if (height < 32)
+                                height = 32;
+                        if (height > maxh)
+                                height = maxh;
+                        if (width < 48)
+                                width = 48;
+                        if (width > maxw)
+                                width = maxw;
+
+                        if(dev->is_em2800){
+                                /* the em2800 can only scale down to 50% */
+                                if(height % (maxh / 2))
+                                        height=maxh;
+                                if(width % (maxw / 2))
+                                        width=maxw;
+                                /* according to empiatech support */
+                                /* the MaxPacketSize is to small to support */
+                                /* framesizes larger than 640x480 @ 30 fps */
+                                /* or 640x576 @ 25 fps. As this would cut */
+                                /* of a part of the image we prefer */
+                                /* 360x576 or 360x480 for now */
+                                if(width == maxw && height == maxh)
+                                        width /= 2;
+                        }
+
+                        if ((hscale =
+                             (((unsigned long)maxw) << 12) / width - 4096L) >=
+                            0x4000)
+                                hscale = 0x3fff;
+                        width =
+                            (((unsigned long)maxw) << 12) / (hscale + 4096L);
+
+                        if ((vscale =
+                             (((unsigned long)maxh) << 12) / height - 4096L) >=
+                            0x4000)
+                                vscale = 0x3fff;
+                        height =
+                            (((unsigned long)maxh) << 12) / (vscale + 4096L);
+
+                        format->fmt.pix.width = width;
+                        format->fmt.pix.height = height;
+                        format->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+                        format->fmt.pix.bytesperline = width * 2;
+                        format->fmt.pix.sizeimage = width * 2 * height;
+                        format->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+                        format->fmt.pix.field = V4L2_FIELD_INTERLACED;
+
+                        em28xx_videodbg("%s: returned %dx%d (%d, %d)\n",
+                                 cmd ==
+                                 VIDIOC_TRY_FMT ? "VIDIOC_TRY_FMT" :
+                                 "VIDIOC_S_FMT", format->fmt.pix.width,
+                                 format->fmt.pix.height, hscale, vscale);
+
+                        if (cmd == VIDIOC_TRY_FMT)
+                                return 0;
+
+                        for (i = 0; i < dev->num_frames; i++)
+                                if (dev->frame[i].vma_use_count) {
+                                        em28xx_videodbg("VIDIOC_S_FMT failed. "
+                                                "Unmap the buffers first.\n");
+                                        return -EINVAL;
+                                }
+
+                        /* stop io in case it is already in progress */
+                        if (dev->stream == STREAM_ON) {
+                                em28xx_videodbg("VIDIOC_SET_FMT: interupting stream\n");
+                                if ((ret = em28xx_stream_interrupt(dev)))
+                                        return ret;
+                        }
+
+                        em28xx_release_buffers(dev);
+                        dev->io = IO_NONE;
+
+                        /* set new image size */
+                        dev->width = width;
+                        dev->height = height;
+                        dev->frame_size = dev->width * dev->height * 2;
+                        dev->field_size = dev->frame_size >> 1; /*both_fileds ? dev->frame_size>>1 : dev->frame_size; */
+                        dev->bytesperline = dev->width * 2;
+                        dev->hscale = hscale;
+                        dev->vscale = vscale;
+/*                      dev->both_fileds = both_fileds; */
+                        em28xx_uninit_isoc(dev);
+                        em28xx_set_alternate(dev);
+                        em28xx_capture_start(dev, 1);
+                        em28xx_resolution_set(dev);
+                        em28xx_init_isoc(dev);
+
+                        return 0;
+                }
+
+                /* --- streaming capture ------------------------------------- */
+        case VIDIOC_REQBUFS:
+                {
+                        struct v4l2_requestbuffers *rb = arg;
+                        u32 i;
+                        int ret;
+
+                        if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+                            rb->memory != V4L2_MEMORY_MMAP)
+                                return -EINVAL;
+
+                        if (dev->io == IO_READ) {
+                                em28xx_videodbg ("method is set to read;"
+                                        " close and open the device again to"
+                                        " choose the mmap I/O method\n");
+                                return -EINVAL;
+                        }
+
+                        for (i = 0; i < dev->num_frames; i++)
+                                if (dev->frame[i].vma_use_count) {
+                                        em28xx_videodbg ("VIDIOC_REQBUFS failed; previous buffers are still mapped\n");
+                                        return -EINVAL;
+                                }
+
+                        if (dev->stream == STREAM_ON) {
+                                em28xx_videodbg("VIDIOC_REQBUFS: interrupting stream\n");
+                                if ((ret = em28xx_stream_interrupt(dev)))
+                                        return ret;
+                        }
+
+                        em28xx_empty_framequeues(dev);
+
+                        em28xx_release_buffers(dev);
+                        if (rb->count)
+                                rb->count =
+                                    em28xx_request_buffers(dev, rb->count);
+
+                        dev->frame_current = NULL;
+
+                        em28xx_videodbg ("VIDIOC_REQBUFS: setting io method to mmap: num bufs %i\n",
+                                                     rb->count);
+                        dev->io = rb->count ? IO_MMAP : IO_NONE;
+                        return 0;
+                }
+
+        case VIDIOC_QUERYBUF:
+                {
+                        struct v4l2_buffer *b = arg;
+
+                        if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+                            b->index >= dev->num_frames || dev->io != IO_MMAP)
+                                return -EINVAL;
+
+                        memcpy(b, &dev->frame[b->index].buf, sizeof(*b));
+
+                        if (dev->frame[b->index].vma_use_count) {
+                                b->flags |= V4L2_BUF_FLAG_MAPPED;
+                        }
+                        if (dev->frame[b->index].state == F_DONE)
+                                b->flags |= V4L2_BUF_FLAG_DONE;
+                        else if (dev->frame[b->index].state != F_UNUSED)
+                                b->flags |= V4L2_BUF_FLAG_QUEUED;
+                        return 0;
+                }
+        case VIDIOC_QBUF:
+                {
+                        struct v4l2_buffer *b = arg;
+                        unsigned long lock_flags;
+
+                        if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+                            b->index >= dev->num_frames || dev->io != IO_MMAP) {
+                                return -EINVAL;
+                        }
+
+                        if (dev->frame[b->index].state != F_UNUSED) {
+                                return -EAGAIN;
+                        }
+                        dev->frame[b->index].state = F_QUEUED;
+
+                        /* add frame to fifo */
+                        spin_lock_irqsave(&dev->queue_lock, lock_flags);
+                        list_add_tail(&dev->frame[b->index].frame,
+                                      &dev->inqueue);
+                        spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
+
+                        return 0;
+                }
+        case VIDIOC_DQBUF:
+                {
+                        struct v4l2_buffer *b = arg;
+                        struct em28xx_frame_t *f;
+                        unsigned long lock_flags;
+                        int ret = 0;
+
+                        if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE
+                            || dev->io != IO_MMAP)
+                                return -EINVAL;
+
+                        if (list_empty(&dev->outqueue)) {
+                                if (dev->stream == STREAM_OFF)
+                                        return -EINVAL;
+                                if (filp->f_flags & O_NONBLOCK)
+                                        return -EAGAIN;
+                                ret = wait_event_interruptible
+                                    (dev->wait_frame,
+                                     (!list_empty(&dev->outqueue)) ||
+                                     (dev->state & DEV_DISCONNECTED));
+                                if (ret)
+                                        return ret;
+                                if (dev->state & DEV_DISCONNECTED)
+                                        return -ENODEV;
+                        }
+
+                        spin_lock_irqsave(&dev->queue_lock, lock_flags);
+                        f = list_entry(dev->outqueue.next,
+                                       struct em28xx_frame_t, frame);
+                        list_del(dev->outqueue.next);
+                        spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
+
+                        f->state = F_UNUSED;
+                        memcpy(b, &f->buf, sizeof(*b));
+
+                        if (f->vma_use_count)
+                                b->flags |= V4L2_BUF_FLAG_MAPPED;
+
+                        return 0;
+                }
+        default:
+                return em28xx_do_ioctl(inode, filp, dev, cmd, arg,
+                                       em28xx_video_do_ioctl);
+        }
+        return 0;
+}
+
+/*
+ * em28xx_v4l2_ioctl()
+ * handle v4l2 ioctl the main action happens in em28xx_v4l2_do_ioctl()
+ */
+static int em28xx_v4l2_ioctl(struct inode *inode, struct file *filp,
+                             unsigned int cmd, unsigned long arg)
+{
+        int ret = 0;
+        struct em28xx *dev = filp->private_data;
+
+        if (down_interruptible(&dev->fileop_lock))
+                return -ERESTARTSYS;
+
+        if (dev->state & DEV_DISCONNECTED) {
+                em28xx_errdev("v4l2 ioctl: device not present\n");
+                up(&dev->fileop_lock);
+                return -ENODEV;
+        }
+
+        if (dev->state & DEV_MISCONFIGURED) {
+                em28xx_errdev
+                    ("v4l2 ioctl: device is misconfigured; close and open it again\n");
+                up(&dev->fileop_lock);
+                return -EIO;
+        }
+
+        ret = video_usercopy(inode, filp, cmd, arg, em28xx_video_do_ioctl);
+
+        up(&dev->fileop_lock);
+
+        return ret;
+}
+
+static struct file_operations em28xx_v4l_fops = {
+        .owner = THIS_MODULE,
+        .open = em28xx_v4l2_open,
+        .release = em28xx_v4l2_close,
+        .ioctl = em28xx_v4l2_ioctl,
+        .read = em28xx_v4l2_read,
+        .poll = em28xx_v4l2_poll,
+        .mmap = em28xx_v4l2_mmap,
+        .llseek = no_llseek,
+};
+
+/******************************** usb interface *****************************************/
+
+/*
+ * em28xx_init_dev()
+ * allocates and inits the device structs, registers i2c bus and v4l device
+ */
+static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
+                           int minor, int model)
+{
+        struct em28xx *dev = *devhandle;
+        int retval = -ENOMEM;
+        int errCode, i;
+        unsigned int maxh, maxw;
+
+        dev->udev = udev;
+        dev->model = model;
+        init_MUTEX(&dev->lock);
+        init_waitqueue_head(&dev->open);
+
+        dev->em28xx_write_regs = em28xx_write_regs;
+        dev->em28xx_read_reg = em28xx_read_reg;
+        dev->em28xx_read_reg_req_len = em28xx_read_reg_req_len;
+        dev->em28xx_write_regs_req = em28xx_write_regs_req;
+        dev->em28xx_read_reg_req = em28xx_read_reg_req;
+        dev->is_em2800 = em28xx_boards[model].is_em2800;
+        dev->has_tuner = em28xx_boards[model].has_tuner;
+        dev->has_msp34xx = em28xx_boards[model].has_msp34xx;
+        dev->tda9887_conf = em28xx_boards[model].tda9887_conf;
+        dev->decoder = em28xx_boards[model].decoder;
+
+        if (tuner >= 0)
+                dev->tuner_type = tuner;
+        else
+                dev->tuner_type = em28xx_boards[model].tuner_type;
+
+        dev->video_inputs = em28xx_boards[model].vchannels;
+
+        for (i = 0; i < TVNORMS; i++)
+                if (em28xx_boards[model].norm == tvnorms[i].mode)
+                        break;
+        if (i == TVNORMS)
+                i = 0;
+
+        dev->tvnorm = &tvnorms[i];      /* set default norm */
+
+        em28xx_videodbg("tvnorm=%s\n", dev->tvnorm->name);
+
+        maxw = norm_maxw(dev);
+        maxh = norm_maxh(dev);
+
+        /* set default image size */
+        dev->width = maxw;
+        dev->height = maxh;
+        dev->interlaced = EM28XX_INTERLACED_DEFAULT;
+        dev->field_size = dev->width * dev->height;
+        dev->frame_size =
+            dev->interlaced ? dev->field_size << 1 : dev->field_size;
+        dev->bytesperline = dev->width * 2;
+        dev->hscale = 0;
+        dev->vscale = 0;
+        dev->ctl_input = 2;
+
+        /* setup video picture settings for saa7113h */
+        memset(&dev->vpic, 0, sizeof(dev->vpic));
+        dev->vpic.colour = 128 << 8;
+        dev->vpic.hue = 128 << 8;
+        dev->vpic.brightness = 128 << 8;
+        dev->vpic.contrast = 192 << 8;
+        dev->vpic.whiteness = 128 << 8; /* This one isn't used */
+        dev->vpic.depth = 16;
+        dev->vpic.palette = VIDEO_PALETTE_YUV422;
+
+#ifdef CONFIG_MODULES
+        /* request some modules */
+        if (dev->decoder == EM28XX_SAA7113 || dev->decoder == EM28XX_SAA7114)
+                request_module("saa711x");
+        if (dev->decoder == EM28XX_TVP5150)
+                request_module("tvp5150");
+        if (dev->has_tuner)
+                request_module("tuner");
+        if (dev->tda9887_conf)
+                request_module("tda9887");
+#endif
+        errCode = em28xx_config(dev);
+        if (errCode) {
+                em28xx_errdev("error configuring device\n");
+                kfree(dev);
+                return -ENOMEM;
+        }
+
+        down(&dev->lock);
+        /* register i2c bus */
+        em28xx_i2c_register(dev);
+
+        /* Do board specific init and eeprom reading */
+        em28xx_card_setup(dev);
+
+        /* configure the device */
+        em28xx_config_i2c(dev);
+
+        up(&dev->lock);
+
+        errCode = em28xx_config(dev);
+
+#ifdef CONFIG_MODULES
+        if (dev->has_msp34xx)
+                request_module("msp3400");
+#endif
+        /* allocate and fill v4l2 device struct */
+        dev->vdev = video_device_alloc();
+        if (NULL == dev->vdev) {
+                em28xx_errdev("cannot allocate video_device.\n");
+                kfree(dev);
+                return -ENOMEM;
+        }
+
+        dev->vdev->type = VID_TYPE_CAPTURE;
+        if (dev->has_tuner)
+                dev->vdev->type |= VID_TYPE_TUNER;
+        dev->vdev->hardware = 0;
+        dev->vdev->fops = &em28xx_v4l_fops;
+        dev->vdev->minor = -1;
+        dev->vdev->dev = &dev->udev->dev;
+        dev->vdev->release = video_device_release;
+        snprintf(dev->vdev->name, sizeof(dev->vdev->name), "%s",
+                 "em28xx video");
+        list_add_tail(&dev->devlist,&em28xx_devlist);
+
+        /* register v4l2 device */
+        down(&dev->lock);
+        if ((retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER, -1))) {
+                em28xx_errdev("unable to register video device (error=%i).\n",
+                              retval);
+                up(&dev->lock);
+                list_del(&dev->devlist);
+                video_device_release(dev->vdev);
+                kfree(dev);
+                return -ENODEV;
+        }
+        if (dev->has_msp34xx) {
+                /* Send a reset to other chips via gpio */
+                em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
+                udelay(2500);
+                em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
+                udelay(2500);
+
+        }
+        video_mux(dev, 0);
+
+        up(&dev->lock);
+
+        em28xx_info("V4L2 device registered as /dev/video%d\n",
+                    dev->vdev->minor);
+
+        return 0;
+}
+
+/*
+ * em28xx_usb_probe()
+ * checks for supported devices
+ */
+static int em28xx_usb_probe(struct usb_interface *interface,
+                            const struct usb_device_id *id)
+{
+        const struct usb_endpoint_descriptor *endpoint;
+        struct usb_device *udev;
+        struct usb_interface *uif;
+        struct em28xx *dev = NULL;
+        int retval = -ENODEV;
+        int model,i,nr,ifnum;
+
+        udev = usb_get_dev(interface_to_usbdev(interface));
+        ifnum = interface->altsetting[0].desc.bInterfaceNumber;
+
+
+        /* Don't register audio interfaces */
+        if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
+                em28xx_err(DRIVER_NAME " audio device (%04x:%04x): interface %i, class %i\n",
+                                udev->descriptor.idVendor,udev->descriptor.idProduct,
+                                ifnum,
+                                interface->altsetting[0].desc.bInterfaceClass);
+                return -ENODEV;
+        }
+
+        em28xx_err(DRIVER_NAME " new video device (%04x:%04x): interface %i, class %i\n",
+                        udev->descriptor.idVendor,udev->descriptor.idProduct,
+                        ifnum,
+                        interface->altsetting[0].desc.bInterfaceClass);
+
+        endpoint = &interface->cur_altsetting->endpoint[1].desc;
+
+        /* check if the the device has the iso in endpoint at the correct place */
+        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
+            USB_ENDPOINT_XFER_ISOC) {
+                em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n");
+                return -ENODEV;
+        }
+        if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
+                em28xx_err(DRIVER_NAME " probing error: endpoint is ISO OUT endpoint!\n");
+                return -ENODEV;
+        }
+
+        model=id->driver_info;
+        nr=interface->minor;
+
+        if (nr>EM28XX_MAXBOARDS) {
+                printk (DRIVER_NAME ": Supports only %i em28xx boards.\n",EM28XX_MAXBOARDS);
+                return -ENOMEM;
+        }
+
+        /* allocate memory for our device state and initialize it */
+        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        if (dev == NULL) {
+                em28xx_err(DRIVER_NAME ": out of memory!\n");
+                return -ENOMEM;
+        }
+        memset(dev, 0, sizeof(*dev));
+
+        /* compute alternate max packet sizes */
+        uif = udev->actconfig->interface[0];
+
+        dev->num_alt=uif->num_altsetting;
+        printk(DRIVER_NAME ": Alternate settings: %i\n",dev->num_alt);
+//      dev->alt_max_pkt_size = kmalloc(sizeof(*dev->alt_max_pkt_size)*
+        dev->alt_max_pkt_size = kmalloc(32*
+                                                dev->num_alt,GFP_KERNEL);
+        if (dev->alt_max_pkt_size == NULL) {
+                em28xx_err(DRIVER_NAME ": out of memory!\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < dev->num_alt ; i++) {
+                u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc.
+                                                        wMaxPacketSize);
+                dev->alt_max_pkt_size[i] =
+                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
+                printk(DRIVER_NAME ": Alternate setting %i, max size= %i\n",i,
+                                                        dev->alt_max_pkt_size[i]);
+        }
+
+        snprintf(dev->name, 29, "em28xx #%d", nr);
+
+        if ((card[nr]>=0)&&(card[nr]<em28xx_bcount))
+                model=card[nr];
+
+        if ((model==EM2800_BOARD_UNKNOWN)||(model==EM2820_BOARD_UNKNOWN)) {
+                printk( "%s: Your board has no eeprom inside it and thus can't\n"
+                        "%s: be autodetected.  Please pass card=<n> insmod option to\n"
+                        "%s: workaround that.  Redirect complaints to the vendor of\n"
+                        "%s: the TV card.  Best regards,\n"
+                        "%s:         -- tux\n",
+                        dev->name,dev->name,dev->name,dev->name,dev->name);
+                printk("%s: Here is a list of valid choices for the card=<n> insmod option:\n",
+                        dev->name);
+                for (i = 0; i < em28xx_bcount; i++) {
+                        printk("%s:    card=%d -> %s\n",
+                                dev->name, i, em28xx_boards[i].name);
+                }
+        }
+
+        /* allocate device struct */
+        retval = em28xx_init_dev(&dev, udev, nr, model);
+        if (retval)
+                return retval;
+
+        em28xx_info("Found %s\n", em28xx_boards[model].name);
+
+        /* save our data pointer in this interface device */
+        usb_set_intfdata(interface, dev);
+        return 0;
+}
+
+/*
+ * em28xx_usb_disconnect()
+ * called when the device gets diconencted
+ * video device will be unregistered on v4l2_close in case it is still open
+ */
+static void em28xx_usb_disconnect(struct usb_interface *interface)
+{
+        struct em28xx *dev = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
+
+        if (!dev)
+                return;
+
+        down_write(&em28xx_disconnect);
+
+        down(&dev->lock);
+
+        em28xx_info("disconnecting %s\n", dev->vdev->name);
+
+        wake_up_interruptible_all(&dev->open);
+
+        if (dev->users) {
+                em28xx_warn
+                    ("device /dev/video%d is open! Deregistration and memory "
+                     "deallocation are deferred on close.\n", dev->vdev->minor);
+                dev->state |= DEV_MISCONFIGURED;
+                em28xx_uninit_isoc(dev);
+                dev->state |= DEV_DISCONNECTED;
+                wake_up_interruptible(&dev->wait_frame);
+                wake_up_interruptible(&dev->wait_stream);
+        } else {
+                dev->state |= DEV_DISCONNECTED;
+                em28xx_release_resources(dev);
+        }
+
+        up(&dev->lock);
+
+        if (!dev->users) {
+                kfree(dev->alt_max_pkt_size);
+                kfree(dev);
+        }
+
+        up_write(&em28xx_disconnect);
+}
+
+static struct usb_driver em28xx_usb_driver = {
+        .owner = THIS_MODULE,
+        .name = "em28xx",
+        .probe = em28xx_usb_probe,
+        .disconnect = em28xx_usb_disconnect,
+        .id_table = em28xx_id_table,
+};
+
+static int __init em28xx_module_init(void)
+{
+        int result;
+
+        printk(KERN_INFO DRIVER_NAME " v4l2 driver version %d.%d.%d loaded\n",
+               (EM28XX_VERSION_CODE >> 16) & 0xff,
+               (EM28XX_VERSION_CODE >> 8) & 0xff, EM28XX_VERSION_CODE & 0xff);
+#ifdef SNAPSHOT
+        printk(KERN_INFO DRIVER_NAME " snapshot date %04d-%02d-%02d\n",
+               SNAPSHOT / 10000, (SNAPSHOT / 100) % 100, SNAPSHOT % 100);
+#endif
+
+        /* register this driver with the USB subsystem */
+        result = usb_register(&em28xx_usb_driver);
+        if (result)
+                em28xx_err(DRIVER_NAME
+                           " usb_register failed. Error number %d.\n", result);
+
+        return result;
+}
+
+static void __exit em28xx_module_exit(void)
+{
+        /* deregister this driver with the USB subsystem */
+        usb_deregister(&em28xx_usb_driver);
+}
+
+module_init(em28xx_module_init);
+module_exit(em28xx_module_exit);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
new file mode 100644
index 000000000000..5c7a41ce69f3
--- /dev/null
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -0,0 +1,513 @@
+/*
+   em28xx-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+
+   Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
+                      Ludovico Cavedon <cavedon@sssup.it>
+                      Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+   Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _EM28XX_H
+#define _EM28XX_H
+
+#include <linux/videodev.h>
+#include <linux/i2c.h>
+#include <media/ir-kbd-i2c.h>
+
+/* Boards supported by driver */
+
+#define EM2800_BOARD_UNKNOWN                    0
+#define EM2820_BOARD_UNKNOWN                    1
+#define EM2820_BOARD_TERRATEC_CINERGY_250       2
+#define EM2820_BOARD_PINNACLE_USB_2             3
+#define EM2820_BOARD_HAUPPAUGE_WINTV_USB_2      4
+#define EM2820_BOARD_MSI_VOX_USB_2              5
+#define EM2800_BOARD_TERRATEC_CINERGY_200       6
+#define EM2800_BOARD_LEADTEK_WINFAST_USBII      7
+#define EM2800_BOARD_KWORLD_USB2800             8
+#define EM2820_BOARD_PINNACLE_DVC_90            9
+
+#define UNSET -1
+
+/* maximum number of em28xx boards */
+#define EM28XX_MAXBOARDS 1 /*FIXME: should be bigger */
+
+/* maximum number of frames that can be queued */
+#define EM28XX_NUM_FRAMES 5
+/* number of frames that get used for v4l2_read() */
+#define EM28XX_NUM_READ_FRAMES 2
+
+/* number of buffers for isoc transfers */
+#define EM28XX_NUM_BUFS 5
+
+/* number of packets for each buffer
+   windows requests only 40 packets .. so we better do the same
+   this is what I found out for all alternate numbers there!
+ */
+#define EM28XX_NUM_PACKETS 40
+
+/* default alternate; 0 means choose the best */
+#define EM28XX_PINOUT 0
+
+#define EM28XX_INTERLACED_DEFAULT 1
+
+/*
+#define (use usbview if you want to get the other alternate number infos)
+#define
+#define alternate number 2
+#define                         Endpoint Address: 82
+                        Direction: in
+                        Attribute: 1
+                        Type: Isoc
+                        Max Packet Size: 1448
+                        Interval: 125us
+
+  alternate number 7
+
+                        Endpoint Address: 82
+                        Direction: in
+                        Attribute: 1
+                        Type: Isoc
+                        Max Packet Size: 3072
+                        Interval: 125us
+*/
+
+/* time to wait when stopping the isoc transfer */
+#define EM28XX_URB_TIMEOUT       msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS)
+
+/* time in msecs to wait for i2c writes to finish */
+#define EM2800_I2C_WRITE_TIMEOUT 20
+
+/* the various frame states */
+enum em28xx_frame_state {
+        F_UNUSED = 0,
+        F_QUEUED,
+        F_GRABBING,
+        F_DONE,
+        F_ERROR,
+};
+
+/* stream states */
+enum em28xx_stream_state {
+        STREAM_OFF,
+        STREAM_INTERRUPT,
+        STREAM_ON,
+};
+
+/* frames */
+struct em28xx_frame_t {
+        void *bufmem;
+        struct v4l2_buffer buf;
+        enum em28xx_frame_state state;
+        struct list_head frame;
+        unsigned long vma_use_count;
+        int top_field;
+        int fieldbytesused;
+};
+
+/* io methods */
+enum em28xx_io_method {
+        IO_NONE,
+        IO_READ,
+        IO_MMAP,
+};
+
+/* inputs */
+
+#define MAX_EM28XX_INPUT 4
+enum enum28xx_itype {
+        EM28XX_VMUX_COMPOSITE1 = 1,
+        EM28XX_VMUX_COMPOSITE2,
+        EM28XX_VMUX_COMPOSITE3,
+        EM28XX_VMUX_COMPOSITE4,
+        EM28XX_VMUX_SVIDEO,
+        EM28XX_VMUX_TELEVISION,
+        EM28XX_VMUX_CABLE,
+        EM28XX_VMUX_DVB,
+        EM28XX_VMUX_DEBUG,
+        EM28XX_RADIO,
+};
+
+struct em28xx_input {
+        enum enum28xx_itype type;
+        unsigned int vmux;
+        unsigned int amux;
+};
+
+#define INPUT(nr) (&em28xx_boards[dev->model].input[nr])
+
+enum em28xx_decoder {
+        EM28XX_TVP5150,
+        EM28XX_SAA7113,
+        EM28XX_SAA7114
+};
+
+struct em28xx_board {
+        char *name;
+        int vchannels;
+        int norm;
+        int tuner_type;
+
+        /* i2c flags */
+        unsigned int is_em2800;
+        unsigned int tda9887_conf;
+
+        unsigned int has_tuner:1;
+        unsigned int has_msp34xx:1;
+
+        enum em28xx_decoder decoder;
+
+        struct em28xx_input       input[MAX_EM28XX_INPUT];
+};
+
+struct em28xx_eeprom {
+        u32 id;                 /* 0x9567eb1a */
+        u16 vendor_ID;
+        u16 product_ID;
+
+        u16 chip_conf;
+
+        u16 board_conf;
+
+        u16 string1, string2, string3;
+
+        u8 string_idx_table;
+};
+
+/* device states */
+enum em28xx_dev_state {
+        DEV_INITIALIZED = 0x01,
+        DEV_DISCONNECTED = 0x02,
+        DEV_MISCONFIGURED = 0x04,
+};
+
+/* tvnorms */
+struct em28xx_tvnorm {
+        char *name;
+        v4l2_std_id id;
+        /* mode for saa7113h */
+        int mode;
+};
+
+/* main device struct */
+struct em28xx {
+        /* generic device properties */
+        char name[30];          /* name (including minor) of the device */
+        int model;              /* index in the device_data struct */
+        unsigned int is_em2800;
+        int video_inputs;       /* number of video inputs */
+        struct list_head        devlist;
+        unsigned int has_tuner:1;
+        unsigned int has_msp34xx:1;
+        unsigned int has_tda9887:1;
+
+        enum em28xx_decoder decoder;
+
+        int tuner_type;         /* type of the tuner */
+        int tuner_addr;         /* tuner address */
+        int tda9887_conf;
+        /* i2c i/o */
+        struct i2c_adapter i2c_adap;
+        struct i2c_client i2c_client;
+        /* video for linux */
+        int users;              /* user count for exclusive use */
+        struct video_device *vdev;      /* video for linux device struct */
+        struct video_picture vpic;      /* picture settings only used to init saa7113h */
+        struct em28xx_tvnorm *tvnorm;   /* selected tv norm */
+        int ctl_freq;           /* selected frequency */
+        unsigned int ctl_input; /* selected input */
+        unsigned int ctl_ainput;        /* slected audio input */
+        int mute;
+        int volume;
+        /* frame properties */
+        struct em28xx_frame_t frame[EM28XX_NUM_FRAMES]; /* list of frames */
+        int num_frames;         /* number of frames currently in use */
+        unsigned int frame_count;       /* total number of transfered frames */
+        struct em28xx_frame_t *frame_current;   /* the frame that is being filled */
+        int width;              /* current frame width */
+        int height;             /* current frame height */
+        int frame_size;         /* current frame size */
+        int field_size;         /* current field size */
+        int bytesperline;
+        int hscale;             /* horizontal scale factor (see datasheet) */
+        int vscale;             /* vertical scale factor (see datasheet) */
+        int interlaced;         /* 1=interlace fileds, 0=just top fileds */
+        int type;
+
+        /* states */
+        enum em28xx_dev_state state;
+        enum em28xx_stream_state stream;
+        enum em28xx_io_method io;
+        /* locks */
+        struct semaphore lock, fileop_lock;
+        spinlock_t queue_lock;
+        struct list_head inqueue, outqueue;
+        wait_queue_head_t open, wait_frame, wait_stream;
+        struct video_device *vbi_dev;
+
+        unsigned char eedata[256];
+
+        /* usb transfer */
+        struct usb_device *udev;        /* the usb device */
+        int alt;                /* alternate */
+        int max_pkt_size;       /* max packet size of isoc transaction */
+        int num_alt;            /* Number of alternative settings */
+        unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
+        struct urb *urb[EM28XX_NUM_BUFS];       /* urb for isoc transfers */
+        char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */
+        /* helper funcs that call usb_control_msg */
+        int (*em28xx_write_regs) (struct em28xx * dev, u16 reg, char *buf,
+                                  int len);
+        int (*em28xx_read_reg) (struct em28xx * dev, u16 reg);
+        int (*em28xx_read_reg_req_len) (struct em28xx * dev, u8 req, u16 reg,
+                                        char *buf, int len);
+        int (*em28xx_write_regs_req) (struct em28xx * dev, u8 req, u16 reg,
+                                      char *buf, int len);
+        int (*em28xx_read_reg_req) (struct em28xx * dev, u8 req, u16 reg);
+};
+
+/* Provided by em28xx-i2c.c */
+
+void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg);
+int em28xx_i2c_register(struct em28xx *dev);
+int em28xx_i2c_unregister(struct em28xx *dev);
+
+/* Provided by em28xx-input.c */
+
+void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir);
+
+/* Provided by em28xx-core.c */
+
+void em28xx_print_ioctl(char *name, unsigned int cmd);
+
+u32 em28xx_request_buffers(struct em28xx *dev, u32 count);
+void em28xx_queue_unusedframes(struct em28xx *dev);
+void em28xx_release_buffers(struct em28xx *dev);
+
+int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
+                            char *buf, int len);
+int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg);
+int em28xx_read_reg(struct em28xx *dev, u16 reg);
+int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
+                          int len);
+int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
+int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
+                          u8 bitmask);
+int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 * val);
+int em28xx_audio_analog_set(struct em28xx *dev);
+int em28xx_colorlevels_set_default(struct em28xx *dev);
+int em28xx_capture_start(struct em28xx *dev, int start);
+int em28xx_outfmt_set_yuv422(struct em28xx *dev);
+int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin,
+                           u8 ymax);
+int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
+                            u16 width, u16 height);
+int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v);
+int em28xx_resolution_set(struct em28xx *dev);
+void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs);
+int em28xx_init_isoc(struct em28xx *dev);
+void em28xx_uninit_isoc(struct em28xx *dev);
+int em28xx_set_alternate(struct em28xx *dev);
+
+/* Provided by em28xx-cards.c */
+extern int em2800_variant_detect(struct usb_device* udev,int model);
+extern void em28xx_card_setup(struct em28xx *dev);
+extern struct em28xx_board em28xx_boards[];
+extern struct usb_device_id em28xx_id_table[];
+extern const unsigned int em28xx_bcount;
+
+/* em28xx registers */
+#define CHIPID_REG      0x0a
+#define USBSUSP_REG     0x0c    /* */
+
+#define AUDIOSRC_REG    0x0e
+#define XCLK_REG        0x0f
+
+#define VINMODE_REG     0x10
+#define VINCTRL_REG     0x11
+#define VINENABLE_REG   0x12    /* */
+
+#define GAMMA_REG       0x14
+#define RGAIN_REG       0x15
+#define GGAIN_REG       0x16
+#define BGAIN_REG       0x17
+#define ROFFSET_REG     0x18
+#define GOFFSET_REG     0x19
+#define BOFFSET_REG     0x1a
+
+#define OFLOW_REG       0x1b
+#define HSTART_REG      0x1c
+#define VSTART_REG      0x1d
+#define CWIDTH_REG      0x1e
+#define CHEIGHT_REG     0x1f
+
+#define YGAIN_REG       0x20
+#define YOFFSET_REG     0x21
+#define UVGAIN_REG      0x22
+#define UOFFSET_REG     0x23
+#define VOFFSET_REG     0x24
+#define SHARPNESS_REG   0x25
+
+#define COMPR_REG       0x26
+#define OUTFMT_REG      0x27
+
+#define XMIN_REG        0x28
+#define XMAX_REG        0x29
+#define YMIN_REG        0x2a
+#define YMAX_REG        0x2b
+
+#define HSCALELOW_REG   0x30
+#define HSCALEHIGH_REG  0x31
+#define VSCALELOW_REG   0x32
+#define VSCALEHIGH_REG  0x33
+
+#define AC97LSB_REG     0x40
+#define AC97MSB_REG     0x41
+#define AC97ADDR_REG    0x42
+#define AC97BUSY_REG    0x43
+
+/* em202 registers */
+#define MASTER_AC97     0x02
+#define VIDEO_AC97      0x14
+
+/* register settings */
+#define EM28XX_AUDIO_SRC_TUNER  0xc0
+#define EM28XX_AUDIO_SRC_LINE   0x80
+
+/* printk macros */
+
+#define em28xx_err(fmt, arg...) do {\
+        printk(KERN_ERR fmt , ##arg); } while (0)
+
+#define em28xx_errdev(fmt, arg...) do {\
+        printk(KERN_ERR "%s: "fmt,\
+                        dev->name , ##arg); } while (0)
+
+#define em28xx_info(fmt, arg...) do {\
+        printk(KERN_INFO "%s: "fmt,\
+                        dev->name , ##arg); } while (0)
+#define em28xx_warn(fmt, arg...) do {\
+        printk(KERN_WARNING "%s: "fmt,\
+                        dev->name , ##arg); } while (0)
+
+inline static int em28xx_audio_source(struct em28xx *dev, int input)
+{
+        return em28xx_write_reg_bits(dev, AUDIOSRC_REG, input, 0xc0);
+}
+
+inline static int em28xx_audio_usb_mute(struct em28xx *dev, int mute)
+{
+        return em28xx_write_reg_bits(dev, XCLK_REG, mute ? 0x00 : 0x80, 0x80);
+}
+
+inline static int em28xx_audio_analog_setup(struct em28xx *dev)
+{
+        /* unmute video mixer with default volume level */
+        return em28xx_write_ac97(dev, VIDEO_AC97, "\x08\x08");
+}
+
+inline static int em28xx_compression_disable(struct em28xx *dev)
+{
+        /* side effect of disabling scaler and mixer */
+        return em28xx_write_regs(dev, COMPR_REG, "\x00", 1);
+}
+
+inline static int em28xx_contrast_get(struct em28xx *dev)
+{
+        return em28xx_read_reg(dev, YGAIN_REG) & 0x1f;
+}
+
+inline static int em28xx_brightness_get(struct em28xx *dev)
+{
+        return em28xx_read_reg(dev, YOFFSET_REG);
+}
+
+inline static int em28xx_saturation_get(struct em28xx *dev)
+{
+        return em28xx_read_reg(dev, UVGAIN_REG) & 0x1f;
+}
+
+inline static int em28xx_u_balance_get(struct em28xx *dev)
+{
+        return em28xx_read_reg(dev, UOFFSET_REG);
+}
+
+inline static int em28xx_v_balance_get(struct em28xx *dev)
+{
+        return em28xx_read_reg(dev, VOFFSET_REG);
+}
+
+inline static int em28xx_gamma_get(struct em28xx *dev)
+{
+        return em28xx_read_reg(dev, GAMMA_REG) & 0x3f;
+}
+
+inline static int em28xx_contrast_set(struct em28xx *dev, s32 val)
+{
+        u8 tmp = (u8) val;
+        return em28xx_write_regs(dev, YGAIN_REG, &tmp, 1);
+}
+
+inline static int em28xx_brightness_set(struct em28xx *dev, s32 val)
+{
+        u8 tmp = (u8) val;
+        return em28xx_write_regs(dev, YOFFSET_REG, &tmp, 1);
+}
+
+inline static int em28xx_saturation_set(struct em28xx *dev, s32 val)
+{
+        u8 tmp = (u8) val;
+        return em28xx_write_regs(dev, UVGAIN_REG, &tmp, 1);
+}
+
+inline static int em28xx_u_balance_set(struct em28xx *dev, s32 val)
+{
+        u8 tmp = (u8) val;
+        return em28xx_write_regs(dev, UOFFSET_REG, &tmp, 1);
+}
+
+inline static int em28xx_v_balance_set(struct em28xx *dev, s32 val)
+{
+        u8 tmp = (u8) val;
+        return em28xx_write_regs(dev, VOFFSET_REG, &tmp, 1);
+}
+
+inline static int em28xx_gamma_set(struct em28xx *dev, s32 val)
+{
+        u8 tmp = (u8) val;
+        return em28xx_write_regs(dev, GAMMA_REG, &tmp, 1);
+}
+
+/*FIXME: maxw should be dependent of alt mode */
+inline static unsigned int norm_maxw(struct em28xx *dev)
+{
+        switch(dev->model){
+                case (EM2820_BOARD_MSI_VOX_USB_2): return(640);
+                default: return(720);
+        }
+}
+
+inline static unsigned int norm_maxh(struct em28xx *dev)
+{
+        switch(dev->model){
+                case (EM2820_BOARD_MSI_VOX_USB_2): return(480);
+                default: return (dev->tvnorm->id & V4L2_STD_625_50) ? 576 : 480;
+        }
+}
+
+#endif
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c
index 234151e48edc..ed81934ef3cd 100644
--- a/drivers/media/video/ir-kbd-gpio.c
+++ b/drivers/media/video/ir-kbd-gpio.c
@@ -156,6 +156,71 @@ static IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE] = {
 
 /* ---------------------------------------------------------------------- */
 
+/* Ricardo Cerqueira <v4l@cerqueira.org> */
+/* Weird matching, since the remote has "uncommon" keys */
+
+static IR_KEYTAB_TYPE ir_codes_conceptronic[IR_KEYTAB_SIZE] = {
+
+        [ 30 ] = KEY_POWER,       // power
+        [ 7  ] = KEY_MEDIA,       // source
+        [ 28 ] = KEY_SEARCH,      // scan
+
+/* FIXME: duplicate keycodes?
+ *
+ * These four keys seem to share the same GPIO as CH+, CH-, <<< and >>>
+ * The GPIO values are
+ * 6397fb for both "Scan <" and "CH -",
+ * 639ffb for "Scan >" and "CH+",
+ * 6384fb for "Tune <" and "<<<",
+ * 638cfb for "Tune >" and ">>>", regardless of the mask.
+ *
+ *      [ 23 ] = KEY_BACK,        // fm scan <<
+ *      [ 31 ] = KEY_FORWARD,     // fm scan >>
+ *
+ *      [ 4  ] = KEY_LEFT,        // fm tuning <
+ *      [ 12 ] = KEY_RIGHT,       // fm tuning >
+ *
+ * For now, these four keys are disabled. Pressing them will generate
+ * the CH+/CH-/<<</>>> events
+ */
+
+        [ 3  ] = KEY_TUNER,       // TV/FM
+
+        [ 0  ] = KEY_RECORD,
+        [ 8  ] = KEY_STOP,
+        [ 17 ] = KEY_PLAY,
+
+        [ 26 ] = KEY_PLAYPAUSE,   // freeze
+        [ 25 ] = KEY_ZOOM,        // zoom
+        [ 15 ] = KEY_TEXT,        // min
+
+        [ 1  ] = KEY_KP1,
+        [ 11 ] = KEY_KP2,
+        [ 27 ] = KEY_KP3,
+        [ 5  ] = KEY_KP4,
+        [ 9  ] = KEY_KP5,
+        [ 21 ] = KEY_KP6,
+        [ 6  ] = KEY_KP7,
+        [ 10 ] = KEY_KP8,
+        [ 18 ] = KEY_KP9,
+        [ 2  ] = KEY_KP0,
+        [ 16 ] = KEY_LAST,        // +100
+        [ 19 ] = KEY_LIST,        // recall
+
+        [ 31 ] = KEY_CHANNELUP,   // chn down
+        [ 23 ] = KEY_CHANNELDOWN, // chn up
+        [ 22 ] = KEY_VOLUMEUP,    // vol down
+        [ 20 ] = KEY_VOLUMEDOWN,  // vol up
+
+        [ 4  ] = KEY_KPMINUS,     // <<<
+        [ 14 ] = KEY_SETUP,       // function
+        [ 12 ] = KEY_KPPLUS,      // >>>
+
+        [ 13 ] = KEY_GOTO,        // mts
+        [ 29 ] = KEY_REFRESH,     // reset
+        [ 24 ] = KEY_MUTE         // mute/unmute
+};
+
 struct IR {
         struct bttv_sub_device  *sub;
         struct input_dev        *input;
@@ -282,53 +347,59 @@ static int ir_probe(struct device *dev)
 
         /* detect & configure */
         switch (sub->core->type) {
-        case BTTV_AVERMEDIA:
-        case BTTV_AVPHONE98:
-        case BTTV_AVERMEDIA98:
+        case BTTV_BOARD_AVERMEDIA:
+        case BTTV_BOARD_AVPHONE98:
+        case BTTV_BOARD_AVERMEDIA98:
                 ir_codes         = ir_codes_avermedia;
                 ir->mask_keycode = 0xf88000;
                 ir->mask_keydown = 0x010000;
                 ir->polling      = 50; // ms
                 break;
 
-        case BTTV_AVDVBT_761:
-        case BTTV_AVDVBT_771:
+        case BTTV_BOARD_AVDVBT_761:
+        case BTTV_BOARD_AVDVBT_771:
                 ir_codes         = ir_codes_avermedia_dvbt;
                 ir->mask_keycode = 0x0f00c0;
                 ir->mask_keydown = 0x000020;
                 ir->polling      = 50; // ms
                 break;
 
-        case BTTV_PXELVWPLTVPAK:
+        case BTTV_BOARD_PXELVWPLTVPAK:
                 ir_codes         = ir_codes_pixelview;
                 ir->mask_keycode = 0x003e00;
                 ir->mask_keyup   = 0x010000;
                 ir->polling      = 50; // ms
-                break;
-        case BTTV_PV_BT878P_9B:
-        case BTTV_PV_BT878P_PLUS:
+                break;
+        case BTTV_BOARD_PV_BT878P_9B:
+        case BTTV_BOARD_PV_BT878P_PLUS:
                 ir_codes         = ir_codes_pixelview;
                 ir->mask_keycode = 0x001f00;
                 ir->mask_keyup   = 0x008000;
                 ir->polling      = 50; // ms
-                break;
+                break;
 
-        case BTTV_WINFAST2000:
+        case BTTV_BOARD_WINFAST2000:
                 ir_codes         = ir_codes_winfast;
                 ir->mask_keycode = 0x1f8;
                 break;
-        case BTTV_MAGICTVIEW061:
-        case BTTV_MAGICTVIEW063:
+        case BTTV_BOARD_MAGICTVIEW061:
+        case BTTV_BOARD_MAGICTVIEW063:
                 ir_codes         = ir_codes_winfast;
                 ir->mask_keycode = 0x0008e000;
                 ir->mask_keydown = 0x00200000;
                 break;
-        case BTTV_APAC_VIEWCOMP:
+        case BTTV_BOARD_APAC_VIEWCOMP:
                 ir_codes         = ir_codes_apac_viewcomp;
                 ir->mask_keycode = 0x001f00;
                 ir->mask_keyup   = 0x008000;
                 ir->polling      = 50; // ms
                 break;
+        case BTTV_BOARD_CONCEPTRONIC_CTVFMI2:
+                ir_codes         = ir_codes_conceptronic;
+                ir->mask_keycode = 0x001F00;
+                ir->mask_keyup   = 0x006000;
+                ir->polling      = 50; // ms
+                break;
         }
         if (NULL == ir_codes) {
                 kfree(ir);
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9703d3d351f9..0085567a1421 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -8,6 +8,8 @@
  *      Christoph Bartelmus <lirc@bartelmus.de>
  * modified for KNC ONE TV Station/Anubis Typhoon TView Tuner by
  *      Ulrich Mueller <ulrich.mueller42@web.de>
+ * modified for em2820 based USB TV tuners by
+ *      Markus Rechberger <mrechberger@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,10 +39,9 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
-
 #include <asm/semaphore.h>
-
 #include <media/ir-common.h>
+#include <media/ir-kbd-i2c.h>
 
 /* Mark Phalan <phalanm@o2.ie> */
 static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = {
@@ -81,57 +82,6 @@ static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = {
         [ 28 ] = KEY_MEDIA,             /* PC/TV */
 };
 
-static IR_KEYTAB_TYPE ir_codes_purpletv[IR_KEYTAB_SIZE] = {
-        [ 0x3  ] = KEY_POWER,
-        [ 0x6f ] = KEY_MUTE,
-        [ 0x10 ] = KEY_BACKSPACE,       /* Recall */
-
-        [ 0x11 ] = KEY_KP0,
-        [ 0x4  ] = KEY_KP1,
-        [ 0x5  ] = KEY_KP2,
-        [ 0x6  ] = KEY_KP3,
-        [ 0x8  ] = KEY_KP4,
-        [ 0x9  ] = KEY_KP5,
-        [ 0xa  ] = KEY_KP6,
-        [ 0xc  ] = KEY_KP7,
-        [ 0xd  ] = KEY_KP8,
-        [ 0xe  ] = KEY_KP9,
-        [ 0x12 ] = KEY_KPDOT,           /* 100+ */
-
-        [ 0x7  ] = KEY_VOLUMEUP,
-        [ 0xb  ] = KEY_VOLUMEDOWN,
-        [ 0x1a ] = KEY_KPPLUS,
-        [ 0x18 ] = KEY_KPMINUS,
-        [ 0x15 ] = KEY_UP,
-        [ 0x1d ] = KEY_DOWN,
-        [ 0xf  ] = KEY_CHANNELUP,
-        [ 0x13 ] = KEY_CHANNELDOWN,
-        [ 0x48 ] = KEY_ZOOM,
-
-        [ 0x1b ] = KEY_VIDEO,           /* Video source */
-        [ 0x49 ] = KEY_LANGUAGE,        /* MTS Select */
-        [ 0x19 ] = KEY_SEARCH,          /* Auto Scan */
-
-        [ 0x4b ] = KEY_RECORD,
-        [ 0x46 ] = KEY_PLAY,
-        [ 0x45 ] = KEY_PAUSE,           /* Pause */
-        [ 0x44 ] = KEY_STOP,
-        [ 0x40 ] = KEY_FORWARD,         /* Forward ? */
-        [ 0x42 ] = KEY_REWIND,          /* Backward ? */
-
-};
-
-struct IR {
-        struct i2c_client      c;
-        struct input_dev       *input;
-        struct ir_input_state  ir;
-
-        struct work_struct     work;
-        struct timer_list      timer;
-        char                   phys[32];
-        int                    (*get_key)(struct IR*, u32*, u32*);
-};
-
 /* ----------------------------------------------------------------------- */
 /* insmod parameters                                                       */
 
@@ -144,7 +94,7 @@ module_param(debug, int, 0644);    /* debug level (0,1,2) */
 
 /* ----------------------------------------------------------------------- */
 
-static int get_key_haup(struct IR *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
         unsigned char buf[3];
         int start, toggle, dev, code;
@@ -171,9 +121,9 @@ static int get_key_haup(struct IR *ir, u32 *ir_key, u32 *ir_raw)
         return 1;
 }
 
-static int get_key_pixelview(struct IR *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
-        unsigned char b;
+        unsigned char b;
 
         /* poll IR chip */
         if (1 != i2c_master_recv(&ir->c,&b,1)) {
@@ -185,9 +135,9 @@ static int get_key_pixelview(struct IR *ir, u32 *ir_key, u32 *ir_raw)
         return 1;
 }
 
-static int get_key_pv951(struct IR *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
-        unsigned char b;
+        unsigned char b;
 
         /* poll IR chip */
         if (1 != i2c_master_recv(&ir->c,&b,1)) {
@@ -205,7 +155,7 @@ static int get_key_pv951(struct IR *ir, u32 *ir_key, u32 *ir_raw)
         return 1;
 }
 
-static int get_key_knc1(struct IR *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
         unsigned char b;
 
@@ -216,15 +166,15 @@ static int get_key_knc1(struct IR *ir, u32 *ir_key, u32 *ir_raw)
         }
 
         /* it seems that 0xFE indicates that a button is still hold
-           down, while 0xFF indicates that no button is hold
-           down. 0xFE sequences are sometimes interrupted by 0xFF */
+           down, while 0xff indicates that no button is hold
+           down. 0xfe sequences are sometimes interrupted by 0xFF */
 
         dprintk(2,"key %02x\n", b);
 
-        if (b == 0xFF)
+        if (b == 0xff)
                 return 0;
 
-        if (b == 0xFE)
+        if (b == 0xfe)
                 /* keep old data */
                 return 1;
 
@@ -233,31 +183,9 @@ static int get_key_knc1(struct IR *ir, u32 *ir_key, u32 *ir_raw)
         return 1;
 }
 
-static int get_key_purpletv(struct IR *ir, u32 *ir_key, u32 *ir_raw)
-{
-        unsigned char b;
-
-        /* poll IR chip */
-        if (1 != i2c_master_recv(&ir->c,&b,1)) {
-                dprintk(1,"read error\n");
-                return -EIO;
-        }
-
-        /* no button press */
-        if (b==0)
-                return 0;
-
-        /* repeating */
-        if (b & 0x80)
-                return 1;
-
-        *ir_key = b;
-        *ir_raw = b;
-        return 1;
-}
 /* ----------------------------------------------------------------------- */
 
-static void ir_key_poll(struct IR *ir)
+static void ir_key_poll(struct IR_i2c *ir)
 {
         static u32 ir_key, ir_raw;
         int rc;
@@ -278,13 +206,13 @@ static void ir_key_poll(struct IR *ir)
 
 static void ir_timer(unsigned long data)
 {
-        struct IR *ir = (struct IR*)data;
+        struct IR_i2c *ir = (struct IR_i2c*)data;
         schedule_work(&ir->work);
 }
 
 static void ir_work(void *data)
 {
-        struct IR *ir = data;
+        struct IR_i2c *ir = data;
         ir_key_poll(ir);
         mod_timer(&ir->timer, jiffies+HZ/10);
 }
@@ -297,17 +225,17 @@ static int ir_detach(struct i2c_client *client);
 static int ir_probe(struct i2c_adapter *adap);
 
 static struct i2c_driver driver = {
-        .name           = "ir remote kbd driver",
-        .id             = I2C_DRIVERID_EXP3, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = ir_probe,
-        .detach_client  = ir_detach,
+        .name           = "ir remote kbd driver",
+        .id             = I2C_DRIVERID_EXP3, /* FIXME */
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = ir_probe,
+        .detach_client  = ir_detach,
 };
 
 static struct i2c_client client_template =
 {
-        .name = "unset",
-        .driver = &driver
+        .name = "unset",
+        .driver = &driver
 };
 
 static int ir_attach(struct i2c_adapter *adap, int addr,
@@ -316,10 +244,10 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
         IR_KEYTAB_TYPE *ir_codes = NULL;
         char *name;
         int ir_type;
-        struct IR *ir;
+        struct IR_i2c *ir;
         struct input_dev *input_dev;
 
-        ir = kzalloc(sizeof(struct IR), GFP_KERNEL);
+        ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!ir || !input_dev) {
                 kfree(ir);
@@ -361,10 +289,10 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                 ir_codes    = ir_codes_empty;
                 break;
         case 0x7a:
-                name        = "Purple TV";
-                ir->get_key = get_key_purpletv;
+        case 0x47:
+                /* Handled by saa7134-input */
+                name        = "SAA713x remote";
                 ir_type     = IR_TYPE_OTHER;
-                ir_codes    = ir_codes_purpletv;
                 break;
         default:
                 /* shouldn't happen */
@@ -373,9 +301,24 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                 return -1;
         }
 
-        /* register i2c device */
-        i2c_attach_client(&ir->c);
+        /* Sets name */
         snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (%s)", name);
+        ir->ir_codes=ir_codes;
+
+        /* register i2c device
+         * At device register, IR codes may be changed to be
+         * board dependent.
+        */
+        i2c_attach_client(&ir->c);
+
+        /* If IR not supported or disabled, unregisters driver */
+        if (ir->get_key == NULL) {
+                i2c_detach_client(&ir->c);
+                kfree(ir);
+                return -1;
+        }
+
+        /* Phys addr can only be set after attaching (for ir->c.dev.bus_id) */
         snprintf(ir->phys, sizeof(ir->phys), "%s/%s/ir0",
                  ir->c.adapter->dev.bus_id,
                  ir->c.dev.bus_id);
@@ -386,6 +329,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
         input_dev->name         = ir->c.name;
         input_dev->phys         = ir->phys;
 
+        /* register event device */
         input_register_device(ir->input);
 
         /* start polling via eventd */
@@ -400,7 +344,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
 
 static int ir_detach(struct i2c_client *client)
 {
-        struct IR *ir = i2c_get_clientdata(client);
+        struct IR_i2c *ir = i2c_get_clientdata(client);
 
         /* kill outstanding polls */
         del_timer(&ir->timer);
@@ -428,9 +372,12 @@ static int ir_probe(struct i2c_adapter *adap)
         */
 
         static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
-        static const int probe_saa7134[] = { 0x7a, -1 };
+        static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
+        static const int probe_em28XX[] = { 0x30, 0x47, -1 };
         const int *probe = NULL;
-        struct i2c_client c; char buf; int i,rc;
+        struct i2c_client c;
+        unsigned char buf;
+        int i,rc;
 
         switch (adap->id) {
         case I2C_HW_B_BT848:
@@ -439,6 +386,9 @@ static int ir_probe(struct i2c_adapter *adap)
         case I2C_HW_SAA7134:
                 probe = probe_saa7134;
                 break;
+        case I2C_HW_B_EM28XX:
+                probe = probe_em28XX;
+                break;
         }
         if (NULL == probe)
                 return 0;
@@ -447,11 +397,11 @@ static int ir_probe(struct i2c_adapter *adap)
         c.adapter = adap;
         for (i = 0; -1 != probe[i]; i++) {
                 c.addr = probe[i];
-                rc = i2c_master_recv(&c,&buf,1);
+                rc = i2c_master_recv(&c,&buf,0);
                 dprintk(1,"probe 0x%02x @ %s: %s\n",
                         probe[i], adap->name,
-                        (1 == rc) ? "yes" : "no");
-                if (1 == rc) {
+                        (0 == rc) ? "yes" : "no");
+                if (0 == rc) {
                         ir_attach(adap,probe[i],0,0);
                         break;
                 }
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index e75e7948fd9d..a23fb0338986 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -54,9 +54,41 @@
 #include <asm/pgtable.h>
 
 #include <media/audiochip.h>
-#include <media/id.h>
 #include "msp3400.h"
 
+#define msp3400_dbg(fmt, arg...) \
+        do { \
+                if (debug) \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                               i2c_adapter_id(client->adapter), client->addr , ## arg); \
+        } while (0)
+
+/* Medium volume debug. */
+#define msp3400_dbg_mediumvol(fmt, arg...) \
+        do { \
+                if (debug >= 2) \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
+        } while (0)
+
+/* High volume debug. Use with care. */
+#define msp3400_dbg_highvol(fmt, arg...) \
+        do { \
+                if (debug >= 16) \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
+        } while (0)
+
+#define msp3400_err(fmt, arg...) do { \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+#define msp3400_warn(fmt, arg...) do { \
+        printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->name, \
+                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+#define msp3400_info(fmt, arg...) do { \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+
 #define OPMODE_AUTO    -1
 #define OPMODE_MANUAL   0
 #define OPMODE_SIMPLE   1   /* use short programming (>= msp3410 only) */
@@ -73,15 +105,26 @@ static int dolby    = 0;
 
 static int stereo_threshold = 0x190; /* a2 threshold for stereo/bilingual
                                         (msp34xxg only) 0x00a0-0x03c0 */
+#define DFP_COUNT 0x41
+static const int bl_dfp[] = {
+        0x00, 0x01, 0x02, 0x03, 0x06, 0x08, 0x09, 0x0a,
+        0x0b, 0x0d, 0x0e, 0x10
+};
+
+#define IS_MSP34XX_G(msp) ((msp)->opmode==2)
 
 struct msp3400c {
         int rev1,rev2;
 
         int opmode;
+        int nicam;
         int mode;
         int norm;
+        int stereo;
         int nicam_on;
         int acb;
+        int in_scart;
+        int i2s_mode;
         int main, second;       /* sound carrier */
         int input;
         int source;             /* see msp34xxg_set_source */
@@ -91,9 +134,12 @@ struct msp3400c {
         int rxsubchans;
 
         int muted;
-        int volume, balance;
+        int left, right;        /* volume */
         int bass, treble;
 
+        /* shadow register set */
+        int dfp_regs[DFP_COUNT];
+
         /* thread */
         struct task_struct   *kthread;
         wait_queue_head_t    wq;
@@ -101,6 +147,8 @@ struct msp3400c {
         int                  watch_stereo:1;
 };
 
+#define MIN(a,b) (((a)>(b))?(b):(a))
+#define MAX(a,b) (((a)>(b))?(a):(b))
 #define HAVE_NICAM(msp)   (((msp->rev2>>8) & 0xff) != 00)
 #define HAVE_SIMPLE(msp)  ((msp->rev1      & 0xff) >= 'D'-'@')
 #define HAVE_SIMPLER(msp) ((msp->rev1      & 0xff) >= 'G'-'@')
@@ -110,9 +158,6 @@ struct msp3400c {
 
 /* ---------------------------------------------------------------------- */
 
-#define dprintk      if (debug >= 1) printk
-#define d2printk     if (debug >= 2) printk
-
 /* read-only */
 module_param(opmode,           int, 0444);
 
@@ -132,11 +177,6 @@ MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Defau
 MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan");
 MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
 
-
-MODULE_DESCRIPTION("device driver for msp34xx TV sound processor");
-MODULE_AUTHOR("Gerd Knorr");
-MODULE_LICENSE("Dual BSD/GPL"); /* FreeBSD uses this too */
-
 /* ---------------------------------------------------------------------- */
 
 #define I2C_MSP3400C       0x80
@@ -153,6 +193,10 @@ static unsigned short normal_i2c[] = {
 };
 I2C_CLIENT_INSMOD;
 
+MODULE_DESCRIPTION("device driver for msp34xx TV sound processor");
+MODULE_AUTHOR("Gerd Knorr");
+MODULE_LICENSE("GPL");
+
 /* ----------------------------------------------------------------------- */
 /* functions for talking to the MSP3400C Sound processor                   */
 
@@ -172,68 +216,73 @@ static int msp3400c_reset(struct i2c_client *client)
                 { client->addr, I2C_M_RD, 2, read  },
         };
 
+        msp3400_dbg_highvol("msp3400c_reset\n");
         if ( (1 != i2c_transfer(client->adapter,&reset[0],1)) ||
              (1 != i2c_transfer(client->adapter,&reset[1],1)) ||
              (2 != i2c_transfer(client->adapter,test,2)) ) {
-                printk(KERN_ERR "msp3400: chip reset failed\n");
+                msp3400_err("chip reset failed\n");
                 return -1;
-        }
+        }
         return 0;
 }
 
-static int
-msp3400c_read(struct i2c_client *client, int dev, int addr)
+static int msp3400c_read(struct i2c_client *client, int dev, int addr)
 {
-        int err;
+        int err,retval;
+
+        unsigned char write[3];
+        unsigned char read[2];
+        struct i2c_msg msgs[2] = {
+                { client->addr, 0,        3, write },
+                { client->addr, I2C_M_RD, 2, read  }
+        };
 
-        unsigned char write[3];
-        unsigned char read[2];
-        struct i2c_msg msgs[2] = {
-                { client->addr, 0,        3, write },
-                { client->addr, I2C_M_RD, 2, read  }
-        };
-        write[0] = dev+1;
-        write[1] = addr >> 8;
-        write[2] = addr & 0xff;
+        write[0] = dev+1;
+        write[1] = addr >> 8;
+        write[2] = addr & 0xff;
 
         for (err = 0; err < 3;) {
                 if (2 == i2c_transfer(client->adapter,msgs,2))
                         break;
                 err++;
-                printk(KERN_WARNING "msp34xx: I/O error #%d (read 0x%02x/0x%02x)\n",
-                       err, dev, addr);
-                msleep(10);
+                msp3400_warn("I/O error #%d (read 0x%02x/0x%02x)\n", err,
+                       dev, addr);
+                current->state = TASK_INTERRUPTIBLE;
+                schedule_timeout(msecs_to_jiffies(10));
         }
         if (3 == err) {
-                printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
+                msp3400_warn("giving up, resetting chip. Sound will go off, sorry folks :-|\n");
                 msp3400c_reset(client);
                 return -1;
         }
-        return read[0] << 8 | read[1];
+        retval = read[0] << 8 | read[1];
+        msp3400_dbg_highvol("msp3400c_read(0x%x, 0x%x): 0x%x\n", dev, addr, retval);
+        return retval;
 }
 
-static int
-msp3400c_write(struct i2c_client *client, int dev, int addr, int val)
+static int msp3400c_write(struct i2c_client *client, int dev, int addr, int val)
 {
         int err;
-        unsigned char buffer[5];
+        unsigned char buffer[5];
 
-        buffer[0] = dev;
-        buffer[1] = addr >> 8;
-        buffer[2] = addr &  0xff;
-        buffer[3] = val  >> 8;
-        buffer[4] = val  &  0xff;
+        buffer[0] = dev;
+        buffer[1] = addr >> 8;
+        buffer[2] = addr &  0xff;
+        buffer[3] = val  >> 8;
+        buffer[4] = val  &  0xff;
 
+        msp3400_dbg_highvol("msp3400c_write(0x%x, 0x%x, 0x%x)\n", dev, addr, val);
         for (err = 0; err < 3;) {
                 if (5 == i2c_master_send(client, buffer, 5))
                         break;
                 err++;
-                printk(KERN_WARNING "msp34xx: I/O error #%d (write 0x%02x/0x%02x)\n",
-                       err, dev, addr);
-                msleep(10);
+                msp3400_warn("I/O error #%d (write 0x%02x/0x%02x)\n", err,
+                       dev, addr);
+                current->state = TASK_INTERRUPTIBLE;
+                schedule_timeout(msecs_to_jiffies(10));
         }
         if (3 == err) {
-                printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
+                msp3400_warn("giving up, reseting chip. Sound will go off, sorry folks :-|\n");
                 msp3400c_reset(client);
                 return -1;
         }
@@ -266,45 +315,47 @@ static struct MSP_INIT_DATA_DEM {
         int dfp_src;
         int dfp_matrix;
 } msp_init_data[] = {
-        /* AM (for carrier detect / msp3400) */
-        { { 75, 19, 36, 35, 39, 40 }, { 75, 19, 36, 35, 39, 40 },
-          MSP_CARRIER(5.5), MSP_CARRIER(5.5),
-          0x00d0, 0x0500,   0x0020, 0x3000},
-
-        /* AM (for carrier detect / msp3410) */
-        { { -1, -1, -8, 2, 59, 126 }, { -1, -1, -8, 2, 59, 126 },
-          MSP_CARRIER(5.5), MSP_CARRIER(5.5),
-          0x00d0, 0x0100,   0x0020, 0x3000},
-
-        /* FM Radio */
-        { { -8, -8, 4, 6, 78, 107 }, { -8, -8, 4, 6, 78, 107 },
-          MSP_CARRIER(10.7), MSP_CARRIER(10.7),
-          0x00d0, 0x0480, 0x0020, 0x3000 },
-
-        /* Terrestial FM-mono + FM-stereo */
-        { {  3, 18, 27, 48, 66, 72 }, {  3, 18, 27, 48, 66, 72 },
-          MSP_CARRIER(5.5), MSP_CARRIER(5.5),
-          0x00d0, 0x0480,   0x0030, 0x3000},
-
-        /* Sat FM-mono */
-        { {  1,  9, 14, 24, 33, 37 }, {  3, 18, 27, 48, 66, 72 },
-          MSP_CARRIER(6.5), MSP_CARRIER(6.5),
-          0x00c6, 0x0480,   0x0000, 0x3000},
-
-        /* NICAM/FM --  B/G (5.5/5.85), D/K (6.5/5.85) */
-        { { -2, -8, -10, 10, 50, 86 }, {  3, 18, 27, 48, 66, 72 },
-          MSP_CARRIER(5.5), MSP_CARRIER(5.5),
-          0x00d0, 0x0040,   0x0120, 0x3000},
-
-        /* NICAM/FM -- I (6.0/6.552) */
-        { {  2, 4, -6, -4, 40, 94 }, {  3, 18, 27, 48, 66, 72 },
-          MSP_CARRIER(6.0), MSP_CARRIER(6.0),
-          0x00d0, 0x0040,   0x0120, 0x3000},
-
-        /* NICAM/AM -- L (6.5/5.85) */
-        { {  -2, -8, -10, 10, 50, 86 }, {  -4, -12, -9, 23, 79, 126 },
-          MSP_CARRIER(6.5), MSP_CARRIER(6.5),
-          0x00c6, 0x0140,   0x0120, 0x7c03},
+        {       /* AM (for carrier detect / msp3400) */
+                {75, 19, 36, 35, 39, 40},
+                {75, 19, 36, 35, 39, 40},
+                MSP_CARRIER(5.5), MSP_CARRIER(5.5),
+                0x00d0, 0x0500, 0x0020, 0x3000
+        },{     /* AM (for carrier detect / msp3410) */
+                {-1, -1, -8, 2, 59, 126},
+                {-1, -1, -8, 2, 59, 126},
+                MSP_CARRIER(5.5), MSP_CARRIER(5.5),
+                0x00d0, 0x0100, 0x0020, 0x3000
+        },{     /* FM Radio */
+                {-8, -8, 4, 6, 78, 107},
+                {-8, -8, 4, 6, 78, 107},
+                MSP_CARRIER(10.7), MSP_CARRIER(10.7),
+                0x00d0, 0x0480, 0x0020, 0x3000
+        },{     /* Terrestial FM-mono + FM-stereo */
+                {3, 18, 27, 48, 66, 72},
+                {3, 18, 27, 48, 66, 72},
+                MSP_CARRIER(5.5), MSP_CARRIER(5.5),
+                0x00d0, 0x0480, 0x0030, 0x3000
+        },{     /* Sat FM-mono */
+                { 1, 9, 14, 24, 33, 37},
+                { 3, 18, 27, 48, 66, 72},
+                MSP_CARRIER(6.5), MSP_CARRIER(6.5),
+                0x00c6, 0x0480, 0x0000, 0x3000
+        },{     /* NICAM/FM --  B/G (5.5/5.85), D/K (6.5/5.85) */
+                {-2, -8, -10, 10, 50, 86},
+                {3, 18, 27, 48, 66, 72},
+                MSP_CARRIER(5.5), MSP_CARRIER(5.5),
+                0x00d0, 0x0040, 0x0120, 0x3000
+        },{     /* NICAM/FM -- I (6.0/6.552) */
+                {2, 4, -6, -4, 40, 94},
+                {3, 18, 27, 48, 66, 72},
+                MSP_CARRIER(6.0), MSP_CARRIER(6.0),
+                0x00d0, 0x0040, 0x0120, 0x3000
+        },{     /* NICAM/AM -- L (6.5/5.85) */
+                {-2, -8, -10, 10, 50, 86},
+                {-4, -12, -9, 23, 79, 126},
+                MSP_CARRIER(6.5), MSP_CARRIER(6.5),
+                0x00c6, 0x0140, 0x0120, 0x7c03
+        },
 };
 
 struct CARRIER_DETECT {
@@ -338,32 +389,68 @@ static struct CARRIER_DETECT carrier_detect_65[] = {
 
 #define CARRIER_COUNT(x) (sizeof(x)/sizeof(struct CARRIER_DETECT))
 
-/* ----------------------------------------------------------------------- */
+/* ----------------------------------------------------------------------- *
+ * bits  9  8  5 - SCART DSP input Select:
+ *       0  0  0 - SCART 1 to DSP input (reset position)
+ *       0  1  0 - MONO to DSP input
+ *       1  0  0 - SCART 2 to DSP input
+ *       1  1  1 - Mute DSP input
+ *
+ * bits 11 10  6 - SCART 1 Output Select:
+ *       0  0  0 - undefined (reset position)
+ *       0  1  0 - SCART 2 Input to SCART 1 Output (for devices with 2 SCARTS)
+ *       1  0  0 - MONO input to SCART 1 Output
+ *       1  1  0 - SCART 1 DA to SCART 1 Output
+ *       0  0  1 - SCART 2 DA to SCART 1 Output
+ *       0  1  1 - SCART 1 Input to SCART 1 Output
+ *       1  1  1 - Mute SCART 1 Output
+ *
+ * bits 13 12  7 - SCART 2 Output Select (for devices with 2 Output SCART):
+ *       0  0  0 - SCART 1 DA to SCART 2 Output (reset position)
+ *       0  1  0 - SCART 1 Input to SCART 2 Output
+ *       1  0  0 - MONO input to SCART 2 Output
+ *       0  0  1 - SCART 2 DA to SCART 2 Output
+ *       0  1  1 - SCART 2 Input to SCART 2 Output
+ *       1  1  0 - Mute SCART 2 Output
+ *
+ * Bits 4 to 0 should be zero.
+ * ----------------------------------------------------------------------- */
 
 static int scarts[3][9] = {
-  /* MASK    IN1     IN2     IN1_DA  IN2_DA  IN3     IN4     MONO    MUTE   */
-  {  0x0320, 0x0000, 0x0200, -1,     -1,     0x0300, 0x0020, 0x0100, 0x0320 },
-  {  0x0c40, 0x0440, 0x0400, 0x0c00, 0x0040, 0x0000, 0x0840, 0x0800, 0x0c40 },
-  {  0x3080, 0x1000, 0x1080, 0x0000, 0x0080, 0x2080, 0x3080, 0x2000, 0x3000 },
+        /* MASK    IN1     IN2     IN1_DA  IN2_DA  IN3     IN4     MONO    MUTE   */
+        /* SCART DSP Input select */
+        { 0x0320, 0x0000, 0x0200, -1,     -1,     0x0300, 0x0020, 0x0100, 0x0320 },
+        /* SCART1 Output select */
+        { 0x0c40, 0x0440, 0x0400, 0x0c00, 0x0040, 0x0000, 0x0840, 0x0800, 0x0c40 },
+        /* SCART2 Output select */
+        { 0x3080, 0x1000, 0x1080, 0x0000, 0x0080, 0x2080, 0x3080, 0x2000, 0x3000 },
 };
 
 static char *scart_names[] = {
-  "mask", "in1", "in2", "in1 da", "in2 da", "in3", "in4", "mono", "mute"
+        "mask", "in1", "in2", "in1 da", "in2 da", "in3", "in4", "mono", "mute"
 };
 
-static void
-msp3400c_set_scart(struct i2c_client *client, int in, int out)
+static void msp3400c_set_scart(struct i2c_client *client, int in, int out)
 {
         struct msp3400c *msp = i2c_get_clientdata(client);
 
-        if (-1 == scarts[out][in])
-                return;
+        msp->in_scart=in;
+
+        if (in >= 1 && in <= 8 && out >= 0 && out <= 2) {
+                if (-1 == scarts[out][in])
+                        return;
 
-        dprintk(KERN_DEBUG
-                "msp34xx: scart switch: %s => %d\n",scart_names[in],out);
-        msp->acb &= ~scarts[out][SCART_MASK];
-        msp->acb |=  scarts[out][in];
-        msp3400c_write(client,I2C_MSP3400C_DFP, 0x0013, msp->acb);
+                msp->acb &= ~scarts[out][SCART_MASK];
+                msp->acb |=  scarts[out][in];
+        } else
+                msp->acb = 0xf60; /* Mute Input and SCART 1 Output */
+
+        msp3400_dbg("scart switch: %s => %d (ACB=0x%04x)\n",
+                                                scart_names[in], out, msp->acb);
+        msp3400c_write(client,I2C_MSP3400C_DFP, 0x13, msp->acb);
+
+        /* Sets I2S speed 0 = 1.024 Mbps, 1 = 2.048 Mbps */
+        msp3400c_write(client,I2C_MSP3400C_DEM, 0x40, msp->i2s_mode);
 }
 
 /* ------------------------------------------------------------------------ */
@@ -378,33 +465,34 @@ static void msp3400c_setcarrier(struct i2c_client *client, int cdo1, int cdo2)
 }
 
 static void msp3400c_setvolume(struct i2c_client *client,
-                               int muted, int volume, int balance)
-{
-        int val = 0, bal = 0;
+                               int muted, int left, int right)
+ {
+        int vol = 0, val = 0, balance = 0;
 
         if (!muted) {
                 /* 0x7f instead if 0x73 here has sound quality issues,
                  * probably due to overmodulation + clipping ... */
-                val = (volume * 0x73 / 65535) << 8;
+                vol = (left > right) ? left : right;
+                val = (vol * 0x73 / 65535) << 8;
         }
-        if (val) {
-                bal = (balance / 256) - 128;
+        if (vol > 0) {
+                balance = ((right - left) * 127) / vol;
         }
-        dprintk(KERN_DEBUG
-                "msp34xx: setvolume: mute=%s %d:%d  v=0x%02x b=0x%02x\n",
-                muted ? "on" : "off", volume, balance, val>>8, bal);
+
+        msp3400_dbg("setvolume: mute=%s %d:%d  v=0x%02x b=0x%02x\n",
+                muted ? "on" : "off", left, right, val >> 8, balance);
         msp3400c_write(client,I2C_MSP3400C_DFP, 0x0000, val); /* loudspeaker */
         msp3400c_write(client,I2C_MSP3400C_DFP, 0x0006, val); /* headphones  */
         msp3400c_write(client,I2C_MSP3400C_DFP, 0x0007,
-                       muted ? 0x01 : (val | 0x01));
-        msp3400c_write(client,I2C_MSP3400C_DFP, 0x0001, bal << 8);
+                                        muted ? 0x1 : (val | 0x1));
+        msp3400c_write(client, I2C_MSP3400C_DFP, 0x0001, balance << 8);
 }
 
 static void msp3400c_setbass(struct i2c_client *client, int bass)
 {
         int val = ((bass-32768) * 0x60 / 65535) << 8;
 
-        dprintk(KERN_DEBUG "msp34xx: setbass: %d 0x%02x\n",bass, val>>8);
+        msp3400_dbg("setbass: %d 0x%02x\n", bass, val >> 8);
         msp3400c_write(client,I2C_MSP3400C_DFP, 0x0002, val); /* loudspeaker */
 }
 
@@ -412,7 +500,7 @@ static void msp3400c_settreble(struct i2c_client *client, int treble)
 {
         int val = ((treble-32768) * 0x60 / 65535) << 8;
 
-        dprintk(KERN_DEBUG "msp34xx: settreble: %d 0x%02x\n",treble, val>>8);
+        msp3400_dbg("settreble: %d 0x%02x\n",treble, val>>8);
         msp3400c_write(client,I2C_MSP3400C_DFP, 0x0003, val); /* loudspeaker */
 }
 
@@ -421,7 +509,7 @@ static void msp3400c_setmode(struct i2c_client *client, int type)
         struct msp3400c *msp = i2c_get_clientdata(client);
         int i;
 
-        dprintk(KERN_DEBUG "msp3400: setmode: %d\n",type);
+        msp3400_dbg("setmode: %d\n",type);
         msp->mode       = type;
         msp->audmode    = V4L2_TUNER_MODE_MONO;
         msp->rxsubchans = V4L2_TUNER_SUB_MONO;
@@ -474,7 +562,8 @@ static void msp3400c_setmode(struct i2c_client *client, int type)
         }
 }
 
-static int best_audio_mode(int rxsubchans)
+/* given a bitmask of VIDEO_SOUND_XXX returns the "best" in the bitmask */
+static int best_video_sound(int rxsubchans)
 {
         if (rxsubchans & V4L2_TUNER_SUB_STEREO)
                 return V4L2_TUNER_MODE_STEREO;
@@ -486,31 +575,31 @@ static int best_audio_mode(int rxsubchans)
 }
 
 /* turn on/off nicam + stereo */
-static void msp3400c_set_audmode(struct i2c_client *client, int audmode)
+static void msp3400c_setstereo(struct i2c_client *client, int mode)
 {
-        static char *strmode[16] = {
-#if __GNUC__ >= 3
-                [ 0 ... 15 ]               = "invalid",
-#endif
-                [ V4L2_TUNER_MODE_MONO   ] = "mono",
-                [ V4L2_TUNER_MODE_STEREO ] = "stereo",
-                [ V4L2_TUNER_MODE_LANG1  ] = "lang1",
-                [ V4L2_TUNER_MODE_LANG2  ] = "lang2",
+        static char *strmode[] = { "0", "mono", "stereo", "3",
+                "lang1", "5", "6", "7", "lang2"
         };
         struct msp3400c *msp = i2c_get_clientdata(client);
-        int nicam=0; /* channel source: FM/AM or nicam */
-        int src=0;
+        int nicam = 0;          /* channel source: FM/AM or nicam */
+        int src = 0;
 
-        BUG_ON(msp->opmode == OPMODE_SIMPLER);
-        msp->audmode = audmode;
+        if (IS_MSP34XX_G(msp)) {
+                /* this method would break everything, let's make sure
+                 * it's never called
+                 */
+                msp3400_dbg
+                    ("DEBUG WARNING setstereo called with mode=%d instead of set_source (ignored)\n",
+                     mode);
+                return;
+        }
 
         /* switch demodulator */
         switch (msp->mode) {
         case MSP_MODE_FM_TERRA:
-                dprintk(KERN_DEBUG "msp3400: FM setstereo: %s\n",
-                        strmode[audmode]);
+                msp3400_dbg("FM setstereo: %s\n", strmode[mode]);
                 msp3400c_setcarrier(client,msp->second,msp->main);
-                switch (audmode) {
+                switch (mode) {
                 case V4L2_TUNER_MODE_STEREO:
                         msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3001);
                         break;
@@ -522,9 +611,8 @@ static void msp3400c_set_audmode(struct i2c_client *client, int audmode)
                 }
                 break;
         case MSP_MODE_FM_SAT:
-                dprintk(KERN_DEBUG "msp3400: SAT setstereo: %s\n",
-                        strmode[audmode]);
-                switch (audmode) {
+                msp3400_dbg("SAT setstereo: %s\n", strmode[mode]);
+                switch (mode) {
                 case V4L2_TUNER_MODE_MONO:
                         msp3400c_setcarrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5));
                         break;
@@ -542,39 +630,35 @@ static void msp3400c_set_audmode(struct i2c_client *client, int audmode)
         case MSP_MODE_FM_NICAM1:
         case MSP_MODE_FM_NICAM2:
         case MSP_MODE_AM_NICAM:
-                dprintk(KERN_DEBUG "msp3400: NICAM setstereo: %s\n",
-                        strmode[audmode]);
+                msp3400_dbg("NICAM setstereo: %s\n",strmode[mode]);
                 msp3400c_setcarrier(client,msp->second,msp->main);
                 if (msp->nicam_on)
                         nicam=0x0100;
                 break;
         case MSP_MODE_BTSC:
-                dprintk(KERN_DEBUG "msp3400: BTSC setstereo: %s\n",
-                        strmode[audmode]);
+                msp3400_dbg("BTSC setstereo: %s\n",strmode[mode]);
                 nicam=0x0300;
                 break;
         case MSP_MODE_EXTERN:
-                dprintk(KERN_DEBUG "msp3400: extern setstereo: %s\n",
-                        strmode[audmode]);
+                msp3400_dbg("extern setstereo: %s\n",strmode[mode]);
                 nicam = 0x0200;
                 break;
         case MSP_MODE_FM_RADIO:
-                dprintk(KERN_DEBUG "msp3400: FM-Radio setstereo: %s\n",
-                        strmode[audmode]);
+                msp3400_dbg("FM-Radio setstereo: %s\n",strmode[mode]);
                 break;
         default:
-                dprintk(KERN_DEBUG "msp3400: mono setstereo\n");
+                msp3400_dbg("mono setstereo\n");
                 return;
         }
 
         /* switch audio */
-        switch (audmode) {
+        switch (best_video_sound(mode)) {
         case V4L2_TUNER_MODE_STEREO:
                 src = 0x0020 | nicam;
                 break;
         case V4L2_TUNER_MODE_MONO:
                 if (msp->mode == MSP_MODE_AM_NICAM) {
-                        dprintk("msp3400: switching to AM mono\n");
+                        msp3400_dbg("switching to AM mono\n");
                         /* AM mono decoding is handled by tuner, not MSP chip */
                         /* SCART switching control register */
                         msp3400c_set_scart(client,SCART_MONO,0);
@@ -588,8 +672,7 @@ static void msp3400c_set_audmode(struct i2c_client *client, int audmode)
                 src = 0x0010 | nicam;
                 break;
         }
-        dprintk(KERN_DEBUG
-                "msp3400: setstereo final source/matrix = 0x%x\n", src);
+        msp3400_dbg("setstereo final source/matrix = 0x%x\n", src);
 
         if (dolby) {
                 msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,0x0520);
@@ -605,29 +688,55 @@ static void msp3400c_set_audmode(struct i2c_client *client, int audmode)
 }
 
 static void
-msp3400c_print_mode(struct msp3400c *msp)
+msp3400c_print_mode(struct i2c_client *client)
 {
+        struct msp3400c *msp = i2c_get_clientdata(client);
+
         if (msp->main == msp->second) {
-                printk(KERN_DEBUG "msp3400: mono sound carrier: %d.%03d MHz\n",
+                msp3400_dbg("mono sound carrier: %d.%03d MHz\n",
                        msp->main/910000,(msp->main/910)%1000);
         } else {
-                printk(KERN_DEBUG "msp3400: main sound carrier: %d.%03d MHz\n",
+                msp3400_dbg("main sound carrier: %d.%03d MHz\n",
                        msp->main/910000,(msp->main/910)%1000);
         }
-        if (msp->mode == MSP_MODE_FM_NICAM1 ||
-            msp->mode == MSP_MODE_FM_NICAM2)
-                printk(KERN_DEBUG "msp3400: NICAM/FM carrier   : %d.%03d MHz\n",
+        if (msp->mode == MSP_MODE_FM_NICAM1 || msp->mode == MSP_MODE_FM_NICAM2)
+                msp3400_dbg("NICAM/FM carrier   : %d.%03d MHz\n",
                        msp->second/910000,(msp->second/910)%1000);
         if (msp->mode == MSP_MODE_AM_NICAM)
-                printk(KERN_DEBUG "msp3400: NICAM/AM carrier   : %d.%03d MHz\n",
+                msp3400_dbg("NICAM/AM carrier   : %d.%03d MHz\n",
                        msp->second/910000,(msp->second/910)%1000);
         if (msp->mode == MSP_MODE_FM_TERRA &&
             msp->main != msp->second) {
-                printk(KERN_DEBUG "msp3400: FM-stereo carrier : %d.%03d MHz\n",
+                msp3400_dbg("FM-stereo carrier : %d.%03d MHz\n",
                        msp->second/910000,(msp->second/910)%1000);
         }
 }
 
+#define MSP3400_MAX 4
+static struct i2c_client *msps[MSP3400_MAX];
+static void msp3400c_restore_dfp(struct i2c_client *client)
+{
+        struct msp3400c *msp = i2c_get_clientdata(client);
+        int i;
+
+        for (i = 0; i < DFP_COUNT; i++) {
+                if (-1 == msp->dfp_regs[i])
+                        continue;
+                msp3400c_write(client, I2C_MSP3400C_DFP, i, msp->dfp_regs[i]);
+        }
+}
+
+/* if the dfp_regs is set, set what's in there. Otherwise, set the default value */
+static int msp3400c_write_dfp_with_default(struct i2c_client *client,
+                                        int addr, int default_value)
+{
+        struct msp3400c *msp = i2c_get_clientdata(client);
+        int value = default_value;
+        if (addr < DFP_COUNT && -1 != msp->dfp_regs[addr])
+                value = msp->dfp_regs[addr];
+        return msp3400c_write(client, I2C_MSP3400C_DFP, addr, value);
+}
+
 /* ----------------------------------------------------------------------- */
 
 struct REGISTER_DUMP {
@@ -635,8 +744,15 @@ struct REGISTER_DUMP {
         char *name;
 };
 
-static int
-autodetect_stereo(struct i2c_client *client)
+struct REGISTER_DUMP d1[] = {
+        {0x007e, "autodetect"},
+        {0x0023, "C_AD_BITS "},
+        {0x0038, "ADD_BITS  "},
+        {0x003e, "CIB_BITS  "},
+        {0x0057, "ERROR_RATE"},
+};
+
+static int autodetect_stereo(struct i2c_client *client)
 {
         struct msp3400c *msp = i2c_get_clientdata(client);
         int val;
@@ -649,8 +765,7 @@ autodetect_stereo(struct i2c_client *client)
                 val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x18);
                 if (val > 32767)
                         val -= 65536;
-                dprintk(KERN_DEBUG
-                        "msp34xx: stereo detect register: %d\n",val);
+                msp3400_dbg("stereo detect register: %d\n",val);
                 if (val > 4096) {
                         rxsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
                 } else if (val < -4096) {
@@ -664,8 +779,7 @@ autodetect_stereo(struct i2c_client *client)
         case MSP_MODE_FM_NICAM2:
         case MSP_MODE_AM_NICAM:
                 val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x23);
-                dprintk(KERN_DEBUG
-                        "msp34xx: nicam sync=%d, mode=%d\n",
+                msp3400_dbg("nicam sync=%d, mode=%d\n",
                         val & 1, (val & 0x1e) >> 1);
 
                 if (val & 1) {
@@ -698,8 +812,7 @@ autodetect_stereo(struct i2c_client *client)
                 break;
         case MSP_MODE_BTSC:
                 val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x200);
-                dprintk(KERN_DEBUG
-                        "msp3410: status=0x%x (pri=%s, sec=%s, %s%s%s)\n",
+                msp3400_dbg("status=0x%x (pri=%s, sec=%s, %s%s%s)\n",
                         val,
                         (val & 0x0002) ? "no"     : "yes",
                         (val & 0x0004) ? "no"     : "yes",
@@ -713,13 +826,13 @@ autodetect_stereo(struct i2c_client *client)
         }
         if (rxsubchans != msp->rxsubchans) {
                 update = 1;
-                dprintk(KERN_DEBUG "msp34xx: watch: rxsubchans %d => %d\n",
+                msp3400_dbg("watch: rxsubchans %d => %d\n",
                         msp->rxsubchans,rxsubchans);
                 msp->rxsubchans = rxsubchans;
         }
         if (newnicam != msp->nicam_on) {
                 update = 1;
-                dprintk(KERN_DEBUG "msp34xx: watch: nicam %d => %d\n",
+                msp3400_dbg("watch: nicam %d => %d\n",
                         msp->nicam_on,newnicam);
                 msp->nicam_on = newnicam;
         }
@@ -756,8 +869,15 @@ static void watch_stereo(struct i2c_client *client)
 {
         struct msp3400c *msp = i2c_get_clientdata(client);
 
-        if (autodetect_stereo(client))
-                msp3400c_set_audmode(client,best_audio_mode(msp->rxsubchans));
+        if (autodetect_stereo(client)) {
+                if (msp->stereo & V4L2_TUNER_MODE_STEREO)
+                        msp3400c_setstereo(client, V4L2_TUNER_MODE_STEREO);
+                else if (msp->stereo & VIDEO_SOUND_LANG1)
+                        msp3400c_setstereo(client, V4L2_TUNER_MODE_LANG1);
+                else
+                        msp3400c_setstereo(client, V4L2_TUNER_MODE_MONO);
+        }
+
         if (once)
                 msp->watch_stereo = 0;
 }
@@ -769,14 +889,14 @@ static int msp3400c_thread(void *data)
         struct CARRIER_DETECT *cd;
         int count, max1,max2,val1,val2, val,this;
 
-        printk("msp3400: kthread started\n");
+        msp3400_info("msp3400 daemon started\n");
         for (;;) {
-                d2printk("msp3400: thread: sleep\n");
+                msp3400_dbg_mediumvol("msp3400 thread: sleep\n");
                 msp34xx_sleep(msp,-1);
-                d2printk("msp3400: thread: wakeup\n");
+                msp3400_dbg_mediumvol("msp3400 thread: wakeup\n");
 
         restart:
-                dprintk("msp3410: thread: restart scan\n");
+                msp3400_dbg("thread: restart scan\n");
                 msp->restart = 0;
                 if (kthread_should_stop())
                         break;
@@ -784,9 +904,8 @@ static int msp3400c_thread(void *data)
                 if (VIDEO_MODE_RADIO == msp->norm ||
                     MSP_MODE_EXTERN  == msp->mode) {
                         /* no carrier scan, just unmute */
-                        printk("msp3400: thread: no carrier scan\n");
-                        msp3400c_setvolume(client, msp->muted,
-                                           msp->volume, msp->balance);
+                        msp3400_info("thread: no carrier scan\n");
+                        msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
                         continue;
                 }
 
@@ -802,13 +921,14 @@ static int msp3400c_thread(void *data)
                         goto restart;
 
                 /* carrier detect pass #1 -- main carrier */
-                cd = carrier_detect_main; count = CARRIER_COUNT(carrier_detect_main);
+                cd = carrier_detect_main;
+                count = CARRIER_COUNT(carrier_detect_main);
 
                 if (amsound && (msp->norm == VIDEO_MODE_SECAM)) {
                         /* autodetect doesn't work well with AM ... */
                         max1 = 3;
                         count = 0;
-                        dprintk("msp3400: AM sound override\n");
+                        msp3400_dbg("AM sound override\n");
                 }
 
                 for (this = 0; this < count; this++) {
@@ -820,7 +940,7 @@ static int msp3400c_thread(void *data)
                                 val -= 65536;
                         if (val1 < val)
                                 val1 = val, max1 = this;
-                        dprintk("msp3400: carrier1 val: %5d / %s\n", val,cd[this].name);
+                        msp3400_dbg("carrier1 val: %5d / %s\n", val,cd[this].name);
                 }
 
                 /* carrier detect pass #2 -- second (stereo) carrier */
@@ -836,13 +956,16 @@ static int msp3400c_thread(void *data)
                 case 0: /* 4.5 */
                 case 2: /* 6.0 */
                 default:
-                        cd = NULL; count = 0;
+                        cd = NULL;
+                        count = 0;
                         break;
                 }
 
                 if (amsound && (msp->norm == VIDEO_MODE_SECAM)) {
                         /* autodetect doesn't work well with AM ... */
-                        cd = NULL; count = 0; max2 = 0;
+                        cd = NULL;
+                        count = 0;
+                        max2 = 0;
                 }
                 for (this = 0; this < count; this++) {
                         msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo);
@@ -853,7 +976,7 @@ static int msp3400c_thread(void *data)
                                 val -= 65536;
                         if (val2 < val)
                                 val2 = val, max2 = this;
-                        dprintk("msp3400: carrier2 val: %5d / %s\n", val,cd[this].name);
+                        msp3400_dbg("carrier2 val: %5d / %s\n", val,cd[this].name);
                 }
 
                 /* programm the msp3400 according to the results */
@@ -865,7 +988,7 @@ static int msp3400c_thread(void *data)
                                 msp->second = carrier_detect_55[max2].cdo;
                                 msp3400c_setmode(client, MSP_MODE_FM_TERRA);
                                 msp->nicam_on = 0;
-                                msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
+                                msp3400c_setstereo(client, V4L2_TUNER_MODE_MONO);
                                 msp->watch_stereo = 1;
                         } else if (max2 == 1 && HAVE_NICAM(msp)) {
                                 /* B/G NICAM */
@@ -892,7 +1015,7 @@ static int msp3400c_thread(void *data)
                                 msp->second = carrier_detect_65[max2].cdo;
                                 msp3400c_setmode(client, MSP_MODE_FM_TERRA);
                                 msp->nicam_on = 0;
-                                msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
+                                msp3400c_setstereo(client, V4L2_TUNER_MODE_MONO);
                                 msp->watch_stereo = 1;
                         } else if (max2 == 0 &&
                                    msp->norm == VIDEO_MODE_SECAM) {
@@ -900,7 +1023,7 @@ static int msp3400c_thread(void *data)
                                 msp->second = carrier_detect_65[max2].cdo;
                                 msp3400c_setmode(client, MSP_MODE_AM_NICAM);
                                 msp->nicam_on = 0;
-                                msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
+                                msp3400c_setstereo(client, V4L2_TUNER_MODE_MONO);
                                 msp3400c_setcarrier(client, msp->second, msp->main);
                                 /* volume prescale for SCART (AM mono input) */
                                 msp3400c_write(client,I2C_MSP3400C_DFP, 0x000d, 0x1900);
@@ -924,15 +1047,16 @@ static int msp3400c_thread(void *data)
                         msp->nicam_on = 0;
                         msp3400c_setcarrier(client, msp->second, msp->main);
                         msp->rxsubchans = V4L2_TUNER_SUB_MONO;
-                        msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
+                        msp3400c_setstereo(client, V4L2_TUNER_MODE_MONO);
                         break;
                 }
 
                 /* unmute */
-                msp3400c_setvolume(client, msp->muted,
-                                   msp->volume, msp->balance);
+                msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
+                msp3400c_restore_dfp(client);
+
                 if (debug)
-                        msp3400c_print_mode(msp);
+                        msp3400c_print_mode(client);
 
                 /* monitor tv audio mode */
                 while (msp->watch_stereo) {
@@ -941,7 +1065,7 @@ static int msp3400c_thread(void *data)
                         watch_stereo(client);
                 }
         }
-        dprintk(KERN_DEBUG "msp3400: thread: exit\n");
+        msp3400_dbg("thread: exit\n");
         return 0;
 }
 
@@ -985,10 +1109,12 @@ static inline const char *msp34xx_standard_mode_name(int mode)
         return "unknown";
 }
 
-static int msp34xx_modus(int norm)
+static int msp34xx_modus(struct i2c_client *client, int norm)
 {
         switch (norm) {
         case VIDEO_MODE_PAL:
+                msp3400_dbg("video mode selected to PAL\n");
+
 #if 1
                 /* experimental: not sure this works with all chip versions */
                 return 0x7003;
@@ -997,12 +1123,16 @@ static int msp34xx_modus(int norm)
                 return 0x1003;
 #endif
         case VIDEO_MODE_NTSC:  /* BTSC */
+                msp3400_dbg("video mode selected to NTSC\n");
                 return 0x2003;
         case VIDEO_MODE_SECAM:
+                msp3400_dbg("video mode selected to SECAM\n");
                 return 0x0003;
         case VIDEO_MODE_RADIO:
+                msp3400_dbg("video mode selected to Radio\n");
                 return 0x0003;
         case VIDEO_MODE_AUTO:
+                msp3400_dbg("video mode selected to Auto\n");
                 return 0x2003;
         default:
                 return 0x0003;
@@ -1031,23 +1161,22 @@ static int msp3410d_thread(void *data)
         struct msp3400c *msp = i2c_get_clientdata(client);
         int mode,val,i,std;
 
-        printk("msp3410: daemon started\n");
+        msp3400_info("msp3410 daemon started\n");
         for (;;) {
-                d2printk(KERN_DEBUG "msp3410: thread: sleep\n");
+                msp3400_dbg_mediumvol("msp3410 thread: sleep\n");
                 msp34xx_sleep(msp,-1);
-                d2printk(KERN_DEBUG "msp3410: thread: wakeup\n");
+                msp3400_dbg_mediumvol("msp3410 thread: wakeup\n");
 
         restart:
-                dprintk("msp3410: thread: restart scan\n");
+                msp3400_dbg("thread: restart scan\n");
                 msp->restart = 0;
                 if (kthread_should_stop())
                         break;
 
                 if (msp->mode == MSP_MODE_EXTERN) {
                         /* no carrier scan needed, just unmute */
-                        dprintk(KERN_DEBUG "msp3410: thread: no carrier scan\n");
-                        msp3400c_setvolume(client, msp->muted,
-                                           msp->volume, msp->balance);
+                        msp3400_dbg("thread: no carrier scan\n");
+                msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
                         continue;
                 }
 
@@ -1059,14 +1188,14 @@ static int msp3410d_thread(void *data)
                         goto restart;
 
                 /* start autodetect */
-                mode = msp34xx_modus(msp->norm);
+                mode = msp34xx_modus(client, msp->norm);
                 std  = msp34xx_standard(msp->norm);
                 msp3400c_write(client, I2C_MSP3400C_DEM, 0x30, mode);
                 msp3400c_write(client, I2C_MSP3400C_DEM, 0x20, std);
                 msp->watch_stereo = 0;
 
                 if (debug)
-                        printk(KERN_DEBUG "msp3410: setting mode: %s (0x%04x)\n",
+                        msp3400_dbg("setting mode: %s (0x%04x)\n",
                                msp34xx_standard_mode_name(std) ,std);
 
                 if (std != 1) {
@@ -1082,13 +1211,13 @@ static int msp3410d_thread(void *data)
                                 val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x7e);
                                 if (val < 0x07ff)
                                         break;
-                                dprintk(KERN_DEBUG "msp3410: detection still in progress\n");
+                                msp3400_dbg("detection still in progress\n");
                         }
                 }
                 for (i = 0; modelist[i].name != NULL; i++)
                         if (modelist[i].retval == val)
                                 break;
-                dprintk(KERN_DEBUG "msp3410: current mode: %s (0x%04x)\n",
+                msp3400_dbg("current mode: %s (0x%04x)\n",
                         modelist[i].name ? modelist[i].name : "unknown",
                         val);
                 msp->main   = modelist[i].main;
@@ -1096,7 +1225,7 @@ static int msp3410d_thread(void *data)
 
                 if (amsound && (msp->norm == VIDEO_MODE_SECAM) && (val != 0x0009)) {
                         /* autodetection has failed, let backup */
-                        dprintk(KERN_DEBUG "msp3410: autodetection failed,"
+                        msp3400_dbg("autodetection failed,"
                                 " switching to backup mode: %s (0x%04x)\n",
                                 modelist[8].name ? modelist[8].name : "unknown",val);
                         val = 0x0009;
@@ -1120,13 +1249,13 @@ static int msp3410d_thread(void *data)
                         msp->rxsubchans = V4L2_TUNER_SUB_STEREO;
                         msp->nicam_on = 1;
                         msp->watch_stereo = 1;
-                        msp3400c_set_audmode(client,V4L2_TUNER_MODE_STEREO);
+                        msp3400c_setstereo(client,V4L2_TUNER_MODE_STEREO);
                         break;
                 case 0x0009:
                         msp->mode = MSP_MODE_AM_NICAM;
                         msp->rxsubchans = V4L2_TUNER_SUB_MONO;
                         msp->nicam_on = 1;
-                        msp3400c_set_audmode(client,V4L2_TUNER_MODE_MONO);
+                        msp3400c_setstereo(client,V4L2_TUNER_MODE_MONO);
                         msp->watch_stereo = 1;
                         break;
                 case 0x0020: /* BTSC */
@@ -1135,7 +1264,7 @@ static int msp3410d_thread(void *data)
                         msp->rxsubchans = V4L2_TUNER_SUB_STEREO;
                         msp->nicam_on = 0;
                         msp->watch_stereo = 1;
-                        msp3400c_set_audmode(client,V4L2_TUNER_MODE_STEREO);
+                        msp3400c_setstereo(client,V4L2_TUNER_MODE_STEREO);
                         break;
                 case 0x0040: /* FM radio */
                         msp->mode   = MSP_MODE_FM_RADIO;
@@ -1169,9 +1298,10 @@ static int msp3410d_thread(void *data)
                 /* unmute, restore misc registers */
                 msp3400c_setbass(client, msp->bass);
                 msp3400c_settreble(client, msp->treble);
-                msp3400c_setvolume(client, msp->muted,
-                                    msp->volume, msp->balance);
-                msp3400c_write(client, I2C_MSP3400C_DFP, 0x0013, msp->acb);
+                msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
+                msp3400c_write(client, I2C_MSP3400C_DFP, 0x13, msp->acb);
+                msp3400c_write(client,I2C_MSP3400C_DEM, 0x40, msp->i2s_mode);
+                msp3400c_restore_dfp(client);
 
                 /* monitor tv audio mode */
                 while (msp->watch_stereo) {
@@ -1180,7 +1310,7 @@ static int msp3410d_thread(void *data)
                         watch_stereo(client);
                 }
         }
-        dprintk(KERN_DEBUG "msp3410: thread: exit\n");
+        msp3400_dbg("thread: exit\n");
         return 0;
 }
 
@@ -1195,7 +1325,7 @@ static void msp34xxg_set_source(struct i2c_client *client, int source);
 /* (re-)initialize the msp34xxg, according to the current norm in msp->norm
  * return 0 if it worked, -1 if it failed
  */
-static int msp34xxg_init(struct i2c_client *client)
+static int msp34xxg_reset(struct i2c_client *client)
 {
         struct msp3400c *msp = i2c_get_clientdata(client);
         int modus,std;
@@ -1210,8 +1340,10 @@ static int msp34xxg_init(struct i2c_client *client)
                            0x0f20 /* mute DSP input, mute SCART 1 */))
                 return -1;
 
+        msp3400c_write(client,I2C_MSP3400C_DEM, 0x40, msp->i2s_mode);
+
         /* step-by-step initialisation, as described in the manual */
-        modus = msp34xx_modus(msp->norm);
+        modus = msp34xx_modus(client, msp->norm);
         std   = msp34xx_standard(msp->norm);
         modus &= ~0x03; /* STATUS_CHANGE=0 */
         modus |= 0x01;  /* AUTOMATIC_SOUND_DETECTION=1 */
@@ -1222,7 +1354,7 @@ static int msp34xxg_init(struct i2c_client *client)
                 return -1;
         if (msp3400c_write(client,
                            I2C_MSP3400C_DEM,
-                           0x20/*stanard*/,
+                           0x20/*standard*/,
                            std))
                 return -1;
 
@@ -1230,21 +1362,18 @@ static int msp34xxg_init(struct i2c_client *client)
            standard/audio autodetection right now */
         msp34xxg_set_source(client, msp->source);
 
-        if (msp3400c_write(client, I2C_MSP3400C_DFP,
-                           0x0e, /* AM/FM Prescale */
-                           0x3000 /* default: [15:8] 75khz deviation */))
+        if (msp3400c_write_dfp_with_default(client, 0x0e,       /* AM/FM Prescale */
+                                            0x3000
+                                            /* default: [15:8] 75khz deviation */
+            ))
                 return -1;
 
-        if (msp3400c_write(client, I2C_MSP3400C_DFP,
-                           0x10, /* NICAM Prescale */
-                           0x5a00 /* default: 9db gain (as recommended) */))
+        if (msp3400c_write_dfp_with_default(client, 0x10,       /* NICAM Prescale */
+                                            0x5a00
+                                            /* default: 9db gain (as recommended) */
+            ))
                 return -1;
 
-        if (msp3400c_write(client,
-                           I2C_MSP3400C_DEM,
-                           0x20, /* STANDARD SELECT  */
-                           standard /* default: 0x01 for automatic standard select*/))
-                return -1;
         return 0;
 }
 
@@ -1254,27 +1383,27 @@ static int msp34xxg_thread(void *data)
         struct msp3400c *msp = i2c_get_clientdata(client);
         int val, std, i;
 
-        printk("msp34xxg: daemon started\n");
+        msp3400_info("msp34xxg daemon started\n");
         msp->source = 1; /* default */
         for (;;) {
-                d2printk(KERN_DEBUG "msp34xxg: thread: sleep\n");
+                msp3400_dbg_mediumvol("msp34xxg thread: sleep\n");
                 msp34xx_sleep(msp,-1);
-                d2printk(KERN_DEBUG "msp34xxg: thread: wakeup\n");
+                msp3400_dbg_mediumvol("msp34xxg thread: wakeup\n");
 
         restart:
-                dprintk("msp34xxg: thread: restart scan\n");
+                msp3400_dbg("thread: restart scan\n");
                 msp->restart = 0;
                 if (kthread_should_stop())
                         break;
 
                 /* setup the chip*/
-                msp34xxg_init(client);
+                msp34xxg_reset(client);
                 std = standard;
                 if (std != 0x01)
                         goto unmute;
 
                 /* watch autodetect */
-                dprintk("msp34xxg: triggered autodetect, waiting for result\n");
+                msp3400_dbg("triggered autodetect, waiting for result\n");
                 for (i = 0; i < 10; i++) {
                         if (msp34xx_sleep(msp,100))
                                 goto restart;
@@ -1285,23 +1414,23 @@ static int msp34xxg_thread(void *data)
                                 std = val;
                                 break;
                         }
-                        dprintk("msp34xxg: detection still in progress\n");
+                        msp3400_dbg("detection still in progress\n");
                 }
                 if (0x01 == std) {
-                        dprintk("msp34xxg: detection still in progress after 10 tries. giving up.\n");
+                        msp3400_dbg("detection still in progress after 10 tries. giving up.\n");
                         continue;
                 }
 
         unmute:
-                dprintk("msp34xxg: current mode: %s (0x%04x)\n",
+                msp3400_dbg("current mode: %s (0x%04x)\n",
                         msp34xx_standard_mode_name(std), std);
 
                 /* unmute: dispatch sound to scart output, set scart volume */
-                dprintk("msp34xxg: unmute\n");
+                msp3400_dbg("unmute\n");
 
                 msp3400c_setbass(client, msp->bass);
                 msp3400c_settreble(client, msp->treble);
-                msp3400c_setvolume(client, msp->muted, msp->volume, msp->balance);
+                msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
 
                 /* restore ACB */
                 if (msp3400c_write(client,
@@ -1309,8 +1438,10 @@ static int msp34xxg_thread(void *data)
                                    0x13, /* ACB */
                                    msp->acb))
                         return -1;
+
+                msp3400c_write(client,I2C_MSP3400C_DEM, 0x40, msp->i2s_mode);
         }
-        dprintk(KERN_DEBUG "msp34xxg: thread: exit\n");
+        msp3400_dbg("thread: exit\n");
         return 0;
 }
 
@@ -1329,7 +1460,7 @@ static void msp34xxg_set_source(struct i2c_client *client, int source)
          * for MONO (source==0) downmixing set bit[7:0] to 0x30
          */
         int value = (source&0x07)<<8|(source==0 ? 0x30:0x20);
-        dprintk("msp34xxg: set source to %d (0x%x)\n", source, value);
+        msp3400_dbg("set source to %d (0x%x)\n", source, value);
         msp3400c_write(client,
                        I2C_MSP3400C_DFP,
                        0x08, /* Loudspeaker Output */
@@ -1380,7 +1511,7 @@ static void msp34xxg_detect_stereo(struct i2c_client *client)
                  * this is a problem, I'll handle SAP just like lang1/lang2.
                  */
         }
-        dprintk("msp34xxg: status=0x%x, stereo=%d, bilingual=%d -> rxsubchans=%d\n",
+        msp3400_dbg("status=0x%x, stereo=%d, bilingual=%d -> rxsubchans=%d\n",
                 status, is_stereo, is_bilingual, msp->rxsubchans);
 }
 
@@ -1427,7 +1558,7 @@ static void msp_wake_thread(struct i2c_client *client);
 
 static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
-        .name           = "i2c msp3400 driver",
+        .name           = "msp3400",
         .id             = I2C_DRIVERID_MSP3400,
         .flags          = I2C_DF_NOTIFY,
         .attach_adapter = msp_probe,
@@ -1449,57 +1580,64 @@ static struct i2c_client client_template =
 static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct msp3400c *msp;
-        struct i2c_client *c;
+        struct i2c_client *client = &client_template;
         int (*thread_func)(void *data) = NULL;
+        int i;
 
-        client_template.adapter = adap;
-        client_template.addr = addr;
+        client_template.adapter = adap;
+        client_template.addr = addr;
 
-        if (-1 == msp3400c_reset(&client_template)) {
-                dprintk("msp34xx: no chip found\n");
-                return -1;
-        }
+        if (-1 == msp3400c_reset(&client_template)) {
+                msp3400_dbg("no chip found\n");
+                return -1;
+        }
 
-        if (NULL == (c = kmalloc(sizeof(struct i2c_client),GFP_KERNEL)))
-                return -ENOMEM;
-        memcpy(c,&client_template,sizeof(struct i2c_client));
+        if (NULL == (client = kmalloc(sizeof(struct i2c_client),GFP_KERNEL)))
+                return -ENOMEM;
+        memcpy(client,&client_template,sizeof(struct i2c_client));
         if (NULL == (msp = kmalloc(sizeof(struct msp3400c),GFP_KERNEL))) {
-                kfree(c);
+                kfree(client);
                 return -ENOMEM;
         }
 
         memset(msp,0,sizeof(struct msp3400c));
-        msp->volume  = 58880;  /* 0db gain */
-        msp->balance = 32768;
-        msp->bass    = 32768;
-        msp->treble  = 32768;
-        msp->input   = -1;
-        msp->muted   = 1;
-
-        i2c_set_clientdata(c, msp);
+        msp->norm = VIDEO_MODE_NTSC;
+        msp->left = 58880;      /* 0db gain */
+        msp->right = 58880;     /* 0db gain */
+        msp->bass = 32768;
+        msp->treble = 32768;
+        msp->input = -1;
+        msp->muted = 0;
+        msp->i2s_mode = 0;
+        for (i = 0; i < DFP_COUNT; i++)
+                msp->dfp_regs[i] = -1;
+
+        i2c_set_clientdata(client, msp);
         init_waitqueue_head(&msp->wq);
 
-        if (-1 == msp3400c_reset(c)) {
+        if (-1 == msp3400c_reset(client)) {
                 kfree(msp);
-                kfree(c);
-                dprintk("msp34xx: no chip found\n");
+                kfree(client);
+                msp3400_dbg("no chip found\n");
                 return -1;
         }
 
-        msp->rev1 = msp3400c_read(c, I2C_MSP3400C_DFP, 0x1e);
+        msp->rev1 = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1e);
         if (-1 != msp->rev1)
-                msp->rev2 = msp3400c_read(c, I2C_MSP3400C_DFP, 0x1f);
+                msp->rev2 = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1f);
         if ((-1 == msp->rev1) || (0 == msp->rev1 && 0 == msp->rev2)) {
                 kfree(msp);
-                kfree(c);
-                dprintk("msp34xx: error while reading chip version\n");
+                kfree(client);
+                msp3400_dbg("error while reading chip version\n");
                 return -1;
         }
+        msp3400_dbg("rev1=0x%04x, rev2=0x%04x\n", msp->rev1, msp->rev2);
 
-        msp3400c_setvolume(c, msp->muted, msp->volume, msp->balance);
+        msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
 
-        snprintf(c->name, sizeof(c->name), "MSP34%02d%c-%c%d",
-                 (msp->rev2>>8)&0xff, (msp->rev1&0xff)+'@',
+        snprintf(client->name, sizeof(client->name), "MSP%c4%02d%c-%c%d",
+                 ((msp->rev1>>4)&0x0f) + '3',
+                 (msp->rev2>>8)&0xff, (msp->rev1&0x0f)+'@',
                  ((msp->rev1>>8)&0xff)+'@', msp->rev2&0x1f);
 
         msp->opmode = opmode;
@@ -1513,7 +1651,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
         }
 
         /* hello world :-) */
-        printk(KERN_INFO "msp34xx: init: chip=%s", c->name);
+        msp3400_info("chip=%s", client->name);
         if (HAVE_NICAM(msp))
                 printk(" +nicam");
         if (HAVE_SIMPLE(msp))
@@ -1542,29 +1680,49 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
 
         /* startup control thread if needed */
         if (thread_func) {
-                msp->kthread = kthread_run(thread_func, c, "msp34xx");
+                msp->kthread = kthread_run(thread_func, client, "msp34xx");
+
                 if (NULL == msp->kthread)
-                        printk(KERN_WARNING "msp34xx: kernel_thread() failed\n");
-                msp_wake_thread(c);
+                        msp3400_warn("kernel_thread() failed\n");
+                msp_wake_thread(client);
         }
 
         /* done */
-        i2c_attach_client(c);
+        i2c_attach_client(client);
+
+        /* update our own array */
+        for (i = 0; i < MSP3400_MAX; i++) {
+                if (NULL == msps[i]) {
+                        msps[i] = client;
+                        break;
+                }
+        }
+
         return 0;
 }
 
 static int msp_detach(struct i2c_client *client)
 {
         struct msp3400c *msp  = i2c_get_clientdata(client);
+        int i;
 
         /* shutdown control thread */
-        if (msp->kthread >= 0) {
+        if (msp->kthread) {
                 msp->restart = 1;
                 kthread_stop(msp->kthread);
         }
-        msp3400c_reset(client);
+        msp3400c_reset(client);
+
+        /* update our own array */
+        for (i = 0; i < MSP3400_MAX; i++) {
+                if (client == msps[i]) {
+                        msps[i] = NULL;
+                        break;
+                }
+        }
 
         i2c_detach_client(client);
+
         kfree(msp);
         kfree(client);
         return 0;
@@ -1640,7 +1798,7 @@ static void msp_any_set_audmode(struct i2c_client *client, int audmode)
         case OPMODE_MANUAL:
         case OPMODE_SIMPLE:
                 msp->watch_stereo = 0;
-                msp3400c_set_audmode(client, audmode);
+                msp3400c_setstereo(client, audmode);
                 break;
         case OPMODE_SIMPLER:
                 msp34xxg_set_audmode(client, audmode);
@@ -1648,16 +1806,18 @@ static void msp_any_set_audmode(struct i2c_client *client, int audmode)
         }
 }
 
+
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
         struct msp3400c *msp  = i2c_get_clientdata(client);
-        __u16           *sarg = arg;
+        __u16           *sarg = arg;
         int scart = 0;
 
         switch (cmd) {
 
         case AUDC_SET_INPUT:
-                dprintk(KERN_DEBUG "msp34xx: AUDC_SET_INPUT(%d)\n",*sarg);
+                msp3400_dbg("AUDC_SET_INPUT(%d)\n",*sarg);
+
                 if (*sarg == msp->input)
                         break;
                 msp->input = *sarg;
@@ -1691,15 +1851,15 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         msp3400c_set_scart(client,scart,0);
                         msp3400c_write(client,I2C_MSP3400C_DFP,0x000d,0x1900);
                         if (msp->opmode != OPMODE_SIMPLER)
-                                msp3400c_set_audmode(client, msp->audmode);
+                                msp3400c_setstereo(client, msp->audmode);
                 }
                 msp_wake_thread(client);
                 break;
 
         case AUDC_SET_RADIO:
-                dprintk(KERN_DEBUG "msp34xx: AUDC_SET_RADIO\n");
+                msp3400_dbg("AUDC_SET_RADIO\n");
                 msp->norm = VIDEO_MODE_RADIO;
-                dprintk(KERN_DEBUG "msp34xx: switching to radio mode\n");
+                msp3400_dbg("switching to radio mode\n");
                 msp->watch_stereo = 0;
                 switch (msp->opmode) {
                 case OPMODE_MANUAL:
@@ -1707,8 +1867,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         msp3400c_setmode(client,MSP_MODE_FM_RADIO);
                         msp3400c_setcarrier(client, MSP_CARRIER(10.7),
                                             MSP_CARRIER(10.7));
-                        msp3400c_setvolume(client, msp->muted,
-                                           msp->volume, msp->balance);
+                        msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
                         break;
                 case OPMODE_SIMPLE:
                 case OPMODE_SIMPLER:
@@ -1717,6 +1876,30 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         break;
                 }
                 break;
+                /* work-in-progress:  hook to control the DFP registers */
+        case MSP_SET_DFPREG:
+        {
+                struct msp_dfpreg *r = arg;
+                int i;
+
+                if (r->reg < 0 || r->reg >= DFP_COUNT)
+                        return -EINVAL;
+                for (i = 0; i < sizeof(bl_dfp) / sizeof(int); i++)
+                        if (r->reg == bl_dfp[i])
+                                return -EINVAL;
+                msp->dfp_regs[r->reg] = r->value;
+                msp3400c_write(client, I2C_MSP3400C_DFP, r->reg, r->value);
+                return 0;
+        }
+        case MSP_GET_DFPREG:
+        {
+                struct msp_dfpreg *r = arg;
+
+                if (r->reg < 0 || r->reg >= DFP_COUNT)
+                        return -EINVAL;
+                r->value = msp3400c_read(client, I2C_MSP3400C_DFP, r->reg);
+                return 0;
+        }
 
         /* --- v4l ioctls --- */
         /* take care: bttv does userspace copying, we'll get a
@@ -1725,7 +1908,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 struct video_audio *va = arg;
 
-                dprintk(KERN_DEBUG "msp34xx: VIDIOCGAUDIO\n");
+                msp3400_dbg("VIDIOCGAUDIO\n");
                 va->flags |= VIDEO_AUDIO_VOLUME |
                         VIDEO_AUDIO_BASS |
                         VIDEO_AUDIO_TREBLE |
@@ -1733,8 +1916,15 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 if (msp->muted)
                         va->flags |= VIDEO_AUDIO_MUTE;
 
-                va->volume = msp->volume;
-                va->balance = (va->volume) ? msp->balance : 32768;
+                if (msp->muted)
+                        va->flags |= VIDEO_AUDIO_MUTE;
+                va->volume = MAX(msp->left, msp->right);
+                va->balance = (32768 * MIN(msp->left, msp->right)) /
+                    (va->volume ? va->volume : 1);
+                va->balance = (msp->left < msp->right) ?
+                    (65535 - va->balance) : va->balance;
+                if (0 == va->volume)
+                        va->balance = 32768;
                 va->bass = msp->bass;
                 va->treble = msp->treble;
 
@@ -1746,27 +1936,43 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 struct video_audio *va = arg;
 
-                dprintk(KERN_DEBUG "msp34xx: VIDIOCSAUDIO\n");
+                msp3400_dbg("VIDIOCSAUDIO\n");
                 msp->muted = (va->flags & VIDEO_AUDIO_MUTE);
-                msp->volume = va->volume;
-                msp->balance = va->balance;
+                msp->left = (MIN(65536 - va->balance, 32768) *
+                             va->volume) / 32768;
+                msp->right = (MIN(va->balance, 32768) * va->volume) / 32768;
                 msp->bass = va->bass;
                 msp->treble = va->treble;
-
-                msp3400c_setvolume(client, msp->muted,
-                                   msp->volume, msp->balance);
-                msp3400c_setbass(client,msp->bass);
-                msp3400c_settreble(client,msp->treble);
+                msp3400_dbg("VIDIOCSAUDIO setting va->volume to %d\n",
+                        va->volume);
+                msp3400_dbg("VIDIOCSAUDIO setting va->balance to %d\n",
+                        va->balance);
+                msp3400_dbg("VIDIOCSAUDIO setting va->flags to %d\n",
+                        va->flags);
+                msp3400_dbg("VIDIOCSAUDIO setting msp->left to %d\n",
+                        msp->left);
+                msp3400_dbg("VIDIOCSAUDIO setting msp->right to %d\n",
+                        msp->right);
+                msp3400_dbg("VIDIOCSAUDIO setting msp->bass to %d\n",
+                        msp->bass);
+                msp3400_dbg("VIDIOCSAUDIO setting msp->treble to %d\n",
+                        msp->treble);
+                msp3400_dbg("VIDIOCSAUDIO setting msp->mode to %d\n",
+                        msp->mode);
+                msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
+                msp3400c_setbass(client, msp->bass);
+                msp3400c_settreble(client, msp->treble);
 
                 if (va->mode != 0 && msp->norm != VIDEO_MODE_RADIO)
                         msp_any_set_audmode(client,mode_v4l1_to_v4l2(va->mode));
                 break;
         }
+
         case VIDIOCSCHAN:
         {
                 struct video_channel *vc = arg;
 
-                dprintk(KERN_DEBUG "msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm);
+                msp3400_dbg("VIDIOCSCHAN (norm=%d)\n",vc->norm);
                 msp->norm = vc->norm;
                 msp_wake_thread(client);
                 break;
@@ -1776,12 +1982,135 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
         case VIDIOC_S_FREQUENCY:
         {
                 /* new channel -- kick audio carrier scan */
-                dprintk(KERN_DEBUG "msp34xx: VIDIOCSFREQ\n");
+                msp3400_dbg("VIDIOCSFREQ\n");
                 msp_wake_thread(client);
                 break;
         }
 
+        /* msp34xx specific */
+        case MSP_SET_MATRIX:
+        {
+                struct msp_matrix *mspm = arg;
+
+                msp3400_dbg("MSP_SET_MATRIX\n");
+                msp3400c_set_scart(client, mspm->input, mspm->output);
+                break;
+        }
+
         /* --- v4l2 ioctls --- */
+        case VIDIOC_S_STD:
+        {
+                v4l2_std_id *id = arg;
+
+                /*FIXME: use V4L2 mode flags on msp3400 instead of V4L1*/
+                if (*id & V4L2_STD_PAL) {
+                        msp->norm=VIDEO_MODE_PAL;
+                } else if (*id & V4L2_STD_SECAM) {
+                        msp->norm=VIDEO_MODE_SECAM;
+                } else {
+                        msp->norm=VIDEO_MODE_NTSC;
+                }
+
+                msp_wake_thread(client);
+                return 0;
+        }
+
+        case VIDIOC_ENUMINPUT:
+        {
+                struct v4l2_input *i = arg;
+
+                if (i->index != 0)
+                        return -EINVAL;
+
+                i->type = V4L2_INPUT_TYPE_TUNER;
+                switch (i->index) {
+                case AUDIO_RADIO:
+                        strcpy(i->name,"Radio");
+                        break;
+                case AUDIO_EXTERN_1:
+                        strcpy(i->name,"Extern 1");
+                        break;
+                case AUDIO_EXTERN_2:
+                        strcpy(i->name,"Extern 2");
+                        break;
+                case AUDIO_TUNER:
+                        strcpy(i->name,"Television");
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                return 0;
+        }
+
+        case VIDIOC_G_AUDIO:
+        {
+                struct v4l2_audio *a = arg;
+
+                memset(a,0,sizeof(*a));
+
+                switch (a->index) {
+                case AUDIO_RADIO:
+                        strcpy(a->name,"Radio");
+                        break;
+                case AUDIO_EXTERN_1:
+                        strcpy(a->name,"Extern 1");
+                        break;
+                case AUDIO_EXTERN_2:
+                        strcpy(a->name,"Extern 2");
+                        break;
+                case AUDIO_TUNER:
+                        strcpy(a->name,"Television");
+                        break;
+                default:
+                        return -EINVAL;
+                }
+
+                msp_any_detect_stereo(client);
+                if (msp->audmode == V4L2_TUNER_MODE_STEREO) {
+                        a->capability=V4L2_AUDCAP_STEREO;
+                }
+
+                break;
+        }
+        case VIDIOC_S_AUDIO:
+        {
+                struct v4l2_audio *sarg = arg;
+
+                switch (sarg->index) {
+                case AUDIO_RADIO:
+                        /* Hauppauge uses IN2 for the radio */
+                        msp->mode   = MSP_MODE_FM_RADIO;
+                        scart       = SCART_IN2;
+                        break;
+                case AUDIO_EXTERN_1:
+                        /* IN1 is often used for external input ... */
+                        msp->mode   = MSP_MODE_EXTERN;
+                        scart       = SCART_IN1;
+                        break;
+                case AUDIO_EXTERN_2:
+                        /* ... sometimes it is IN2 through ;) */
+                        msp->mode   = MSP_MODE_EXTERN;
+                        scart       = SCART_IN2;
+                        break;
+                case AUDIO_TUNER:
+                        msp->mode   = -1;
+                        break;
+                }
+                if (scart) {
+                        msp->rxsubchans = V4L2_TUNER_SUB_STEREO;
+                        msp->audmode = V4L2_TUNER_MODE_STEREO;
+                        msp3400c_set_scart(client,scart,0);
+                        msp3400c_write(client,I2C_MSP3400C_DFP,0x000d,0x1900);
+                }
+                if (sarg->capability==V4L2_AUDCAP_STEREO) {
+                        msp->audmode = V4L2_TUNER_MODE_STEREO;
+                } else {
+                        msp->audmode &= ~V4L2_TUNER_MODE_STEREO;
+                }
+                msp_any_set_audmode(client, msp->audmode);
+                msp_wake_thread(client);
+                break;
+        }
         case VIDIOC_G_TUNER:
         {
                 struct v4l2_tuner *vt = arg;
@@ -1804,13 +2133,46 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 break;
         }
 
-        /* msp34xx specific */
-        case MSP_SET_MATRIX:
+        case VIDIOC_G_AUDOUT:
         {
-                struct msp_matrix *mspm = arg;
+                struct v4l2_audioout *a=(struct v4l2_audioout *)arg;
+                int idx=a->index;
+
+                memset(a,0,sizeof(*a));
+
+                switch (idx) {
+                case 0:
+                        strcpy(a->name,"Scart1 Out");
+                        break;
+                case 1:
+                        strcpy(a->name,"Scart2 Out");
+                        break;
+                case 2:
+                        strcpy(a->name,"I2S Out");
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+
+        }
+        case VIDIOC_S_AUDOUT:
+        {
+                struct v4l2_audioout *a=(struct v4l2_audioout *)arg;
+
+                if (a->index<0||a->index>2)
+                        return -EINVAL;
+
+                if (a->index==2) {
+                        if (a->mode == V4L2_AUDMODE_32BITS)
+                                msp->i2s_mode=1;
+                        else
+                                msp->i2s_mode=0;
+                }
+                msp3400_dbg("Setting audio out on msp34xx to input %i, mode %i\n",
+                                                a->index,msp->i2s_mode);
+                msp3400c_set_scart(client,msp->in_scart,a->index+1);
 
-                dprintk(KERN_DEBUG "msp34xx: MSP_SET_MATRIX\n");
-                msp3400c_set_scart(client, mspm->input, mspm->output);
                 break;
         }
 
@@ -1823,19 +2185,19 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static int msp_suspend(struct device * dev, pm_message_t state)
 {
-        struct i2c_client *c = container_of(dev, struct i2c_client, dev);
+        struct i2c_client *client = container_of(dev, struct i2c_client, dev);
 
-        dprintk("msp34xx: suspend\n");
-        msp3400c_reset(c);
+        msp3400_dbg("msp34xx: suspend\n");
+        msp3400c_reset(client);
         return 0;
 }
 
 static int msp_resume(struct device * dev)
 {
-        struct i2c_client *c = container_of(dev, struct i2c_client, dev);
+        struct i2c_client *client = container_of(dev, struct i2c_client, dev);
 
-        dprintk("msp34xx: resume\n");
-        msp_wake_thread(c);
+        msp3400_dbg("msp34xx: resume\n");
+        msp_wake_thread(client);
         return 0;
 }
 
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 972aa5e0aeef..2180018f06de 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -76,17 +76,17 @@ static int mt2032_compute_freq(struct i2c_client *c,
                                unsigned int xogc) //all in Hz
 {
         struct tuner *t = i2c_get_clientdata(c);
-        unsigned int fref,lo1,lo1n,lo1a,s,sel,lo1freq, desired_lo1,
+        unsigned int fref,lo1,lo1n,lo1a,s,sel,lo1freq, desired_lo1,
                 desired_lo2,lo2,lo2n,lo2a,lo2num,lo2freq;
 
-        fref= 5250 *1000; //5.25MHz
+        fref= 5250 *1000; //5.25MHz
         desired_lo1=rfin+if1;
 
         lo1=(2*(desired_lo1/1000)+(fref/1000)) / (2*fref/1000);
-        lo1n=lo1/8;
-        lo1a=lo1-(lo1n*8);
+        lo1n=lo1/8;
+        lo1a=lo1-(lo1n*8);
 
-        s=rfin/1000/1000+1090;
+        s=rfin/1000/1000+1090;
 
         if(optimize_vco) {
                 if(s>1890) sel=0;
@@ -96,34 +96,34 @@ static int mt2032_compute_freq(struct i2c_client *c,
                 else sel=4; // >1090
         }
         else {
-                if(s>1790) sel=0; // <1958
-                else if(s>1617) sel=1;
-                else if(s>1449) sel=2;
-                else if(s>1291) sel=3;
-                else sel=4; // >1090
+                if(s>1790) sel=0; // <1958
+                else if(s>1617) sel=1;
+                else if(s>1449) sel=2;
+                else if(s>1291) sel=3;
+                else sel=4; // >1090
         }
         *ret_sel=sel;
 
-        lo1freq=(lo1a+8*lo1n)*fref;
+        lo1freq=(lo1a+8*lo1n)*fref;
 
         tuner_dbg("mt2032: rfin=%d lo1=%d lo1n=%d lo1a=%d sel=%d, lo1freq=%d\n",
                   rfin,lo1,lo1n,lo1a,sel,lo1freq);
 
-        desired_lo2=lo1freq-rfin-if2;
-        lo2=(desired_lo2)/fref;
-        lo2n=lo2/8;
-        lo2a=lo2-(lo2n*8);
-        lo2num=((desired_lo2/1000)%(fref/1000))* 3780/(fref/1000); //scale to fit in 32bit arith
-        lo2freq=(lo2a+8*lo2n)*fref + lo2num*(fref/1000)/3780*1000;
+        desired_lo2=lo1freq-rfin-if2;
+        lo2=(desired_lo2)/fref;
+        lo2n=lo2/8;
+        lo2a=lo2-(lo2n*8);
+        lo2num=((desired_lo2/1000)%(fref/1000))* 3780/(fref/1000); //scale to fit in 32bit arith
+        lo2freq=(lo2a+8*lo2n)*fref + lo2num*(fref/1000)/3780*1000;
 
         tuner_dbg("mt2032: rfin=%d lo2=%d lo2n=%d lo2a=%d num=%d lo2freq=%d\n",
                   rfin,lo2,lo2n,lo2a,lo2num,lo2freq);
 
-        if(lo1a<0 || lo1a>7 || lo1n<17 ||lo1n>48 || lo2a<0 ||lo2a >7 ||lo2n<17 || lo2n>30) {
+        if(lo1a<0 || lo1a>7 || lo1n<17 ||lo1n>48 || lo2a<0 ||lo2a >7 ||lo2n<17 || lo2n>30) {
                 tuner_info("mt2032: frequency parameters out of range: %d %d %d %d\n",
                            lo1a, lo1n, lo2a,lo2n);
-                return(-1);
-        }
+                return(-1);
+        }
 
         mt2032_spurcheck(c, lo1freq, desired_lo2,  spectrum_from, spectrum_to);
         // should recalculate lo1 (one step up/down)
@@ -135,10 +135,10 @@ static int mt2032_compute_freq(struct i2c_client *c,
         buf[3]=0x0f; //reserved
         buf[4]=0x1f;
         buf[5]=(lo2n-1) | (lo2a<<5);
-        if(rfin >400*1000*1000)
-                buf[6]=0xe4;
-        else
-                buf[6]=0xf4; // set PKEN per rev 1.2
+        if(rfin >400*1000*1000)
+                buf[6]=0xe4;
+        else
+                buf[6]=0xf4; // set PKEN per rev 1.2
         buf[7]=8+xogc;
         buf[8]=0xc3; //reserved
         buf[9]=0x4e; //reserved
@@ -168,7 +168,7 @@ static int mt2032_check_lo_lock(struct i2c_client *c)
                 tuner_dbg("mt2032: pll wait 1ms for lock (0x%2x)\n",buf[0]);
                 udelay(1000);
         }
-        return lock;
+        return lock;
 }
 
 static int mt2032_optimize_vco(struct i2c_client *c,int sel,int lock)
@@ -202,7 +202,7 @@ static int mt2032_optimize_vco(struct i2c_client *c,int sel,int lock)
 
         buf[0]=0x0f;
         buf[1]=sel;
-        i2c_master_send(c,buf,2);
+        i2c_master_send(c,buf,2);
         lock=mt2032_check_lo_lock(c);
         return lock;
 }
@@ -219,23 +219,23 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
         tuner_dbg("mt2032_set_if_freq rfin=%d if1=%d if2=%d from=%d to=%d\n",
                   rfin,if1,if2,from,to);
 
-        buf[0]=0;
-        ret=i2c_master_send(c,buf,1);
-        i2c_master_recv(c,buf,21);
+        buf[0]=0;
+        ret=i2c_master_send(c,buf,1);
+        i2c_master_recv(c,buf,21);
 
         buf[0]=0;
         ret=mt2032_compute_freq(c,rfin,if1,if2,from,to,&buf[1],&sel,t->xogc);
         if (ret<0)
                 return;
 
-        // send only the relevant registers per Rev. 1.2
-        buf[0]=0;
-        ret=i2c_master_send(c,buf,4);
-        buf[5]=5;
-        ret=i2c_master_send(c,buf+5,4);
-        buf[11]=11;
-        ret=i2c_master_send(c,buf+11,3);
-        if(ret!=3)
+        // send only the relevant registers per Rev. 1.2
+        buf[0]=0;
+        ret=i2c_master_send(c,buf,4);
+        buf[5]=5;
+        ret=i2c_master_send(c,buf+5,4);
+        buf[11]=11;
+        ret=i2c_master_send(c,buf+11,3);
+        if(ret!=3)
                 tuner_warn("i2c i/o error: rc == %d (should be 3)\n",ret);
 
         // wait for PLLs to lock (per manual), retry LINT if not.
@@ -253,7 +253,7 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
                 mdelay(10);
                 buf[1]=8+t->xogc;
                 i2c_master_send(c,buf,2);
-        }
+        }
 
         if (lock!=6)
                 tuner_warn("MT2032 Fatal Error: PLLs didn't lock.\n");
@@ -284,7 +284,7 @@ static void mt2032_set_tv_freq(struct i2c_client *c, unsigned int freq)
                 if2  = 38900*1000;
         }
 
-        mt2032_set_if_freq(c, freq*62500 /* freq*1000*1000/16 */,
+        mt2032_set_if_freq(c, freq*62500 /* freq*1000*1000/16 */,
                            1090*1000*1000, if2, from, to);
 }
 
@@ -294,7 +294,7 @@ static void mt2032_set_radio_freq(struct i2c_client *c, unsigned int freq)
         int if2 = t->radio_if2;
 
         // per Manual for FM tuning: first if center freq. 1085 MHz
-        mt2032_set_if_freq(c, freq * 1000 / 16,
+        mt2032_set_if_freq(c, freq * 1000 / 16,
                               1085*1000*1000,if2,if2,if2);
 }
 
@@ -302,57 +302,57 @@ static void mt2032_set_radio_freq(struct i2c_client *c, unsigned int freq)
 static int mt2032_init(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
-        unsigned char buf[21];
-        int ret,xogc,xok=0;
+        unsigned char buf[21];
+        int ret,xogc,xok=0;
 
         // Initialize Registers per spec.
-        buf[1]=2; // Index to register 2
-        buf[2]=0xff;
-        buf[3]=0x0f;
-        buf[4]=0x1f;
-        ret=i2c_master_send(c,buf+1,4);
-
-        buf[5]=6; // Index register 6
-        buf[6]=0xe4;
-        buf[7]=0x8f;
-        buf[8]=0xc3;
-        buf[9]=0x4e;
-        buf[10]=0xec;
-        ret=i2c_master_send(c,buf+5,6);
-
-        buf[12]=13;  // Index register 13
-        buf[13]=0x32;
-        ret=i2c_master_send(c,buf+12,2);
-
-        // Adjust XOGC (register 7), wait for XOK
-        xogc=7;
-        do {
+        buf[1]=2; // Index to register 2
+        buf[2]=0xff;
+        buf[3]=0x0f;
+        buf[4]=0x1f;
+        ret=i2c_master_send(c,buf+1,4);
+
+        buf[5]=6; // Index register 6
+        buf[6]=0xe4;
+        buf[7]=0x8f;
+        buf[8]=0xc3;
+        buf[9]=0x4e;
+        buf[10]=0xec;
+        ret=i2c_master_send(c,buf+5,6);
+
+        buf[12]=13;  // Index register 13
+        buf[13]=0x32;
+        ret=i2c_master_send(c,buf+12,2);
+
+        // Adjust XOGC (register 7), wait for XOK
+        xogc=7;
+        do {
                 tuner_dbg("mt2032: xogc = 0x%02x\n",xogc&0x07);
-                mdelay(10);
-                buf[0]=0x0e;
-                i2c_master_send(c,buf,1);
-                i2c_master_recv(c,buf,1);
-                xok=buf[0]&0x01;
-                tuner_dbg("mt2032: xok = 0x%02x\n",xok);
-                if (xok == 1) break;
-
-                xogc--;
-                tuner_dbg("mt2032: xogc = 0x%02x\n",xogc&0x07);
-                if (xogc == 3) {
-                        xogc=4; // min. 4 per spec
-                        break;
-                }
-                buf[0]=0x07;
-                buf[1]=0x88 + xogc;
-                ret=i2c_master_send(c,buf,2);
-                if (ret!=2)
+                mdelay(10);
+                buf[0]=0x0e;
+                i2c_master_send(c,buf,1);
+                i2c_master_recv(c,buf,1);
+                xok=buf[0]&0x01;
+                tuner_dbg("mt2032: xok = 0x%02x\n",xok);
+                if (xok == 1) break;
+
+                xogc--;
+                tuner_dbg("mt2032: xogc = 0x%02x\n",xogc&0x07);
+                if (xogc == 3) {
+                        xogc=4; // min. 4 per spec
+                        break;
+                }
+                buf[0]=0x07;
+                buf[1]=0x88 + xogc;
+                ret=i2c_master_send(c,buf,2);
+                if (ret!=2)
                         tuner_warn("i2c i/o error: rc == %d (should be 2)\n",ret);
-        } while (xok != 1 );
+        } while (xok != 1 );
         t->xogc=xogc;
 
         t->tv_freq    = mt2032_set_tv_freq;
         t->radio_freq = mt2032_set_radio_freq;
-        return(1);
+        return(1);
 }
 
 static void mt2050_set_antenna(struct i2c_client *c, unsigned char antenna)
@@ -426,7 +426,7 @@ static void mt2050_set_if_freq(struct i2c_client *c,unsigned int freq, unsigned
         }
 
         ret=i2c_master_send(c,buf,6);
-        if (ret!=6)
+        if (ret!=6)
                 tuner_warn("i2c i/o error: rc == %d (should be 6)\n",ret);
 }
 
@@ -437,11 +437,11 @@ static void mt2050_set_tv_freq(struct i2c_client *c, unsigned int freq)
 
         if (t->std & V4L2_STD_525_60) {
                 // NTSC
-                if2 = 45750*1000;
-        } else {
-                // PAL
-                if2 = 38900*1000;
-        }
+                if2 = 45750*1000;
+        } else {
+                // PAL
+                if2 = 38900*1000;
+        }
         if (V4L2_TUNER_DIGITAL_TV == t->mode) {
                 // DVB (pinnacle 300i)
                 if2 = 36150*1000;
@@ -455,7 +455,7 @@ static void mt2050_set_radio_freq(struct i2c_client *c, unsigned int freq)
         struct tuner *t = i2c_get_clientdata(c);
         int if2 = t->radio_if2;
 
-        mt2050_set_if_freq(c, freq*62500, if2);
+        mt2050_set_if_freq(c, freq * 1000 / 16, if2);
         mt2050_set_antenna(c, radio_antenna);
 }
 
@@ -487,7 +487,7 @@ int microtune_init(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
         char *name;
-        unsigned char buf[21];
+        unsigned char buf[21];
         int company_code;
 
         memset(buf,0,sizeof(buf));
@@ -496,17 +496,17 @@ int microtune_init(struct i2c_client *c)
         t->standby    = NULL;
         name = "unknown";
 
-        i2c_master_send(c,buf,1);
-        i2c_master_recv(c,buf,21);
-        if (tuner_debug) {
-                int i;
+        i2c_master_send(c,buf,1);
+        i2c_master_recv(c,buf,21);
+        if (tuner_debug) {
+                int i;
                 tuner_dbg("MT20xx hexdump:");
-                for(i=0;i<21;i++) {
-                        printk(" %02x",buf[i]);
-                        if(((i+1)%8)==0) printk(" ");
-                }
-                printk("\n");
-        }
+                for(i=0;i<21;i++) {
+                        printk(" %02x",buf[i]);
+                        if(((i+1)%8)==0) printk(" ");
+                }
+                printk("\n");
+        }
         company_code = buf[0x11] << 8 | buf[0x12];
         tuner_info("microtune: companycode=%04x part=%02x rev=%02x\n",
                    company_code,buf[0x13],buf[0x14]);
@@ -525,8 +525,8 @@ int microtune_init(struct i2c_client *c)
         default:
                 tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n",
                            name);
-                return 0;
-        }
+                return 0;
+        }
 
         strlcpy(c->name, name, sizeof(c->name));
         tuner_info("microtune %s found, OK\n",name);
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 72b70eb5da1d..dca3ddfd510f 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -31,7 +31,6 @@
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 
-#include <media/id.h>
 
 #include "rds.h"
 
@@ -246,7 +245,7 @@ static void block_to_buf(struct saa6588 *s, unsigned char *blockbuf)
                 s->wr_index = 0;
 
         if (s->wr_index == s->rd_index) {
-                s->rd_index++;
+                s->rd_index += 3;
                 if (s->rd_index >= s->buf_size)
                         s->rd_index = 0;
         } else
@@ -328,7 +327,7 @@ static void saa6588_work(void *data)
         struct saa6588 *s = (struct saa6588 *)data;
 
         saa6588_i2c_poll(s);
-        mod_timer(&s->timer, jiffies + HZ / 50);        /* 20 msec */
+        mod_timer(&s->timer, jiffies + msecs_to_jiffies(20));
 }
 
 static int saa6588_configure(struct saa6588 *s)
@@ -434,9 +433,9 @@ static int saa6588_probe(struct i2c_adapter *adap)
                 return i2c_probe(adap, &addr_data, saa6588_attach);
 #else
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
+        case I2C_HW_SAA7134:
                 return i2c_probe(adap, &addr_data, saa6588_attach);
                 break;
         }
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
new file mode 100644
index 000000000000..9aa8827de2c3
--- /dev/null
+++ b/drivers/media/video/saa711x.c
@@ -0,0 +1,593 @@
+/*
+ * saa711x - Philips SAA711x video decoder driver version 0.0.1
+ *
+ * To do: Now, it handles only saa7113/7114. Should be improved to
+ * handle all Philips saa711x devices.
+ *
+ * Based on saa7113 driver from Dave Perks <dperks@ibm.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/major.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/pci.h>
+#include <linux/signal.h>
+#include <asm/io.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <linux/sched.h>
+#include <asm/segment.h>
+#include <linux/types.h>
+#include <asm/uaccess.h>
+#include <linux/videodev.h>
+
+MODULE_DESCRIPTION("Philips SAA711x video decoder driver");
+MODULE_AUTHOR("Dave Perks, Jose Ignacio Gijon, Joerg Heckenbach, Mark McClelland, Dwaine Garden");
+MODULE_LICENSE("GPL");
+
+#include <linux/i2c.h>
+#include <linux/i2c-dev.h>
+
+#define I2C_NAME(s) (s)->name
+
+#include <linux/video_decoder.h>
+
+static int debug = 0;
+MODULE_PARM(debug, "i");
+MODULE_PARM_DESC(debug, " Set the default Debug level.  Default: 0 (Off) - (0-1)");
+
+
+#define dprintk(num, format, args...) \
+        do { \
+                if (debug >= num) \
+                        printk(format , ##args); \
+        } while (0)
+
+/* ----------------------------------------------------------------------- */
+
+struct saa711x {
+        unsigned char reg[32];
+
+        int norm;
+        int input;
+        int enable;
+        int bright;
+        int contrast;
+        int hue;
+        int sat;
+};
+
+#define   I2C_SAA7113        0x4A
+#define   I2C_SAA7114        0x42
+
+/* ----------------------------------------------------------------------- */
+
+static inline int
+saa711x_write (struct i2c_client *client,
+               u8                 reg,
+               u8                 value)
+{
+        struct saa711x *decoder = i2c_get_clientdata(client);
+
+        decoder->reg[reg] = value;
+        return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+static int
+saa711x_write_block (struct i2c_client *client,
+                     const u8          *data,
+                     unsigned int       len)
+{
+        int ret = -1;
+        u8 reg;
+
+        /* the saa711x has an autoincrement function, use it if
+         * the adapter understands raw I2C */
+        if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
+                /* do raw I2C, not smbus compatible */
+                struct saa711x *decoder = i2c_get_clientdata(client);
+                struct i2c_msg msg;
+                u8 block_data[32];
+
+                msg.addr = client->addr;
+                msg.flags = 0;
+                while (len >= 2) {
+                        msg.buf = (char *) block_data;
+                        msg.len = 0;
+                        block_data[msg.len++] = reg = data[0];
+                        do {
+                                block_data[msg.len++] =
+                                    decoder->reg[reg++] = data[1];
+                                len -= 2;
+                                data += 2;
+                        } while (len >= 2 && data[0] == reg &&
+                                 msg.len < 32);
+                        if ((ret = i2c_transfer(client->adapter,
+                                                &msg, 1)) < 0)
+                                break;
+                }
+        } else {
+                /* do some slow I2C emulation kind of thing */
+                while (len >= 2) {
+                        reg = *data++;
+                        if ((ret = saa711x_write(client, reg,
+                                                 *data++)) < 0)
+                                break;
+                        len -= 2;
+                }
+        }
+
+        return ret;
+}
+
+static int
+saa711x_init_decoder (struct i2c_client *client,
+              struct video_decoder_init *init)
+{
+        return saa711x_write_block(client, init->data, init->len);
+}
+
+static inline int
+saa711x_read (struct i2c_client *client,
+              u8                 reg)
+{
+        return i2c_smbus_read_byte_data(client, reg);
+}
+
+/* ----------------------------------------------------------------------- */
+
+static const unsigned char saa711x_i2c_init[] = {
+        0x00, 0x00,     /* PH711x_CHIP_VERSION 00 - ID byte */
+        0x01, 0x08,     /* PH711x_INCREMENT_DELAY - (1) (1) (1) (1) IDEL3 IDEL2 IDELL1 IDEL0 */
+        0x02, 0xc0,     /* PH711x_ANALOG_INPUT_CONTR_1 - FUSE1 FUSE0 GUDL1 GUDL0 MODE3 MODE2 MODE1 MODE0 */
+        0x03, 0x23,     /* PH711x_ANALOG_INPUT_CONTR_2 - (1) HLNRS VBSL WPOFF HOLDG GAFIX GAI28 GAI18 */
+        0x04, 0x00,     /* PH711x_ANALOG_INPUT_CONTR_3 - GAI17 GAI16 GAI15 GAI14 GAI13 GAI12 GAI11 GAI10 */
+        0x05, 0x00,     /* PH711x_ANALOG_INPUT_CONTR_4 - GAI27 GAI26 GAI25 GAI24 GAI23 GAI22 GAI21 GAI20 */
+        0x06, 0xeb,     /* PH711x_HORIZONTAL_SYNC_START - HSB7 HSB6 HSB5 HSB4 HSB3 HSB2 HSB1 HSB0 */
+        0x07, 0xe0,     /* PH711x_HORIZONTAL_SYNC_STOP - HSS7 HSS6 HSS5 HSS4 HSS3 HSS2 HSS1 HSS0 */
+        0x08, 0x88,     /* PH711x_SYNC_CONTROL - AUFD FSEL FOET HTC1 HTC0 HPLL VNOI1 VNOI0 */
+        0x09, 0x00,     /* PH711x_LUMINANCE_CONTROL - BYPS PREF BPSS1 BPSS0 VBLB UPTCV APER1 APER0 */
+        0x0a, 0x80,     /* PH711x_LUMINANCE_BRIGHTNESS - BRIG7 BRIG6 BRIG5 BRIG4 BRIG3 BRIG2 BRIG1 BRIG0 */
+        0x0b, 0x47,     /* PH711x_LUMINANCE_CONTRAST - CONT7 CONT6 CONT5 CONT4 CONT3 CONT2 CONT1 CONT0 */
+        0x0c, 0x40,     /* PH711x_CHROMA_SATURATION - SATN7 SATN6 SATN5 SATN4 SATN3 SATN2 SATN1 SATN0 */
+        0x0d, 0x00,     /* PH711x_CHROMA_HUE_CONTROL - HUEC7 HUEC6 HUEC5 HUEC4 HUEC3 HUEC2 HUEC1 HUEC0 */
+        0x0e, 0x01,     /* PH711x_CHROMA_CONTROL - CDTO CSTD2 CSTD1 CSTD0 DCCF FCTC CHBW1 CHBW0 */
+        0x0f, 0xaa,     /* PH711x_CHROMA_GAIN_CONTROL - ACGC CGAIN6 CGAIN5 CGAIN4 CGAIN3 CGAIN2 CGAIN1 CGAIN0 */
+        0x10, 0x00,     /* PH711x_FORMAT_DELAY_CONTROL - OFTS1 OFTS0 HDEL1 HDEL0 VRLN YDEL2 YDEL1 YDEL0 */
+        0x11, 0x1C,     /* PH711x_OUTPUT_CONTROL_1 - GPSW1 CM99 GPSW0 HLSEL OEYC OERT VIPB COLO */
+        0x12, 0x01,     /* PH711x_OUTPUT_CONTROL_2 - RTSE13 RTSE12 RTSE11 RTSE10 RTSE03 RTSE02 RTSE01 RTSE00 */
+        0x13, 0x00,     /* PH711x_OUTPUT_CONTROL_3 - ADLSB (1) (1) OLDSB FIDP (1) AOSL1 AOSL0 */
+        0x14, 0x00,     /* RESERVED 14 - (1) (1) (1) (1) (1) (1) (1) (1) */
+        0x15, 0x00,     /* PH711x_V_GATE1_START - VSTA7 VSTA6 VSTA5 VSTA4 VSTA3 VSTA2 VSTA1 VSTA0 */
+        0x16, 0x00,     /* PH711x_V_GATE1_STOP - VSTO7 VSTO6 VSTO5 VSTO4 VSTO3 VSTO2 VSTO1 VSTO0 */
+        0x17, 0x00,     /* PH711x_V_GATE1_MSB - (1) (1) (1) (1) (1) (1) VSTO8 VSTA8 */
+};
+
+static int
+saa711x_command (struct i2c_client *client,
+                 unsigned int       cmd,
+                 void              *arg)
+{
+        struct saa711x *decoder = i2c_get_clientdata(client);
+
+        switch (cmd) {
+
+        case 0:
+        case DECODER_INIT:
+        {
+                struct video_decoder_init *init = arg;
+                if (NULL != init)
+                        return saa711x_init_decoder(client, init);
+                else {
+                        struct video_decoder_init vdi;
+                        vdi.data = saa711x_i2c_init;
+                        vdi.len = sizeof(saa711x_i2c_init);
+                        return saa711x_init_decoder(client, &vdi);
+                }
+        }
+
+        case DECODER_DUMP:
+        {
+                int i;
+
+                for (i = 0; i < 32; i += 16) {
+                        int j;
+
+                        printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i);
+                        for (j = 0; j < 16; ++j) {
+                                printk(" %02x",
+                                       saa711x_read(client, i + j));
+                        }
+                        printk("\n");
+                }
+        }
+                break;
+
+        case DECODER_GET_CAPABILITIES:
+        {
+                struct video_decoder_capability *cap = arg;
+
+                cap->flags = VIDEO_DECODER_PAL |
+                             VIDEO_DECODER_NTSC |
+                             VIDEO_DECODER_SECAM |
+                             VIDEO_DECODER_AUTO |
+                             VIDEO_DECODER_CCIR;
+                cap->inputs = 8;
+                cap->outputs = 1;
+        }
+                break;
+
+        case DECODER_GET_STATUS:
+        {
+                int *iarg = arg;
+                int status;
+                int res;
+
+                status = saa711x_read(client, 0x1f);
+                dprintk(1, KERN_DEBUG "%s status: 0x%02x\n", I2C_NAME(client),
+                        status);
+                res = 0;
+                if ((status & (1 << 6)) == 0) {
+                        res |= DECODER_STATUS_GOOD;
+                }
+                switch (decoder->norm) {
+                case VIDEO_MODE_NTSC:
+                        res |= DECODER_STATUS_NTSC;
+                        break;
+                case VIDEO_MODE_PAL:
+                        res |= DECODER_STATUS_PAL;
+                        break;
+                case VIDEO_MODE_SECAM:
+                        res |= DECODER_STATUS_SECAM;
+                        break;
+                default:
+                case VIDEO_MODE_AUTO:
+                        if ((status & (1 << 5)) != 0) {
+                                res |= DECODER_STATUS_NTSC;
+                        } else {
+                                res |= DECODER_STATUS_PAL;
+                        }
+                        break;
+                }
+                if ((status & (1 << 0)) != 0) {
+                        res |= DECODER_STATUS_COLOR;
+                }
+                *iarg = res;
+        }
+                break;
+
+        case DECODER_SET_GPIO:
+        {
+                int *iarg = arg;
+                if (0 != *iarg) {
+                        saa711x_write(client, 0x11,
+                                (decoder->reg[0x11] | 0x80));
+                } else {
+                        saa711x_write(client, 0x11,
+                                (decoder->reg[0x11] & 0x7f));
+                }
+                break;
+        }
+
+        case DECODER_SET_VBI_BYPASS:
+        {
+                int *iarg = arg;
+                if (0 != *iarg) {
+                        saa711x_write(client, 0x13,
+                                (decoder->reg[0x13] & 0xf0) | 0x0a);
+                } else {
+                        saa711x_write(client, 0x13,
+                                (decoder->reg[0x13] & 0xf0));
+                }
+                break;
+        }
+
+        case DECODER_SET_NORM:
+        {
+                int *iarg = arg;
+
+                switch (*iarg) {
+
+                case VIDEO_MODE_NTSC:
+                        saa711x_write(client, 0x08,
+                                      (decoder->reg[0x08] & 0x3f) | 0x40);
+                        saa711x_write(client, 0x0e,
+                                      (decoder->reg[0x0e] & 0x8f));
+                        break;
+
+                case VIDEO_MODE_PAL:
+                        saa711x_write(client, 0x08,
+                                      (decoder->reg[0x08] & 0x3f) | 0x00);
+                        saa711x_write(client, 0x0e,
+                                      (decoder->reg[0x0e] & 0x8f));
+                        break;
+
+                case VIDEO_MODE_SECAM:
+                        saa711x_write(client, 0x08,
+                                      (decoder->reg[0x0e] & 0x3f) | 0x00);
+                        saa711x_write(client, 0x0e,
+                                      (decoder->reg[0x0e] & 0x8f) | 0x50);
+                        break;
+
+                case VIDEO_MODE_AUTO:
+                        saa711x_write(client, 0x08,
+                                      (decoder->reg[0x08] & 0x3f) | 0x80);
+                        saa711x_write(client, 0x0e,
+                                      (decoder->reg[0x0e] & 0x8f));
+                        break;
+
+                default:
+                        return -EINVAL;
+
+                }
+                decoder->norm = *iarg;
+        }
+                break;
+
+        case DECODER_SET_INPUT:
+        {
+                int *iarg = arg;
+                if (*iarg < 0 || *iarg > 9) {
+                        return -EINVAL;
+                }
+                if (decoder->input != *iarg) {
+                        decoder->input = *iarg;
+                        /* select mode */
+                        saa711x_write(client, 0x02,
+                                      (decoder->reg[0x02] & 0xf0) | decoder->input);
+                        /* bypass chrominance trap for modes 4..7 */
+                        saa711x_write(client, 0x09,
+                                      (decoder->reg[0x09] & 0x7f) | ((decoder->input > 3) ? 0x80 : 0));
+                }
+        }
+                break;
+
+        case DECODER_SET_OUTPUT:
+        {
+                int *iarg = arg;
+
+                /* not much choice of outputs */
+                if (*iarg != 0) {
+                        return -EINVAL;
+                }
+        }
+                break;
+
+        case DECODER_ENABLE_OUTPUT:
+        {
+                int *iarg = arg;
+                int enable = (*iarg != 0);
+
+                if (decoder->enable != enable) {
+                        decoder->enable = enable;
+
+                        /* RJ: If output should be disabled (for
+                         * playing videos), we also need a open PLL.
+                         * The input is set to 0 (where no input
+                         * source is connected), although this
+                         * is not necessary.
+                         *
+                         * If output should be enabled, we have to
+                         * reverse the above.
+                         */
+
+                        if (decoder->enable) {
+                                saa711x_write(client, 0x02,
+                                              (decoder->
+                                               reg[0x02] & 0xf8) |
+                                              decoder->input);
+                                saa711x_write(client, 0x08,
+                                              (decoder->reg[0x08] & 0xfb));
+                                saa711x_write(client, 0x11,
+                                              (decoder->
+                                               reg[0x11] & 0xf3) | 0x0c);
+                        } else {
+                                saa711x_write(client, 0x02,
+                                              (decoder->reg[0x02] & 0xf8));
+                                saa711x_write(client, 0x08,
+                                              (decoder->
+                                               reg[0x08] & 0xfb) | 0x04);
+                                saa711x_write(client, 0x11,
+                                              (decoder->reg[0x11] & 0xf3));
+                        }
+                }
+        }
+                break;
+
+        case DECODER_SET_PICTURE:
+        {
+                struct video_picture *pic = arg;
+
+                if (decoder->bright != pic->brightness) {
+                        /* We want 0 to 255 we get 0-65535 */
+                        decoder->bright = pic->brightness;
+                        saa711x_write(client, 0x0a, decoder->bright >> 8);
+                }
+                if (decoder->contrast != pic->contrast) {
+                        /* We want 0 to 127 we get 0-65535 */
+                        decoder->contrast = pic->contrast;
+                        saa711x_write(client, 0x0b,
+                                      decoder->contrast >> 9);
+                }
+                if (decoder->sat != pic->colour) {
+                        /* We want 0 to 127 we get 0-65535 */
+                        decoder->sat = pic->colour;
+                        saa711x_write(client, 0x0c, decoder->sat >> 9);
+                }
+                if (decoder->hue != pic->hue) {
+                        /* We want -128 to 127 we get 0-65535 */
+                        decoder->hue = pic->hue;
+                        saa711x_write(client, 0x0d,
+                                      (decoder->hue - 32768) >> 8);
+                }
+        }
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+
+/*
+ * Generic i2c probe
+ * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
+ */
+
+/* standard i2c insmod options */
+static unsigned short normal_i2c[] = {
+        I2C_SAA7113>>1,         /* saa7113 */
+        I2C_SAA7114>>1,         /* saa7114 */
+        I2C_CLIENT_END
+};
+
+I2C_CLIENT_INSMOD;
+
+
+static struct i2c_driver i2c_driver_saa711x;
+
+static int
+saa711x_detect_client (struct i2c_adapter *adapter,
+                       int                 address,
+                       int                 kind)
+{
+        int i;
+        struct i2c_client *client;
+        struct saa711x *decoder;
+        struct video_decoder_init vdi;
+
+        dprintk(1,
+                KERN_INFO
+                "saa711x.c: detecting saa711x client on address 0x%x\n",
+                address << 1);
+
+        /* Check if the adapter supports the needed features */
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                return 0;
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (client == 0)
+                return -ENOMEM;
+        memset(client, 0, sizeof(struct i2c_client));
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &i2c_driver_saa711x;
+        client->flags = I2C_CLIENT_ALLOW_USE;
+        strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client)));
+        decoder = kmalloc(sizeof(struct saa711x), GFP_KERNEL);
+        if (decoder == NULL) {
+                kfree(client);
+                return -ENOMEM;
+        }
+        memset(decoder, 0, sizeof(struct saa711x));
+        decoder->norm = VIDEO_MODE_NTSC;
+        decoder->input = 0;
+        decoder->enable = 1;
+        decoder->bright = 32768;
+        decoder->contrast = 32768;
+        decoder->hue = 32768;
+        decoder->sat = 32768;
+        i2c_set_clientdata(client, decoder);
+
+        i = i2c_attach_client(client);
+        if (i) {
+                kfree(client);
+                kfree(decoder);
+                return i;
+        }
+
+        vdi.data = saa711x_i2c_init;
+        vdi.len = sizeof(saa711x_i2c_init);
+        i = saa711x_init_decoder(client, &vdi);
+        if (i < 0) {
+                dprintk(1, KERN_ERR "%s_attach error: init status %d\n",
+                        I2C_NAME(client), i);
+        } else {
+                dprintk(1,
+                        KERN_INFO
+                        "%s_attach: chip version %x at address 0x%x\n",
+                        I2C_NAME(client), saa711x_read(client, 0x00) >> 4,
+                        client->addr << 1);
+        }
+
+        return 0;
+}
+
+static int
+saa711x_attach_adapter (struct i2c_adapter *adapter)
+{
+        dprintk(1,
+                KERN_INFO
+                "saa711x.c: starting probe for adapter %s (0x%x)\n",
+                I2C_NAME(adapter), adapter->id);
+        return i2c_probe(adapter, &addr_data, &saa711x_detect_client);
+}
+
+static int
+saa711x_detach_client (struct i2c_client *client)
+{
+        struct saa711x *decoder = i2c_get_clientdata(client);
+        int err;
+
+        err = i2c_detach_client(client);
+        if (err) {
+                return err;
+        }
+
+        kfree(decoder);
+        kfree(client);
+
+        return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+
+static struct i2c_driver i2c_driver_saa711x = {
+        .owner = THIS_MODULE,
+        .name = "saa711x",
+
+        .id = I2C_DRIVERID_SAA711X,
+        .flags = I2C_DF_NOTIFY,
+
+        .attach_adapter = saa711x_attach_adapter,
+        .detach_client = saa711x_detach_client,
+        .command = saa711x_command,
+};
+
+static int __init
+saa711x_init (void)
+{
+        return i2c_add_driver(&i2c_driver_saa711x);
+}
+
+static void __exit
+saa711x_exit (void)
+{
+        i2c_del_driver(&i2c_driver_saa711x);
+}
+
+module_init(saa711x_init);
+module_exit(saa711x_exit);
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
new file mode 100644
index 000000000000..624e8808a517
--- /dev/null
+++ b/drivers/media/video/saa7134/Kconfig
@@ -0,0 +1,68 @@
+config VIDEO_SAA7134
+        tristate "Philips SAA7134 support"
+        depends on VIDEO_DEV && PCI && I2C && SOUND
+        select VIDEO_BUF
+        select VIDEO_IR
+        select VIDEO_TUNER
+        select CRC32
+        ---help---
+          This is a video4linux driver for Philips SAA713x based
+          TV cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7134.
+
+config VIDEO_SAA7134_DVB
+        tristate "DVB/ATSC Support for saa7134 based TV cards"
+        depends on VIDEO_SAA7134 && DVB_CORE
+        select VIDEO_BUF_DVB
+        ---help---
+          This adds support for DVB cards based on the
+          Philips saa7134 chip.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa7134-dvb.
+
+          You must also select one or more DVB demodulators.
+          If you are unsure which you need, choose all of them.
+
+config VIDEO_SAA7134_DVB_ALL_FRONTENDS
+        bool "Build all supported frontends for saa7134 based TV cards"
+        default y
+        depends on VIDEO_SAA7134_DVB
+        select DVB_MT352
+        select DVB_TDA1004X
+        select DVB_NXT200X
+        ---help---
+          This builds saa7134-dvb with all currently supported frontend
+          demodulators.  If you wish to tweak your configuration, and
+          only include support for the hardware that you need, choose N here.
+
+          If you are unsure, choose Y.
+
+config VIDEO_SAA7134_DVB_MT352
+        tristate "Zarlink MT352 DVB-T Support"
+        default m
+        depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
+        select DVB_MT352
+        ---help---
+          This adds DVB-T support for cards based on the
+          Philips saa7134 chip and the MT352 demodulator.
+
+config VIDEO_SAA7134_DVB_TDA1004X
+        tristate "Phillips TDA10045H/TDA10046H DVB-T Support"
+        default m
+        depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
+        select DVB_TDA1004X
+        ---help---
+          This adds DVB-T support for cards based on the
+          Philips saa7134 chip and the TDA10045H/TDA10046H demodulator.
+
+config VIDEO_SAA7134_DVB_NXT200X
+        tristate "NXT2002/NXT2004 ATSC Support"
+        default m
+        depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
+        select DVB_NXT200X
+        ---help---
+          This adds ATSC 8VSB and QAM64/256 support for cards based on the
+          Philips saa7134 chip and the NXT2002/NXT2004 demodulator.
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index b778ffd94e65..e0b28f0533af 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -3,15 +3,22 @@ saa7134-objs :=	saa7134-cards.o saa7134-core.o saa7134-i2c.o	\
                 saa7134-oss.o saa7134-ts.o saa7134-tvaudio.o    \
                 saa7134-vbi.o saa7134-video.o saa7134-input.o
 
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o
+obj-$(CONFIG_VIDEO_SAA7134) +=  saa7134.o saa7134-empress.o \
+                                saa6752hs.o saa7134-alsa.o
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
 EXTRA_CFLAGS += -I$(src)/..
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+ifneq ($(CONFIG_VIDEO_BUF_DVB),n)
+ EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
+endif
 ifneq ($(CONFIG_DVB_MT352),n)
  EXTRA_CFLAGS += -DHAVE_MT352=1
 endif
 ifneq ($(CONFIG_DVB_TDA1004X),n)
  EXTRA_CFLAGS += -DHAVE_TDA1004X=1
 endif
+ifneq ($(CONFIG_DVB_NXT200X),n)
+ EXTRA_CFLAGS += -DHAVE_NXT200X=1
+endif
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 382911c6ef22..cdd1ed9c8065 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/crc32.h>
 
-#include <media/id.h>
 
 #define MPEG_VIDEO_TARGET_BITRATE_MAX  27000
 #define MPEG_VIDEO_MAX_BITRATE_MAX     27000
@@ -57,6 +56,7 @@ struct saa6752hs_state {
         struct i2c_client             client;
         struct v4l2_mpeg_compression  params;
         enum saa6752hs_videoformat    video_format;
+        v4l2_std_id                   standard;
 };
 
 enum saa6752hs_command {
@@ -74,58 +74,58 @@ enum saa6752hs_command {
 /* ---------------------------------------------------------------------- */
 
 static u8 PAT[] = {
-        0xc2, // i2c register
-        0x00, // table number for encoder
+        0xc2, /* i2c register */
+        0x00, /* table number for encoder */
 
-        0x47, // sync
-        0x40, 0x00, // transport_error_indicator(0), payload_unit_start(1), transport_priority(0), pid(0)
-        0x10, // transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0)
+        0x47, /* sync */
+        0x40, 0x00, /* transport_error_indicator(0), payload_unit_start(1), transport_priority(0), pid(0) */
+        0x10, /* transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0) */
 
-        0x00, // PSI pointer to start of table
+        0x00, /* PSI pointer to start of table */
 
-        0x00, // tid(0)
-        0xb0, 0x0d, // section_syntax_indicator(1), section_length(13)
+        0x00, /* tid(0) */
+        0xb0, 0x0d, /* section_syntax_indicator(1), section_length(13) */
 
-        0x00, 0x01, // transport_stream_id(1)
+        0x00, 0x01, /* transport_stream_id(1) */
 
-        0xc1, // version_number(0), current_next_indicator(1)
+        0xc1, /* version_number(0), current_next_indicator(1) */
 
-        0x00, 0x00, // section_number(0), last_section_number(0)
+        0x00, 0x00, /* section_number(0), last_section_number(0) */
 
-        0x00, 0x01, // program_number(1)
+        0x00, 0x01, /* program_number(1) */
 
-        0xe0, 0x00, // PMT PID
+        0xe0, 0x00, /* PMT PID */
 
-        0x00, 0x00, 0x00, 0x00 // CRC32
+        0x00, 0x00, 0x00, 0x00 /* CRC32 */
 };
 
 static u8 PMT[] = {
-        0xc2, // i2c register
-        0x01, // table number for encoder
+        0xc2, /* i2c register */
+        0x01, /* table number for encoder */
 
-        0x47, // sync
-        0x40, 0x00, // transport_error_indicator(0), payload_unit_start(1), transport_priority(0), pid
-        0x10, // transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0)
+        0x47, /* sync */
+        0x40, 0x00, /* transport_error_indicator(0), payload_unit_start(1), transport_priority(0), pid */
+        0x10, /* transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0) */
 
-        0x00, // PSI pointer to start of table
+        0x00, /* PSI pointer to start of table */
 
-        0x02, // tid(2)
-        0xb0, 0x17, // section_syntax_indicator(1), section_length(23)
+        0x02, /* tid(2) */
+        0xb0, 0x17, /* section_syntax_indicator(1), section_length(23) */
 
-        0x00, 0x01, // program_number(1)
+        0x00, 0x01, /* program_number(1) */
 
-        0xc1, // version_number(0), current_next_indicator(1)
+        0xc1, /* version_number(0), current_next_indicator(1) */
 
-        0x00, 0x00, // section_number(0), last_section_number(0)
+        0x00, 0x00, /* section_number(0), last_section_number(0) */
 
-        0xe0, 0x00, // PCR_PID
+        0xe0, 0x00, /* PCR_PID */
 
-        0xf0, 0x00, // program_info_length(0)
+        0xf0, 0x00, /* program_info_length(0) */
 
-        0x02, 0xe0, 0x00, 0xf0, 0x00, // video stream type(2), pid
-        0x04, 0xe0, 0x00, 0xf0, 0x00, // audio stream type(4), pid
+        0x02, 0xe0, 0x00, 0xf0, 0x00, /* video stream type(2), pid */
+        0x04, 0xe0, 0x00, 0xf0, 0x00, /* audio stream type(4), pid */
 
-        0x00, 0x00, 0x00, 0x00 // CRC32
+        0x00, 0x00, 0x00, 0x00 /* CRC32 */
 };
 
 static struct v4l2_mpeg_compression param_defaults =
@@ -166,33 +166,33 @@ static int saa6752hs_chip_command(struct i2c_client* client,
         unsigned long timeout;
         int status = 0;
 
-        // execute the command
+        /* execute the command */
         switch(command) {
-        case SAA6752HS_COMMAND_RESET:
-                buf[0] = 0x00;
+        case SAA6752HS_COMMAND_RESET:
+                buf[0] = 0x00;
                 break;
 
         case SAA6752HS_COMMAND_STOP:
-                buf[0] = 0x03;
+                buf[0] = 0x03;
                 break;
 
         case SAA6752HS_COMMAND_START:
-                buf[0] = 0x02;
+                buf[0] = 0x02;
                 break;
 
         case SAA6752HS_COMMAND_PAUSE:
-                buf[0] = 0x04;
+                buf[0] = 0x04;
                 break;
 
         case SAA6752HS_COMMAND_RECONFIGURE:
                 buf[0] = 0x05;
                 break;
 
-        case SAA6752HS_COMMAND_SLEEP:
-                buf[0] = 0x06;
+        case SAA6752HS_COMMAND_SLEEP:
+                buf[0] = 0x06;
                 break;
 
-        case SAA6752HS_COMMAND_RECONFIGURE_FORCE:
+        case SAA6752HS_COMMAND_RECONFIGURE_FORCE:
                 buf[0] = 0x07;
                 break;
 
@@ -200,13 +200,13 @@ static int saa6752hs_chip_command(struct i2c_client* client,
                 return -EINVAL;
         }
 
-        // set it and wait for it to be so
+        /* set it and wait for it to be so */
         i2c_master_send(client, buf, 1);
         timeout = jiffies + HZ * 3;
         for (;;) {
-                // get the current status
+                /* get the current status */
                 buf[0] = 0x10;
-                i2c_master_send(client, buf, 1);
+                i2c_master_send(client, buf, 1);
                 i2c_master_recv(client, buf, 1);
 
                 if (!(buf[0] & 0x20))
@@ -216,61 +216,58 @@ static int saa6752hs_chip_command(struct i2c_client* client,
                         break;
                 }
 
-                // wait a bit
                 msleep(10);
         }
 
-        // delay a bit to let encoder settle
+        /* delay a bit to let encoder settle */
         msleep(50);
 
-        // done
-        return status;
+        return status;
 }
 
 
 static int saa6752hs_set_bitrate(struct i2c_client* client,
                                  struct v4l2_mpeg_compression* params)
 {
-        u8 buf[3];
+        u8 buf[3];
 
-        // set the bitrate mode
+        /* set the bitrate mode */
         buf[0] = 0x71;
         buf[1] = (params->vi_bitrate.mode == V4L2_BITRATE_VBR) ? 0 : 1;
         i2c_master_send(client, buf, 2);
 
-        // set the video bitrate
+        /* set the video bitrate */
         if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) {
-                // set the target bitrate
+                /* set the target bitrate */
                 buf[0] = 0x80;
                 buf[1] = params->vi_bitrate.target >> 8;
-                buf[2] = params->vi_bitrate.target & 0xff;
+                buf[2] = params->vi_bitrate.target & 0xff;
                 i2c_master_send(client, buf, 3);
 
-                // set the max bitrate
+                /* set the max bitrate */
                 buf[0] = 0x81;
                 buf[1] = params->vi_bitrate.max >> 8;
-                buf[2] = params->vi_bitrate.max & 0xff;
+                buf[2] = params->vi_bitrate.max & 0xff;
                 i2c_master_send(client, buf, 3);
         } else {
-                // set the target bitrate (no max bitrate for CBR)
-                buf[0] = 0x81;
+                /* set the target bitrate (no max bitrate for CBR) */
+                buf[0] = 0x81;
                 buf[1] = params->vi_bitrate.target >> 8;
-                buf[2] = params->vi_bitrate.target & 0xff;
+                buf[2] = params->vi_bitrate.target & 0xff;
                 i2c_master_send(client, buf, 3);
         }
 
-        // set the audio bitrate
-        buf[0] = 0x94;
+        /* set the audio bitrate */
+        buf[0] = 0x94;
         buf[1] = (256 == params->au_bitrate.target) ? 0 : 1;
         i2c_master_send(client, buf, 2);
 
-        // set the total bitrate
+        /* set the total bitrate */
         buf[0] = 0xb1;
-        buf[1] = params->st_bitrate.target >> 8;
-        buf[2] = params->st_bitrate.target & 0xff;
+        buf[1] = params->st_bitrate.target >> 8;
+        buf[2] = params->st_bitrate.target & 0xff;
         i2c_master_send(client, buf, 3);
 
-        // return success
         return 0;
 }
 
@@ -376,36 +373,43 @@ static int saa6752hs_init(struct i2c_client* client)
 
         h = i2c_get_clientdata(client);
 
-        // Set video format - must be done first as it resets other settings
+        /* Set video format - must be done first as it resets other settings */
         buf[0] = 0x41;
         buf[1] = h->video_format;
         i2c_master_send(client, buf, 2);
 
-        // set bitrate
-        saa6752hs_set_bitrate(client, &h->params);
+        /* Set number of lines in input signal */
+        buf[0] = 0x40;
+        buf[1] = 0x00;
+        if (h->standard & V4L2_STD_525_60)
+                buf[1] = 0x01;
+        i2c_master_send(client, buf, 2);
+
+        /* set bitrate */
+        saa6752hs_set_bitrate(client, &h->params);
 
-        // Set GOP structure {3, 13}
+        /* Set GOP structure {3, 13} */
         buf[0] = 0x72;
         buf[1] = 0x03;
         buf[2] = 0x0D;
         i2c_master_send(client,buf,3);
 
-        // Set minimum Q-scale {4}
+        /* Set minimum Q-scale {4} */
         buf[0] = 0x82;
         buf[1] = 0x04;
         i2c_master_send(client,buf,2);
 
-        // Set maximum Q-scale {12}
+        /* Set maximum Q-scale {12} */
         buf[0] = 0x83;
         buf[1] = 0x0C;
         i2c_master_send(client,buf,2);
 
-        // Set Output Protocol
+        /* Set Output Protocol */
         buf[0] = 0xD0;
         buf[1] = 0x81;
         i2c_master_send(client,buf,2);
 
-        // Set video output stream format {TS}
+        /* Set video output stream format {TS} */
         buf[0] = 0xB0;
         buf[1] = 0x05;
         i2c_master_send(client,buf,2);
@@ -421,9 +425,9 @@ static int saa6752hs_init(struct i2c_client* client)
         localPAT[sizeof(PAT) - 1] = crc & 0xFF;
 
         /* compute PMT */
-        memcpy(localPMT, PMT, sizeof(PMT));
-        localPMT[3] = 0x40 | ((h->params.ts_pid_pmt >> 8) & 0x0f);
-        localPMT[4] = h->params.ts_pid_pmt & 0xff;
+        memcpy(localPMT, PMT, sizeof(PMT));
+        localPMT[3] = 0x40 | ((h->params.ts_pid_pmt >> 8) & 0x0f);
+        localPMT[4] = h->params.ts_pid_pmt & 0xff;
         localPMT[15] = 0xE0 | ((h->params.ts_pid_pcr >> 8) & 0x0F);
         localPMT[16] = h->params.ts_pid_pcr & 0xFF;
         localPMT[20] = 0xE0 | ((h->params.ts_pid_video >> 8) & 0x0F);
@@ -436,39 +440,39 @@ static int saa6752hs_init(struct i2c_client* client)
         localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF;
         localPMT[sizeof(PMT) - 1] = crc & 0xFF;
 
-        // Set Audio PID
+        /* Set Audio PID */
         buf[0] = 0xC1;
         buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF;
         buf[2] = h->params.ts_pid_audio & 0xFF;
         i2c_master_send(client,buf,3);
 
-        // Set Video PID
+        /* Set Video PID */
         buf[0] = 0xC0;
         buf[1] = (h->params.ts_pid_video >> 8) & 0xFF;
         buf[2] = h->params.ts_pid_video & 0xFF;
         i2c_master_send(client,buf,3);
 
-        // Set PCR PID
+        /* Set PCR PID */
         buf[0] = 0xC4;
         buf[1] = (h->params.ts_pid_pcr >> 8) & 0xFF;
         buf[2] = h->params.ts_pid_pcr & 0xFF;
         i2c_master_send(client,buf,3);
 
-        // Send SI tables
+        /* Send SI tables */
         i2c_master_send(client,localPAT,sizeof(PAT));
         i2c_master_send(client,localPMT,sizeof(PMT));
 
-        // mute then unmute audio. This removes buzzing artefacts
+        /* mute then unmute audio. This removes buzzing artefacts */
         buf[0] = 0xa4;
         buf[1] = 1;
         i2c_master_send(client, buf, 2);
-        buf[1] = 0;
+        buf[1] = 0;
         i2c_master_send(client, buf, 2);
 
-        // start it going
+        /* start it going */
         saa6752hs_chip_command(client, SAA6752HS_COMMAND_START);
 
-        // readout current state
+        /* readout current state */
         buf[0] = 0xE1;
         buf[1] = 0xA7;
         buf[2] = 0xFE;
@@ -477,7 +481,7 @@ static int saa6752hs_init(struct i2c_client* client)
         i2c_master_send(client, buf, 5);
         i2c_master_recv(client, buf2, 4);
 
-        // change aspect ratio
+        /* change aspect ratio */
         buf[0] = 0xE0;
         buf[1] = 0xA7;
         buf[2] = 0xFE;
@@ -498,7 +502,6 @@ static int saa6752hs_init(struct i2c_client* client)
         buf[8] = buf2[3];
         i2c_master_send(client, buf, 9);
 
-        // return success
         return 0;
 }
 
@@ -506,16 +509,19 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct saa6752hs_state *h;
 
-        printk("saa6752hs: chip found @ 0x%x\n", addr<<1);
+        printk("saa6752hs: chip found @ 0x%x\n", addr<<1);
 
-        if (NULL == (h = kmalloc(sizeof(*h), GFP_KERNEL)))
-                return -ENOMEM;
+        if (NULL == (h = kmalloc(sizeof(*h), GFP_KERNEL)))
+                return -ENOMEM;
         memset(h,0,sizeof(*h));
         h->client = client_template;
         h->params = param_defaults;
         h->client.adapter = adap;
         h->client.addr = addr;
 
+        /* Assume 625 input lines */
+        h->standard = 0;
+
         i2c_set_clientdata(&h->client, h);
         i2c_attach_client(&h->client);
         return 0;
@@ -545,7 +551,7 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
         struct v4l2_mpeg_compression *params = arg;
         int err = 0;
 
-        switch (cmd) {
+        switch (cmd) {
         case VIDIOC_S_MPEGCOMP:
                 if (NULL == params) {
                         /* apply settings and start encoder */
@@ -559,7 +565,7 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 break;
         case VIDIOC_G_FMT:
         {
-           struct v4l2_format *f = arg;
+           struct v4l2_format *f = arg;
 
            if (h->video_format == SAA6752HS_VF_UNKNOWN)
                    h->video_format = SAA6752HS_VF_D1;
@@ -576,6 +582,9 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 saa6752hs_set_subsampling(client, f);
                 break;
         }
+        case VIDIOC_S_STD:
+                h->standard = *((v4l2_std_id *) arg);
+                break;
         default:
                 /* nothing */
                 break;
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
new file mode 100644
index 000000000000..4f3c42354329
--- /dev/null
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -0,0 +1,1047 @@
+/*
+ *   SAA713x ALSA support for V4L
+ *
+ *
+ *   Caveats:
+ *        - Volume doesn't work (it's always at max)
+ *
+ *   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
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <linux/moduleparam.h>
+#include <linux/module.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/pcm.h>
+#include <sound/initval.h>
+
+#include "saa7134.h"
+#include "saa7134-reg.h"
+
+static unsigned int debug  = 0;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
+
+/*
+ * Configuration macros
+ */
+
+/* defaults */
+#define MIXER_ADDR_TVTUNER      0
+#define MIXER_ADDR_LINE1        1
+#define MIXER_ADDR_LINE2        2
+#define MIXER_ADDR_LAST         2
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
+static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
+
+#define dprintk(fmt, arg...)    if (debug) \
+        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg)
+
+/*
+ * Main chip structure
+ */
+typedef struct snd_card_saa7134 {
+        snd_card_t *card;
+        spinlock_t mixer_lock;
+        int mixer_volume[MIXER_ADDR_LAST+1][2];
+        int capture_source[MIXER_ADDR_LAST+1][2];
+        struct pci_dev *pci;
+        struct saa7134_dev *saadev;
+
+        unsigned long iobase;
+        int irq;
+
+        spinlock_t lock;
+} snd_card_saa7134_t;
+
+
+
+/*
+ * PCM structure
+ */
+
+typedef struct snd_card_saa7134_pcm {
+        struct saa7134_dev *saadev;
+
+        spinlock_t lock;
+        unsigned int pcm_size;          /* buffer size */
+        unsigned int pcm_count;         /* bytes per period */
+        unsigned int pcm_bps;           /* bytes per second */
+        snd_pcm_substream_t *substream;
+} snd_card_saa7134_pcm_t;
+
+static snd_card_t *snd_saa7134_cards[SNDRV_CARDS];
+
+
+/*
+ * saa7134 DMA audio stop
+ *
+ *   Called when the capture device is released or the buffer overflows
+ *
+ *   - Copied verbatim from saa7134-oss's dsp_dma_stop. Can be dropped
+ *     if we just share dsp_dma_stop and use it here
+ *
+ */
+
+static void saa7134_dma_stop(struct saa7134_dev *dev)
+
+{
+        dev->dmasound.dma_blk     = -1;
+        dev->dmasound.dma_running = 0;
+        saa7134_set_dmabits(dev);
+}
+
+/*
+ * saa7134 DMA audio start
+ *
+ *   Called when preparing the capture device for use
+ *
+ *   - Copied verbatim from saa7134-oss's dsp_dma_start. Can be dropped
+ *     if we just share dsp_dma_start and use it here
+ *
+ */
+
+static void saa7134_dma_start(struct saa7134_dev *dev)
+{
+        dev->dmasound.dma_blk     = 0;
+        dev->dmasound.dma_running = 1;
+        saa7134_set_dmabits(dev);
+}
+
+/*
+ * saa7134 audio DMA IRQ handler
+ *
+ *   Called whenever we get an SAA7134_IRQ_REPORT_DONE_RA3 interrupt
+ *   Handles shifting between the 2 buffers, manages the read counters,
+ *  and notifies ALSA when periods elapse
+ *
+ *   - Mostly copied from saa7134-oss's saa7134_irq_oss_done.
+ *
+ */
+
+void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status)
+{
+        int next_blk, reg = 0;
+
+        spin_lock(&dev->slock);
+        if (UNSET == dev->dmasound.dma_blk) {
+                dprintk("irq: recording stopped\n");
+                goto done;
+        }
+        if (0 != (status & 0x0f000000))
+                dprintk("irq: lost %ld\n", (status >> 24) & 0x0f);
+        if (0 == (status & 0x10000000)) {
+                /* odd */
+                if (0 == (dev->dmasound.dma_blk & 0x01))
+                        reg = SAA7134_RS_BA1(6);
+        } else {
+                /* even */
+                if (1 == (dev->dmasound.dma_blk & 0x01))
+                        reg = SAA7134_RS_BA2(6);
+        }
+        if (0 == reg) {
+                dprintk("irq: field oops [%s]\n",
+                        (status & 0x10000000) ? "even" : "odd");
+                goto done;
+        }
+
+        if (dev->dmasound.read_count >= dev->dmasound.blksize * (dev->dmasound.blocks-2)) {
+                dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,
+                        dev->dmasound.bufsize, dev->dmasound.blocks);
+                snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN);
+                saa7134_dma_stop(dev);
+                goto done;
+        }
+
+        /* next block addr */
+        next_blk = (dev->dmasound.dma_blk + 2) % dev->dmasound.blocks;
+        saa_writel(reg,next_blk * dev->dmasound.blksize);
+        if (debug > 2)
+                dprintk("irq: ok, %s, next_blk=%d, addr=%x, blocks=%u, size=%u, read=%u\n",
+                        (status & 0x10000000) ? "even" : "odd ", next_blk,
+                        next_blk * dev->dmasound.blksize, dev->dmasound.blocks, dev->dmasound.blksize, dev->dmasound.read_count);
+
+        /* update status & wake waiting readers */
+        dev->dmasound.dma_blk = (dev->dmasound.dma_blk + 1) % dev->dmasound.blocks;
+        dev->dmasound.read_count += dev->dmasound.blksize;
+
+        dev->dmasound.recording_on = reg;
+
+        if (dev->dmasound.read_count >= snd_pcm_lib_period_bytes(dev->dmasound.substream)) {
+                spin_unlock(&dev->slock);
+                snd_pcm_period_elapsed(dev->dmasound.substream);
+                spin_lock(&dev->slock);
+        }
+ done:
+        spin_unlock(&dev->slock);
+
+}
+
+/*
+ * IRQ request handler
+ *
+ *   Runs along with saa7134's IRQ handler, discards anything that isn't
+ *   DMA sound
+ *
+ */
+
+static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct saa7134_dev *dev = (struct saa7134_dev*) dev_id;
+        unsigned long report, status;
+        int loop, handled = 0;
+
+        for (loop = 0; loop < 10; loop++) {
+                report = saa_readl(SAA7134_IRQ_REPORT);
+                status = saa_readl(SAA7134_IRQ_STATUS);
+
+                if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
+                        handled = 1;
+                        saa_writel(SAA7134_IRQ_REPORT,report);
+                        saa7134_irq_alsa_done(dev, status);
+                } else {
+                        goto out;
+                }
+        }
+
+        if (loop == 10) {
+                dprintk("error! looping IRQ!");
+        }
+
+out:
+        return IRQ_RETVAL(handled);
+}
+
+/*
+ * ALSA capture trigger
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called whenever a capture is started or stopped. Must be defined,
+ *   but there's nothing we want to do here
+ *
+ */
+
+static int snd_card_saa7134_capture_trigger(snd_pcm_substream_t * substream,
+                                          int cmd)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        snd_card_saa7134_pcm_t *saapcm = runtime->private_data;
+        struct saa7134_dev *dev=saapcm->saadev;
+        int err = 0;
+
+        spin_lock_irq(&dev->slock);
+        if (cmd == SNDRV_PCM_TRIGGER_START) {
+                /* start dma */
+                saa7134_dma_start(dev);
+        } else if (cmd == SNDRV_PCM_TRIGGER_STOP) {
+                /* stop dma */
+                saa7134_dma_stop(dev);
+        } else {
+                err = -EINVAL;
+        }
+        spin_unlock_irq(&dev->slock);
+
+        return err;
+}
+
+/*
+ * DMA buffer config
+ *
+ *   Sets the values that will later be used as the size of the buffer,
+ *  size of the fragments, and total number of fragments.
+ *   Must be called during the preparation stage, before memory is
+ *  allocated
+ *
+ *   - Copied verbatim from saa7134-oss. Can be dropped
+ *     if we just share dsp_buffer_conf from OSS.
+ */
+
+static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks)
+{
+        if (blksize < 0x100)
+                blksize = 0x100;
+        if (blksize > 0x10000)
+                blksize = 0x10000;
+
+        if (blocks < 2)
+                blocks = 2;
+        if ((blksize * blocks) > 1024*1024)
+                blocks = 1024*1024 / blksize;
+
+        dev->dmasound.blocks  = blocks;
+        dev->dmasound.blksize = blksize;
+        dev->dmasound.bufsize = blksize * blocks;
+
+        dprintk("buffer config: %d blocks / %d bytes, %d kB total\n",
+                blocks,blksize,blksize * blocks / 1024);
+        return 0;
+}
+
+/*
+ * DMA buffer initialization
+ *
+ *   Uses V4L functions to initialize the DMA. Shouldn't be necessary in
+ *  ALSA, but I was unable to use ALSA's own DMA, and had to force the
+ *  usage of V4L's
+ *
+ *   - Copied verbatim from saa7134-oss. Can be dropped
+ *     if we just share dsp_buffer_init from OSS.
+ */
+
+static int dsp_buffer_init(struct saa7134_dev *dev)
+{
+        int err;
+
+        if (!dev->dmasound.bufsize)
+                BUG();
+        videobuf_dma_init(&dev->dmasound.dma);
+        err = videobuf_dma_init_kernel(&dev->dmasound.dma, PCI_DMA_FROMDEVICE,
+                                       (dev->dmasound.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
+        if (0 != err)
+                return err;
+        return 0;
+}
+
+/*
+ * ALSA PCM preparation
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called right after the capture device is opened, this function configures
+ *  the buffer using the previously defined functions, allocates the memory,
+ *  sets up the hardware registers, and then starts the DMA. When this function
+ *  returns, the audio should be flowing.
+ *
+ */
+
+static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        int err, bswap, sign;
+        u32 fmt, control;
+        snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
+        struct saa7134_dev *dev;
+        snd_card_saa7134_pcm_t *saapcm = runtime->private_data;
+        unsigned int bps;
+        unsigned long size;
+        unsigned count;
+
+        size = snd_pcm_lib_buffer_bytes(substream);
+        count = snd_pcm_lib_period_bytes(substream);
+
+        saapcm->saadev->dmasound.substream = substream;
+        bps = runtime->rate * runtime->channels;
+        bps *= snd_pcm_format_width(runtime->format);
+        bps /= 8;
+        if (bps <= 0)
+                return -EINVAL;
+        saapcm->pcm_bps = bps;
+        saapcm->pcm_size = snd_pcm_lib_buffer_bytes(substream);
+        saapcm->pcm_count = snd_pcm_lib_period_bytes(substream);
+
+
+        dev=saa7134->saadev;
+
+        dsp_buffer_conf(dev,saapcm->pcm_count,(saapcm->pcm_size/saapcm->pcm_count));
+
+        err = dsp_buffer_init(dev);
+        if (0 != err)
+                goto fail2;
+
+        /* prepare buffer */
+        if (0 != (err = videobuf_dma_pci_map(dev->pci,&dev->dmasound.dma)))
+                return err;
+        if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt)))
+                goto fail1;
+        if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->dmasound.pt,
+                                              dev->dmasound.dma.sglist,
+                                              dev->dmasound.dma.sglen,
+                                              0)))
+                goto fail2;
+
+
+
+        switch (runtime->format) {
+          case SNDRV_PCM_FORMAT_U8:
+          case SNDRV_PCM_FORMAT_S8:
+                fmt = 0x00;
+                break;
+          case SNDRV_PCM_FORMAT_U16_LE:
+          case SNDRV_PCM_FORMAT_U16_BE:
+          case SNDRV_PCM_FORMAT_S16_LE:
+          case SNDRV_PCM_FORMAT_S16_BE:
+                fmt = 0x01;
+                break;
+          default:
+                err = -EINVAL;
+                return 1;
+        }
+
+        switch (runtime->format) {
+          case SNDRV_PCM_FORMAT_S8:
+          case SNDRV_PCM_FORMAT_S16_LE:
+          case SNDRV_PCM_FORMAT_S16_BE:
+                sign = 1;
+                break;
+          default:
+                sign = 0;
+                break;
+        }
+
+        switch (runtime->format) {
+          case SNDRV_PCM_FORMAT_U16_BE:
+          case SNDRV_PCM_FORMAT_S16_BE:
+                bswap = 1; break;
+          default:
+                bswap = 0; break;
+        }
+
+        switch (dev->pci->device) {
+          case PCI_DEVICE_ID_PHILIPS_SAA7134:
+                if (1 == runtime->channels)
+                        fmt |= (1 << 3);
+                if (2 == runtime->channels)
+                        fmt |= (3 << 3);
+                if (sign)
+                        fmt |= 0x04;
+
+                fmt |= (MIXER_ADDR_TVTUNER == dev->dmasound.input) ? 0xc0 : 0x80;
+                saa_writeb(SAA7134_NUM_SAMPLES0, ((dev->dmasound.blksize - 1) & 0x0000ff));
+                saa_writeb(SAA7134_NUM_SAMPLES1, ((dev->dmasound.blksize - 1) & 0x00ff00) >>  8);
+                saa_writeb(SAA7134_NUM_SAMPLES2, ((dev->dmasound.blksize - 1) & 0xff0000) >> 16);
+                saa_writeb(SAA7134_AUDIO_FORMAT_CTRL, fmt);
+
+                break;
+          case PCI_DEVICE_ID_PHILIPS_SAA7133:
+          case PCI_DEVICE_ID_PHILIPS_SAA7135:
+                if (1 == runtime->channels)
+                        fmt |= (1 << 4);
+                if (2 == runtime->channels)
+                        fmt |= (2 << 4);
+                if (!sign)
+                        fmt |= 0x04;
+                saa_writel(SAA7133_NUM_SAMPLES, dev->dmasound.blksize -1);
+                saa_writel(SAA7133_AUDIO_CHANNEL, 0x543210 | (fmt << 24));
+                //saa_writel(SAA7133_AUDIO_CHANNEL, 0x543210);
+                break;
+        }
+
+        dprintk("rec_start: afmt=%d ch=%d  =>  fmt=0x%x swap=%c\n",
+                runtime->format, runtime->channels, fmt,
+                bswap ? 'b' : '-');
+        /* dma: setup channel 6 (= AUDIO) */
+        control = SAA7134_RS_CONTROL_BURST_16 |
+                SAA7134_RS_CONTROL_ME |
+                (dev->dmasound.pt.dma >> 12);
+        if (bswap)
+                control |= SAA7134_RS_CONTROL_BSWAP;
+
+        /* I should be able to use runtime->dma_addr in the control
+           byte, but it doesn't work. So I allocate the DMA using the
+           V4L functions, and force ALSA to use that as the DMA area */
+
+        runtime->dma_area = dev->dmasound.dma.vmalloc;
+
+        saa_writel(SAA7134_RS_BA1(6),0);
+        saa_writel(SAA7134_RS_BA2(6),dev->dmasound.blksize);
+        saa_writel(SAA7134_RS_PITCH(6),0);
+        saa_writel(SAA7134_RS_CONTROL(6),control);
+
+        dev->dmasound.rate = runtime->rate;
+
+        return 0;
+ fail2:
+        saa7134_pgtable_free(dev->pci,&dev->dmasound.pt);
+ fail1:
+        videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma);
+        return err;
+
+
+}
+
+/*
+ * ALSA pointer fetching
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called whenever a period elapses, it must return the current hardware
+ *  position of the buffer.
+ *   Also resets the read counter used to prevent overruns
+ *
+ */
+
+static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t * substream)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        snd_card_saa7134_pcm_t *saapcm = runtime->private_data;
+        struct saa7134_dev *dev=saapcm->saadev;
+
+
+
+        if (dev->dmasound.read_count) {
+                dev->dmasound.read_count  -= snd_pcm_lib_period_bytes(substream);
+                dev->dmasound.read_offset += snd_pcm_lib_period_bytes(substream);
+                if (dev->dmasound.read_offset == dev->dmasound.bufsize)
+                        dev->dmasound.read_offset = 0;
+        }
+
+        return bytes_to_frames(runtime, dev->dmasound.read_offset);
+}
+
+/*
+ * ALSA hardware capabilities definition
+ */
+
+static snd_pcm_hardware_t snd_card_saa7134_capture =
+{
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE | \
+                                SNDRV_PCM_FMTBIT_S16_BE | \
+                                SNDRV_PCM_FMTBIT_S8 | \
+                                SNDRV_PCM_FMTBIT_U8 | \
+                                SNDRV_PCM_FMTBIT_U16_LE | \
+                                SNDRV_PCM_FMTBIT_U16_BE,
+        .rates =                SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000,
+        .rate_min =             32000,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .buffer_bytes_max =     (256*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (256*1024),
+        .periods_min =          2,
+        .periods_max =          1024,
+};
+
+static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime)
+{
+        snd_card_saa7134_pcm_t *saapcm = runtime->private_data;
+
+        kfree(saapcm);
+}
+
+
+/*
+ * ALSA hardware params
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called on initialization, right before the PCM preparation
+ *   Usually used in ALSA to allocate the DMA, but since we don't use the
+ *  ALSA DMA it does nothing
+ *
+ */
+
+static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
+                                    snd_pcm_hw_params_t * hw_params)
+{
+
+        return 0;
+
+
+}
+
+/*
+ * ALSA hardware release
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called after closing the device, but before snd_card_saa7134_capture_close
+ *   Usually used in ALSA to free the DMA, but since we don't use the
+ *  ALSA DMA I'm almost sure this isn't necessary.
+ *
+ */
+
+static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream)
+{
+        return 0;
+}
+
+/*
+ * DMA buffer release
+ *
+ *   Called after closing the device, during snd_card_saa7134_capture_close
+ *
+ */
+
+static int dsp_buffer_free(struct saa7134_dev *dev)
+{
+        if (!dev->dmasound.blksize)
+                BUG();
+
+        videobuf_dma_free(&dev->dmasound.dma);
+
+        dev->dmasound.blocks  = 0;
+        dev->dmasound.blksize = 0;
+        dev->dmasound.bufsize = 0;
+
+        return 0;
+}
+
+/*
+ * ALSA capture finish
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called after closing the device. It stops the DMA audio and releases
+ *  the buffers
+ *
+ */
+
+static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream)
+{
+        snd_card_saa7134_t *chip = snd_pcm_substream_chip(substream);
+        struct saa7134_dev *dev = chip->saadev;
+
+        /* unlock buffer */
+        saa7134_pgtable_free(dev->pci,&dev->dmasound.pt);
+        videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma);
+
+        dsp_buffer_free(dev);
+        return 0;
+}
+
+/*
+ * ALSA capture start
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called when opening the device. It creates and populates the PCM
+ *  structure
+ *
+ */
+
+static int snd_card_saa7134_capture_open(snd_pcm_substream_t * substream)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        snd_card_saa7134_pcm_t *saapcm;
+        snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
+        struct saa7134_dev *dev = saa7134->saadev;
+        int err;
+
+        down(&dev->dmasound.lock);
+
+        dev->dmasound.afmt        = SNDRV_PCM_FORMAT_U8;
+        dev->dmasound.channels    = 2;
+        dev->dmasound.read_count  = 0;
+        dev->dmasound.read_offset = 0;
+
+        up(&dev->dmasound.lock);
+
+        saapcm = kzalloc(sizeof(*saapcm), GFP_KERNEL);
+        if (saapcm == NULL)
+                return -ENOMEM;
+        saapcm->saadev=saa7134->saadev;
+
+        spin_lock_init(&saapcm->lock);
+
+        saapcm->substream = substream;
+        runtime->private_data = saapcm;
+        runtime->private_free = snd_card_saa7134_runtime_free;
+        runtime->hw = snd_card_saa7134_capture;
+
+        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+                return err;
+
+        return 0;
+}
+
+/*
+ * ALSA capture callbacks definition
+ */
+
+static snd_pcm_ops_t snd_card_saa7134_capture_ops = {
+        .open =                 snd_card_saa7134_capture_open,
+        .close =                snd_card_saa7134_capture_close,
+        .ioctl =                snd_pcm_lib_ioctl,
+        .hw_params =            snd_card_saa7134_hw_params,
+        .hw_free =              snd_card_saa7134_hw_free,
+        .prepare =              snd_card_saa7134_capture_prepare,
+        .trigger =              snd_card_saa7134_capture_trigger,
+        .pointer =              snd_card_saa7134_capture_pointer,
+};
+
+/*
+ * ALSA PCM setup
+ *
+ *   Called when initializing the board. Sets up the name and hooks up
+ *  the callbacks
+ *
+ */
+
+static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
+{
+        snd_pcm_t *pcm;
+        int err;
+
+        if ((err = snd_pcm_new(saa7134->card, "SAA7134 PCM", device, 0, 1, &pcm)) < 0)
+                return err;
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_card_saa7134_capture_ops);
+        pcm->private_data = saa7134;
+        pcm->info_flags = 0;
+        strcpy(pcm->name, "SAA7134 PCM");
+        return 0;
+}
+
+#define SAA713x_VOLUME(xname, xindex, addr) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_saa7134_volume_info, \
+  .get = snd_saa7134_volume_get, .put = snd_saa7134_volume_put, \
+  .private_value = addr }
+
+static int snd_saa7134_volume_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 20;
+        return 0;
+}
+
+static int snd_saa7134_volume_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+        int addr = kcontrol->private_value;
+
+        ucontrol->value.integer.value[0] = chip->mixer_volume[addr][0];
+        ucontrol->value.integer.value[1] = chip->mixer_volume[addr][1];
+        return 0;
+}
+
+static int snd_saa7134_volume_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+        unsigned long flags;
+        int change, addr = kcontrol->private_value;
+        int left, right;
+
+        left = ucontrol->value.integer.value[0];
+        if (left < 0)
+                left = 0;
+        if (left > 20)
+                left = 20;
+        right = ucontrol->value.integer.value[1];
+        if (right < 0)
+                right = 0;
+        if (right > 20)
+                right = 20;
+        spin_lock_irqsave(&chip->mixer_lock, flags);
+        change = chip->mixer_volume[addr][0] != left ||
+                 chip->mixer_volume[addr][1] != right;
+        chip->mixer_volume[addr][0] = left;
+        chip->mixer_volume[addr][1] = right;
+        spin_unlock_irqrestore(&chip->mixer_lock, flags);
+        return change;
+}
+
+#define SAA713x_CAPSRC(xname, xindex, addr) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_saa7134_capsrc_info, \
+  .get = snd_saa7134_capsrc_get, .put = snd_saa7134_capsrc_put, \
+  .private_value = addr }
+
+static int snd_saa7134_capsrc_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_saa7134_capsrc_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+        unsigned long flags;
+        int addr = kcontrol->private_value;
+
+        spin_lock_irqsave(&chip->mixer_lock, flags);
+        ucontrol->value.integer.value[0] = chip->capture_source[addr][0];
+        ucontrol->value.integer.value[1] = chip->capture_source[addr][1];
+        spin_unlock_irqrestore(&chip->mixer_lock, flags);
+        return 0;
+}
+
+static int snd_saa7134_capsrc_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+        unsigned long flags;
+        int change, addr = kcontrol->private_value;
+        int left, right;
+        u32 anabar, xbarin;
+        int analog_io, rate;
+        struct saa7134_dev *dev;
+
+        dev = chip->saadev;
+
+        left = ucontrol->value.integer.value[0] & 1;
+        right = ucontrol->value.integer.value[1] & 1;
+        spin_lock_irqsave(&chip->mixer_lock, flags);
+
+        change = chip->capture_source[addr][0] != left ||
+                 chip->capture_source[addr][1] != right;
+        chip->capture_source[addr][0] = left;
+        chip->capture_source[addr][1] = right;
+        dev->dmasound.input=addr;
+        spin_unlock_irqrestore(&chip->mixer_lock, flags);
+
+
+        if (change) {
+          switch (dev->pci->device) {
+
+           case PCI_DEVICE_ID_PHILIPS_SAA7134:
+                switch (addr) {
+                        case MIXER_ADDR_TVTUNER:
+                                saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, 0xc0);
+                                saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, 0x00);
+                                break;
+                        case MIXER_ADDR_LINE1:
+                        case MIXER_ADDR_LINE2:
+                                analog_io = (MIXER_ADDR_LINE1 == addr) ? 0x00 : 0x08;
+                                rate = (32000 == dev->dmasound.rate) ? 0x01 : 0x03;
+                                saa_andorb(SAA7134_ANALOG_IO_SELECT,  0x08, analog_io);
+                                saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, 0x80);
+                                saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, rate);
+                                break;
+                }
+
+                break;
+           case PCI_DEVICE_ID_PHILIPS_SAA7133:
+           case PCI_DEVICE_ID_PHILIPS_SAA7135:
+                xbarin = 0x03; // adc
+                anabar = 0;
+                switch (addr) {
+                        case MIXER_ADDR_TVTUNER:
+                                xbarin = 0; // Demodulator
+                                anabar = 2; // DACs
+                                break;
+                        case MIXER_ADDR_LINE1:
+                                anabar = 0;  // aux1, aux1
+                                break;
+                        case MIXER_ADDR_LINE2:
+                                anabar = 9;  // aux2, aux2
+                                break;
+                }
+
+                /* output xbar always main channel */
+                saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10);
+
+                if (left || right) { // We've got data, turn the input on
+                  saa_dsp_writel(dev, SAA7133_DIGITAL_INPUT_XBAR1, xbarin);
+                  saa_writel(SAA7133_ANALOG_IO_SELECT, anabar);
+                } else {
+                  saa_dsp_writel(dev, SAA7133_DIGITAL_INPUT_XBAR1, 0);
+                  saa_writel(SAA7133_ANALOG_IO_SELECT, 0);
+                }
+                break;
+          }
+        }
+
+        return change;
+}
+
+static snd_kcontrol_new_t snd_saa7134_controls[] = {
+SAA713x_VOLUME("Video Volume", 0, MIXER_ADDR_TVTUNER),
+SAA713x_CAPSRC("Video Capture Switch", 0, MIXER_ADDR_TVTUNER),
+SAA713x_VOLUME("Line Volume", 1, MIXER_ADDR_LINE1),
+SAA713x_CAPSRC("Line Capture Switch", 1, MIXER_ADDR_LINE1),
+SAA713x_VOLUME("Line Volume", 2, MIXER_ADDR_LINE2),
+SAA713x_CAPSRC("Line Capture Switch", 2, MIXER_ADDR_LINE2),
+};
+
+/*
+ * ALSA mixer setup
+ *
+ *   Called when initializing the board. Sets up the name and hooks up
+ *  the callbacks
+ *
+ */
+
+static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
+{
+        snd_card_t *card = chip->card;
+        unsigned int idx;
+        int err;
+
+        snd_assert(chip != NULL, return -EINVAL);
+        strcpy(card->mixername, "SAA7134 Mixer");
+
+        for (idx = 0; idx < ARRAY_SIZE(snd_saa7134_controls); idx++) {
+                if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_saa7134_controls[idx], chip))) < 0)
+                        return err;
+        }
+        return 0;
+}
+
+static int snd_saa7134_free(snd_card_saa7134_t *chip)
+{
+        return 0;
+}
+
+static int snd_saa7134_dev_free(snd_device_t *device)
+{
+        snd_card_saa7134_t *chip = device->device_data;
+        return snd_saa7134_free(chip);
+}
+
+/*
+ * ALSA initialization
+ *
+ *   Called by saa7134-core, it creates the basic structures and registers
+ *  the ALSA devices
+ *
+ */
+
+int alsa_card_saa7134_create (struct saa7134_dev *saadev)
+{
+        static int dev;
+
+        snd_card_t *card;
+        snd_card_saa7134_t *chip;
+        int err;
+        static snd_device_ops_t ops = {
+                .dev_free =     snd_saa7134_dev_free,
+        };
+
+
+        if (dev >= SNDRV_CARDS)
+                return -ENODEV;
+        if (!enable[dev])
+                return -ENODEV;
+
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+
+        if (card == NULL)
+                return -ENOMEM;
+
+        strcpy(card->driver, "SAA7134");
+
+        /* Card "creation" */
+
+        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        if (chip == NULL) {
+                return -ENOMEM;
+        }
+
+        spin_lock_init(&chip->lock);
+        spin_lock_init(&chip->mixer_lock);
+
+        chip->saadev = saadev;
+
+        chip->card = card;
+
+        chip->pci = saadev->pci;
+        chip->irq = saadev->pci->irq;
+        chip->iobase = pci_resource_start(saadev->pci, 0);
+
+        err = request_irq(saadev->pci->irq, saa7134_alsa_irq,
+                                SA_SHIRQ | SA_INTERRUPT, saadev->name, saadev);
+
+        if (err < 0) {
+                printk(KERN_ERR "%s: can't get IRQ %d for ALSA\n",
+                        saadev->name, saadev->pci->irq);
+                goto __nodev;
+        }
+
+        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+                goto __nodev;
+        }
+
+        if ((err = snd_card_saa7134_new_mixer(chip)) < 0)
+                goto __nodev;
+
+        if ((err = snd_card_saa7134_pcm(chip, 0)) < 0)
+                goto __nodev;
+
+        snd_card_set_dev(card, &chip->pci->dev);
+
+        /* End of "creation" */
+
+        strcpy(card->shortname, "SAA7134");
+        sprintf(card->longname, "%s at 0x%lx irq %d",
+                chip->saadev->name, chip->iobase, chip->irq);
+
+        if ((err = snd_card_register(card)) == 0) {
+                snd_saa7134_cards[dev] = card;
+                return 0;
+        }
+
+__nodev:
+        snd_card_free(card);
+        kfree(chip);
+        return err;
+}
+
+/*
+ * Module initializer
+ *
+ * Loops through present saa7134 cards, and assigns an ALSA device
+ * to each one
+ *
+ */
+
+static int saa7134_alsa_init(void)
+{
+        struct saa7134_dev *saadev = NULL;
+        struct list_head *list;
+
+        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
+
+        list_for_each(list,&saa7134_devlist) {
+                saadev = list_entry(list, struct saa7134_dev, devlist);
+                alsa_card_saa7134_create(saadev);
+        }
+
+        if (saadev == NULL)
+                printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n");
+
+        return 0;
+
+}
+
+/*
+ * Module destructor
+ */
+
+void saa7134_alsa_exit(void)
+{
+        int idx;
+
+        for (idx = 0; idx < SNDRV_CARDS; idx++) {
+                snd_card_free(snd_saa7134_cards[idx]);
+        }
+
+        printk(KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n");
+
+        return;
+}
+
+module_init(saa7134_alsa_init);
+module_exit(saa7134_alsa_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ricardo Cerqueira");
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index acc7a4335e23..663d03e5bc67 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -191,10 +191,14 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = TV,
                         .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .name = name_comp1,     /* Composite signal on S-Video input */
                         .vmux = 0,
                         .amux = LINE2,
                 },{
+                        .name = name_comp2,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
                         .name = name_svideo,
                         .vmux = 8,
                         .amux = LINE2,
@@ -2109,8 +2113,423 @@ struct saa7134_board saa7134_boards[] = {
                         .gpio = 0x01,
                 },
         },
-};
+        [SAA7134_BOARD_BEHOLD_409FM] = {
+                /* <http://tuner.beholder.ru>, Sergey <skiv@orel.ru> */
+                .name           = "Beholder BeholdTV 409 FM",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .inputs         = {{
+                          .name = name_tv,
+                          .vmux = 3,
+                          .amux = TV,
+                          .tv   = 1,
+                },{
+                          .name = name_comp1,
+                          .vmux = 1,
+                          .amux = LINE1,
+                },{
+                          .name = name_svideo,
+                          .vmux = 8,
+                          .amux = LINE1,
+                }},
+                .radio = {
+                          .name = name_radio,
+                          .amux = LINE2,
+                },
+        },
+        [SAA7134_BOARD_GOTVIEW_7135] = {
+                /* Mike Baikov <mike@baikov.com> */
+                /* Andrey Cvetcov <ays14@yandex.ru> */
+                .name            = "GoTView 7135 PCI",
+                .audio_clock     = 0x00187de7,
+                .tuner_type      = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type      = UNSET,
+                .tuner_addr      = ADDR_UNSET,
+                .radio_addr      = ADDR_UNSET,
+                .tda9887_conf    = TDA9887_PRESENT,
+                .gpiomask        = 0x00200003,
+                .inputs          = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                        .gpio = 0x00200003,
+                },{
+                        .name = name_tv_mono,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .gpio = 0x00200003,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                        .gpio = 0x00200003,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                        .gpio = 0x00200003,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+                        .gpio = 0x00200003,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                        .gpio = 0x00200003,
+                },
+        },
+        [SAA7134_BOARD_PHILIPS_EUROPA] = {
+                .name           = "Philips EUROPA V3 reference design",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TD1316,
+                .radio_type     = UNSET,
+                .tuner_addr     = 0x61,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 3,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 0,
+                        .amux   = LINE2,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE2,
+                }},
+        },
+        [SAA7134_BOARD_VIDEOMATE_DVBT_300] = {
+                .name           = "Compro Videomate DVB-T300",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TD1316,
+                .radio_type     = UNSET,
+                .tuner_addr     = 0x61,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 3,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 1,
+                        .amux   = LINE2,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE2,
+                }},
+        },
+        [SAA7134_BOARD_VIDEOMATE_DVBT_200] = {
+                .name           = "Compro Videomate DVB-T200",
+                .tuner_type     = TUNER_ABSENT,
+                .audio_clock    = 0x00187de7,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs = {{
+                        .name   = name_comp1,
+                        .vmux   = 0,
+                        .amux   = LINE1,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                }},
+        },
+        [SAA7134_BOARD_RTD_VFG7350] = {
+                .name           = "RTD Embedded Technologies VFG7350",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name   = "Composite 0",
+                        .vmux   = 0,
+                        .amux   = LINE1,
+                },{
+                        .name   = "Composite 1",
+                        .vmux   = 1,
+                        .amux   = LINE2,
+                },{
+                        .name   = "Composite 2",
+                        .vmux   = 2,
+                        .amux   = LINE1,
+                },{
+                        .name   = "Composite 3",
+                        .vmux   = 3,
+                        .amux   = LINE2,
+                },{
+                        .name   = "S-Video 0",
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                },{
+                        .name   = "S-Video 1",
+                        .vmux   = 9,
+                        .amux   = LINE2,
+                }},
+                .mpeg           = SAA7134_MPEG_EMPRESS,
+                .video_out      = CCIR656,
+                .vid_port_opts  = ( SET_T_CODE_POLARITY_NON_INVERTED |
+                                    SET_CLOCK_NOT_DELAYED |
+                                    SET_CLOCK_INVERTED |
+                                    SET_VSYNC_OFF ),
+        },
+        [SAA7134_BOARD_RTD_VFG7330] = {
+                .name           = "RTD Embedded Technologies VFG7330",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name   = "Composite 0",
+                        .vmux   = 0,
+                        .amux   = LINE1,
+                },{
+                        .name   = "Composite 1",
+                        .vmux   = 1,
+                        .amux   = LINE2,
+                },{
+                        .name   = "Composite 2",
+                        .vmux   = 2,
+                        .amux   = LINE1,
+                },{
+                        .name   = "Composite 3",
+                        .vmux   = 3,
+                        .amux   = LINE2,
+                },{
+                        .name   = "S-Video 0",
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                },{
+                        .name   = "S-Video 1",
+                        .vmux   = 9,
+                        .amux   = LINE2,
+                }},
+        },
+        [SAA7134_BOARD_FLYTVPLATINUM_MINI2] = {
+                .name           = "LifeView FlyTV Platinum Mini2",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
 
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,     /* Composite signal on S-Video input */
+                        .vmux = 0,
+                        .amux = LINE2,
+                },{
+                        .name = name_comp2,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+        },
+        [SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180] = {
+                /* Michael Krufky <mkrufky@m1k.net>
+                 * Uses Alps Electric TDHU2, containing NXT2004 ATSC Decoder
+                 * AFAIK, there is no analog demod, thus,
+                 * no support for analog television.
+                 */
+                .name           = "AVerMedia AVerTVHD MCE A180",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = {{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+        },
+        [SAA7134_BOARD_MONSTERTV_MOBILE] = {
+                .name           = "SKNet MonsterTV Mobile",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+
+                .inputs         = {{
+                          .name = name_tv,
+                          .vmux = 1,
+                          .amux = TV,
+                          .tv   = 1,
+                },{
+                          .name = name_comp1,
+                          .vmux = 3,
+                          .amux = LINE1,
+                },{
+                          .name = name_svideo,
+                          .vmux = 6,
+                          .amux = LINE1,
+                }},
+        },
+        [SAA7134_BOARD_PINNACLE_PCTV_110i] = {
+                .name           = "Pinnacle PCTV 110i (saa7133)",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x080200000,
+                .inputs         = {{
+                          .name = name_tv,
+                          .vmux = 4,
+                          .amux = TV,
+                          .tv   = 1,
+                },{
+                          .name = name_comp1,
+                          .vmux = 1,
+                          .amux = LINE2,
+                },{
+                          .name = name_svideo,
+                          .vmux = 8,
+                          .amux = LINE2,
+                }},
+                .radio = {
+                          .name = name_radio,
+                          .amux = LINE1,
+                },
+        },
+        [SAA7134_BOARD_ASUSTeK_P7131_DUAL] = {
+                .name           = "ASUSTeK P7131 Dual",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 1 << 21,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
+                },
+        },
+        [SAA7134_BOARD_SEDNA_PC_TV_CARDBUS] = {
+                /* Paul Tom Zalac <pzalac@gmail.com> */
+                /* Pavel Mihaylov <bin@bash.info> */
+                .name           = "Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)",
+                                /* Sedna/MuchTV (OEM) Cardbus TV Tuner */
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0xe880c0,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 3,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 1,
+                        .amux = LINE1,
+                },{
+                        .name = name_svideo,
+                        .vmux = 6,
+                        .amux = LINE1,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+                },
+        },
+        [SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV] = {
+                /* "Cyril Lacoux (Yack)" <clacoux@ifeelgood.org> */
+                .name           = "ASUS Digimatrix TV",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_PHILIPS_FQ1216ME,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                }},
+        },
+        [SAA7134_BOARD_PHILIPS_TIGER] = {
+                .name           = "Philips Tiger reference design",
+                .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   = 3,
+                        .amux   = LINE1,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                }},
+        },
+};
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
 
@@ -2145,19 +2564,19 @@ struct pci_device_id saa7134_pci_tbl[] = {
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
-                .subvendor    = 0x153B,
+                .subvendor    = 0x153b,
                 .subdevice    = 0x1142,
                 .driver_data  = SAA7134_BOARD_CINERGY400,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
-                .subvendor    = 0x153B,
+                .subvendor    = 0x153b,
                 .subdevice    = 0x1143,
                 .driver_data  = SAA7134_BOARD_CINERGY600,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
-                .subvendor    = 0x153B,
+                .subvendor    = 0x153b,
                 .subdevice    = 0x1158,
                 .driver_data  = SAA7134_BOARD_CINERGY600_MK3,
         },{
@@ -2193,6 +2612,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x14c0,
+                .subdevice    = 0x1212, /* minipci, LR1212 */
+                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_MINI2,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x4e42,
+                .subdevice    = 0x0212, /* OEM minipci, LR212 */
+                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_MINI,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x5168, /* Animation Technologies (LifeView) */
                 .subdevice    = 0x0214, /* Standard PCI, LR214WF */
                 .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,
@@ -2369,7 +2800,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
-                .subvendor    = 0x153B,
+                .subvendor    = 0x153b,
                 .subdevice    = 0x1152,
                 .driver_data  = SAA7134_BOARD_CINERGY200,
         },{
@@ -2434,13 +2865,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subvendor    = 0x1421,
                 .subdevice    = 0x0350,         /* PCI version */
                 .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
-
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x1421,
                 .subdevice    = 0x0370,         /* cardbus version */
                 .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1421,
+                .subdevice    = 0x1370,        /* cardbus version */
+                .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
 
         },{     /* Typhoon DVB-T Duo Digital/Analog Cardbus */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -2459,9 +2895,81 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
                 .subvendor    = 0x1043,
                 .subdevice    = 0x0210,         /* mini pci PAL/SECAM version */
-                .driver_data  = SAA7134_BOARD_FLYTV_DIGIMATRIX,
+                .driver_data  = SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV,
 
         },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x0000, /* It shouldn't break anything, since subdevice id seems unique */
+                .subdevice    = 0x4091,
+                .driver_data  = SAA7134_BOARD_BEHOLD_409FM,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x5456, /* GoTView */
+                .subdevice    = 0x7135,
+                .driver_data  = SAA7134_BOARD_GOTVIEW_7135,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = PCI_VENDOR_ID_PHILIPS,
+                .subdevice    = 0x2004,
+                .driver_data  = SAA7134_BOARD_PHILIPS_EUROPA,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x185b,
+                .subdevice    = 0xc900,
+                .driver_data  = SAA7134_BOARD_VIDEOMATE_DVBT_300,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x185b,
+                .subdevice    = 0xc901,
+                .driver_data  = SAA7134_BOARD_VIDEOMATE_DVBT_200,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1435,
+                .subdevice    = 0x7350,
+                .driver_data  = SAA7134_BOARD_RTD_VFG7350,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1435,
+                .subdevice    = 0x7330,
+                .driver_data  = SAA7134_BOARD_RTD_VFG7330,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1461,
+                .subdevice    = 0x1044,
+                .driver_data  = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1131,
+                .subdevice    = 0x4ee9,
+                .driver_data  = SAA7134_BOARD_MONSTERTV_MOBILE,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x11bd,
+                .subdevice    = 0x002e,
+                .driver_data  = SAA7134_BOARD_PINNACLE_PCTV_110i,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1043,
+                .subdevice    = 0x4862,
+                .driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = PCI_VENDOR_ID_PHILIPS,
+                .subdevice    = 0x2018,
+                .driver_data  = SAA7134_BOARD_PHILIPS_TIGER,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -2530,9 +3038,10 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         switch (dev->board) {
         case SAA7134_BOARD_FLYVIDEO2000:
         case SAA7134_BOARD_FLYVIDEO3000:
-                dev->has_remote = 1;
+                dev->has_remote = SAA7134_REMOTE_GPIO;
                 board_flyvideo(dev);
                 break;
+        case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
         case SAA7134_BOARD_FLYTVPLATINUM_FM:
         case SAA7134_BOARD_CINERGY400:
         case SAA7134_BOARD_CINERGY600:
@@ -2550,10 +3059,16 @@ int saa7134_board_init1(struct saa7134_dev *dev)
 /*      case SAA7134_BOARD_SABRENT_SBTTVFM:  */ /* not finished yet */
         case SAA7134_BOARD_VIDEOMATE_TV_PVR:
         case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
+        case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+        case SAA7134_BOARD_VIDEOMATE_DVBT_200:
         case SAA7134_BOARD_MANLI_MTV001:
         case SAA7134_BOARD_MANLI_MTV002:
+        case SAA7134_BOARD_BEHOLD_409FM:
         case SAA7134_BOARD_AVACSSMARTTV:
-                dev->has_remote = 1;
+        case SAA7134_BOARD_GOTVIEW_7135:
+        case SAA7134_BOARD_KWORLD_TERMINATOR:
+        case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
+                dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_MD5044:
                 printk("%s: seems there are two different versions of the MD5044\n"
@@ -2565,11 +3080,14 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 /* power-up tuner chip */
                 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);
                 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000);
-                msleep(1);
+        case SAA7134_BOARD_MONSTERTV_MOBILE:
+                /* power-up tuner chip */
+                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);
+                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000004);
                 break;
         case SAA7134_BOARD_FLYDVBTDUO:
         case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS:
-        /* turn the fan on Hac: static for the time being */
+                /* turn the fan on */
                 saa_writeb(SAA7134_GPIO_GPMODE3, 0x08);
                 saa_writeb(SAA7134_GPIO_GPSTATUS3, 0x06);
                 break;
@@ -2579,6 +3097,22 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0xffffffff);
                 msleep(1);
                 break;
+        case SAA7134_BOARD_RTD_VFG7350:
+
+                /*
+                 * Make sure Production Test Register at offset 0x1D1 is cleared
+                 * to take chip out of test mode.  Clearing bit 4 (TST_EN_AOUT)
+                 * prevents pin 105 from remaining low; keeping pin 105 low
+                 * continually resets the SAA6752 chip.
+                 */
+
+                saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00);
+                break;
+        /* i2c remotes */
+        case SAA7134_BOARD_PINNACLE_PCTV_110i:
+        case SAA7134_BOARD_UPMOST_PURPLE_TV:
+                dev->has_remote = SAA7134_REMOTE_I2C;
+                break;
         }
         return 0;
 }
@@ -2613,7 +3147,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                                 saa7134_i2c_call_clients (dev, TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
                 break;
-case SAA7134_BOARD_MD7134:
+        case SAA7134_BOARD_MD7134:
                 {
                 struct tuner_setup tun_setup;
                 u8 subaddr;
@@ -2680,6 +3214,33 @@ case SAA7134_BOARD_MD7134:
                 saa7134_i2c_call_clients (dev, TUNER_SET_TYPE_ADDR,&tun_setup);
                 }
                 break;
+        case SAA7134_BOARD_PHILIPS_EUROPA:
+        case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+                /* The Philips EUROPA based hybrid boards have the tuner connected through
+                 * the channel decoder. We have to make it transparent to find it
+                 */
+                {
+                struct tuner_setup tun_setup;
+                u8 data[] = { 0x07, 0x02};
+                struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
+                i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+                tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
+                tun_setup.type = dev->tuner_type;
+                tun_setup.addr = dev->tuner_addr;
+
+                saa7134_i2c_call_clients (dev, TUNER_SET_TYPE_ADDR,&tun_setup);
+                }
+                break;
+        case SAA7134_BOARD_PHILIPS_TIGER:
+        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+                /* this is a hybrid board, initialize to analog mode */
+                {
+                u8 data[] = { 0x3c, 0x33, 0x68};
+                struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
+                i2c_transfer(&dev->i2c_adap, &msg, 1);
+                }
+                break;
         }
         return 0;
 }
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index e5e36f3c6250..19b88744fb31 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -57,6 +57,10 @@ static unsigned int oss = 0;
 module_param(oss, int, 0444);
 MODULE_PARM_DESC(oss,"register oss devices (default: no)");
 
+static unsigned int alsa = 0;
+module_param(alsa, int, 0444);
+MODULE_PARM_DESC(alsa,"register alsa devices (default: no)");
+
 static unsigned int latency = UNSET;
 module_param(latency, int, 0444);
 MODULE_PARM_DESC(latency,"pci latency timer");
@@ -190,6 +194,7 @@ void saa7134_track_gpio(struct saa7134_dev *dev, char *msg)
 
 static int need_empress;
 static int need_dvb;
+static int need_alsa;
 
 static int pending_call(struct notifier_block *self, unsigned long state,
                         void *module)
@@ -197,10 +202,12 @@ static int pending_call(struct notifier_block *self, unsigned long state,
         if (module != THIS_MODULE || state != MODULE_STATE_LIVE)
                 return NOTIFY_DONE;
 
-        if (need_empress)
-                request_module("saa7134-empress");
-        if (need_dvb)
-                request_module("saa7134-dvb");
+        if (need_empress)
+                request_module("saa7134-empress");
+        if (need_dvb)
+                request_module("saa7134-dvb");
+        if (need_alsa)
+                request_module("saa7134-alsa");
         return NOTIFY_DONE;
 }
 
@@ -275,8 +282,8 @@ unsigned long saa7134_buffer_base(struct saa7134_buf *buf)
 
 int saa7134_pgtable_alloc(struct pci_dev *pci, struct saa7134_pgtable *pt)
 {
-        __le32       *cpu;
-        dma_addr_t   dma_addr;
+        __le32       *cpu;
+        dma_addr_t   dma_addr;
 
         cpu = pci_alloc_consistent(pci, SAA7134_PGTABLE_SIZE, &dma_addr);
         if (NULL == cpu)
@@ -436,7 +443,7 @@ int saa7134_set_dmabits(struct saa7134_dev *dev)
                 ctrl |= SAA7134_MAIN_CTRL_TE0;
                 irq  |= SAA7134_IRQ1_INTE_RA0_1 |
                         SAA7134_IRQ1_INTE_RA0_0;
-                cap = dev->video_q.curr->vb.field;
+                cap = dev->video_q.curr->vb.field;
         }
 
         /* video capture -- dma 1+2 (planar modes) */
@@ -465,7 +472,7 @@ int saa7134_set_dmabits(struct saa7134_dev *dev)
         }
 
         /* audio capture -- dma 3 */
-        if (dev->oss.dma_running) {
+        if (dev->dmasound.dma_running) {
                 ctrl |= SAA7134_MAIN_CTRL_TE6;
                 irq  |= SAA7134_IRQ1_INTE_RA3_1 |
                         SAA7134_IRQ1_INTE_RA3_0;
@@ -570,6 +577,17 @@ static irqreturn_t saa7134_irq(int irq, void *dev_id, struct pt_regs *regs)
                                        dev->name);
                         goto out;
                 }
+
+                /* If alsa support is active and we get a sound report, exit
+                   and let the saa7134-alsa module deal with it */
+
+                if ((report & SAA7134_IRQ_REPORT_DONE_RA3) && alsa)  {
+                        if (irq_debug > 1)
+                                printk(KERN_DEBUG "%s/irq: ignoring interrupt for ALSA\n",
+                                       dev->name);
+                        goto out;
+                }
+
                 handled = 1;
                 saa_writel(SAA7134_IRQ_REPORT,report);
                 if (irq_debug)
@@ -591,13 +609,17 @@ static irqreturn_t saa7134_irq(int irq, void *dev_id, struct pt_regs *regs)
                     card_has_mpeg(dev))
                         saa7134_irq_ts_done(dev,status);
 
-                if ((report & SAA7134_IRQ_REPORT_DONE_RA3))
-                        saa7134_irq_oss_done(dev,status);
+                if ((report & SAA7134_IRQ_REPORT_DONE_RA3))  {
+                        if (oss) {
+                                saa7134_irq_oss_done(dev,status);
+                        }
+                }
 
                 if ((report & (SAA7134_IRQ_REPORT_GPIO16 |
                                SAA7134_IRQ_REPORT_GPIO18)) &&
                     dev->remote)
                         saa7134_input_irq(dev);
+
         }
 
         if (10 == loop) {
@@ -636,7 +658,7 @@ static int saa7134_hwinit1(struct saa7134_dev *dev)
 
         saa_writel(SAA7134_IRQ1, 0);
         saa_writel(SAA7134_IRQ2, 0);
-        init_MUTEX(&dev->lock);
+        init_MUTEX(&dev->lock);
         spin_lock_init(&dev->slock);
 
         saa7134_track_gpio(dev,"pre-init");
@@ -646,14 +668,6 @@ static int saa7134_hwinit1(struct saa7134_dev *dev)
                 saa7134_ts_init1(dev);
         saa7134_input_init1(dev);
 
-        switch (dev->pci->device) {
-        case PCI_DEVICE_ID_PHILIPS_SAA7134:
-        case PCI_DEVICE_ID_PHILIPS_SAA7133:
-        case PCI_DEVICE_ID_PHILIPS_SAA7135:
-                saa7134_oss_init1(dev);
-                break;
-        }
-
         /* RAM FIFO config */
         saa_writel(SAA7134_FIFO_SIZE, 0x08070503);
         saa_writel(SAA7134_THRESHOULD,0x02020202);
@@ -668,6 +682,21 @@ static int saa7134_hwinit1(struct saa7134_dev *dev)
                    SAA7134_MAIN_CTRL_ESFE  |
                    SAA7134_MAIN_CTRL_EBDAC);
 
+        /*
+         * Initialize OSS _after_ enabling audio clock PLL and audio processing.
+         * OSS initialization writes to registers via the audio DSP; these
+         * writes will fail unless the audio clock has been started.  At worst,
+         * audio will not work.
+         */
+
+        switch (dev->pci->device) {
+        case PCI_DEVICE_ID_PHILIPS_SAA7134:
+        case PCI_DEVICE_ID_PHILIPS_SAA7133:
+        case PCI_DEVICE_ID_PHILIPS_SAA7135:
+                saa7134_oss_init1(dev);
+                break;
+        }
+
         /* enable peripheral devices */
         saa_writeb(SAA7134_SPECIAL_MODE, 0x01);
 
@@ -687,7 +716,7 @@ static int saa7134_hwinit2(struct saa7134_dev *dev)
         saa7134_tvaudio_init2(dev);
 
         /* enable IRQ's */
-        irq2_mask =
+        irq2_mask =
                 SAA7134_IRQ2_INTE_DEC3    |
                 SAA7134_IRQ2_INTE_DEC2    |
                 SAA7134_IRQ2_INTE_DEC1    |
@@ -695,10 +724,12 @@ static int saa7134_hwinit2(struct saa7134_dev *dev)
                 SAA7134_IRQ2_INTE_PE      |
                 SAA7134_IRQ2_INTE_AR;
 
-        if (dev->has_remote)
+        if (dev->has_remote == SAA7134_REMOTE_GPIO)
                 irq2_mask |= (SAA7134_IRQ2_INTE_GPIO18  |
                               SAA7134_IRQ2_INTE_GPIO18A |
                               SAA7134_IRQ2_INTE_GPIO16  );
+        else if (dev->has_remote == SAA7134_REMOTE_I2C)
+                request_module("ir-kbd-i2c");
 
         saa_writel(SAA7134_IRQ1, 0);
         saa_writel(SAA7134_IRQ2, irq2_mask);
@@ -872,8 +903,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 
         /* print pci info */
         pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
-        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
-        printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, "
+        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
+        printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, "
                "latency: %d, mmio: 0x%lx\n", dev->name,
                pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
                dev->pci_lat,pci_resource_start(pci_dev,0));
@@ -897,7 +928,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         dev->tda9887_conf = saa7134_boards[dev->board].tda9887_conf;
         if (UNSET != tuner[dev->nr])
                 dev->tuner_type = tuner[dev->nr];
-        printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
+        printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
                dev->name,pci_dev->subsystem_vendor,
                pci_dev->subsystem_device,saa7134_boards[dev->board].name,
                dev->board, card[dev->nr] == dev->board ?
@@ -947,14 +978,20 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                 request_module("tuner");
         if (dev->tda9887_conf)
                 request_module("tda9887");
-        if (card_is_empress(dev)) {
+        if (card_is_empress(dev)) {
                 request_module("saa6752hs");
                 request_module_depend("saa7134-empress",&need_empress);
         }
 
-        if (card_is_dvb(dev))
+        if (card_is_dvb(dev))
                 request_module_depend("saa7134-dvb",&need_dvb);
 
+        if (!oss && alsa) {
+                dprintk("Requesting ALSA module\n");
+                request_module_depend("saa7134-alsa",&need_alsa);
+        }
+
+
         v4l2_prio_init(&dev->prio);
 
         /* register v4l devices */
@@ -993,22 +1030,22 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         case PCI_DEVICE_ID_PHILIPS_SAA7133:
         case PCI_DEVICE_ID_PHILIPS_SAA7135:
                 if (oss) {
-                        err = dev->oss.minor_dsp =
+                        err = dev->dmasound.minor_dsp =
                                 register_sound_dsp(&saa7134_dsp_fops,
                                                    dsp_nr[dev->nr]);
                         if (err < 0) {
                                 goto fail4;
                         }
                         printk(KERN_INFO "%s: registered device dsp%d\n",
-                               dev->name,dev->oss.minor_dsp >> 4);
+                               dev->name,dev->dmasound.minor_dsp >> 4);
 
-                        err = dev->oss.minor_mixer =
+                        err = dev->dmasound.minor_mixer =
                                 register_sound_mixer(&saa7134_mixer_fops,
                                                      mixer_nr[dev->nr]);
                         if (err < 0)
                                 goto fail5;
                         printk(KERN_INFO "%s: registered device mixer%d\n",
-                               dev->name,dev->oss.minor_mixer >> 4);
+                               dev->name,dev->dmasound.minor_mixer >> 4);
                 }
                 break;
         }
@@ -1035,7 +1072,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         case PCI_DEVICE_ID_PHILIPS_SAA7133:
         case PCI_DEVICE_ID_PHILIPS_SAA7135:
                 if (oss)
-                        unregister_sound_dsp(dev->oss.minor_dsp);
+                        unregister_sound_dsp(dev->dmasound.minor_dsp);
                 break;
         }
  fail4:
@@ -1055,7 +1092,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 
 static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
 {
-        struct saa7134_dev *dev = pci_get_drvdata(pci_dev);
+        struct saa7134_dev *dev = pci_get_drvdata(pci_dev);
         struct list_head *item;
         struct saa7134_mpeg_ops *mops;
 
@@ -1093,8 +1130,8 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
         case PCI_DEVICE_ID_PHILIPS_SAA7133:
         case PCI_DEVICE_ID_PHILIPS_SAA7135:
                 if (oss) {
-                        unregister_sound_mixer(dev->oss.minor_mixer);
-                        unregister_sound_dsp(dev->oss.minor_dsp);
+                        unregister_sound_mixer(dev->dmasound.minor_mixer);
+                        unregister_sound_dsp(dev->dmasound.minor_dsp);
                 }
                 break;
         }
@@ -1149,10 +1186,10 @@ EXPORT_SYMBOL(saa7134_ts_unregister);
 /* ----------------------------------------------------------- */
 
 static struct pci_driver saa7134_pci_driver = {
-        .name     = "saa7134",
-        .id_table = saa7134_pci_tbl,
-        .probe    = saa7134_initdev,
-        .remove   = __devexit_p(saa7134_finidev),
+        .name     = "saa7134",
+        .id_table = saa7134_pci_tbl,
+        .probe    = saa7134_initdev,
+        .remove   = __devexit_p(saa7134_finidev),
 };
 
 static int saa7134_init(void)
@@ -1188,6 +1225,13 @@ EXPORT_SYMBOL(saa7134_i2c_call_clients);
 EXPORT_SYMBOL(saa7134_devlist);
 EXPORT_SYMBOL(saa7134_boards);
 
+/* ----------------- For ALSA -------------------------------- */
+
+EXPORT_SYMBOL(saa7134_pgtable_free);
+EXPORT_SYMBOL(saa7134_pgtable_build);
+EXPORT_SYMBOL(saa7134_pgtable_alloc);
+EXPORT_SYMBOL(saa7134_set_dmabits);
+
 /* ----------------------------------------------------------- */
 /*
  * Local variables:
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 639ae51a052d..e016480c3468 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -29,7 +29,6 @@
 #include <linux/kthread.h>
 #include <linux/suspend.h>
 
-
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
@@ -40,6 +39,10 @@
 #ifdef HAVE_TDA1004X
 # include "tda1004x.h"
 #endif
+#ifdef HAVE_NXT200X
+# include "nxt200x.h"
+# include "dvb-pll.h"
+#endif
 
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
@@ -151,25 +154,12 @@ static struct mt352_config pinnacle_300i = {
 /* ------------------------------------------------------------------ */
 
 #ifdef HAVE_TDA1004X
-static int philips_tu1216_pll_init(struct dvb_frontend *fe)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-        static u8 tu1216_init[] = { 0x0b, 0xf5, 0x85, 0xab };
-        struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
-
-        /* setup PLL configuration */
-        if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
-                return -EIO;
-        msleep(1);
 
-        return 0;
-}
-
-static int philips_tu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int philips_tda6651_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
         struct saa7134_dev *dev = fe->dvb->priv;
         u8 tuner_buf[4];
-        struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,.len =
+        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tuner_buf,.len =
                         sizeof(tuner_buf) };
         int tuner_frequency = 0;
         u8 band, cp, filter;
@@ -242,11 +232,36 @@ static int philips_tu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_p
 
         if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
+        msleep(1);
+        return 0;
+}
 
+static int philips_tda6651_pll_init(u8 addr, struct dvb_frontend *fe)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+        static u8 tu1216_init[] = { 0x0b, 0xf5, 0x85, 0xab };
+        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
+
+        /* setup PLL configuration */
+        if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
+                return -EIO;
         msleep(1);
+
         return 0;
 }
 
+/* ------------------------------------------------------------------ */
+
+static int philips_tu1216_pll_60_init(struct dvb_frontend *fe)
+{
+        return philips_tda6651_pll_init(0x60, fe);
+}
+
+static int philips_tu1216_pll_60_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        return philips_tda6651_pll_set(0x60, fe, params);
+}
+
 static int philips_tu1216_request_firmware(struct dvb_frontend *fe,
                                            const struct firmware **fw, char *name)
 {
@@ -254,22 +269,108 @@ static int philips_tu1216_request_firmware(struct dvb_frontend *fe,
         return request_firmware(fw, name, &dev->pci->dev);
 }
 
-static struct tda1004x_config philips_tu1216_config = {
+static struct tda1004x_config philips_tu1216_60_config = {
+
+        .demod_address = 0x8,
+        .invert        = 1,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_4M,
+        .agc_config    = TDA10046_AGC_DEFAULT,
+        .if_freq       = TDA10046_FREQ_3617,
+        .pll_init      = philips_tu1216_pll_60_init,
+        .pll_set       = philips_tu1216_pll_60_set,
+        .pll_sleep     = NULL,
+        .request_firmware = philips_tu1216_request_firmware,
+};
+
+/* ------------------------------------------------------------------ */
+
+static int philips_tu1216_pll_61_init(struct dvb_frontend *fe)
+{
+        return philips_tda6651_pll_init(0x61, fe);
+}
+
+static int philips_tu1216_pll_61_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        return philips_tda6651_pll_set(0x61, fe, params);
+}
+
+static struct tda1004x_config philips_tu1216_61_config = {
 
         .demod_address = 0x8,
         .invert        = 1,
-        .invert_oclk   = 1,
+        .invert_oclk   = 0,
         .xtal_freq     = TDA10046_XTAL_4M,
         .agc_config    = TDA10046_AGC_DEFAULT,
         .if_freq       = TDA10046_FREQ_3617,
-        .pll_init      = philips_tu1216_pll_init,
-        .pll_set       = philips_tu1216_pll_set,
+        .pll_init      = philips_tu1216_pll_61_init,
+        .pll_set       = philips_tu1216_pll_61_set,
         .pll_sleep     = NULL,
         .request_firmware = philips_tu1216_request_firmware,
 };
 
 /* ------------------------------------------------------------------ */
 
+static int philips_europa_pll_init(struct dvb_frontend *fe)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+        static u8 msg[] = { 0x0b, 0xf5, 0x86, 0xab };
+        struct i2c_msg init_msg = {.addr = 0x61,.flags = 0,.buf = msg,.len = sizeof(msg) };
+
+        /* setup PLL configuration */
+        if (i2c_transfer(&dev->i2c_adap, &init_msg, 1) != 1)
+                return -EIO;
+        msleep(1);
+
+        /* switch the board to dvb mode */
+        init_msg.addr = 0x43;
+        init_msg.len  = 0x02;
+        msg[0] = 0x00;
+        msg[1] = 0x40;
+        if (i2c_transfer(&dev->i2c_adap, &init_msg, 1) != 1)
+                return -EIO;
+
+        return 0;
+}
+
+static int philips_td1316_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        return philips_tda6651_pll_set(0x61, fe, params);
+}
+
+static void philips_europa_analog(struct dvb_frontend *fe)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+        /* this message actually turns the tuner back to analog mode */
+        static u8 msg[] = { 0x0b, 0xdc, 0x86, 0xa4 };
+        struct i2c_msg analog_msg = {.addr = 0x61,.flags = 0,.buf = msg,.len = sizeof(msg) };
+
+        i2c_transfer(&dev->i2c_adap, &analog_msg, 1);
+        msleep(1);
+
+        /* switch the board to analog mode */
+        analog_msg.addr = 0x43;
+        analog_msg.len  = 0x02;
+        msg[0] = 0x00;
+        msg[1] = 0x14;
+        i2c_transfer(&dev->i2c_adap, &analog_msg, 1);
+}
+
+static struct tda1004x_config philips_europa_config = {
+
+        .demod_address = 0x8,
+        .invert        = 0,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_4M,
+        .agc_config    = TDA10046_AGC_IFO_AUTO_POS,
+        .if_freq       = TDA10046_FREQ_052,
+        .pll_init      = philips_europa_pll_init,
+        .pll_set       = philips_td1316_pll_set,
+        .pll_sleep     = philips_europa_analog,
+        .request_firmware = NULL,
+};
+
+/* ------------------------------------------------------------------ */
 
 static int philips_fmd1216_pll_init(struct dvb_frontend *fe)
 {
@@ -382,7 +483,6 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
         return 0;
 }
 
-#ifdef HAVE_TDA1004X
 static struct tda1004x_config medion_cardbus = {
         .demod_address = 0x08,
         .invert        = 1,
@@ -395,7 +495,6 @@ static struct tda1004x_config medion_cardbus = {
         .pll_sleep         = philips_fmd1216_analog,
         .request_firmware = NULL,
 };
-#endif
 
 /* ------------------------------------------------------------------ */
 
@@ -452,7 +551,7 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
         u8 tuner_buf[14];
 
         struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,
-                                        .len = sizeof(tuner_buf) };
+                                        .len = sizeof(tuner_buf) };
         int i, tuner_freq, if_freq;
         u32 N;
         switch (params->u.ofdm.bandwidth) {
@@ -511,7 +610,7 @@ static void philips_tda827x_pll_sleep(struct dvb_frontend *fe)
         struct saa7134_dev *dev = fe->dvb->priv;
         static u8 tda827x_sleep[] = { 0x30, 0xd0};
         struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep,
-                                    .len = sizeof(tda827x_sleep) };
+                                    .len = sizeof(tda827x_sleep) };
         i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
 }
 
@@ -527,6 +626,202 @@ static struct tda1004x_config tda827x_lifeview_config = {
         .pll_sleep         = philips_tda827x_pll_sleep,
         .request_firmware = NULL,
 };
+
+/* ------------------------------------------------------------------ */
+
+struct tda827xa_data {
+        u32 lomax;
+        u8  svco;
+        u8  spd;
+        u8  scr;
+        u8  sbs;
+        u8  gc3;
+};
+
+static struct tda827xa_data tda827xa_dvbt[] = {
+        { .lomax =  56875000, .svco = 3, .spd = 4, .scr = 0, .sbs = 0, .gc3 = 1},
+        { .lomax =  67250000, .svco = 0, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 1},
+        { .lomax =  81250000, .svco = 1, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 1},
+        { .lomax =  97500000, .svco = 2, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 1},
+        { .lomax = 113750000, .svco = 3, .spd = 3, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 134500000, .svco = 0, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 154000000, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 162500000, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 183000000, .svco = 2, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 195000000, .svco = 2, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 1},
+        { .lomax = 227500000, .svco = 3, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 1},
+        { .lomax = 269000000, .svco = 0, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 1},
+        { .lomax = 290000000, .svco = 1, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 1},
+        { .lomax = 325000000, .svco = 1, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 1},
+        { .lomax = 390000000, .svco = 2, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 1},
+        { .lomax = 455000000, .svco = 3, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 1},
+        { .lomax = 520000000, .svco = 0, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},
+        { .lomax = 538000000, .svco = 0, .spd = 0, .scr = 1, .sbs = 3, .gc3 = 1},
+        { .lomax = 550000000, .svco = 1, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},
+        { .lomax = 620000000, .svco = 1, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},
+        { .lomax = 650000000, .svco = 1, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},
+        { .lomax = 700000000, .svco = 2, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},
+        { .lomax = 780000000, .svco = 2, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},
+        { .lomax = 820000000, .svco = 3, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},
+        { .lomax = 870000000, .svco = 3, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},
+        { .lomax = 911000000, .svco = 3, .spd = 0, .scr = 2, .sbs = 4, .gc3 = 0},
+        { .lomax =         0, .svco = 0, .spd = 0, .scr = 0, .sbs = 0, .gc3 = 0}};
+
+
+static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+        u8 tuner_buf[14];
+        unsigned char reg2[2];
+
+        struct i2c_msg msg = {.addr = addr,.flags = 0,.buf = tuner_buf};
+        int i, tuner_freq, if_freq;
+        u32 N;
+
+        switch (params->u.ofdm.bandwidth) {
+        case BANDWIDTH_6_MHZ:
+                if_freq = 4000000;
+                break;
+        case BANDWIDTH_7_MHZ:
+                if_freq = 4500000;
+                break;
+        default:                   /* 8 MHz or Auto */
+                if_freq = 5000000;
+                break;
+        }
+        tuner_freq = params->frequency + if_freq;
+
+        i = 0;
+        while (tda827xa_dvbt[i].lomax < tuner_freq) {
+                if(tda827xa_dvbt[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+
+        N = ((tuner_freq + 31250) / 62500) << tda827xa_dvbt[i].spd;
+        tuner_buf[0] = 0;            // subaddress
+        tuner_buf[1] = N >> 8;
+        tuner_buf[2] = N & 0xff;
+        tuner_buf[3] = 0;
+        tuner_buf[4] = 0x16;
+        tuner_buf[5] = (tda827xa_dvbt[i].spd << 5) + (tda827xa_dvbt[i].svco << 3) +
+                        tda827xa_dvbt[i].sbs;
+        tuner_buf[6] = 0x4b + (tda827xa_dvbt[i].gc3 << 4);
+        tuner_buf[7] = 0x0c;
+        tuner_buf[8] = 0x06;
+        tuner_buf[9] = 0x24;
+        tuner_buf[10] = 0xff;
+        tuner_buf[11] = 0x60;
+        tuner_buf[12] = 0x00;
+        tuner_buf[13] = 0x39;  // lpsel
+        msg.len = 14;
+        if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
+                return -EIO;
+
+        msg.buf= reg2;
+        msg.len = 2;
+        reg2[0] = 0x60;
+        reg2[1] = 0x3c;
+        i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+        reg2[0] = 0xa0;
+        reg2[1] = 0x40;
+        i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+        msleep(2);
+        /* correct CP value */
+        reg2[0] = 0x30;
+        reg2[1] = 0x10 + tda827xa_dvbt[i].scr;
+        msg.len = 2;
+        i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+        msleep(550);
+        reg2[0] = 0x50;
+        reg2[1] = 0x4f + (tda827xa_dvbt[i].gc3 << 4);
+        i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+        return 0;
+
+}
+
+static void philips_tda827xa_pll_sleep(u8 addr, struct dvb_frontend *fe)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+        static u8 tda827xa_sleep[] = { 0x30, 0x90};
+        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tda827xa_sleep,
+                                    .len = sizeof(tda827xa_sleep) };
+        i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
+
+}
+
+/* ------------------------------------------------------------------ */
+
+static int philips_tiger_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        int ret;
+        struct saa7134_dev *dev = fe->dvb->priv;
+        static u8 tda8290_close[] = { 0x21, 0xc0};
+        static u8 tda8290_open[]  = { 0x21, 0x80};
+        struct i2c_msg tda8290_msg = {.addr = 0x4b,.flags = 0, .len = 2};
+        /* close tda8290 i2c bridge */
+        tda8290_msg.buf = tda8290_close;
+        ret = i2c_transfer(&dev->i2c_adap, &tda8290_msg, 1);
+        if (ret != 1)
+                return -EIO;
+        msleep(20);
+        ret = philips_tda827xa_pll_set(0x61, fe, params);
+        if (ret != 0)
+                return ret;
+        /* open tda8290 i2c bridge */
+        tda8290_msg.buf = tda8290_open;
+        i2c_transfer(&dev->i2c_adap, &tda8290_msg, 1);
+        return ret;
+};
+
+static int philips_tiger_dvb_mode(struct dvb_frontend *fe)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+        static u8 data[] = { 0x3c, 0x33, 0x6a};
+        struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
+
+        if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
+                return -EIO;
+        return 0;
+}
+
+static void philips_tiger_analog_mode(struct dvb_frontend *fe)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+        static u8 data[] = { 0x3c, 0x33, 0x68};
+        struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
+
+        i2c_transfer(&dev->i2c_adap, &msg, 1);
+        philips_tda827xa_pll_sleep( 0x61, fe);
+}
+
+static struct tda1004x_config philips_tiger_config = {
+        .demod_address = 0x08,
+        .invert        = 1,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_16M,
+        .agc_config    = TDA10046_AGC_TDA827X,
+        .if_freq       = TDA10046_FREQ_045,
+        .pll_init      = philips_tiger_dvb_mode,
+        .pll_set       = philips_tiger_pll_set,
+        .pll_sleep     = philips_tiger_analog_mode,
+        .request_firmware = NULL,
+};
+
+#endif
+
+/* ------------------------------------------------------------------ */
+
+#ifdef HAVE_NXT200X
+static struct nxt200x_config avertvhda180 = {
+        .demod_address    = 0x0a,
+        .pll_address      = 0x61,
+        .pll_desc         = &dvb_pll_tdhu2,
+};
 #endif
 
 /* ------------------------------------------------------------------ */
@@ -558,7 +853,7 @@ static int dvb_init(struct saa7134_dev *dev)
                                                     &dev->i2c_adap);
                 break;
         case SAA7134_BOARD_PHILIPS_TOUGH:
-                dev->dvb.frontend = tda10046_attach(&philips_tu1216_config,
+                dev->dvb.frontend = tda10046_attach(&philips_tu1216_60_config,
                                                     &dev->i2c_adap);
                 break;
         case SAA7134_BOARD_FLYDVBTDUO:
@@ -569,6 +864,31 @@ static int dvb_init(struct saa7134_dev *dev)
                 dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
                                                     &dev->i2c_adap);
                 break;
+        case SAA7134_BOARD_PHILIPS_EUROPA:
+                dev->dvb.frontend = tda10046_attach(&philips_europa_config,
+                                                    &dev->i2c_adap);
+                break;
+        case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+                dev->dvb.frontend = tda10046_attach(&philips_europa_config,
+                                                    &dev->i2c_adap);
+                break;
+        case SAA7134_BOARD_VIDEOMATE_DVBT_200:
+                dev->dvb.frontend = tda10046_attach(&philips_tu1216_61_config,
+                                                    &dev->i2c_adap);
+                break;
+        case SAA7134_BOARD_PHILIPS_TIGER:
+                dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
+                                                    &dev->i2c_adap);
+                break;
+        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+                dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
+                                                    &dev->i2c_adap);
+                break;
+#endif
+#ifdef HAVE_NXT200X
+        case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
+                dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap);
+                break;
 #endif
         default:
                 printk("%s: Huh? unknown DVB card?\n",dev->name);
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 77b627eb6483..e9ec69efb4c9 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -55,7 +55,7 @@ static void ts_reset_encoder(struct saa7134_dev* dev)
 
         saa_writeb(SAA7134_SPECIAL_MODE, 0x00);
         msleep(10);
-        saa_writeb(SAA7134_SPECIAL_MODE, 0x01);
+        saa_writeb(SAA7134_SPECIAL_MODE, 0x01);
         msleep(100);
         dev->empress_started = 0;
 }
@@ -65,7 +65,7 @@ static int ts_init_encoder(struct saa7134_dev* dev)
         ts_reset_encoder(dev);
         saa7134_i2c_call_clients(dev, VIDIOC_S_MPEGCOMP, NULL);
         dev->empress_started = 1;
-        return 0;
+        return 0;
 }
 
 /* ------------------------------------------------------------------ */
@@ -169,7 +169,7 @@ static int ts_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_capability *cap = arg;
 
                 memset(cap,0,sizeof(*cap));
-                strcpy(cap->driver, "saa7134");
+                strcpy(cap->driver, "saa7134");
                 strlcpy(cap->card, saa7134_boards[dev->board].name,
                         sizeof(cap->card));
                 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 711aa8e85fac..7575043f0874 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -239,7 +239,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
         unsigned char data;
         int addr,rc,i,byte;
 
-        status = i2c_get_status(dev);
+        status = i2c_get_status(dev);
         if (!i2c_is_idle(status))
                 if (!i2c_reset(dev))
                         return -EIO;
@@ -296,7 +296,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
         rc = -EIO;
         if (!i2c_is_busy_wait(dev))
                 goto err;
-        status = i2c_get_status(dev);
+        status = i2c_get_status(dev);
         if (i2c_is_error(status))
                 goto err;
         /* ensure that the bus is idle for at least one bit slot */
@@ -335,6 +335,20 @@ static int attach_inform(struct i2c_client *client)
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
                  client->driver->name, client->addr, client->name);
 
+        /* Am I an i2c remote control? */
+
+        switch (client->addr) {
+                case 0x7a:
+                case 0x47:
+                {
+                        struct IR_i2c *ir = i2c_get_clientdata(client);
+                        d1printk("%s i2c IR detected (%s).\n",
+                                 client->driver->name,ir->phys);
+                        saa7134_set_i2c_ir(dev,ir);
+                        break;
+                }
+        }
+
         if (!client->driver->command)
                 return 0;
 
@@ -348,12 +362,12 @@ static int attach_inform(struct i2c_client *client)
 
                         client->driver->command(client, TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
-        }
+        }
 
         if (tuner != UNSET) {
 
-                tun_setup.type = tuner;
-                tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
+                tun_setup.type = tuner;
+                tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
 
                 if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) {
 
@@ -361,11 +375,11 @@ static int attach_inform(struct i2c_client *client)
 
                         client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
-        }
+        }
 
         client->driver->command(client, TDA9887_SET_CONFIG, &conf);
 
-        return 0;
+        return 0;
 }
 
 static struct i2c_algorithm saa7134_algo = {
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 242cb235cf92..329accda6d45 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -39,6 +39,8 @@ MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");
 
 #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)
 
 /* ---------------------------------------------------------------------- */
 
@@ -114,24 +116,24 @@ static IR_KEYTAB_TYPE cinergy_codes[IR_KEYTAB_SIZE] = {
 /* Alfons Geser <a.geser@cox.net>
  * updates from Job D. R. Borges <jobdrb@ig.com.br> */
 static IR_KEYTAB_TYPE eztv_codes[IR_KEYTAB_SIZE] = {
-        [ 18 ] = KEY_POWER,
-        [  1 ] = KEY_TV,             // DVR
-        [ 21 ] = KEY_DVD,            // DVD
-        [ 23 ] = KEY_AUDIO,          // music
-                                     // DVR mode / DVD mode / music mode
-
-        [ 27 ] = KEY_MUTE,           // mute
-        [  2 ] = KEY_LANGUAGE,       // MTS/SAP / audio / autoseek
-        [ 30 ] = KEY_SUBTITLE,       // closed captioning / subtitle / seek
-        [ 22 ] = KEY_ZOOM,           // full screen
-        [ 28 ] = KEY_VIDEO,          // video source / eject / delall
-        [ 29 ] = KEY_RESTART,        // playback / angle / del
-        [ 47 ] = KEY_SEARCH,         // scan / menu / playlist
-        [ 48 ] = KEY_CHANNEL,        // CH surfing / bookmark / memo
-
-        [ 49 ] = KEY_HELP,           // help
-        [ 50 ] = KEY_MODE,           // num/memo
-        [ 51 ] = KEY_ESC,            // cancel
+        [ 18 ] = KEY_POWER,
+        [  1 ] = KEY_TV,             // DVR
+        [ 21 ] = KEY_DVD,            // DVD
+        [ 23 ] = KEY_AUDIO,          // music
+                                     // DVR mode / DVD mode / music mode
+
+        [ 27 ] = KEY_MUTE,           // mute
+        [  2 ] = KEY_LANGUAGE,       // MTS/SAP / audio / autoseek
+        [ 30 ] = KEY_SUBTITLE,       // closed captioning / subtitle / seek
+        [ 22 ] = KEY_ZOOM,           // full screen
+        [ 28 ] = KEY_VIDEO,          // video source / eject / delall
+        [ 29 ] = KEY_RESTART,        // playback / angle / del
+        [ 47 ] = KEY_SEARCH,         // scan / menu / playlist
+        [ 48 ] = KEY_CHANNEL,        // CH surfing / bookmark / memo
+
+        [ 49 ] = KEY_HELP,           // help
+        [ 50 ] = KEY_MODE,           // num/memo
+        [ 51 ] = KEY_ESC,            // cancel
 
         [ 12 ] = KEY_UP,             // up
         [ 16 ] = KEY_DOWN,           // down
@@ -148,24 +150,24 @@ static IR_KEYTAB_TYPE eztv_codes[IR_KEYTAB_SIZE] = {
         [ 45 ] = KEY_PLAY,           // play
         [ 46 ] = KEY_SHUFFLE,        // snapshot / shuffle
 
-        [  0 ] = KEY_KP0,
-        [  5 ] = KEY_KP1,
-        [  6 ] = KEY_KP2,
-        [  7 ] = KEY_KP3,
-        [  9 ] = KEY_KP4,
-        [ 10 ] = KEY_KP5,
-        [ 11 ] = KEY_KP6,
-        [ 13 ] = KEY_KP7,
-        [ 14 ] = KEY_KP8,
-        [ 15 ] = KEY_KP9,
-
-        [ 42 ] = KEY_VOLUMEUP,
-        [ 17 ] = KEY_VOLUMEDOWN,
-        [ 24 ] = KEY_CHANNELUP,      // CH.tracking up
-        [ 25 ] = KEY_CHANNELDOWN,    // CH.tracking down
-
-        [ 19 ] = KEY_KPENTER,        // enter
-        [ 33 ] = KEY_KPDOT,          // . (decimal dot)
+        [  0 ] = KEY_KP0,
+        [  5 ] = KEY_KP1,
+        [  6 ] = KEY_KP2,
+        [  7 ] = KEY_KP3,
+        [  9 ] = KEY_KP4,
+        [ 10 ] = KEY_KP5,
+        [ 11 ] = KEY_KP6,
+        [ 13 ] = KEY_KP7,
+        [ 14 ] = KEY_KP8,
+        [ 15 ] = KEY_KP9,
+
+        [ 42 ] = KEY_VOLUMEUP,
+        [ 17 ] = KEY_VOLUMEDOWN,
+        [ 24 ] = KEY_CHANNELUP,      // CH.tracking up
+        [ 25 ] = KEY_CHANNELDOWN,    // CH.tracking down
+
+        [ 19 ] = KEY_KPENTER,        // enter
+        [ 33 ] = KEY_KPDOT,          // . (decimal dot)
 };
 
 static IR_KEYTAB_TYPE avacssmart_codes[IR_KEYTAB_SIZE] = {
@@ -401,7 +403,183 @@ static IR_KEYTAB_TYPE manli_codes[IR_KEYTAB_SIZE] = {
 
         // 0x1d unused ?
 };
-/* ---------------------------------------------------------------------- */
+
+
+/* Mike Baikov <mike@baikov.com> */
+static IR_KEYTAB_TYPE gotview7135_codes[IR_KEYTAB_SIZE] = {
+
+        [ 33 ] = KEY_POWER,
+        [ 105] = KEY_TV,
+        [ 51 ] = KEY_KP0,
+        [ 81 ] = KEY_KP1,
+        [ 49 ] = KEY_KP2,
+        [ 113] = KEY_KP3,
+        [ 59 ] = KEY_KP4,
+        [ 88 ] = KEY_KP5,
+        [ 65 ] = KEY_KP6,
+        [ 72 ] = KEY_KP7,
+        [ 48 ] = KEY_KP8,
+        [ 83 ] = KEY_KP9,
+        [ 115] = KEY_AGAIN, /* LOOP */
+        [ 10 ] = KEY_AUDIO,
+        [ 97 ] = KEY_PRINT, /* PREVIEW */
+        [ 122] = KEY_VIDEO,
+        [ 32 ] = KEY_CHANNELUP,
+        [ 64 ] = KEY_CHANNELDOWN,
+        [ 24 ] = KEY_VOLUMEDOWN,
+        [ 80 ] = KEY_VOLUMEUP,
+        [ 16 ] = KEY_MUTE,
+        [ 74 ] = KEY_SEARCH,
+        [ 123] = KEY_SHUFFLE, /* SNAPSHOT */
+        [ 34 ] = KEY_RECORD,
+        [ 98 ] = KEY_STOP,
+        [ 120] = KEY_PLAY,
+        [ 57 ] = KEY_REWIND,
+        [ 89 ] = KEY_PAUSE,
+        [ 25 ] = KEY_FORWARD,
+        [  9 ] = KEY_ZOOM,
+
+        [ 82 ] = KEY_F21, /* LIVE TIMESHIFT */
+        [ 26 ] = KEY_F22, /* MIN TIMESHIFT */
+        [ 58 ] = KEY_F23, /* TIMESHIFT */
+        [ 112] = KEY_F24, /* NORMAL TIMESHIFT */
+};
+
+static IR_KEYTAB_TYPE ir_codes_purpletv[IR_KEYTAB_SIZE] = {
+        [ 0x3  ] = KEY_POWER,
+        [ 0x6f ] = KEY_MUTE,
+        [ 0x10 ] = KEY_BACKSPACE,       /* Recall */
+
+        [ 0x11 ] = KEY_KP0,
+        [ 0x4  ] = KEY_KP1,
+        [ 0x5  ] = KEY_KP2,
+        [ 0x6  ] = KEY_KP3,
+        [ 0x8  ] = KEY_KP4,
+        [ 0x9  ] = KEY_KP5,
+        [ 0xa  ] = KEY_KP6,
+        [ 0xc  ] = KEY_KP7,
+        [ 0xd  ] = KEY_KP8,
+        [ 0xe  ] = KEY_KP9,
+        [ 0x12 ] = KEY_KPDOT,           /* 100+ */
+
+        [ 0x7  ] = KEY_VOLUMEUP,
+        [ 0xb  ] = KEY_VOLUMEDOWN,
+        [ 0x1a ] = KEY_KPPLUS,
+        [ 0x18 ] = KEY_KPMINUS,
+        [ 0x15 ] = KEY_UP,
+        [ 0x1d ] = KEY_DOWN,
+        [ 0xf  ] = KEY_CHANNELUP,
+        [ 0x13 ] = KEY_CHANNELDOWN,
+        [ 0x48 ] = KEY_ZOOM,
+
+        [ 0x1b ] = KEY_VIDEO,           /* Video source */
+        [ 0x49 ] = KEY_LANGUAGE,        /* MTS Select */
+        [ 0x19 ] = KEY_SEARCH,          /* Auto Scan */
+
+        [ 0x4b ] = KEY_RECORD,
+        [ 0x46 ] = KEY_PLAY,
+        [ 0x45 ] = KEY_PAUSE,           /* Pause */
+        [ 0x44 ] = KEY_STOP,
+        [ 0x40 ] = KEY_FORWARD,         /* Forward ? */
+        [ 0x42 ] = KEY_REWIND,          /* Backward ? */
+
+};
+
+static IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE] = {
+        [ 0x59 ] = KEY_MUTE,
+        [ 0x4a ] = KEY_POWER,
+
+        [ 0x18 ] = KEY_TEXT,
+        [ 0x26 ] = KEY_TV,
+        [ 0x3d ] = KEY_PRINT,
+
+        [ 0x48 ] = KEY_RED,
+        [ 0x04 ] = KEY_GREEN,
+        [ 0x11 ] = KEY_YELLOW,
+        [ 0x00 ] = KEY_BLUE,
+
+        [ 0x2d ] = KEY_VOLUMEUP,
+        [ 0x1e ] = KEY_VOLUMEDOWN,
+
+        [ 0x49 ] = KEY_MENU,
+
+        [ 0x16 ] = KEY_CHANNELUP,
+        [ 0x17 ] = KEY_CHANNELDOWN,
+
+        [ 0x20 ] = KEY_UP,
+        [ 0x21 ] = KEY_DOWN,
+        [ 0x22 ] = KEY_LEFT,
+        [ 0x23 ] = KEY_RIGHT,
+        [ 0x0d ] = KEY_SELECT,
+
+
+
+        [ 0x08 ] = KEY_BACK,
+        [ 0x07 ] = KEY_REFRESH,
+
+        [ 0x2f ] = KEY_ZOOM,
+        [ 0x29 ] = KEY_RECORD,
+
+        [ 0x4b ] = KEY_PAUSE,
+        [ 0x4d ] = KEY_REWIND,
+        [ 0x2e ] = KEY_PLAY,
+        [ 0x4e ] = KEY_FORWARD,
+        [ 0x53 ] = KEY_PREVIOUS,
+        [ 0x4c ] = KEY_STOP,
+        [ 0x54 ] = KEY_NEXT,
+
+        [ 0x69 ] = KEY_KP0,
+        [ 0x6a ] = KEY_KP1,
+        [ 0x6b ] = KEY_KP2,
+        [ 0x6c ] = KEY_KP3,
+        [ 0x6d ] = KEY_KP4,
+        [ 0x6e ] = KEY_KP5,
+        [ 0x6f ] = KEY_KP6,
+        [ 0x70 ] = KEY_KP7,
+        [ 0x71 ] = KEY_KP8,
+        [ 0x72 ] = KEY_KP9,
+
+        [ 0x74 ] = KEY_CHANNEL,
+        [ 0x0a ] = KEY_BACKSPACE,
+};
+
+/* Mapping for the 28 key remote control as seen at
+   http://www.sednacomputer.com/photo/cardbus-tv.jpg
+   Pavel Mihaylov <bin@bash.info> */
+static IR_KEYTAB_TYPE pctv_sedna_codes[IR_KEYTAB_SIZE] = {
+        [    0 ] = KEY_KP0,
+        [    1 ] = KEY_KP1,
+        [    2 ] = KEY_KP2,
+        [    3 ] = KEY_KP3,
+        [    4 ] = KEY_KP4,
+        [    5 ] = KEY_KP5,
+        [    6 ] = KEY_KP6,
+        [    7 ] = KEY_KP7,
+        [    8 ] = KEY_KP8,
+        [    9 ] = KEY_KP9,
+
+        [ 0x0a ] = KEY_AGAIN,          /* Recall */
+        [ 0x0b ] = KEY_CHANNELUP,
+        [ 0x0c ] = KEY_VOLUMEUP,
+        [ 0x0d ] = KEY_MODE,           /* Stereo */
+        [ 0x0e ] = KEY_STOP,
+        [ 0x0f ] = KEY_PREVIOUSSONG,
+        [ 0x10 ] = KEY_ZOOM,
+        [ 0x11 ] = KEY_TUNER,          /* Source */
+        [ 0x12 ] = KEY_POWER,
+        [ 0x13 ] = KEY_MUTE,
+        [ 0x15 ] = KEY_CHANNELDOWN,
+        [ 0x18 ] = KEY_VOLUMEDOWN,
+        [ 0x19 ] = KEY_SHUFFLE,        /* Snapshot */
+        [ 0x1a ] = KEY_NEXTSONG,
+        [ 0x1b ] = KEY_TEXT,           /* Time Shift */
+        [ 0x1c ] = KEY_RADIO,          /* FM Radio */
+        [ 0x1d ] = KEY_RECORD,
+        [ 0x1e ] = KEY_PAUSE,
+};
+
+
+/* -------------------- GPIO generic keycode builder -------------------- */
 
 static int build_key(struct saa7134_dev *dev)
 {
@@ -413,13 +591,13 @@ static int build_key(struct saa7134_dev *dev)
         saa_setb(SAA7134_GPIO_GPMODE3,SAA7134_GPIO_GPRESCAN);
 
         gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2);
-        if (ir->polling) {
-                if (ir->last_gpio == gpio)
-                        return 0;
-                ir->last_gpio = gpio;
-        }
+        if (ir->polling) {
+                if (ir->last_gpio == gpio)
+                        return 0;
+                ir->last_gpio = gpio;
+        }
 
-        data = ir_extract_bits(gpio, ir->mask_keycode);
+        data = ir_extract_bits(gpio, ir->mask_keycode);
         dprintk("build_key gpio=0x%x mask=0x%x data=%d\n",
                 gpio, ir->mask_keycode, data);
 
@@ -432,13 +610,87 @@ static int build_key(struct saa7134_dev *dev)
         return 0;
 }
 
-/* ---------------------------------------------------------------------- */
+/* --------------------- Chip specific I2C key builders ----------------- */
+
+static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        unsigned char b;
+
+        /* poll IR chip */
+        if (1 != i2c_master_recv(&ir->c,&b,1)) {
+                i2cdprintk("read error\n");
+                return -EIO;
+        }
+
+        /* no button press */
+        if (b==0)
+                return 0;
+
+        /* repeating */
+        if (b & 0x80)
+                return 1;
+
+        *ir_key = b;
+        *ir_raw = b;
+        return 1;
+}
+
+/* The new pinnacle PCTV remote (with the colored buttons)
+ *
+ * Ricardo Cerqueira <v4l@cerqueira.org>
+ */
+
+static int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        unsigned char b[4];
+        unsigned int start = 0,parity = 0,code = 0;
+
+        /* poll IR chip */
+        if (4 != i2c_master_recv(&ir->c,b,4)) {
+                i2cdprintk("read error\n");
+                return -EIO;
+        }
+
+        for (start = 0; start<4; start++) {
+                if (b[start] == 0x80) {
+                        code=b[(start+3)%4];
+                        parity=b[(start+2)%4];
+                }
+        }
+
+        /* Empty Request */
+        if (parity==0)
+                return 0;
+
+        /* Repeating... */
+        if (ir->old == parity)
+                return 0;
+
+
+        ir->old = parity;
+
+        /* Reduce code value to fit inside IR_KEYTAB_SIZE
+         *
+         * this is the only value that results in 42 unique
+         * codes < 128
+         */
+
+        code %= 0x88;
+
+        *ir_raw = code;
+        *ir_key = code;
+
+        i2cdprintk("Pinnacle PCTV key %02x\n", code);
+
+        return 1;
+}
+
 
 void saa7134_input_irq(struct saa7134_dev *dev)
 {
-        struct saa7134_ir *ir = dev->remote;
+        struct saa7134_ir *ir = dev->remote;
 
-        if (!ir->polling)
+        if (!ir->polling)
                 build_key(dev);
 }
 
@@ -464,7 +716,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         int polling      = 0;
         int ir_type      = IR_TYPE_OTHER;
 
-        if (!dev->has_remote)
+        if (dev->has_remote != SAA7134_REMOTE_GPIO)
                 return -ENODEV;
         if (disable_ir)
                 return -ENODEV;
@@ -473,7 +725,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         switch (dev->board) {
         case SAA7134_BOARD_FLYVIDEO2000:
         case SAA7134_BOARD_FLYVIDEO3000:
-        case SAA7134_BOARD_FLYTVPLATINUM_FM:
+        case SAA7134_BOARD_FLYTVPLATINUM_FM:
+        case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
                 ir_codes     = flyvideo_codes;
                 mask_keycode = 0xEC00000;
                 mask_keydown = 0x0040000;
@@ -514,14 +767,33 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
                 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                 break;
+        case SAA7134_BOARD_KWORLD_TERMINATOR:
+                ir_codes     = avacssmart_codes;
+                mask_keycode = 0x00001f;
+                mask_keyup   = 0x000060;
+                polling      = 50; // ms
+                break;
         case SAA7134_BOARD_MANLI_MTV001:
         case SAA7134_BOARD_MANLI_MTV002:
+        case SAA7134_BOARD_BEHOLD_409FM:
                 ir_codes     = manli_codes;
                 mask_keycode = 0x001f00;
                 mask_keyup   = 0x004000;
-                mask_keydown = 0x002000;
                 polling      = 50; // ms
                 break;
+        case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
+                ir_codes     = pctv_sedna_codes;
+                mask_keycode = 0x001f00;
+                mask_keyup   = 0x004000;
+                polling      = 50; // ms
+                break;
+        case SAA7134_BOARD_GOTVIEW_7135:
+                ir_codes     = gotview7135_codes;
+                mask_keycode = 0x0003EC;
+                mask_keyup   = 0x008000;
+                mask_keydown = 0x000010;
+                polling      = 50; // ms
+                break;
         case SAA7134_BOARD_VIDEOMATE_TV_PVR:
         case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
                 ir_codes     = videomate_tv_pvr_codes;
@@ -529,6 +801,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x400000;
                 polling      = 50; // ms
                 break;
+        case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+        case SAA7134_BOARD_VIDEOMATE_DVBT_200:
+                ir_codes     = videomate_tv_pvr_codes;
+                mask_keycode = 0x003F00;
+                mask_keyup   = 0x040000;
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -548,7 +826,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         ir->mask_keycode = mask_keycode;
         ir->mask_keydown = mask_keydown;
         ir->mask_keyup   = mask_keyup;
-        ir->polling      = polling;
+        ir->polling      = polling;
 
         /* init input device */
         snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
@@ -596,6 +874,31 @@ void saa7134_input_fini(struct saa7134_dev *dev)
         dev->remote = NULL;
 }
 
+void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
+{
+        if (disable_ir) {
+                dprintk("Found supported i2c remote, but IR has been disabled\n");
+                ir->get_key=NULL;
+                return;
+        }
+
+        switch (dev->board) {
+        case SAA7134_BOARD_PINNACLE_PCTV_110i:
+                snprintf(ir->c.name, sizeof(ir->c.name), "Pinnacle PCTV");
+                ir->get_key   = get_key_pinnacle;
+                ir->ir_codes  = ir_codes_pinnacle;
+                break;
+        case SAA7134_BOARD_UPMOST_PURPLE_TV:
+                snprintf(ir->c.name, sizeof(ir->c.name), "Purple TV");
+                ir->get_key   = get_key_purpletv;
+                ir->ir_codes  = ir_codes_purpletv;
+                break;
+        default:
+                dprintk("Shouldn't get here: Unknown board %x for I2C IR?\n",dev->board);
+                break;
+        }
+
+}
 /* ----------------------------------------------------------------------
  * Local variables:
  * c-basic-offset: 8
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index c20630c82f1c..fd53dfcc1644 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -44,6 +44,7 @@ MODULE_PARM_DESC(oss_rate,"sample rate (valid are: 32000,48000)");
 #define dprintk(fmt, arg...)    if (oss_debug) \
         printk(KERN_DEBUG "%s/oss: " fmt, dev->name , ## arg)
 
+
 /* ------------------------------------------------------------------ */
 
 static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks)
@@ -58,12 +59,12 @@ static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks)
         if ((blksize * blocks) > 1024*1024)
                 blocks = 1024*1024 / blksize;
 
-        dev->oss.blocks  = blocks;
-        dev->oss.blksize = blksize;
-        dev->oss.bufsize = blksize * blocks;
+        dev->dmasound.blocks  = blocks;
+        dev->dmasound.blksize = blksize;
+        dev->dmasound.bufsize = blksize * blocks;
 
         dprintk("buffer config: %d blocks / %d bytes, %d kB total\n",
-                blocks,blksize,blksize * blocks / 1024);
+                blocks,blksize,blksize * blocks / 1024);
         return 0;
 }
 
@@ -71,11 +72,11 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
 {
         int err;
 
-        if (!dev->oss.bufsize)
+        if (!dev->dmasound.bufsize)
                 BUG();
-        videobuf_dma_init(&dev->oss.dma);
-        err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE,
-                                       (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
+        videobuf_dma_init(&dev->dmasound.dma);
+        err = videobuf_dma_init_kernel(&dev->dmasound.dma, PCI_DMA_FROMDEVICE,
+                                       (dev->dmasound.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
         if (0 != err)
                 return err;
         return 0;
@@ -83,26 +84,26 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
 
 static int dsp_buffer_free(struct saa7134_dev *dev)
 {
-        if (!dev->oss.blksize)
+        if (!dev->dmasound.blksize)
                 BUG();
-        videobuf_dma_free(&dev->oss.dma);
-        dev->oss.blocks  = 0;
-        dev->oss.blksize = 0;
-        dev->oss.bufsize = 0;
+        videobuf_dma_free(&dev->dmasound.dma);
+        dev->dmasound.blocks  = 0;
+        dev->dmasound.blksize = 0;
+        dev->dmasound.bufsize = 0;
         return 0;
 }
 
 static void dsp_dma_start(struct saa7134_dev *dev)
 {
-        dev->oss.dma_blk     = 0;
-        dev->oss.dma_running = 1;
+        dev->dmasound.dma_blk     = 0;
+        dev->dmasound.dma_running = 1;
         saa7134_set_dmabits(dev);
 }
 
 static void dsp_dma_stop(struct saa7134_dev *dev)
 {
-        dev->oss.dma_blk     = -1;
-        dev->oss.dma_running = 0;
+        dev->dmasound.dma_blk     = -1;
+        dev->dmasound.dma_running = 0;
         saa7134_set_dmabits(dev);
 }
 
@@ -113,18 +114,18 @@ static int dsp_rec_start(struct saa7134_dev *dev)
         unsigned long flags;
 
         /* prepare buffer */
-        if (0 != (err = videobuf_dma_pci_map(dev->pci,&dev->oss.dma)))
+        if (0 != (err = videobuf_dma_pci_map(dev->pci,&dev->dmasound.dma)))
                 return err;
-        if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt)))
+        if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt)))
                 goto fail1;
-        if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt,
-                                              dev->oss.dma.sglist,
-                                              dev->oss.dma.sglen,
+        if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->dmasound.pt,
+                                              dev->dmasound.dma.sglist,
+                                              dev->dmasound.dma.sglen,
                                               0)))
                 goto fail2;
 
         /* sample format */
-        switch (dev->oss.afmt) {
+        switch (dev->dmasound.afmt) {
         case AFMT_U8:
         case AFMT_S8:     fmt = 0x00;  break;
         case AFMT_U16_LE:
@@ -136,14 +137,14 @@ static int dsp_rec_start(struct saa7134_dev *dev)
                 goto fail2;
         }
 
-        switch (dev->oss.afmt) {
+        switch (dev->dmasound.afmt) {
         case AFMT_S8:
         case AFMT_S16_LE:
         case AFMT_S16_BE: sign = 1; break;
         default:          sign = 0; break;
         }
 
-        switch (dev->oss.afmt) {
+        switch (dev->dmasound.afmt) {
         case AFMT_U16_BE:
         case AFMT_S16_BE: bswap = 1; break;
         default:          bswap = 0; break;
@@ -151,58 +152,58 @@ static int dsp_rec_start(struct saa7134_dev *dev)
 
         switch (dev->pci->device) {
         case PCI_DEVICE_ID_PHILIPS_SAA7134:
-                if (1 == dev->oss.channels)
+                if (1 == dev->dmasound.channels)
                         fmt |= (1 << 3);
-                if (2 == dev->oss.channels)
+                if (2 == dev->dmasound.channels)
                         fmt |= (3 << 3);
                 if (sign)
                         fmt |= 0x04;
-                fmt |= (TV == dev->oss.input) ? 0xc0 : 0x80;
+                fmt |= (TV == dev->dmasound.input) ? 0xc0 : 0x80;
 
-                saa_writeb(SAA7134_NUM_SAMPLES0, ((dev->oss.blksize - 1) & 0x0000ff));
-                saa_writeb(SAA7134_NUM_SAMPLES1, ((dev->oss.blksize - 1) & 0x00ff00) >>  8);
-                saa_writeb(SAA7134_NUM_SAMPLES2, ((dev->oss.blksize - 1) & 0xff0000) >> 16);
+                saa_writeb(SAA7134_NUM_SAMPLES0, ((dev->dmasound.blksize - 1) & 0x0000ff));
+                saa_writeb(SAA7134_NUM_SAMPLES1, ((dev->dmasound.blksize - 1) & 0x00ff00) >>  8);
+                saa_writeb(SAA7134_NUM_SAMPLES2, ((dev->dmasound.blksize - 1) & 0xff0000) >> 16);
                 saa_writeb(SAA7134_AUDIO_FORMAT_CTRL, fmt);
 
                 break;
         case PCI_DEVICE_ID_PHILIPS_SAA7133:
         case PCI_DEVICE_ID_PHILIPS_SAA7135:
-                if (1 == dev->oss.channels)
+                if (1 == dev->dmasound.channels)
                         fmt |= (1 << 4);
-                if (2 == dev->oss.channels)
+                if (2 == dev->dmasound.channels)
                         fmt |= (2 << 4);
                 if (!sign)
                         fmt |= 0x04;
-                saa_writel(0x588 >> 2, dev->oss.blksize -4);
-                saa_writel(0x58c >> 2, 0x543210 | (fmt << 24));
+                saa_writel(SAA7133_NUM_SAMPLES, dev->dmasound.blksize -4);
+                saa_writel(SAA7133_AUDIO_CHANNEL, 0x543210 | (fmt << 24));
                 break;
         }
         dprintk("rec_start: afmt=%d ch=%d  =>  fmt=0x%x swap=%c\n",
-                dev->oss.afmt, dev->oss.channels, fmt,
+                dev->dmasound.afmt, dev->dmasound.channels, fmt,
                 bswap ? 'b' : '-');
 
         /* dma: setup channel 6 (= AUDIO) */
         control = SAA7134_RS_CONTROL_BURST_16 |
                 SAA7134_RS_CONTROL_ME |
-                (dev->oss.pt.dma >> 12);
+                (dev->dmasound.pt.dma >> 12);
         if (bswap)
                 control |= SAA7134_RS_CONTROL_BSWAP;
         saa_writel(SAA7134_RS_BA1(6),0);
-        saa_writel(SAA7134_RS_BA2(6),dev->oss.blksize);
+        saa_writel(SAA7134_RS_BA2(6),dev->dmasound.blksize);
         saa_writel(SAA7134_RS_PITCH(6),0);
         saa_writel(SAA7134_RS_CONTROL(6),control);
 
         /* start dma */
-        dev->oss.recording_on = 1;
+        dev->dmasound.recording_on = 1;
         spin_lock_irqsave(&dev->slock,flags);
         dsp_dma_start(dev);
         spin_unlock_irqrestore(&dev->slock,flags);
         return 0;
 
  fail2:
-        saa7134_pgtable_free(dev->pci,&dev->oss.pt);
+        saa7134_pgtable_free(dev->pci,&dev->dmasound.pt);
  fail1:
-        videobuf_dma_pci_unmap(dev->pci,&dev->oss.dma);
+        videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma);
         return err;
 }
 
@@ -210,17 +211,17 @@ static int dsp_rec_stop(struct saa7134_dev *dev)
 {
         unsigned long flags;
 
-        dprintk("rec_stop dma_blk=%d\n",dev->oss.dma_blk);
+        dprintk("rec_stop dma_blk=%d\n",dev->dmasound.dma_blk);
 
         /* stop dma */
-        dev->oss.recording_on = 0;
+        dev->dmasound.recording_on = 0;
         spin_lock_irqsave(&dev->slock,flags);
         dsp_dma_stop(dev);
         spin_unlock_irqrestore(&dev->slock,flags);
 
         /* unlock buffer */
-        saa7134_pgtable_free(dev->pci,&dev->oss.pt);
-        videobuf_dma_pci_unmap(dev->pci,&dev->oss.dma);
+        saa7134_pgtable_free(dev->pci,&dev->dmasound.pt);
+        videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma);
         return 0;
 }
 
@@ -235,35 +236,35 @@ static int dsp_open(struct inode *inode, struct file *file)
 
         list_for_each(list,&saa7134_devlist) {
                 h = list_entry(list, struct saa7134_dev, devlist);
-                if (h->oss.minor_dsp == minor)
+                if (h->dmasound.minor_dsp == minor)
                         dev = h;
         }
         if (NULL == dev)
                 return -ENODEV;
 
-        down(&dev->oss.lock);
+        down(&dev->dmasound.lock);
         err = -EBUSY;
-        if (dev->oss.users_dsp)
+        if (dev->dmasound.users_dsp)
                 goto fail1;
-        dev->oss.users_dsp++;
+        dev->dmasound.users_dsp++;
         file->private_data = dev;
 
-        dev->oss.afmt        = AFMT_U8;
-        dev->oss.channels    = 1;
-        dev->oss.read_count  = 0;
-        dev->oss.read_offset = 0;
+        dev->dmasound.afmt        = AFMT_U8;
+        dev->dmasound.channels    = 1;
+        dev->dmasound.read_count  = 0;
+        dev->dmasound.read_offset = 0;
         dsp_buffer_conf(dev,PAGE_SIZE,64);
         err = dsp_buffer_init(dev);
         if (0 != err)
                 goto fail2;
 
-        up(&dev->oss.lock);
+        up(&dev->dmasound.lock);
         return 0;
 
  fail2:
-        dev->oss.users_dsp--;
+        dev->dmasound.users_dsp--;
  fail1:
-        up(&dev->oss.lock);
+        up(&dev->dmasound.lock);
         return err;
 }
 
@@ -271,13 +272,13 @@ static int dsp_release(struct inode *inode, struct file *file)
 {
         struct saa7134_dev *dev = file->private_data;
 
-        down(&dev->oss.lock);
-        if (dev->oss.recording_on)
+        down(&dev->dmasound.lock);
+        if (dev->dmasound.recording_on)
                 dsp_rec_stop(dev);
         dsp_buffer_free(dev);
-        dev->oss.users_dsp--;
+        dev->dmasound.users_dsp--;
         file->private_data = NULL;
-        up(&dev->oss.lock);
+        up(&dev->dmasound.lock);
         return 0;
 }
 
@@ -290,12 +291,12 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
         unsigned long flags;
         int err,ret = 0;
 
-        add_wait_queue(&dev->oss.wq, &wait);
-        down(&dev->oss.lock);
+        add_wait_queue(&dev->dmasound.wq, &wait);
+        down(&dev->dmasound.lock);
         while (count > 0) {
                 /* wait for data if needed */
-                if (0 == dev->oss.read_count) {
-                        if (!dev->oss.recording_on) {
+                if (0 == dev->dmasound.read_count) {
+                        if (!dev->dmasound.recording_on) {
                                 err = dsp_rec_start(dev);
                                 if (err < 0) {
                                         if (0 == ret)
@@ -303,8 +304,8 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
                                         break;
                                 }
                         }
-                        if (dev->oss.recording_on &&
-                            !dev->oss.dma_running) {
+                        if (dev->dmasound.recording_on &&
+                            !dev->dmasound.dma_running) {
                                 /* recover from overruns */
                                 spin_lock_irqsave(&dev->slock,flags);
                                 dsp_dma_start(dev);
@@ -315,12 +316,12 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
                                         ret = -EAGAIN;
                                 break;
                         }
-                        up(&dev->oss.lock);
+                        up(&dev->dmasound.lock);
                         set_current_state(TASK_INTERRUPTIBLE);
-                        if (0 == dev->oss.read_count)
+                        if (0 == dev->dmasound.read_count)
                                 schedule();
                         set_current_state(TASK_RUNNING);
-                        down(&dev->oss.lock);
+                        down(&dev->dmasound.lock);
                         if (signal_pending(current)) {
                                 if (0 == ret)
                                         ret = -EINTR;
@@ -330,12 +331,12 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
 
                 /* copy data to userspace */
                 bytes = count;
-                if (bytes > dev->oss.read_count)
-                        bytes = dev->oss.read_count;
-                if (bytes > dev->oss.bufsize - dev->oss.read_offset)
-                        bytes = dev->oss.bufsize - dev->oss.read_offset;
+                if (bytes > dev->dmasound.read_count)
+                        bytes = dev->dmasound.read_count;
+                if (bytes > dev->dmasound.bufsize - dev->dmasound.read_offset)
+                        bytes = dev->dmasound.bufsize - dev->dmasound.read_offset;
                 if (copy_to_user(buffer + ret,
-                                 dev->oss.dma.vmalloc + dev->oss.read_offset,
+                                 dev->dmasound.dma.vmalloc + dev->dmasound.read_offset,
                                  bytes)) {
                         if (0 == ret)
                                 ret = -EFAULT;
@@ -344,13 +345,13 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
 
                 ret   += bytes;
                 count -= bytes;
-                dev->oss.read_count  -= bytes;
-                dev->oss.read_offset += bytes;
-                if (dev->oss.read_offset == dev->oss.bufsize)
-                        dev->oss.read_offset = 0;
+                dev->dmasound.read_count  -= bytes;
+                dev->dmasound.read_offset += bytes;
+                if (dev->dmasound.read_offset == dev->dmasound.bufsize)
+                        dev->dmasound.read_offset = 0;
         }
-        up(&dev->oss.lock);
-        remove_wait_queue(&dev->oss.wq, &wait);
+        up(&dev->dmasound.lock);
+        remove_wait_queue(&dev->dmasound.wq, &wait);
         return ret;
 }
 
@@ -370,53 +371,53 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
 
         if (oss_debug > 1)
                 saa7134_print_ioctl(dev->name,cmd);
-        switch (cmd) {
-        case OSS_GETVERSION:
-                return put_user(SOUND_VERSION, p);
-        case SNDCTL_DSP_GETCAPS:
+        switch (cmd) {
+        case OSS_GETVERSION:
+                return put_user(SOUND_VERSION, p);
+        case SNDCTL_DSP_GETCAPS:
                 return 0;
 
-        case SNDCTL_DSP_SPEED:
+        case SNDCTL_DSP_SPEED:
                 if (get_user(val, p))
                         return -EFAULT;
                 /* fall through */
-        case SOUND_PCM_READ_RATE:
-                return put_user(dev->oss.rate, p);
+        case SOUND_PCM_READ_RATE:
+                return put_user(dev->dmasound.rate, p);
 
-        case SNDCTL_DSP_STEREO:
+        case SNDCTL_DSP_STEREO:
                 if (get_user(val, p))
                         return -EFAULT;
-                down(&dev->oss.lock);
-                dev->oss.channels = val ? 2 : 1;
-                if (dev->oss.recording_on) {
+                down(&dev->dmasound.lock);
+                dev->dmasound.channels = val ? 2 : 1;
+                if (dev->dmasound.recording_on) {
                         dsp_rec_stop(dev);
                         dsp_rec_start(dev);
                 }
-                up(&dev->oss.lock);
-                return put_user(dev->oss.channels-1, p);
+                up(&dev->dmasound.lock);
+                return put_user(dev->dmasound.channels-1, p);
 
-        case SNDCTL_DSP_CHANNELS:
+        case SNDCTL_DSP_CHANNELS:
                 if (get_user(val, p))
                         return -EFAULT;
                 if (val != 1 && val != 2)
                         return -EINVAL;
-                down(&dev->oss.lock);
-                dev->oss.channels = val;
-                if (dev->oss.recording_on) {
+                down(&dev->dmasound.lock);
+                dev->dmasound.channels = val;
+                if (dev->dmasound.recording_on) {
                         dsp_rec_stop(dev);
                         dsp_rec_start(dev);
                 }
-                up(&dev->oss.lock);
+                up(&dev->dmasound.lock);
                 /* fall through */
-        case SOUND_PCM_READ_CHANNELS:
-                return put_user(dev->oss.channels, p);
+        case SOUND_PCM_READ_CHANNELS:
+                return put_user(dev->dmasound.channels, p);
 
-        case SNDCTL_DSP_GETFMTS: /* Returns a mask */
+        case SNDCTL_DSP_GETFMTS: /* Returns a mask */
                 return put_user(AFMT_U8     | AFMT_S8     |
                                 AFMT_U16_LE | AFMT_U16_BE |
                                 AFMT_S16_LE | AFMT_S16_BE, p);
 
-        case SNDCTL_DSP_SETFMT: /* Selects ONE fmt */
+        case SNDCTL_DSP_SETFMT: /* Selects ONE fmt */
                 if (get_user(val, p))
                         return -EFAULT;
                 switch (val) {
@@ -429,20 +430,20 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
                 case AFMT_U16_BE:
                 case AFMT_S16_LE:
                 case AFMT_S16_BE:
-                        down(&dev->oss.lock);
-                        dev->oss.afmt = val;
-                        if (dev->oss.recording_on) {
+                        down(&dev->dmasound.lock);
+                        dev->dmasound.afmt = val;
+                        if (dev->dmasound.recording_on) {
                                 dsp_rec_stop(dev);
                                 dsp_rec_start(dev);
                         }
-                        up(&dev->oss.lock);
-                        return put_user(dev->oss.afmt, p);
+                        up(&dev->dmasound.lock);
+                        return put_user(dev->dmasound.afmt, p);
                 default:
                         return -EINVAL;
                 }
 
-        case SOUND_PCM_READ_BITS:
-                switch (dev->oss.afmt) {
+        case SOUND_PCM_READ_BITS:
+                switch (dev->dmasound.afmt) {
                 case AFMT_U8:
                 case AFMT_S8:
                         return put_user(8, p);
@@ -455,23 +456,23 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
                         return -EINVAL;
                 }
 
-        case SNDCTL_DSP_NONBLOCK:
-                file->f_flags |= O_NONBLOCK;
-                return 0;
+        case SNDCTL_DSP_NONBLOCK:
+                file->f_flags |= O_NONBLOCK;
+                return 0;
 
-        case SNDCTL_DSP_RESET:
-                down(&dev->oss.lock);
-                if (dev->oss.recording_on)
+        case SNDCTL_DSP_RESET:
+                down(&dev->dmasound.lock);
+                if (dev->dmasound.recording_on)
                         dsp_rec_stop(dev);
-                up(&dev->oss.lock);
+                up(&dev->dmasound.lock);
                 return 0;
-        case SNDCTL_DSP_GETBLKSIZE:
-                return put_user(dev->oss.blksize, p);
+        case SNDCTL_DSP_GETBLKSIZE:
+                return put_user(dev->dmasound.blksize, p);
 
-        case SNDCTL_DSP_SETFRAGMENT:
+        case SNDCTL_DSP_SETFRAGMENT:
                 if (get_user(val, p))
                         return -EFAULT;
-                if (dev->oss.recording_on)
+                if (dev->dmasound.recording_on)
                         return -EBUSY;
                 dsp_buffer_free(dev);
                 /* used to be arg >> 16 instead of val >> 16; fixed */
@@ -479,16 +480,16 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
                 dsp_buffer_init(dev);
                 return 0;
 
-        case SNDCTL_DSP_SYNC:
+        case SNDCTL_DSP_SYNC:
                 /* NOP */
                 return 0;
 
         case SNDCTL_DSP_GETISPACE:
         {
                 audio_buf_info info;
-                info.fragsize   = dev->oss.blksize;
-                info.fragstotal = dev->oss.blocks;
-                info.bytes      = dev->oss.read_count;
+                info.fragsize   = dev->dmasound.blksize;
+                info.fragstotal = dev->dmasound.blocks;
+                info.bytes      = dev->dmasound.read_count;
                 info.fragments  = info.bytes / info.fragsize;
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
@@ -504,13 +505,13 @@ static unsigned int dsp_poll(struct file *file, struct poll_table_struct *wait)
         struct saa7134_dev *dev = file->private_data;
         unsigned int mask = 0;
 
-        poll_wait(file, &dev->oss.wq, wait);
+        poll_wait(file, &dev->dmasound.wq, wait);
 
-        if (0 == dev->oss.read_count) {
-                down(&dev->oss.lock);
-                if (!dev->oss.recording_on)
+        if (0 == dev->dmasound.read_count) {
+                down(&dev->dmasound.lock);
+                if (!dev->dmasound.recording_on)
                         dsp_rec_start(dev);
-                up(&dev->oss.lock);
+                up(&dev->dmasound.lock);
         } else
                 mask |= (POLLIN | POLLRDNORM);
         return mask;
@@ -534,7 +535,7 @@ mixer_recsrc_7134(struct saa7134_dev *dev)
 {
         int analog_io,rate;
 
-        switch (dev->oss.input) {
+        switch (dev->dmasound.input) {
         case TV:
                 saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, 0xc0);
                 saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, 0x00);
@@ -542,8 +543,8 @@ mixer_recsrc_7134(struct saa7134_dev *dev)
         case LINE1:
         case LINE2:
         case LINE2_LEFT:
-                analog_io = (LINE1 == dev->oss.input) ? 0x00 : 0x08;
-                rate = (32000 == dev->oss.rate) ? 0x01 : 0x03;
+                analog_io = (LINE1 == dev->dmasound.input) ? 0x00 : 0x08;
+                rate = (32000 == dev->dmasound.rate) ? 0x01 : 0x03;
                 saa_andorb(SAA7134_ANALOG_IO_SELECT,  0x08, analog_io);
                 saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, 0x80);
                 saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, rate);
@@ -559,10 +560,10 @@ mixer_recsrc_7133(struct saa7134_dev *dev)
 
         xbarin = 0x03; // adc
     anabar = 0;
-        switch (dev->oss.input) {
+        switch (dev->dmasound.input) {
         case TV:
                 xbarin = 0; // Demodulator
-        anabar = 2; // DACs
+        anabar = 2; // DACs
                 break;
         case LINE1:
                 anabar = 0;  // aux1, aux1
@@ -585,9 +586,9 @@ mixer_recsrc(struct saa7134_dev *dev, enum saa7134_audio_in src)
 {
         static const char *iname[] = { "Oops", "TV", "LINE1", "LINE2" };
 
-        dev->oss.count++;
-        dev->oss.input = src;
-        dprintk("mixer input = %s\n",iname[dev->oss.input]);
+        dev->dmasound.count++;
+        dev->dmasound.input = src;
+        dprintk("mixer input = %s\n",iname[dev->dmasound.input]);
 
         switch (dev->pci->device) {
         case PCI_DEVICE_ID_PHILIPS_SAA7134:
@@ -639,7 +640,7 @@ static int mixer_open(struct inode *inode, struct file *file)
 
         list_for_each(list,&saa7134_devlist) {
                 h = list_entry(list, struct saa7134_dev, devlist);
-                if (h->oss.minor_mixer == minor)
+                if (h->dmasound.minor_mixer == minor)
                         dev = h;
         }
         if (NULL == dev)
@@ -666,28 +667,28 @@ static int mixer_ioctl(struct inode *inode, struct file *file,
 
         if (oss_debug > 1)
                 saa7134_print_ioctl(dev->name,cmd);
-        switch (cmd) {
-        case OSS_GETVERSION:
-                return put_user(SOUND_VERSION, p);
+        switch (cmd) {
+        case OSS_GETVERSION:
+                return put_user(SOUND_VERSION, p);
         case SOUND_MIXER_INFO:
         {
                 mixer_info info;
                 memset(&info,0,sizeof(info));
-                strlcpy(info.id,   "TV audio", sizeof(info.id));
-                strlcpy(info.name, dev->name,  sizeof(info.name));
-                info.modify_counter = dev->oss.count;
-                if (copy_to_user(argp, &info, sizeof(info)))
-                        return -EFAULT;
+                strlcpy(info.id,   "TV audio", sizeof(info.id));
+                strlcpy(info.name, dev->name,  sizeof(info.name));
+                info.modify_counter = dev->dmasound.count;
+                if (copy_to_user(argp, &info, sizeof(info)))
+                        return -EFAULT;
                 return 0;
         }
         case SOUND_OLD_MIXER_INFO:
         {
                 _old_mixer_info info;
                 memset(&info,0,sizeof(info));
-                strlcpy(info.id,   "TV audio", sizeof(info.id));
-                strlcpy(info.name, dev->name,  sizeof(info.name));
-                if (copy_to_user(argp, &info, sizeof(info)))
-                        return -EFAULT;
+                strlcpy(info.id,   "TV audio", sizeof(info.id));
+                strlcpy(info.name, dev->name,  sizeof(info.name));
+                if (copy_to_user(argp, &info, sizeof(info)))
+                        return -EFAULT;
                 return 0;
         }
         case MIXER_READ(SOUND_MIXER_CAPS):
@@ -697,26 +698,26 @@ static int mixer_ioctl(struct inode *inode, struct file *file,
         case MIXER_READ(SOUND_MIXER_RECMASK):
         case MIXER_READ(SOUND_MIXER_DEVMASK):
                 val = SOUND_MASK_LINE1 | SOUND_MASK_LINE2;
-                if (32000 == dev->oss.rate)
+                if (32000 == dev->dmasound.rate)
                         val |= SOUND_MASK_VIDEO;
                 return put_user(val, p);
 
         case MIXER_WRITE(SOUND_MIXER_RECSRC):
                 if (get_user(val, p))
                         return -EFAULT;
-                input = dev->oss.input;
-                if (32000 == dev->oss.rate  &&
-                    val & SOUND_MASK_VIDEO  &&  dev->oss.input != TV)
+                input = dev->dmasound.input;
+                if (32000 == dev->dmasound.rate  &&
+                    val & SOUND_MASK_VIDEO  &&  dev->dmasound.input != TV)
                         input = TV;
-                if (val & SOUND_MASK_LINE1  &&  dev->oss.input != LINE1)
+                if (val & SOUND_MASK_LINE1  &&  dev->dmasound.input != LINE1)
                         input = LINE1;
-                if (val & SOUND_MASK_LINE2  &&  dev->oss.input != LINE2)
+                if (val & SOUND_MASK_LINE2  &&  dev->dmasound.input != LINE2)
                         input = LINE2;
-                if (input != dev->oss.input)
+                if (input != dev->dmasound.input)
                         mixer_recsrc(dev,input);
                 /* fall throuth */
         case MIXER_READ(SOUND_MIXER_RECSRC):
-                switch (dev->oss.input) {
+                switch (dev->dmasound.input) {
                 case TV:    ret = SOUND_MASK_VIDEO; break;
                 case LINE1: ret = SOUND_MASK_LINE1; break;
                 case LINE2: ret = SOUND_MASK_LINE2; break;
@@ -726,7 +727,7 @@ static int mixer_ioctl(struct inode *inode, struct file *file,
 
         case MIXER_WRITE(SOUND_MIXER_VIDEO):
         case MIXER_READ(SOUND_MIXER_VIDEO):
-                if (32000 != dev->oss.rate)
+                if (32000 != dev->dmasound.rate)
                         return -EINVAL;
                 return put_user(100 | 100 << 8, p);
 
@@ -735,22 +736,22 @@ static int mixer_ioctl(struct inode *inode, struct file *file,
                         return -EFAULT;
                 val &= 0xff;
                 val = (val <= 50) ? 50 : 100;
-                dev->oss.line1 = val;
-                mixer_level(dev,LINE1,dev->oss.line1);
+                dev->dmasound.line1 = val;
+                mixer_level(dev,LINE1,dev->dmasound.line1);
                 /* fall throuth */
         case MIXER_READ(SOUND_MIXER_LINE1):
-                return put_user(dev->oss.line1 | dev->oss.line1 << 8, p);
+                return put_user(dev->dmasound.line1 | dev->dmasound.line1 << 8, p);
 
         case MIXER_WRITE(SOUND_MIXER_LINE2):
                 if (get_user(val, p))
                         return -EFAULT;
                 val &= 0xff;
                 val = (val <= 50) ? 50 : 100;
-                dev->oss.line2 = val;
-                mixer_level(dev,LINE2,dev->oss.line2);
+                dev->dmasound.line2 = val;
+                mixer_level(dev,LINE2,dev->dmasound.line2);
                 /* fall throuth */
         case MIXER_READ(SOUND_MIXER_LINE2):
-                return put_user(dev->oss.line2 | dev->oss.line2 << 8, p);
+                return put_user(dev->dmasound.line2 | dev->dmasound.line2 << 8, p);
 
         default:
                 return -EINVAL;
@@ -770,8 +771,8 @@ struct file_operations saa7134_mixer_fops = {
 int saa7134_oss_init1(struct saa7134_dev *dev)
 {
         /* general */
-        init_MUTEX(&dev->oss.lock);
-        init_waitqueue_head(&dev->oss.wq);
+        init_MUTEX(&dev->dmasound.lock);
+        init_waitqueue_head(&dev->dmasound.wq);
 
         switch (dev->pci->device) {
         case PCI_DEVICE_ID_PHILIPS_SAA7133:
@@ -783,17 +784,17 @@ int saa7134_oss_init1(struct saa7134_dev *dev)
         }
 
         /* dsp */
-        dev->oss.rate = 32000;
+        dev->dmasound.rate = 32000;
         if (oss_rate)
-                dev->oss.rate = oss_rate;
-        dev->oss.rate = (dev->oss.rate > 40000) ? 48000 : 32000;
+                dev->dmasound.rate = oss_rate;
+        dev->dmasound.rate = (dev->dmasound.rate > 40000) ? 48000 : 32000;
 
         /* mixer */
-        dev->oss.line1 = 50;
-        dev->oss.line2 = 50;
-        mixer_level(dev,LINE1,dev->oss.line1);
-        mixer_level(dev,LINE2,dev->oss.line2);
-        mixer_recsrc(dev, (dev->oss.rate == 32000) ? TV : LINE2);
+        dev->dmasound.line1 = 50;
+        dev->dmasound.line2 = 50;
+        mixer_level(dev,LINE1,dev->dmasound.line1);
+        mixer_level(dev,LINE2,dev->dmasound.line2);
+        mixer_recsrc(dev, (dev->dmasound.rate == 32000) ? TV : LINE2);
 
         return 0;
 }
@@ -809,7 +810,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status)
         int next_blk, reg = 0;
 
         spin_lock(&dev->slock);
-        if (UNSET == dev->oss.dma_blk) {
+        if (UNSET == dev->dmasound.dma_blk) {
                 dprintk("irq: recording stopped\n");
                 goto done;
         }
@@ -817,11 +818,11 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status)
                 dprintk("irq: lost %ld\n", (status >> 24) & 0x0f);
         if (0 == (status & 0x10000000)) {
                 /* odd */
-                if (0 == (dev->oss.dma_blk & 0x01))
+                if (0 == (dev->dmasound.dma_blk & 0x01))
                         reg = SAA7134_RS_BA1(6);
         } else {
                 /* even */
-                if (1 == (dev->oss.dma_blk & 0x01))
+                if (1 == (dev->dmasound.dma_blk & 0x01))
                         reg = SAA7134_RS_BA2(6);
         }
         if (0 == reg) {
@@ -829,25 +830,25 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status)
                         (status & 0x10000000) ? "even" : "odd");
                 goto done;
         }
-        if (dev->oss.read_count >= dev->oss.blksize * (dev->oss.blocks-2)) {
-                dprintk("irq: overrun [full=%d/%d]\n",dev->oss.read_count,
-                        dev->oss.bufsize);
+        if (dev->dmasound.read_count >= dev->dmasound.blksize * (dev->dmasound.blocks-2)) {
+                dprintk("irq: overrun [full=%d/%d]\n",dev->dmasound.read_count,
+                        dev->dmasound.bufsize);
                 dsp_dma_stop(dev);
                 goto done;
         }
 
         /* next block addr */
-        next_blk = (dev->oss.dma_blk + 2) % dev->oss.blocks;
-        saa_writel(reg,next_blk * dev->oss.blksize);
+        next_blk = (dev->dmasound.dma_blk + 2) % dev->dmasound.blocks;
+        saa_writel(reg,next_blk * dev->dmasound.blksize);
         if (oss_debug > 2)
                 dprintk("irq: ok, %s, next_blk=%d, addr=%x\n",
                         (status & 0x10000000) ? "even" : "odd ", next_blk,
-                        next_blk * dev->oss.blksize);
+                        next_blk * dev->dmasound.blksize);
 
         /* update status & wake waiting readers */
-        dev->oss.dma_blk = (dev->oss.dma_blk + 1) % dev->oss.blocks;
-        dev->oss.read_count += dev->oss.blksize;
-        wake_up(&dev->oss.wq);
+        dev->dmasound.dma_blk = (dev->dmasound.dma_blk + 1) % dev->dmasound.blocks;
+        dev->dmasound.read_count += dev->dmasound.blksize;
+        wake_up(&dev->dmasound.wq);
 
  done:
         spin_unlock(&dev->slock);
diff --git a/drivers/media/video/saa7134/saa7134-reg.h b/drivers/media/video/saa7134/saa7134-reg.h
index ae0c7a165390..ac6431ba4fc3 100644
--- a/drivers/media/video/saa7134/saa7134-reg.h
+++ b/drivers/media/video/saa7134/saa7134-reg.h
@@ -27,7 +27,7 @@
 
 /* DMA channels, n = 0 ... 6 */
 #define SAA7134_RS_BA1(n)                       ((0x200 >> 2) + 4*n)
-#define SAA7134_RS_BA2(n)                       ((0x204 >> 2) + 4*n)
+#define SAA7134_RS_BA2(n)                       ((0x204 >> 2) + 4*n)
 #define SAA7134_RS_PITCH(n)                     ((0x208 >> 2) + 4*n)
 #define SAA7134_RS_CONTROL(n)                   ((0x20c >> 2) + 4*n)
 #define   SAA7134_RS_CONTROL_WSWAP              (0x01 << 25)
@@ -43,16 +43,24 @@
 #define SAA7134_FIFO_SIZE                       (0x2a0 >> 2)
 #define SAA7134_THRESHOULD                      (0x2a4 >> 2)
 
+#define SAA7133_NUM_SAMPLES                     (0x588 >> 2)
+#define SAA7133_AUDIO_CHANNEL                   (0x58c >> 2)
+#define SAA7133_AUDIO_FORMAT                    (0x58f >> 2)
+#define SAA7133_DIGITAL_OUTPUT_SEL1             (0x46c >> 2)
+#define SAA7133_DIGITAL_OUTPUT_SEL2             (0x470 >> 2)
+#define SAA7133_DIGITAL_INPUT_XBAR1             (0x464 >> 2)
+#define SAA7133_ANALOG_IO_SELECT                (0x594 >> 2)
+
 /* main control */
 #define SAA7134_MAIN_CTRL                       (0x2a8 >> 2)
-#define   SAA7134_MAIN_CTRL_VPLLE               (1 << 15)
-#define   SAA7134_MAIN_CTRL_APLLE               (1 << 14)
-#define   SAA7134_MAIN_CTRL_EXOSC               (1 << 13)
-#define   SAA7134_MAIN_CTRL_EVFE1               (1 << 12)
-#define   SAA7134_MAIN_CTRL_EVFE2               (1 << 11)
-#define   SAA7134_MAIN_CTRL_ESFE                (1 << 10)
-#define   SAA7134_MAIN_CTRL_EBADC               (1 << 9)
-#define   SAA7134_MAIN_CTRL_EBDAC               (1 << 8)
+#define   SAA7134_MAIN_CTRL_VPLLE               (1 << 15)
+#define   SAA7134_MAIN_CTRL_APLLE               (1 << 14)
+#define   SAA7134_MAIN_CTRL_EXOSC               (1 << 13)
+#define   SAA7134_MAIN_CTRL_EVFE1               (1 << 12)
+#define   SAA7134_MAIN_CTRL_EVFE2               (1 << 11)
+#define   SAA7134_MAIN_CTRL_ESFE                (1 << 10)
+#define   SAA7134_MAIN_CTRL_EBADC               (1 << 9)
+#define   SAA7134_MAIN_CTRL_EBDAC               (1 << 8)
 #define   SAA7134_MAIN_CTRL_TE6                 (1 << 6)
 #define   SAA7134_MAIN_CTRL_TE5                 (1 << 5)
 #define   SAA7134_MAIN_CTRL_TE4                 (1 << 4)
@@ -348,6 +356,7 @@
 
 /* test modes */
 #define SAA7134_SPECIAL_MODE                    0x1d0
+#define SAA7134_PRODUCTION_TEST_MODE            0x1d1
 
 /* audio -- saa7133 + saa7135 only */
 #define SAA7135_DSP_RWSTATE                     0x580
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index 463885601ab4..470903e2f5e5 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -46,17 +46,11 @@ static int buffer_activate(struct saa7134_dev *dev,
                            struct saa7134_buf *buf,
                            struct saa7134_buf *next)
 {
-        u32 control;
 
         dprintk("buffer_activate [%p]",buf);
         buf->vb.state = STATE_ACTIVE;
         buf->top_seen = 0;
 
-        /* dma: setup channel 5 (= TS) */
-        control = SAA7134_RS_CONTROL_BURST_16 |
-                SAA7134_RS_CONTROL_ME |
-                (buf->pt->dma >> 12);
-
         if (NULL == next)
                 next = buf;
         if (V4L2_FIELD_TOP == buf->vb.field) {
@@ -68,8 +62,6 @@ static int buffer_activate(struct saa7134_dev *dev,
                 saa_writel(SAA7134_RS_BA1(5),saa7134_buffer_base(next));
                 saa_writel(SAA7134_RS_BA2(5),saa7134_buffer_base(buf));
         }
-        saa_writel(SAA7134_RS_PITCH(5),TS_PACKET_SIZE);
-        saa_writel(SAA7134_RS_CONTROL(5),control);
 
         /* start DMA */
         saa7134_set_dmabits(dev);
@@ -84,6 +76,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
         unsigned int lines, llength, size;
+        u32 control;
         int err;
 
         dprintk("buffer_prepare [%p,%s]\n",buf,v4l2_field_names[field]);
@@ -115,6 +108,18 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 if (err)
                         goto oops;
         }
+
+        /* dma: setup channel 5 (= TS) */
+        control = SAA7134_RS_CONTROL_BURST_16 |
+                  SAA7134_RS_CONTROL_ME |
+                  (buf->pt->dma >> 12);
+
+        saa_writeb(SAA7134_TS_DMA0, ((lines-1)&0xff));
+        saa_writeb(SAA7134_TS_DMA1, (((lines-1)>>8)&0xff));
+        saa_writeb(SAA7134_TS_DMA2, ((((lines-1)>>16)&0x3f) | 0x00)); /* TSNOPIT=0, TSCOLAP=0 */
+        saa_writel(SAA7134_RS_PITCH(5),TS_PACKET_SIZE);
+        saa_writel(SAA7134_RS_CONTROL(5),control);
+
         buf->vb.state = STATE_PREPARED;
         buf->activate = buffer_activate;
         buf->vb.field = field;
@@ -164,11 +169,11 @@ EXPORT_SYMBOL_GPL(saa7134_ts_qops);
 /* ----------------------------------------------------------- */
 /* exported stuff                                              */
 
-static unsigned int tsbufs = 4;
+static unsigned int tsbufs = 8;
 module_param(tsbufs, int, 0444);
 MODULE_PARM_DESC(tsbufs,"number of ts buffers, range 2-32");
 
-static unsigned int ts_nr_packets = 30;
+static unsigned int ts_nr_packets = 64;
 module_param(ts_nr_packets, int, 0444);
 MODULE_PARM_DESC(ts_nr_packets,"size of a ts buffers (in ts packets)");
 
@@ -220,10 +225,10 @@ void saa7134_irq_ts_done(struct saa7134_dev *dev, unsigned long status)
         if (dev->ts_q.curr) {
                 field = dev->ts_q.curr->vb.field;
                 if (field == V4L2_FIELD_TOP) {
-                        if ((status & 0x100000) != 0x100000)
+                        if ((status & 0x100000) != 0x000000)
                                 goto done;
                 } else {
-                        if ((status & 0x100000) != 0x000000)
+                        if ((status & 0x100000) != 0x100000)
                                 goto done;
                 }
                 saa7134_buffer_finish(dev,&dev->ts_q,STATE_DONE);
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 61a2d6b50eef..93268427750d 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -207,6 +207,10 @@ static void tvaudio_setcarrier(struct saa7134_dev *dev,
         saa_writel(SAA7134_CARRIER2_FREQ0 >> 2, tvaudio_carr2reg(secondary));
 }
 
+#define SAA7134_MUTE_MASK 0xbb
+#define SAA7134_MUTE_ANALOG 0x04
+#define SAA7134_MUTE_I2S 0x40
+
 static void mute_input_7134(struct saa7134_dev *dev)
 {
         unsigned int mute;
@@ -241,7 +245,11 @@ static void mute_input_7134(struct saa7134_dev *dev)
 
         if (PCI_DEVICE_ID_PHILIPS_SAA7134 == dev->pci->device)
                 /* 7134 mute */
-                saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ? 0xbf : 0xbb);
+                saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ?
+                                                    SAA7134_MUTE_MASK |
+                                                    SAA7134_MUTE_ANALOG |
+                                                    SAA7134_MUTE_I2S :
+                                                    SAA7134_MUTE_MASK);
 
         /* switch internal audio mux */
         switch (in->amux) {
@@ -753,17 +761,17 @@ static int mute_input_7133(struct saa7134_dev *dev)
 
 
         /* switch gpio-connected external audio mux */
-        if (0 != card(dev).gpiomask) {
-                mask = card(dev).gpiomask;
+        if (0 != card(dev).gpiomask) {
+                mask = card(dev).gpiomask;
 
                 if (card(dev).mute.name && dev->ctl_mute)
                         in = &card(dev).mute;
                 else
                         in = dev->input;
 
-                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
-                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
-                saa7134_track_gpio(dev,in->name);
+                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
+                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
+                saa7134_track_gpio(dev,in->name);
         }
 
         return 0;
@@ -1016,9 +1024,12 @@ int saa7134_tvaudio_do_scan(struct saa7134_dev *dev)
         return 0;
 }
 
+EXPORT_SYMBOL(saa_dsp_writel);
+
 /* ----------------------------------------------------------- */
 /*
  * Local variables:
  * c-basic-offset: 8
  * End:
  */
+
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 35e5e85f669a..45c852df13ed 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -30,6 +30,9 @@
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+
 /* ------------------------------------------------------------------ */
 
 static unsigned int video_debug   = 0;
@@ -48,6 +51,43 @@ MODULE_PARM_DESC(noninterlaced,"video input is noninterlaced");
         printk(KERN_DEBUG "%s/video: " fmt, dev->name , ## arg)
 
 /* ------------------------------------------------------------------ */
+/* Defines for Video Output Port Register at address 0x191            */
+
+/* Bit 0: VIP code T bit polarity */
+
+#define VP_T_CODE_P_NON_INVERTED        0x00
+#define VP_T_CODE_P_INVERTED            0x01
+
+/* ------------------------------------------------------------------ */
+/* Defines for Video Output Port Register at address 0x195            */
+
+/* Bit 2: Video output clock delay control */
+
+#define VP_CLK_CTRL2_NOT_DELAYED        0x00
+#define VP_CLK_CTRL2_DELAYED            0x04
+
+/* Bit 1: Video output clock invert control */
+
+#define VP_CLK_CTRL1_NON_INVERTED       0x00
+#define VP_CLK_CTRL1_INVERTED           0x02
+
+/* ------------------------------------------------------------------ */
+/* Defines for Video Output Port Register at address 0x196            */
+
+/* Bits 2 to 0: VSYNC pin video vertical sync type */
+
+#define VP_VS_TYPE_MASK                 0x07
+
+#define VP_VS_TYPE_OFF                  0x00
+#define VP_VS_TYPE_V123                 0x01
+#define VP_VS_TYPE_V_ITU                0x02
+#define VP_VS_TYPE_VGATE_L              0x03
+#define VP_VS_TYPE_RESERVED1            0x04
+#define VP_VS_TYPE_RESERVED2            0x05
+#define VP_VS_TYPE_F_ITU                0x06
+#define VP_VS_TYPE_SC_FID               0x07
+
+/* ------------------------------------------------------------------ */
 /* data structs for video                                             */
 
 static int video_out[][9] = {
@@ -273,12 +313,12 @@ static struct saa7134_tvnorm tvnorms[] = {
 
                 .h_start       = 0,
                 .h_stop        = 719,
-                .video_v_start = 23,
-                .video_v_stop  = 262,
-                .vbi_v_start_0 = 10,
-                .vbi_v_stop_0  = 21,
-                .vbi_v_start_1 = 273,
-                .src_timing    = 7,
+                .video_v_start = 23,
+                .video_v_stop  = 262,
+                .vbi_v_start_0 = 10,
+                .vbi_v_stop_0  = 21,
+                .vbi_v_start_1 = 273,
+                .src_timing    = 7,
 
                 .sync_control  = 0x18,
                 .luma_control  = 0x40,
@@ -622,7 +662,7 @@ static void set_size(struct saa7134_dev *dev, int task,
                 prescale = 1;
         xscale = 1024 * dev->crop_current.width / prescale / width;
         yscale = 512 * div * dev->crop_current.height / height;
-        dprintk("prescale=%d xscale=%d yscale=%d\n",prescale,xscale,yscale);
+        dprintk("prescale=%d xscale=%d yscale=%d\n",prescale,xscale,yscale);
         set_h_prescale(dev,task,prescale);
         saa_writeb(SAA7134_H_SCALE_INC1(task),      xscale &  0xff);
         saa_writeb(SAA7134_H_SCALE_INC2(task),      xscale >> 8);
@@ -752,20 +792,20 @@ static int verify_preview(struct saa7134_dev *dev, struct v4l2_window *win)
         maxh  = dev->crop_current.height;
 
         if (V4L2_FIELD_ANY == field) {
-                field = (win->w.height > maxh/2)
-                        ? 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;
-        }
+                field = (win->w.height > maxh/2)
+                        ? 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;
+        }
 
         win->field = field;
         if (win->w.width > maxw)
@@ -1306,13 +1346,13 @@ video_poll(struct file *file, struct poll_table_struct *wait)
                         if (res_locked(fh->dev,RESOURCE_VIDEO)) {
                                 up(&fh->cap.lock);
                                 return POLLERR;
-                        }
-                        if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) {
-                                up(&fh->cap.lock);
-                                return POLLERR;
-                        }
-                        fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf);
-                        fh->cap.read_off = 0;
+                        }
+                        if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) {
+                                up(&fh->cap.lock);
+                                return POLLERR;
+                        }
+                        fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf);
+                        fh->cap.read_off = 0;
                 }
                 up(&fh->cap.lock);
                 buf = fh->cap.read_buf;
@@ -1666,9 +1706,10 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_QUERYCAP:
         {
                 struct v4l2_capability *cap = arg;
+                unsigned int tuner_type = dev->tuner_type;
 
                 memset(cap,0,sizeof(*cap));
-                strcpy(cap->driver, "saa7134");
+                strcpy(cap->driver, "saa7134");
                 strlcpy(cap->card, saa7134_boards[dev->board].name,
                         sizeof(cap->card));
                 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
@@ -1677,9 +1718,13 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                         V4L2_CAP_VIDEO_CAPTURE |
                         V4L2_CAP_VIDEO_OVERLAY |
                         V4L2_CAP_VBI_CAPTURE |
-                        V4L2_CAP_TUNER |
                         V4L2_CAP_READWRITE |
-                        V4L2_CAP_STREAMING;
+                        V4L2_CAP_STREAMING |
+                        V4L2_CAP_TUNER;
+
+                if ((tuner_type == TUNER_ABSENT) || (tuner_type == UNSET))
+                        cap->capabilities &= ~V4L2_CAP_TUNER;
+
                 return 0;
         }
 
@@ -1793,9 +1838,9 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                         crop->c.height = b->top - crop->c.top + b->height;
 
                 if (crop->c.left < b->left)
-                        crop->c.top = b->left;
+                        crop->c.left = b->left;
                 if (crop->c.left > b->left + b->width)
-                        crop->c.top = b->left + b->width;
+                        crop->c.left = b->left + b->width;
                 if (crop->c.width > b->left - crop->c.left + b->width)
                         crop->c.width = b->left - crop->c.left + b->width;
 
@@ -1817,6 +1862,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                                 break;
                 if (NULL != card_in(dev,n).name) {
                         strcpy(t->name, "Television");
+                        t->type = V4L2_TUNER_ANALOG_TV;
                         t->capability = V4L2_TUNER_CAP_NORM |
                                 V4L2_TUNER_CAP_STEREO |
                                 V4L2_TUNER_CAP_LANG1 |
@@ -1892,26 +1938,26 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
         }
         case VIDIOC_S_AUDIO:
                 return 0;
-        case VIDIOC_G_PARM:
-        {
-                struct v4l2_captureparm *parm = arg;
-                memset(parm,0,sizeof(*parm));
-                return 0;
-        }
-
-        case VIDIOC_G_PRIORITY:
-        {
-                enum v4l2_priority *p = arg;
-
-                *p = v4l2_prio_max(&dev->prio);
-                return 0;
-        }
-        case VIDIOC_S_PRIORITY:
-        {
-                enum v4l2_priority *prio = arg;
-
-                return v4l2_prio_change(&dev->prio, &fh->prio, *prio);
-        }
+        case VIDIOC_G_PARM:
+        {
+                struct v4l2_captureparm *parm = arg;
+                memset(parm,0,sizeof(*parm));
+                return 0;
+        }
+
+        case VIDIOC_G_PRIORITY:
+        {
+                enum v4l2_priority *p = arg;
+
+                *p = v4l2_prio_max(&dev->prio);
+                return 0;
+        }
+        case VIDIOC_S_PRIORITY:
+        {
+                enum v4l2_priority *prio = arg;
+
+                return v4l2_prio_change(&dev->prio, &fh->prio, *prio);
+        }
 
         /* --- preview ioctls ---------------------------------------- */
         case VIDIOC_ENUM_FMT:
@@ -2018,7 +2064,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_format *f = arg;
                 return saa7134_try_fmt(dev,fh,f);
         }
-
+#ifdef HAVE_V4L1
         case VIDIOCGMBUF:
         {
                 struct video_mbuf *mbuf = arg;
@@ -2043,6 +2089,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 }
                 return 0;
         }
+#endif
         case VIDIOC_REQBUFS:
                 return videobuf_reqbufs(saa7134_queue(fh),arg);
 
@@ -2060,7 +2107,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
         {
                 int res = saa7134_resource(fh);
 
-                if (!res_get(dev,fh,res))
+                if (!res_get(dev,fh,res))
                         return -EBUSY;
                 return videobuf_streamon(saa7134_queue(fh));
         }
@@ -2102,7 +2149,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_capability *cap = arg;
 
                 memset(cap,0,sizeof(*cap));
-                strcpy(cap->driver, "saa7134");
+                strcpy(cap->driver, "saa7134");
                 strlcpy(cap->card, saa7134_boards[dev->board].name,
                         sizeof(cap->card));
                 sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
@@ -2119,6 +2166,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
 
                 memset(t,0,sizeof(*t));
                 strcpy(t->name, "Radio");
+                t->type = V4L2_TUNER_RADIO;
 
                 saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
 
@@ -2233,7 +2281,7 @@ struct video_device saa7134_video_template =
 {
         .name          = "saa7134-video",
         .type          = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_OVERLAY|
-                         VID_TYPE_CLIPPING|VID_TYPE_SCALES,
+                         VID_TYPE_CLIPPING|VID_TYPE_SCALES,
         .hardware      = 0,
         .fops          = &video_fops,
         .minor         = -1,
@@ -2280,7 +2328,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
                 dev->tda9887_conf |= TDA9887_AUTOMUTE;
         dev->automute       = 0;
 
-        INIT_LIST_HEAD(&dev->video_q.queue);
+        INIT_LIST_HEAD(&dev->video_q.queue);
         init_timer(&dev->video_q.timeout);
         dev->video_q.timeout.function = saa7134_buffer_timeout;
         dev->video_q.timeout.data     = (unsigned long)(&dev->video_q);
@@ -2289,13 +2337,28 @@ int saa7134_video_init1(struct saa7134_dev *dev)
         if (saa7134_boards[dev->board].video_out) {
                 /* enable video output */
                 int vo = saa7134_boards[dev->board].video_out;
+                int video_reg;
+                unsigned int vid_port_opts = saa7134_boards[dev->board].vid_port_opts;
                 saa_writeb(SAA7134_VIDEO_PORT_CTRL0, video_out[vo][0]);
-                saa_writeb(SAA7134_VIDEO_PORT_CTRL1, video_out[vo][1]);
+                video_reg = video_out[vo][1];
+                if (vid_port_opts & SET_T_CODE_POLARITY_NON_INVERTED)
+                        video_reg &= ~VP_T_CODE_P_INVERTED;
+                saa_writeb(SAA7134_VIDEO_PORT_CTRL1, video_reg);
                 saa_writeb(SAA7134_VIDEO_PORT_CTRL2, video_out[vo][2]);
                 saa_writeb(SAA7134_VIDEO_PORT_CTRL3, video_out[vo][3]);
                 saa_writeb(SAA7134_VIDEO_PORT_CTRL4, video_out[vo][4]);
-                saa_writeb(SAA7134_VIDEO_PORT_CTRL5, video_out[vo][5]);
-                saa_writeb(SAA7134_VIDEO_PORT_CTRL6, video_out[vo][6]);
+                video_reg = video_out[vo][5];
+                if (vid_port_opts & SET_CLOCK_NOT_DELAYED)
+                        video_reg &= ~VP_CLK_CTRL2_DELAYED;
+                if (vid_port_opts & SET_CLOCK_INVERTED)
+                        video_reg |= VP_CLK_CTRL1_INVERTED;
+                saa_writeb(SAA7134_VIDEO_PORT_CTRL5, video_reg);
+                video_reg = video_out[vo][6];
+                if (vid_port_opts & SET_VSYNC_OFF) {
+                        video_reg &= ~VP_VS_TYPE_MASK;
+                        video_reg |= VP_VS_TYPE_OFF;
+                }
+                saa_writeb(SAA7134_VIDEO_PORT_CTRL6, video_reg);
                 saa_writeb(SAA7134_VIDEO_PORT_CTRL7, video_out[vo][7]);
                 saa_writeb(SAA7134_VIDEO_PORT_CTRL8, video_out[vo][8]);
         }
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 860b89530e2a..fb9727471661 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -24,16 +24,18 @@
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/kdev_t.h>
 #include <linux/input.h>
+#include <linux/notifier.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 
 #include <media/tuner.h>
 #include <media/audiochip.h>
-#include <media/id.h>
 #include <media/ir-common.h>
+#include <media/ir-kbd-i2c.h>
 #include <media/video-buf.h>
 #include <media/video-buf-dvb.h>
 
@@ -45,6 +47,10 @@
 #endif
 #define UNSET (-1U)
 
+#include <sound/driver.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+
 /* ----------------------------------------------------------- */
 /* enums                                                       */
 
@@ -187,10 +193,39 @@ struct saa7134_format {
 #define SAA7134_BOARD_FLYTV_DIGIMATRIX 64
 #define SAA7134_BOARD_KWORLD_TERMINATOR 65
 #define SAA7134_BOARD_YUAN_TUN900 66
+#define SAA7134_BOARD_BEHOLD_409FM 67
+#define SAA7134_BOARD_GOTVIEW_7135 68
+#define SAA7134_BOARD_PHILIPS_EUROPA  69
+#define SAA7134_BOARD_VIDEOMATE_DVBT_300 70
+#define SAA7134_BOARD_VIDEOMATE_DVBT_200 71
+#define SAA7134_BOARD_RTD_VFG7350 72
+#define SAA7134_BOARD_RTD_VFG7330 73
+#define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74
+#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75
+#define SAA7134_BOARD_MONSTERTV_MOBILE 76
+#define SAA7134_BOARD_PINNACLE_PCTV_110i 77
+#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
+#define SAA7134_BOARD_SEDNA_PC_TV_CARDBUS     79
+#define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80
+#define SAA7134_BOARD_PHILIPS_TIGER  81
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
 
+/* ----------------------------------------------------------- */
+/* Since we support 2 remote types, lets tell them apart       */
+
+#define SAA7134_REMOTE_GPIO  1
+#define SAA7134_REMOTE_I2C   2
+
+/* ----------------------------------------------------------- */
+/* Video Output Port Register Initialization Options           */
+
+#define SET_T_CODE_POLARITY_NON_INVERTED        (1 << 0)
+#define SET_CLOCK_NOT_DELAYED                   (1 << 1)
+#define SET_CLOCK_INVERTED                      (1 << 2)
+#define SET_VSYNC_OFF                           (1 << 3)
+
 struct saa7134_input {
         char                    *name;
         unsigned int            vmux;
@@ -226,6 +261,7 @@ struct saa7134_board {
         /* peripheral I/O */
         enum saa7134_video_out  video_out;
         enum saa7134_mpeg_type  mpeg;
+        unsigned int            vid_port_opts;
 };
 
 #define card_has_radio(dev)   (NULL != saa7134_boards[dev->board].radio.name)
@@ -319,9 +355,9 @@ struct saa7134_fh {
         struct saa7134_pgtable     pt_vbi;
 };
 
-/* oss dsp status */
-struct saa7134_oss {
-        struct semaphore           lock;
+/* dmasound dsp status */
+struct saa7134_dmasound {
+        struct semaphore           lock;
         int                        minor_mixer;
         int                        minor_dsp;
         unsigned int               users_dsp;
@@ -347,6 +383,7 @@ struct saa7134_oss {
         unsigned int               dma_blk;
         unsigned int               read_offset;
         unsigned int               read_count;
+        snd_pcm_substream_t        *substream;
 };
 
 /* IR input */
@@ -358,9 +395,9 @@ struct saa7134_ir {
         u32                        mask_keycode;
         u32                        mask_keydown;
         u32                        mask_keyup;
-        int                        polling;
-        u32                        last_gpio;
-        struct timer_list          timer;
+        int                        polling;
+        u32                        last_gpio;
+        struct timer_list          timer;
 };
 
 /* ts/mpeg status */
@@ -383,8 +420,8 @@ struct saa7134_mpeg_ops {
 /* global device status */
 struct saa7134_dev {
         struct list_head           devlist;
-        struct semaphore           lock;
-        spinlock_t                 slock;
+        struct semaphore           lock;
+        spinlock_t                 slock;
 #ifdef VIDIOC_G_PRIORITY
         struct v4l2_prio_state     prio;
 #endif
@@ -394,7 +431,7 @@ struct saa7134_dev {
         struct video_device        *video_dev;
         struct video_device        *radio_dev;
         struct video_device        *vbi_dev;
-        struct saa7134_oss         oss;
+        struct saa7134_dmasound    dmasound;
 
         /* infrared remote */
         int                        has_remote;
@@ -421,7 +458,7 @@ struct saa7134_dev {
         /* i2c i/o */
         struct i2c_adapter         i2c_adap;
         struct i2c_client          i2c_client;
-        unsigned char              eedata[64];
+        unsigned char              eedata[128];
 
         /* video overlay */
         struct v4l2_framebuffer    ovbuf;
@@ -626,6 +663,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status);
 int  saa7134_input_init1(struct saa7134_dev *dev);
 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:
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 255b6088ebf9..d32737dd2142 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -50,7 +50,6 @@
 
 #include "bttv.h"
 #include <media/audiochip.h>
-#include <media/id.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
 # define VIDEO_AUDIO_BALANCE 32
@@ -310,9 +309,9 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind)
         memset(t,0,sizeof *t);
 
         client = &t->c;
-        memcpy(client,&client_template,sizeof(struct i2c_client));
-        client->adapter = adap;
-        client->addr = addr;
+        memcpy(client,&client_template,sizeof(struct i2c_client));
+        client->adapter = adap;
+        client->addr = addr;
         i2c_set_clientdata(client, t);
 
         do_tda7432_init(client);
@@ -472,7 +471,7 @@ static int tda7432_command(struct i2c_client *client,
                 }
                 }
 
-                t->muted=(va->flags & VIDEO_AUDIO_MUTE);
+                t->muted=(va->flags & VIDEO_AUDIO_MUTE);
                 if (t->muted)
                 {
                         /* Mute & update balance*/
@@ -503,12 +502,12 @@ static int tda7432_command(struct i2c_client *client,
 
 static struct i2c_driver driver = {
         .owner           = THIS_MODULE,
-        .name            = "i2c tda7432 driver",
+        .name            = "i2c tda7432 driver",
         .id              = I2C_DRIVERID_TDA7432,
-        .flags           = I2C_DF_NOTIFY,
+        .flags           = I2C_DF_NOTIFY,
         .attach_adapter  = tda7432_probe,
-        .detach_client   = tda7432_detach,
-        .command         = tda7432_command,
+        .detach_client   = tda7432_detach,
+        .command         = tda7432_command,
 };
 
 static struct i2c_client client_template =
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index c65f0c7680a2..b2dfe07e9f9d 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -1,172 +1,406 @@
 /*
- *
- * i2c tv tuner chip device driver
- * controls the philips tda8290+75 tuner chip combo.
- */
+
+   i2c tv tuner chip device driver
+   controls the philips tda8290+75 tuner chip combo.
+
+   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/i2c.h>
 #include <linux/videodev.h>
 #include <linux/delay.h>
 #include <media/tuner.h>
 
-#define I2C_ADDR_TDA8290        0x4b
-#define I2C_ADDR_TDA8275        0x61
-
 /* ---------------------------------------------------------------------- */
 
-struct freq_entry {
-        u16     freq;
-        u8      value;
+struct tda827x_data {
+        u32 lomax;
+        u8  spd;
+        u8  bs;
+        u8  bp;
+        u8  cp;
+        u8  gc3;
+        u8 div1p5;
 };
 
-static struct freq_entry band_table[] = {
-        { 0x2DF4, 0x1C },
-        { 0x2574, 0x14 },
-        { 0x22B4, 0x0C },
-        { 0x20D4, 0x0B },
-        { 0x1E74, 0x3B },
-        { 0x1C34, 0x33 },
-        { 0x16F4, 0x5B },
-        { 0x1454, 0x53 },
-        { 0x12D4, 0x52 },
-        { 0x1034, 0x4A },
-        { 0x0EE4, 0x7A },
-        { 0x0D34, 0x72 },
-        { 0x0B54, 0x9A },
-        { 0x0914, 0x91 },
-        { 0x07F4, 0x89 },
-        { 0x0774, 0xB9 },
-        { 0x067B, 0xB1 },
-        { 0x0634, 0xD9 },
-        { 0x05A4, 0xD8 },       // FM radio
-        { 0x0494, 0xD0 },
-        { 0x03BC, 0xC8 },
-        { 0x0394, 0xF8 },       // 57250000 Hz
-        { 0x0000, 0xF0 },       // 0
+     /* Note lomax entry is lo / 62500 */
+
+static struct tda827x_data tda827x_analog[] = {
+        { .lomax =   992, .spd = 3, .bs = 2, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 1}, /*  62 MHz */
+        { .lomax =  1056, .spd = 3, .bs = 3, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 1}, /*  66 MHz */
+        { .lomax =  1216, .spd = 3, .bs = 1, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 0}, /*  76 MHz */
+        { .lomax =  1344, .spd = 3, .bs = 2, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 0}, /*  84 MHz */
+        { .lomax =  1488, .spd = 3, .bs = 2, .bp = 0, .cp = 0, .gc3 = 1, .div1p5 = 0}, /*  93 MHz */
+        { .lomax =  1568, .spd = 3, .bs = 3, .bp = 0, .cp = 0, .gc3 = 1, .div1p5 = 0}, /*  98 MHz */
+        { .lomax =  1744, .spd = 3, .bs = 3, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 109 MHz */
+        { .lomax =  1968, .spd = 2, .bs = 2, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 123 MHz */
+        { .lomax =  2128, .spd = 2, .bs = 3, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 133 MHz */
+        { .lomax =  2416, .spd = 2, .bs = 1, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 151 MHz */
+        { .lomax =  2464, .spd = 2, .bs = 2, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 154 MHz */
+        { .lomax =  2896, .spd = 2, .bs = 2, .bp = 1, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 181 MHz */
+        { .lomax =  2960, .spd = 2, .bs = 2, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 185 MHz */
+        { .lomax =  3472, .spd = 2, .bs = 3, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 217 MHz */
+        { .lomax =  3904, .spd = 1, .bs = 2, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 244 MHz */
+        { .lomax =  4240, .spd = 1, .bs = 3, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 265 MHz */
+        { .lomax =  4832, .spd = 1, .bs = 1, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 302 MHz */
+        { .lomax =  5184, .spd = 1, .bs = 2, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 324 MHz */
+        { .lomax =  5920, .spd = 1, .bs = 2, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 370 MHz */
+        { .lomax =  7264, .spd = 1, .bs = 3, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 454 MHz */
+        { .lomax =  7888, .spd = 0, .bs = 2, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 493 MHz */
+        { .lomax =  8480, .spd = 0, .bs = 3, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 530 MHz */
+        { .lomax =  8864, .spd = 0, .bs = 1, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 554 MHz */
+        { .lomax =  9664, .spd = 0, .bs = 1, .bp = 4, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 604 MHz */
+        { .lomax = 11088, .spd = 0, .bs = 2, .bp = 4, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 696 MHz */
+        { .lomax = 11840, .spd = 0, .bs = 2, .bp = 4, .cp = 1, .gc3 = 0, .div1p5 = 0}, /* 740 MHz */
+        { .lomax = 13120, .spd = 0, .bs = 3, .bp = 4, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 820 MHz */
+        { .lomax = 13840, .spd = 0, .bs = 3, .bp = 4, .cp = 1, .gc3 = 0, .div1p5 = 0}, /* 865 MHz */
+        { .lomax =     0, .spd = 0, .bs = 0, .bp = 0, .cp = 0, .gc3 = 0, .div1p5 = 0}  /* End      */
 };
 
-static struct freq_entry div_table[] = {
-        { 0x1C34, 3 },
-        { 0x0D34, 2 },
-        { 0x067B, 1 },
-        { 0x0000, 0 },
-};
+static void tda827x_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
+{
+        unsigned char tuner_reg[8];
+        unsigned char reg2[2];
+        u32 N;
+        int i;
+        struct tuner *t = i2c_get_clientdata(c);
+        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags = 0};
 
-static struct freq_entry agc_table[] = {
-        { 0x22B4, 0x8F },
-        { 0x0B54, 0x9F },
-        { 0x09A4, 0x8F },
-        { 0x0554, 0x9F },
-        { 0x0000, 0xBF },
-};
+        if (t->mode == V4L2_TUNER_RADIO)
+                freq = freq / 1000;
 
-static __u8 get_freq_entry( struct freq_entry* table, __u16 freq)
-{
-        while(table->freq && table->freq > freq)
-                table++;
-        return table->value;
-}
+        N = freq + ifc;
+        i = 0;
+        while (tda827x_analog[i].lomax < N) {
+                if(tda827x_analog[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+
+        N = N << tda827x_analog[i].spd;
+
+        tuner_reg[0] = 0;
+        tuner_reg[1] = (unsigned char)(N>>8);
+        tuner_reg[2] = (unsigned char) N;
+        tuner_reg[3] = 0x40;
+        tuner_reg[4] = 0x52 + (t->tda827x_lpsel << 5);
+        tuner_reg[5] = (tda827x_analog[i].spd   << 6) + (tda827x_analog[i].div1p5 <<5) +
+                       (tda827x_analog[i].bs     <<3) +  tda827x_analog[i].bp;
+        tuner_reg[6] = 0x8f + (tda827x_analog[i].gc3 << 4);
+        tuner_reg[7] = 0x8f;
+
+        msg.buf = tuner_reg;
+        msg.len = 8;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        msg.buf= reg2;
+        msg.len = 2;
+        reg2[0] = 0x80;
+        reg2[1] = 0;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        reg2[0] = 0x60;
+        reg2[1] = 0xbf;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        reg2[0] = 0x30;
+        reg2[1] = tuner_reg[4] + 0x80;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        msleep(1);
+        reg2[0] = 0x30;
+        reg2[1] = tuner_reg[4] + 4;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        msleep(1);
+        reg2[0] = 0x30;
+        reg2[1] = tuner_reg[4];
+        i2c_transfer(c->adapter, &msg, 1);
 
-/* ---------------------------------------------------------------------- */
+        msleep(550);
+        reg2[0] = 0x30;
+        reg2[1] = (tuner_reg[4] & 0xfc) + tda827x_analog[i].cp ;
+        i2c_transfer(c->adapter, &msg, 1);
 
-static unsigned char i2c_enable_bridge[2] =     { 0x21, 0xC0 };
-static unsigned char i2c_disable_bridge[2] =    { 0x21, 0x80 };
-static unsigned char i2c_init_tda8275[14] =     { 0x00, 0x00, 0x00, 0x00,
-                                                  0xfC, 0x04, 0xA3, 0x3F,
-                                                  0x2A, 0x04, 0xFF, 0x00,
-                                                  0x00, 0x40 };
-static unsigned char i2c_set_VS[2] =            { 0x30, 0x6F };
-static unsigned char i2c_set_GP01_CF[2] =       { 0x20, 0x0B };
-static unsigned char i2c_tda8290_reset[2] =     { 0x00, 0x00 };
-static unsigned char i2c_tda8290_standby[2] =   { 0x00, 0x02 };
-static unsigned char i2c_gainset_off[2] =       { 0x28, 0x14 };
-static unsigned char i2c_gainset_on[2] =        { 0x28, 0x54 };
-static unsigned char i2c_agc3_00[2] =           { 0x80, 0x00 };
-static unsigned char i2c_agc2_BF[2] =           { 0x60, 0xBF };
-static unsigned char i2c_cb1_D0[2] =            { 0x30, 0xD0 };
-static unsigned char i2c_cb1_D2[2] =            { 0x30, 0xD2 };
-static unsigned char i2c_cb1_56[2] =            { 0x30, 0x56 };
-static unsigned char i2c_cb1_52[2] =            { 0x30, 0x52 };
-static unsigned char i2c_cb1_50[2] =            { 0x30, 0x50 };
-static unsigned char i2c_agc2_7F[2] =           { 0x60, 0x7F };
-static unsigned char i2c_agc3_08[2] =           { 0x80, 0x08 };
-
-static struct i2c_msg i2c_msg_init[] = {
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_init_tda8275), i2c_init_tda8275 },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_disable_bridge), i2c_disable_bridge },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_set_VS), i2c_set_VS },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_set_GP01_CF), i2c_set_GP01_CF },
-};
+        reg2[0] = 0x60;
+        reg2[1] = 0x3f;
+        i2c_transfer(c->adapter, &msg, 1);
 
-static struct i2c_msg i2c_msg_prolog[] = {
-//      { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_easy_mode), i2c_easy_mode },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_gainset_off), i2c_gainset_off },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_tda8290_reset), i2c_tda8290_reset },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_enable_bridge), i2c_enable_bridge },
-};
+        reg2[0] = 0x80;
+        reg2[1] = 0x08;   // Vsync en
+        i2c_transfer(c->adapter, &msg, 1);
+}
 
-static struct i2c_msg i2c_msg_config[] = {
-//      { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_set_freq), i2c_set_freq },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc3_00), i2c_agc3_00 },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc2_BF), i2c_agc2_BF },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_D2), i2c_cb1_D2 },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_56), i2c_cb1_56 },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_52), i2c_cb1_52 },
-};
+static void tda827x_agcf(struct i2c_client *c)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+        unsigned char data[] = {0x80, 0x0c};
+        struct i2c_msg msg = {.addr = t->tda827x_addr, .buf = data,
+                              .flags = 0, .len = 2};
+        i2c_transfer(c->adapter, &msg, 1);
+}
 
-static struct i2c_msg i2c_msg_epilog[] = {
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_50), i2c_cb1_50 },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc2_7F), i2c_agc2_7F },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_agc3_08), i2c_agc3_08 },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_disable_bridge), i2c_disable_bridge },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_gainset_on), i2c_gainset_on },
+/* ---------------------------------------------------------------------- */
+
+struct tda827xa_data {
+        u32 lomax;
+        u8  svco;
+        u8  spd;
+        u8  scr;
+        u8  sbs;
+        u8  gc3;
 };
 
-static struct i2c_msg i2c_msg_standby[] = {
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_enable_bridge), i2c_enable_bridge },
-        { I2C_ADDR_TDA8275, 0, ARRAY_SIZE(i2c_cb1_D0), i2c_cb1_D0 },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_disable_bridge), i2c_disable_bridge },
-        { I2C_ADDR_TDA8290, 0, ARRAY_SIZE(i2c_tda8290_standby), i2c_tda8290_standby },
+static struct tda827xa_data tda827xa_analog[] = {
+        { .lomax =   910, .svco = 3, .spd = 4, .scr = 0, .sbs = 0, .gc3 = 3},  /*  56.875 MHz */
+        { .lomax =  1076, .svco = 0, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},  /*  67.25 MHz */
+        { .lomax =  1300, .svco = 1, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},  /*  81.25 MHz */
+        { .lomax =  1560, .svco = 2, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},  /*  97.5  MHz */
+        { .lomax =  1820, .svco = 3, .spd = 3, .scr = 0, .sbs = 1, .gc3 = 1},  /* 113.75 MHz */
+        { .lomax =  2152, .svco = 0, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 134.5 MHz */
+        { .lomax =  2464, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 154   MHz */
+        { .lomax =  2600, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 162.5 MHz */
+        { .lomax =  2928, .svco = 2, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 183   MHz */
+        { .lomax =  3120, .svco = 2, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 1},  /* 195   MHz */
+        { .lomax =  3640, .svco = 3, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 3},  /* 227.5 MHz */
+        { .lomax =  4304, .svco = 0, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 3},  /* 269   MHz */
+        { .lomax =  5200, .svco = 1, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 1},  /* 325   MHz */
+        { .lomax =  6240, .svco = 2, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 3},  /* 390   MHz */
+        { .lomax =  7280, .svco = 3, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 3},  /* 455   MHz */
+        { .lomax =  8320, .svco = 0, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},  /* 520   MHz */
+        { .lomax =  8608, .svco = 0, .spd = 0, .scr = 1, .sbs = 3, .gc3 = 1},  /* 538   MHz */
+        { .lomax =  8864, .svco = 1, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},  /* 554   MHz */
+        { .lomax =  9920, .svco = 1, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},  /* 620   MHz */
+        { .lomax = 10400, .svco = 1, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},  /* 650   MHz */
+        { .lomax = 11200, .svco = 2, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},  /* 700   MHz */
+        { .lomax = 12480, .svco = 2, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},  /* 780   MHz */
+        { .lomax = 13120, .svco = 3, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},  /* 820   MHz */
+        { .lomax = 13920, .svco = 3, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},  /* 870   MHz */
+        { .lomax = 14576, .svco = 3, .spd = 0, .scr = 2, .sbs = 4, .gc3 = 0},  /* 911   MHz */
+        { .lomax =     0, .svco = 0, .spd = 0, .scr = 0, .sbs = 0, .gc3 = 0}   /* End */
 };
 
-static int tda8290_tune(struct i2c_client *c)
+static void tda827xa_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
 {
+        unsigned char tuner_reg[14];
+        unsigned char reg2[2];
+        u32 N;
+        int i;
         struct tuner *t = i2c_get_clientdata(c);
-        struct i2c_msg easy_mode =
-                { I2C_ADDR_TDA8290, 0, 2, t->i2c_easy_mode };
-        struct i2c_msg set_freq =
-                { I2C_ADDR_TDA8275, 0, 8, t->i2c_set_freq  };
+        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags = 0};
 
-        i2c_transfer(c->adapter, &easy_mode,      1);
-        i2c_transfer(c->adapter, i2c_msg_prolog, ARRAY_SIZE(i2c_msg_prolog));
+        if (t->mode == V4L2_TUNER_RADIO)
+                freq = freq / 1000;
 
-        i2c_transfer(c->adapter, &set_freq,       1);
-        i2c_transfer(c->adapter, i2c_msg_config, ARRAY_SIZE(i2c_msg_config));
+        N = freq + ifc;
+        i = 0;
+        while (tda827xa_analog[i].lomax < N) {
+                if(tda827xa_analog[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+
+        N = N << tda827xa_analog[i].spd;
+
+        tuner_reg[0] = 0;
+        tuner_reg[1] = (unsigned char)(N>>8);
+        tuner_reg[2] = (unsigned char) N;
+        tuner_reg[3] = 0;
+        tuner_reg[4] = 0x16;
+        tuner_reg[5] = (tda827xa_analog[i].spd << 5) + (tda827xa_analog[i].svco << 3) +
+                        tda827xa_analog[i].sbs;
+        tuner_reg[6] = 0x8b + (tda827xa_analog[i].gc3 << 4);
+        tuner_reg[7] = 0x0c;
+        tuner_reg[8] = 4;
+        tuner_reg[9] = 0x20;
+        tuner_reg[10] = 0xff;
+        tuner_reg[11] = 0xe0;
+        tuner_reg[12] = 0;
+        tuner_reg[13] = 0x39 + (t->tda827x_lpsel << 1);
+
+        msg.buf = tuner_reg;
+        msg.len = 14;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        msg.buf= reg2;
+        msg.len = 2;
+        reg2[0] = 0x60;
+        reg2[1] = 0x3c;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        reg2[0] = 0xa0;
+        reg2[1] = 0xc0;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        msleep(2);
+        reg2[0] = 0x30;
+        reg2[1] = 0x10 + tda827xa_analog[i].scr;
+        i2c_transfer(c->adapter, &msg, 1);
 
         msleep(550);
-        i2c_transfer(c->adapter, i2c_msg_epilog, ARRAY_SIZE(i2c_msg_epilog));
-        return 0;
+        reg2[0] = 0x50;
+        reg2[1] = 0x8f + (tda827xa_analog[i].gc3 << 4);
+        i2c_transfer(c->adapter, &msg, 1);
+
+        reg2[0] = 0x80;
+        reg2[1] = 0x28;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        reg2[0] = 0xb0;
+        reg2[1] = 0x01;
+        i2c_transfer(c->adapter, &msg, 1);
+
+        reg2[0] = 0xc0;
+        reg2[1] = 0x19 + (t->tda827x_lpsel << 1);
+        i2c_transfer(c->adapter, &msg, 1);
 }
 
-static void set_frequency(struct tuner *t, u16 ifc, unsigned int freq)
+static void tda827xa_agcf(struct i2c_client *c)
 {
-        u32 N;
+        struct tuner *t = i2c_get_clientdata(c);
+        unsigned char data[] = {0x80, 0x2c};
+        struct i2c_msg msg = {.addr = t->tda827x_addr, .buf = data,
+                              .flags = 0, .len = 2};
+        i2c_transfer(c->adapter, &msg, 1);
+}
 
-        if (t->mode == V4L2_TUNER_RADIO)
-                freq = freq / 1000;
+/*---------------------------------------------------------------------*/
 
-        N = (((freq<<3)+ifc)&0x3fffc);
-
-        N = N >> get_freq_entry(div_table, freq);
-        t->i2c_set_freq[0] = 0;
-        t->i2c_set_freq[1] = (unsigned char)(N>>8);
-        t->i2c_set_freq[2] = (unsigned char) N;
-        t->i2c_set_freq[3] = 0x40;
-        t->i2c_set_freq[4] = 0x52;
-        t->i2c_set_freq[5] = get_freq_entry(band_table, freq);
-        t->i2c_set_freq[6] = get_freq_entry(agc_table,  freq);
-        t->i2c_set_freq[7] = 0x8f;
+static void tda8290_i2c_bridge(struct i2c_client *c, int close)
+{
+        unsigned char  enable[2] = { 0x21, 0xC0 };
+        unsigned char disable[2] = { 0x21, 0x80 };
+        unsigned char *msg;
+        if(close) {
+                msg = enable;
+                i2c_master_send(c, msg, 2);
+                /* let the bridge stabilize */
+                msleep(20);
+        } else {
+                msg = disable;
+                i2c_master_send(c, msg, 2);
+        }
 }
 
+/*---------------------------------------------------------------------*/
+
+static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+        unsigned char soft_reset[]  = { 0x00, 0x00 };
+        unsigned char easy_mode[]   = { 0x01, t->tda8290_easy_mode };
+        unsigned char expert_mode[] = { 0x01, 0x80 };
+        unsigned char gainset_off[] = { 0x28, 0x14 };
+        unsigned char if_agc_spd[]  = { 0x0f, 0x88 };
+        unsigned char adc_head_6[]  = { 0x05, 0x04 };
+        unsigned char adc_head_9[]  = { 0x05, 0x02 };
+        unsigned char adc_head_12[] = { 0x05, 0x01 };
+        unsigned char pll_bw_nom[]  = { 0x0d, 0x47 };
+        unsigned char pll_bw_low[]  = { 0x0d, 0x27 };
+        unsigned char gainset_2[]   = { 0x28, 0x64 };
+        unsigned char agc_rst_on[]  = { 0x0e, 0x0b };
+        unsigned char agc_rst_off[] = { 0x0e, 0x09 };
+        unsigned char if_agc_set[]  = { 0x0f, 0x81 };
+        unsigned char addr_adc_sat  = 0x1a;
+        unsigned char addr_agc_stat = 0x1d;
+        unsigned char addr_pll_stat = 0x1b;
+        unsigned char adc_sat, agc_stat,
+                      pll_stat;
+
+        i2c_master_send(c, easy_mode, 2);
+        i2c_master_send(c, soft_reset, 2);
+        msleep(1);
+
+        expert_mode[1] = t->tda8290_easy_mode + 0x80;
+        i2c_master_send(c, expert_mode, 2);
+        i2c_master_send(c, gainset_off, 2);
+        i2c_master_send(c, if_agc_spd, 2);
+        if (t->tda8290_easy_mode & 0x60)
+                i2c_master_send(c, adc_head_9, 2);
+        else
+                i2c_master_send(c, adc_head_6, 2);
+        i2c_master_send(c, pll_bw_nom, 2);
+
+        tda8290_i2c_bridge(c, 1);
+        if (t->tda827x_ver != 0)
+                tda827xa_tune(c, ifc, freq);
+        else
+                tda827x_tune(c, ifc, freq);
+        /* adjust headroom resp. gain */
+        i2c_master_send(c, &addr_adc_sat, 1);
+        i2c_master_recv(c, &adc_sat, 1);
+        i2c_master_send(c, &addr_agc_stat, 1);
+        i2c_master_recv(c, &agc_stat, 1);
+        i2c_master_send(c, &addr_pll_stat, 1);
+        i2c_master_recv(c, &pll_stat, 1);
+        if (pll_stat & 0x80)
+                tuner_dbg("tda8290 is locked, AGC: %d\n", agc_stat);
+        else
+                tuner_dbg("tda8290 not locked, no signal?\n");
+        if ((agc_stat > 115) || (!(pll_stat & 0x80) && (adc_sat < 20))) {
+                tuner_dbg("adjust gain, step 1. Agc: %d, ADC stat: %d, lock: %d\n",
+                           agc_stat, adc_sat, pll_stat & 0x80);
+                i2c_master_send(c, gainset_2, 2);
+                msleep(100);
+                i2c_master_send(c, &addr_agc_stat, 1);
+                i2c_master_recv(c, &agc_stat, 1);
+                i2c_master_send(c, &addr_pll_stat, 1);
+                i2c_master_recv(c, &pll_stat, 1);
+                if ((agc_stat > 115) || !(pll_stat & 0x80)) {
+                        tuner_dbg("adjust gain, step 2. Agc: %d, lock: %d\n",
+                                   agc_stat, pll_stat & 0x80);
+                        if (t->tda827x_ver != 0)
+                                tda827xa_agcf(c);
+                        else
+                                tda827x_agcf(c);
+                        msleep(100);
+                        i2c_master_send(c, &addr_agc_stat, 1);
+                        i2c_master_recv(c, &agc_stat, 1);
+                        i2c_master_send(c, &addr_pll_stat, 1);
+                        i2c_master_recv(c, &pll_stat, 1);
+                        if((agc_stat > 115) || !(pll_stat & 0x80)) {
+                                tuner_dbg("adjust gain, step 3. Agc: %d\n", agc_stat);
+                                i2c_master_send(c, adc_head_12, 2);
+                                i2c_master_send(c, pll_bw_low, 2);
+                                msleep(100);
+                        }
+                }
+        }
+
+        /* l/ l' deadlock? */
+        if(t->tda8290_easy_mode & 0x60) {
+                i2c_master_send(c, &addr_adc_sat, 1);
+                i2c_master_recv(c, &adc_sat, 1);
+                i2c_master_send(c, &addr_pll_stat, 1);
+                i2c_master_recv(c, &pll_stat, 1);
+                if ((adc_sat > 20) || !(pll_stat & 0x80)) {
+                        tuner_dbg("trying to resolve SECAM L deadlock\n");
+                        i2c_master_send(c, agc_rst_on, 2);
+                        msleep(40);
+                        i2c_master_send(c, agc_rst_off, 2);
+                }
+        }
+
+        tda8290_i2c_bridge(c, 0);
+        i2c_master_send(c, if_agc_set, 2);
+        return 0;
+}
+
+
+/*---------------------------------------------------------------------*/
+
 #define V4L2_STD_MN     (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
 #define V4L2_STD_B      (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
 #define V4L2_STD_GH     (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
@@ -174,20 +408,37 @@ static void set_frequency(struct tuner *t, u16 ifc, unsigned int freq)
 
 static void set_audio(struct tuner *t)
 {
-        t->i2c_easy_mode[0] = 0x01;
-
-        if (t->std & V4L2_STD_MN)
-                t->i2c_easy_mode[1] = 0x01;
-        else if (t->std & V4L2_STD_B)
-                t->i2c_easy_mode[1] = 0x02;
-        else if (t->std & V4L2_STD_GH)
-                t->i2c_easy_mode[1] = 0x04;
-        else if (t->std & V4L2_STD_PAL_I)
-                t->i2c_easy_mode[1] = 0x08;
-        else if (t->std & V4L2_STD_DK)
-                t->i2c_easy_mode[1] = 0x10;
-        else if (t->std & V4L2_STD_SECAM_L)
-                t->i2c_easy_mode[1] = 0x20;
+        char* mode;
+
+        t->tda827x_lpsel = 0;
+        mode = "xx";
+        if (t->std & V4L2_STD_MN) {
+                t->sgIF = 92;
+                t->tda8290_easy_mode = 0x01;
+                t->tda827x_lpsel = 1;
+                mode = "MN";
+        } else if (t->std & V4L2_STD_B) {
+                t->sgIF = 108;
+                t->tda8290_easy_mode = 0x02;
+                mode = "B";
+        } else if (t->std & V4L2_STD_GH) {
+                t->sgIF = 124;
+                t->tda8290_easy_mode = 0x04;
+                mode = "GH";
+        } else if (t->std & V4L2_STD_PAL_I) {
+                t->sgIF = 124;
+                t->tda8290_easy_mode = 0x08;
+                mode = "I";
+        } else if (t->std & V4L2_STD_DK) {
+                t->sgIF = 124;
+                t->tda8290_easy_mode = 0x10;
+                mode = "DK";
+        } else if (t->std & V4L2_STD_SECAM_L) {
+                t->sgIF = 124;
+                t->tda8290_easy_mode = 0x20;
+                mode = "L";
+        }
+    tuner_dbg("setting tda8290 to system %s\n", mode);
 }
 
 static void set_tv_freq(struct i2c_client *c, unsigned int freq)
@@ -195,15 +446,13 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
         struct tuner *t = i2c_get_clientdata(c);
 
         set_audio(t);
-        set_frequency(t, 864, freq);
-        tda8290_tune(c);
+        tda8290_tune(c, t->sgIF, freq);
 }
 
 static void set_radio_freq(struct i2c_client *c, unsigned int freq)
 {
-        struct tuner *t = i2c_get_clientdata(c);
-        set_frequency(t, 704, freq);
-        tda8290_tune(c);
+        /* if frequency is 5.5 MHz */
+        tda8290_tune(c, 88, freq);
 }
 
 static int has_signal(struct i2c_client *c)
@@ -216,27 +465,145 @@ static int has_signal(struct i2c_client *c)
         return (afc & 0x80)? 65535:0;
 }
 
+/*---------------------------------------------------------------------*/
+
 static void standby(struct i2c_client *c)
 {
-        i2c_transfer(c->adapter, i2c_msg_standby, ARRAY_SIZE(i2c_msg_standby));
+        struct tuner *t = i2c_get_clientdata(c);
+        unsigned char cb1[] = { 0x30, 0xD0 };
+        unsigned char tda8290_standby[] = { 0x00, 0x02 };
+        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags=0, .buf=cb1, .len = 2};
+
+        tda8290_i2c_bridge(c, 1);
+        if (t->tda827x_ver != 0)
+                cb1[1] = 0x90;
+        i2c_transfer(c->adapter, &msg, 1);
+        tda8290_i2c_bridge(c, 0);
+        i2c_master_send(c, tda8290_standby, 2);
 }
 
-int tda8290_init(struct i2c_client *c)
+
+static void tda8290_init_if(struct i2c_client *c)
+{
+        unsigned char set_VS[] = { 0x30, 0x6F };
+        unsigned char set_GP01_CF[] = { 0x20, 0x0B };
+
+        i2c_master_send(c, set_VS, 2);
+        i2c_master_send(c, set_GP01_CF, 2);
+}
+
+static void tda8290_init_tuner(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        unsigned char tda8275_init[]  = { 0x00, 0x00, 0x00, 0x40, 0xdC, 0x04, 0xAf,
+                                          0x3F, 0x2A, 0x04, 0xFF, 0x00, 0x00, 0x40 };
+        unsigned char tda8275a_init[] = { 0x00, 0x00, 0x00, 0x00, 0xdC, 0x05, 0x8b,
+                                          0x0c, 0x04, 0x20, 0xFF, 0x00, 0x00, 0x4b };
+        struct i2c_msg msg = {.addr = t->tda827x_addr, .flags=0,
+                              .buf=tda8275_init, .len = 14};
+        if (t->tda827x_ver != 0)
+                msg.buf = tda8275a_init;
+
+        tda8290_i2c_bridge(c, 1);
+        i2c_transfer(c->adapter, &msg, 1);
+        tda8290_i2c_bridge(c, 0);
+}
 
-        strlcpy(c->name, "tda8290+75", sizeof(c->name));
+/*---------------------------------------------------------------------*/
+
+int tda8290_init(struct i2c_client *c)
+{
+        struct tuner *t = i2c_get_clientdata(c);
+        u8 data;
+        int i, ret, tuners_found;
+        u32 tuner_addrs;
+        struct i2c_msg msg = {.flags=I2C_M_RD, .buf=&data, .len = 1};
+
+        tda8290_i2c_bridge(c, 1);
+        /* probe for tuner chip */
+        tuners_found = 0;
+        tuner_addrs = 0;
+        for (i=0x60; i<= 0x63; i++) {
+                msg.addr = i;
+                ret = i2c_transfer(c->adapter, &msg, 1);
+                if (ret == 1) {
+                        tuners_found++;
+                        tuner_addrs = (tuner_addrs << 8) + i;
+                }
+        }
+        /* if there is more than one tuner, we expect the right one is
+           behind the bridge and we choose the highest address that doesn't
+           give a response now
+         */
+        tda8290_i2c_bridge(c, 0);
+        if(tuners_found > 1)
+                for (i = 0; i < tuners_found; i++) {
+                        msg.addr = tuner_addrs  & 0xff;
+                        ret = i2c_transfer(c->adapter, &msg, 1);
+                        if(ret == 1)
+                                tuner_addrs = tuner_addrs >> 8;
+                        else
+                                break;
+                }
+        if (tuner_addrs == 0) {
+                tuner_addrs = 0x61;
+                tuner_info ("could not clearly identify tuner address, defaulting to %x\n",
+                             tuner_addrs);
+        } else {
+                tuner_addrs = tuner_addrs & 0xff;
+                tuner_info ("setting tuner address to %x\n", tuner_addrs);
+        }
+        t->tda827x_addr = tuner_addrs;
+        msg.addr = tuner_addrs;
+
+        tda8290_i2c_bridge(c, 1);
+        ret = i2c_transfer(c->adapter, &msg, 1);
+        if( ret != 1)
+                tuner_warn ("TDA827x access failed!\n");
+        if ((data & 0x3c) == 0) {
+                strlcpy(c->name, "tda8290+75", sizeof(c->name));
+                t->tda827x_ver = 0;
+        } else {
+                strlcpy(c->name, "tda8290+75a", sizeof(c->name));
+                t->tda827x_ver = 2;
+        }
         tuner_info("tuner: type set to %s\n", c->name);
+
         t->tv_freq    = set_tv_freq;
         t->radio_freq = set_radio_freq;
         t->has_signal = has_signal;
         t->standby = standby;
+        t->tda827x_lpsel = 0;
 
-        i2c_master_send(c, i2c_enable_bridge, ARRAY_SIZE(i2c_enable_bridge));
-        i2c_transfer(c->adapter, i2c_msg_init, ARRAY_SIZE(i2c_msg_init));
+        tda8290_init_tuner(c);
+        tda8290_init_if(c);
         return 0;
 }
 
+int tda8290_probe(struct i2c_client *c)
+{
+        unsigned char soft_reset[]  = { 0x00, 0x00 };
+        unsigned char easy_mode_b[] = { 0x01, 0x02 };
+        unsigned char easy_mode_g[] = { 0x01, 0x04 };
+        unsigned char addr_dto_lsb = 0x07;
+        unsigned char data;
+
+        i2c_master_send(c, easy_mode_b, 2);
+        i2c_master_send(c, soft_reset, 2);
+        i2c_master_send(c, &addr_dto_lsb, 1);
+        i2c_master_recv(c, &data, 1);
+        if (data == 0) {
+                i2c_master_send(c, easy_mode_g, 2);
+                i2c_master_send(c, soft_reset, 2);
+                i2c_master_send(c, &addr_dto_lsb, 1);
+                i2c_master_recv(c, &data, 1);
+                if (data == 0x7b) {
+                        return 0;
+                }
+        }
+        return -1;
+}
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 7e3dcdb262b0..a5e37dc91f39 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -32,7 +32,6 @@
 
 #include "bttv.h"
 #include <media/audiochip.h>
-#include <media/id.h>
 
 static int debug; /* insmod parameter */
 module_param(debug, int, S_IRUGO | S_IWUSR);
@@ -126,20 +125,20 @@ static int tda9875_write(struct i2c_client *client, int subaddr, unsigned char v
 
 static int i2c_read_register(struct i2c_adapter *adap, int addr, int reg)
 {
-        unsigned char write[1];
-        unsigned char read[1];
-        struct i2c_msg msgs[2] = {
-                { addr, 0,        1, write },
-                { addr, I2C_M_RD, 1, read  }
-        };
-        write[0] = reg;
-
-        if (2 != i2c_transfer(adap,msgs,2)) {
-                printk(KERN_WARNING "tda9875: I/O error (read2)\n");
-                return -1;
-        }
-        dprintk("tda9875: chip_read2: reg%d=0x%x\n",reg,read[0]);
-        return read[0];
+        unsigned char write[1];
+        unsigned char read[1];
+        struct i2c_msg msgs[2] = {
+                { addr, 0,        1, write },
+                { addr, I2C_M_RD, 1, read  }
+        };
+        write[0] = reg;
+
+        if (2 != i2c_transfer(adap,msgs,2)) {
+                printk(KERN_WARNING "tda9875: I/O error (read2)\n");
+                return -1;
+        }
+        dprintk("tda9875: chip_read2: reg%d=0x%x\n",reg,read[0]);
+        return read[0];
 }
 
 static void tda9875_set(struct i2c_client *client)
@@ -184,7 +183,7 @@ static void do_tda9875_init(struct i2c_client *client)
         tda9875_write(client, TDA9875_DACOS, 0x02 ); /* sig DAC i/o(in:nicam)*/
         tda9875_write(client, TDA9875_ADCIS, 0x6f ); /* sig ADC input(in:mono)*/
         tda9875_write(client, TDA9875_LOSR, 0x00 );  /* line out (in:mono)*/
-        tda9875_write(client, TDA9875_AER, 0x00 );   /*06 Effect (AVL+PSEUDO) */
+        tda9875_write(client, TDA9875_AER, 0x00 );   /*06 Effect (AVL+PSEUDO) */
         tda9875_write(client, TDA9875_MCS, 0x44 );   /* Main ch select (DAC) */
         tda9875_write(client, TDA9875_MVL, 0x03 );   /* Vol Main left 10dB */
         tda9875_write(client, TDA9875_MVR, 0x03 );   /* Vol Main right 10dB*/
@@ -200,7 +199,7 @@ static void do_tda9875_init(struct i2c_client *client)
 
         t->mode=AUDIO_UNMUTE;
         t->lvol=t->rvol =0;     /* 0dB */
-        t->bass=0;                      /* 0dB */
+        t->bass=0;                      /* 0dB */
         t->treble=0;            /* 0dB */
         tda9875_set(client);
 
@@ -239,9 +238,9 @@ static int tda9875_attach(struct i2c_adapter *adap, int addr, int kind)
         memset(t,0,sizeof *t);
 
         client = &t->c;
-        memcpy(client,&client_template,sizeof(struct i2c_client));
-        client->adapter = adap;
-        client->addr = addr;
+        memcpy(client,&client_template,sizeof(struct i2c_client));
+        client->adapter = adap;
+        client->addr = addr;
         i2c_set_clientdata(client, t);
 
         if(!tda9875_checkit(adap,addr)) {
@@ -287,7 +286,7 @@ static int tda9875_command(struct i2c_client *client,
         dprintk("In tda9875_command...\n");
 
         switch (cmd) {
-        /* --- v4l ioctls --- */
+        /* --- v4l ioctls --- */
         /* take care: bttv does userspace copying, we'll get a
            kernel pointer here... */
         case VIDIOCGAUDIO:
@@ -355,7 +354,7 @@ static int tda9875_command(struct i2c_client *client,
 //printk("tda9875 bal:%04x vol:%04x bass:%04x treble:%04x\n",va->balance,va->volume,va->bass,va->treble);
 
 
-                tda9875_set(client);
+                tda9875_set(client);
 
                 break;
 
@@ -374,18 +373,18 @@ static int tda9875_command(struct i2c_client *client,
 
 static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
-        .name           = "i2c tda9875 driver",
-        .id             = I2C_DRIVERID_TDA9875,
-        .flags          = I2C_DF_NOTIFY,
+        .name           = "i2c tda9875 driver",
+        .id             = I2C_DRIVERID_TDA9875,
+        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = tda9875_probe,
-        .detach_client  = tda9875_detach,
-        .command        = tda9875_command,
+        .detach_client  = tda9875_detach,
+        .command        = tda9875_command,
 };
 
 static struct i2c_client client_template =
 {
-        .name      = "tda9875",
-        .driver    = &driver,
+        .name      = "tda9875",
+        .driver    = &driver,
 };
 
 static int __init tda9875_init(void)
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 94053f149ddf..4249127c0a1d 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -11,7 +11,6 @@
 
 #include <media/audiochip.h>
 #include <media/tuner.h>
-#include <media/id.h>
 
 /* Chips:
    TDA9885 (PAL, NTSC)
@@ -44,8 +43,13 @@ MODULE_LICENSE("GPL");
 /* ---------------------------------------------------------------------- */
 
 #define UNSET       (-1U)
-#define PREFIX      "tda9885/6/7: "
-#define dprintk     if (debug) printk
+#define tda9887_info(fmt, arg...) do {\
+        printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
+                        i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
+#define tda9887_dbg(fmt, arg...) do {\
+        if (debug) \
+                printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
+                        i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
 
 struct tda9887 {
         struct i2c_client  client;
@@ -55,6 +59,7 @@ struct tda9887 {
         unsigned int       pinnacle_id;
         unsigned int       using_v4l2;
         unsigned int       radio_mode;
+        unsigned char      data[4];
 };
 
 struct tvnorm {
@@ -180,7 +185,8 @@ static struct tvnorm tvnorms[] = {
                 .name  = "SECAM-L",
                 .b     = ( cPositiveAmTV  |
                            cQSS           ),
-                .e     = ( cAudioIF_6_5   |
+                .e     = ( cGating_36     |
+                           cAudioIF_6_5   |
                            cVideoIF_38_90 ),
         },{
                 .std   = V4L2_STD_SECAM_DK,
@@ -236,7 +242,7 @@ static struct tvnorm radio_mono = {
 
 /* ---------------------------------------------------------------------- */
 
-static void dump_read_message(unsigned char *buf)
+static void dump_read_message(struct tda9887 *t, unsigned char *buf)
 {
         static char *afc[16] = {
                 "- 12.5 kHz",
@@ -256,15 +262,15 @@ static void dump_read_message(unsigned char *buf)
                 "+ 37.5 kHz",
                 "+ 12.5 kHz",
         };
-        printk(PREFIX "read: 0x%2x\n", buf[0]);
-        printk("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
-        printk("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
-        printk("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
-        printk("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
-        printk("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
+        tda9887_info("read: 0x%2x\n", buf[0]);
+        tda9887_info("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
+        tda9887_info("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
+        tda9887_info("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
+        tda9887_info("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
+        tda9887_info("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
 }
 
-static void dump_write_message(unsigned char *buf)
+static void dump_write_message(struct tda9887 *t, unsigned char *buf)
 {
         static char *sound[4] = {
                 "AM/TV",
@@ -304,58 +310,58 @@ static void dump_write_message(unsigned char *buf)
                 "44 MHz",
         };
 
-        printk(PREFIX "write: byte B 0x%02x\n",buf[1]);
-        printk("  B0   video mode      : %s\n",
+        tda9887_info("write: byte B 0x%02x\n",buf[1]);
+        tda9887_info("  B0   video mode      : %s\n",
                (buf[1] & 0x01) ? "video trap" : "sound trap");
-        printk("  B1   auto mute fm    : %s\n",
+        tda9887_info("  B1   auto mute fm    : %s\n",
                (buf[1] & 0x02) ? "yes" : "no");
-        printk("  B2   carrier mode    : %s\n",
+        tda9887_info("  B2   carrier mode    : %s\n",
                (buf[1] & 0x04) ? "QSS" : "Intercarrier");
-        printk("  B3-4 tv sound/radio  : %s\n",
+        tda9887_info("  B3-4 tv sound/radio  : %s\n",
                sound[(buf[1] & 0x18) >> 3]);
-        printk("  B5   force mute audio: %s\n",
+        tda9887_info("  B5   force mute audio: %s\n",
                (buf[1] & 0x20) ? "yes" : "no");
-        printk("  B6   output port 1   : %s\n",
+        tda9887_info("  B6   output port 1   : %s\n",
                (buf[1] & 0x40) ? "high (inactive)" : "low (active)");
-        printk("  B7   output port 2   : %s\n",
+        tda9887_info("  B7   output port 2   : %s\n",
                (buf[1] & 0x80) ? "high (inactive)" : "low (active)");
 
-        printk(PREFIX "write: byte C 0x%02x\n",buf[2]);
-        printk("  C0-4 top adjustment  : %s dB\n", adjust[buf[2] & 0x1f]);
-        printk("  C5-6 de-emphasis     : %s\n", deemph[(buf[2] & 0x60) >> 5]);
-        printk("  C7   audio gain      : %s\n",
+        tda9887_info("write: byte C 0x%02x\n",buf[2]);
+        tda9887_info("  C0-4 top adjustment  : %s dB\n", adjust[buf[2] & 0x1f]);
+        tda9887_info("  C5-6 de-emphasis     : %s\n", deemph[(buf[2] & 0x60) >> 5]);
+        tda9887_info("  C7   audio gain      : %s\n",
                (buf[2] & 0x80) ? "-6" : "0");
 
-        printk(PREFIX "write: byte E 0x%02x\n",buf[3]);
-        printk("  E0-1 sound carrier   : %s\n",
+        tda9887_info("write: byte E 0x%02x\n",buf[3]);
+        tda9887_info("  E0-1 sound carrier   : %s\n",
                carrier[(buf[3] & 0x03)]);
-        printk("  E6   l pll ganting   : %s\n",
+        tda9887_info("  E6   l pll gating   : %s\n",
                (buf[3] & 0x40) ? "36" : "13");
 
         if (buf[1] & 0x08) {
                 /* radio */
-                printk("  E2-4 video if        : %s\n",
+                tda9887_info("  E2-4 video if        : %s\n",
                        rif[(buf[3] & 0x0c) >> 2]);
-                printk("  E7   vif agc output  : %s\n",
+                tda9887_info("  E7   vif agc output  : %s\n",
                        (buf[3] & 0x80)
                        ? ((buf[3] & 0x10) ? "fm-agc radio" : "sif-agc radio")
                        : "fm radio carrier afc");
         } else {
                 /* video */
-                printk("  E2-4 video if        : %s\n",
+                tda9887_info("  E2-4 video if        : %s\n",
                        vif[(buf[3] & 0x1c) >> 2]);
-                printk("  E5   tuner gain      : %s\n",
+                tda9887_info("  E5   tuner gain      : %s\n",
                        (buf[3] & 0x80)
                        ? ((buf[3] & 0x20) ? "external" : "normal")
                        : ((buf[3] & 0x20) ? "minimum"  : "normal"));
-                printk("  E7   vif agc output  : %s\n",
+                tda9887_info("  E7   vif agc output  : %s\n",
                        (buf[3] & 0x80)
                        ? ((buf[3] & 0x20)
                           ? "pin3 port, pin22 vif agc out"
                           : "pin22 port, pin3 vif acg ext in")
                        : "pin3+pin22 port");
         }
-        printk("--\n");
+        tda9887_info("--\n");
 }
 
 /* ---------------------------------------------------------------------- */
@@ -379,11 +385,11 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
                 }
         }
         if (NULL == norm) {
-                dprintk(PREFIX "Unsupported tvnorm entry - audio muted\n");
+                tda9887_dbg("Unsupported tvnorm entry - audio muted\n");
                 return -1;
         }
 
-        dprintk(PREFIX "configure for: %s\n",norm->name);
+        tda9887_dbg("configure for: %s\n",norm->name);
         buf[1] = norm->b;
         buf[2] = norm->c;
         buf[3] = norm->e;
@@ -458,6 +464,8 @@ static int tda9887_set_config(struct tda9887 *t, char *buf)
                         break;
                 }
         }
+        if ((t->config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+                buf[1] &= ~cQSS;
         return 0;
 }
 
@@ -475,11 +483,11 @@ static int tda9887_set_pinnacle(struct tda9887 *t, char *buf)
                 }
         }
         if (t->std & V4L2_STD_525_60) {
-                if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
+                if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
                         bCarrierMode = cIntercarrier;
                 } else {
                         bCarrierMode = cQSS;
-                }
+                }
         }
 
         if (bCarrierMode != UNSET) {
@@ -505,26 +513,26 @@ static int tda9887_fixup_std(struct tda9887 *t)
                 case 'B':
                 case 'g':
                 case 'G':
-                        dprintk(PREFIX "insmod fixup: PAL => PAL-BG\n");
+                        tda9887_dbg("insmod fixup: PAL => PAL-BG\n");
                         t->std = V4L2_STD_PAL_BG;
                         break;
                 case 'i':
                 case 'I':
-                        dprintk(PREFIX "insmod fixup: PAL => PAL-I\n");
+                        tda9887_dbg("insmod fixup: PAL => PAL-I\n");
                         t->std = V4L2_STD_PAL_I;
                         break;
                 case 'd':
                 case 'D':
                 case 'k':
                 case 'K':
-                        dprintk(PREFIX "insmod fixup: PAL => PAL-DK\n");
+                        tda9887_dbg("insmod fixup: PAL => PAL-DK\n");
                         t->std = V4L2_STD_PAL_DK;
                         break;
                 case '-':
                         /* default parameter, do nothing */
                         break;
                 default:
-                        printk(PREFIX "pal= argument not recognised\n");
+                        tda9887_info("pal= argument not recognised\n");
                         break;
                 }
         }
@@ -534,19 +542,19 @@ static int tda9887_fixup_std(struct tda9887 *t)
                 case 'D':
                 case 'k':
                 case 'K':
-                        dprintk(PREFIX "insmod fixup: SECAM => SECAM-DK\n");
+                        tda9887_dbg("insmod fixup: SECAM => SECAM-DK\n");
                         t->std = V4L2_STD_SECAM_DK;
                         break;
                 case 'l':
                 case 'L':
-                        dprintk(PREFIX "insmod fixup: SECAM => SECAM-L\n");
+                        tda9887_dbg("insmod fixup: SECAM => SECAM-L\n");
                         t->std = V4L2_STD_SECAM_L;
                         break;
                 case '-':
                         /* default parameter, do nothing */
                         break;
                 default:
-                        printk(PREFIX "secam= argument not recognised\n");
+                        tda9887_info("secam= argument not recognised\n");
                         break;
                 }
         }
@@ -559,41 +567,40 @@ static int tda9887_status(struct tda9887 *t)
         int rc;
 
         memset(buf,0,sizeof(buf));
-        if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
-                printk(PREFIX "i2c i/o error: rc == %d (should be 1)\n",rc);
-        dump_read_message(buf);
+        if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
+                tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
+        dump_read_message(t, buf);
         return 0;
 }
 
 static int tda9887_configure(struct tda9887 *t)
 {
-        unsigned char buf[4];
         int rc;
 
-        memset(buf,0,sizeof(buf));
-        tda9887_set_tvnorm(t,buf);
+        memset(t->data,0,sizeof(t->data));
+        tda9887_set_tvnorm(t,t->data);
 
-        buf[1] |= cOutputPort1Inactive;
-        buf[1] |= cOutputPort2Inactive;
+        t->data[1] |= cOutputPort1Inactive;
+        t->data[1] |= cOutputPort2Inactive;
 
         if (UNSET != t->pinnacle_id) {
-                tda9887_set_pinnacle(t,buf);
+                tda9887_set_pinnacle(t,t->data);
         }
-        tda9887_set_config(t,buf);
-        tda9887_set_insmod(t,buf);
+        tda9887_set_config(t,t->data);
+        tda9887_set_insmod(t,t->data);
 
         if (t->mode == T_STANDBY) {
-                buf[1] |= cForcedMuteAudioON;
+                t->data[1] |= cForcedMuteAudioON;
         }
 
 
-        dprintk(PREFIX "writing: b=0x%02x c=0x%02x e=0x%02x\n",
-                buf[1],buf[2],buf[3]);
+        tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
+                t->data[1],t->data[2],t->data[3]);
         if (debug > 1)
-                dump_write_message(buf);
+                dump_write_message(t, t->data);
 
-        if (4 != (rc = i2c_master_send(&t->client,buf,4)))
-                printk(PREFIX "i2c i/o error: rc == %d (should be 4)\n",rc);
+        if (4 != (rc = i2c_master_send(&t->client,t->data,4)))
+                tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
 
         if (debug > 2) {
                 msleep_interruptible(1000);
@@ -608,13 +615,11 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct tda9887 *t;
 
-        client_template.adapter = adap;
-        client_template.addr    = addr;
-
-        printk(PREFIX "chip found @ 0x%x\n", addr<<1);
+        client_template.adapter = adap;
+        client_template.addr    = addr;
 
-        if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
-                return -ENOMEM;
+        if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
+                return -ENOMEM;
         memset(t,0,sizeof(*t));
 
         t->client      = client_template;
@@ -622,6 +627,8 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
         t->pinnacle_id = UNSET;
         t->radio_mode = V4L2_TUNER_MODE_STEREO;
 
+        tda9887_info("chip found @ 0x%x (%s)\n", addr<<1, adap->name);
+
         i2c_set_clientdata(&t->client, t);
         i2c_attach_client(&t->client);
 
@@ -655,18 +662,18 @@ static int tda9887_detach(struct i2c_client *client)
 }
 
 #define SWITCH_V4L2     if (!t->using_v4l2 && debug) \
-                          printk(PREFIX "switching to v4l2\n"); \
-                          t->using_v4l2 = 1;
+                          tda9887_info("switching to v4l2\n"); \
+                          t->using_v4l2 = 1;
 #define CHECK_V4L2      if (t->using_v4l2) { if (debug) \
-                          printk(PREFIX "ignore v4l1 call\n"); \
-                          return 0; }
+                          tda9887_info("ignore v4l1 call\n"); \
+                          return 0; }
 
 static int
 tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
         struct tda9887 *t = i2c_get_clientdata(client);
 
-        switch (cmd) {
+        switch (cmd) {
 
         /* --- configuration --- */
         case AUDC_SET_RADIO:
@@ -777,6 +784,11 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 }
                 break;
         }
+        case VIDIOC_LOG_STATUS:
+        {
+                tda9887_info("Data bytes: b=%02x c=%02x e=%02x\n", t->data[1], t->data[2], t->data[3]);
+                break;
+        }
         default:
                 /* nothing */
                 break;
@@ -786,7 +798,10 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static int tda9887_suspend(struct device * dev, pm_message_t state)
 {
-        dprintk("tda9887: suspend\n");
+        struct i2c_client *c = container_of(dev, struct i2c_client, dev);
+        struct tda9887 *t = i2c_get_clientdata(c);
+
+        tda9887_dbg("suspend\n");
         return 0;
 }
 
@@ -795,7 +810,7 @@ static int tda9887_resume(struct device * dev)
         struct i2c_client *c = container_of(dev, struct i2c_client, dev);
         struct tda9887 *t = i2c_get_clientdata(c);
 
-        dprintk("tda9887: resume\n");
+        tda9887_dbg("resume\n");
         tda9887_configure(t);
         return 0;
 }
diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c
index 38bf50943798..a9375ef05de1 100644
--- a/drivers/media/video/tea5767.c
+++ b/drivers/media/video/tea5767.c
@@ -117,10 +117,10 @@
 #define TEA5767_RESERVED_MASK   0xff
 
 enum tea5767_xtal_freq {
-        TEA5767_LOW_LO_32768    = 0,
-        TEA5767_HIGH_LO_32768   = 1,
-        TEA5767_LOW_LO_13MHz    = 2,
-        TEA5767_HIGH_LO_13MHz   = 3,
+        TEA5767_LOW_LO_32768    = 0,
+        TEA5767_HIGH_LO_32768   = 1,
+        TEA5767_LOW_LO_13MHz    = 2,
+        TEA5767_HIGH_LO_13MHz   = 3,
 };
 
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index ad85bef1c3d5..73c4041c35d7 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -28,7 +28,7 @@
 
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
-        0x4b,                   /* tda8290 */
+        0x42, 0x43, 0x4a, 0x4b,                 /* tda8290 */
         0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
         0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
         I2C_CLIENT_END
@@ -189,6 +189,13 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 i2c_master_send(c, buffer, 4);
                 default_tuner_init(c);
                 break;
+        case TUNER_PHILIPS_TD1316:
+                buffer[0] = 0x0b;
+                buffer[1] = 0xdc;
+                buffer[2] = 0x86;
+                buffer[3] = 0xa4;
+                i2c_master_send(c,buffer,4);
+                default_tuner_init(c);
         default:
                 default_tuner_init(c);
                 break;
@@ -215,9 +222,9 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup)
 {
         struct tuner *t = i2c_get_clientdata(c);
 
-        if ((tun_setup->addr == ADDR_UNSET &&
+        if ( t->type == UNSET && ((tun_setup->addr == ADDR_UNSET &&
                 (t->mode_mask & tun_setup->mode_mask)) ||
-                tun_setup->addr == c->addr) {
+                tun_setup->addr == c->addr)) {
                         set_type(c, tun_setup->type, tun_setup->mode_mask);
         }
 }
@@ -341,23 +348,33 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         t->audmode = V4L2_TUNER_MODE_STEREO;
         t->mode_mask = T_UNINITIALIZED;
 
-
-        tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name);
-
         if (show_i2c) {
                 unsigned char buffer[16];
                 int i,rc;
 
                 memset(buffer, 0, sizeof(buffer));
                 rc = i2c_master_recv(&t->i2c, buffer, sizeof(buffer));
-                printk("tuner-%04x I2C RECV = ",addr);
+                tuner_info("I2C RECV = ");
                 for (i=0;i<rc;i++)
                         printk("%02x ",buffer[i]);
                 printk("\n");
         }
         /* TEA5767 autodetection code - only for addr = 0xc0 */
         if (!no_autodetect) {
-                if (addr == 0x60) {
+                switch (addr) {
+                case 0x42:
+                case 0x43:
+                case 0x4a:
+                case 0x4b:
+                        /* If chip is not tda8290, don't register.
+                           since it can be tda9887*/
+                        if (tda8290_probe(&t->i2c) != 0) {
+                                tuner_dbg("chip at addr %x is not a tda8290\n", addr);
+                                kfree(t);
+                                return 0;
+                        }
+                        break;
+                case 0x60:
                         if (tea5767_autodetection(&t->i2c) != EINVAL) {
                                 t->type = TUNER_TEA5767;
                                 t->mode_mask = T_RADIO;
@@ -365,10 +382,9 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
                                 t->freq = 87.5 * 16; /* Sets freq to FM range */
                                 default_mode_mask &= ~T_RADIO;
 
-                                i2c_attach_client (&t->i2c);
-                                set_type(&t->i2c,t->type, t->mode_mask);
-                                return 0;
+                                goto register_client;
                         }
+                        break;
                 }
         }
 
@@ -381,6 +397,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         }
 
         /* Should be just before return */
+register_client:
+        tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name);
         i2c_attach_client (&t->i2c);
         set_type (&t->i2c,t->type, t->mode_mask);
         return 0;
@@ -425,23 +443,23 @@ static int tuner_detach(struct i2c_client *client)
 
 static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode, char *cmd)
 {
-        if (mode == t->mode)
-                return 0;
-
-        t->mode = mode;
-
-        if (check_mode(t, cmd) == EINVAL) {
-                t->mode = T_STANDBY;
-                if (t->standby)
-                        t->standby (client);
-                return EINVAL;
-        }
-        return 0;
+        if (mode == t->mode)
+                return 0;
+
+        t->mode = mode;
+
+        if (check_mode(t, cmd) == EINVAL) {
+                t->mode = T_STANDBY;
+                if (t->standby)
+                        t->standby (client);
+                return EINVAL;
+        }
+        return 0;
 }
 
 #define switch_v4l2()   if (!t->using_v4l2) \
-                            tuner_dbg("switching to v4l2\n"); \
-                        t->using_v4l2 = 1;
+                            tuner_dbg("switching to v4l2\n"); \
+                        t->using_v4l2 = 1;
 
 static inline int check_v4l2(struct tuner *t)
 {
@@ -479,8 +497,6 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         break;
                 }
         case AUDC_CONFIG_PINNACLE:
-                if (check_mode(t, "AUDC_CONFIG_PINNACLE") == EINVAL)
-                        return 0;
                 switch (*iarg) {
                 case 2:
                         tuner_dbg("pinnacle pal\n");
@@ -616,7 +632,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         switch_v4l2();
                         if (V4L2_TUNER_RADIO == f->type &&
                             V4L2_TUNER_RADIO != t->mode) {
-                                if (set_mode (client, t, f->type, "VIDIOC_S_FREQUENCY")
+                                if (set_mode (client, t, f->type, "VIDIOC_S_FREQUENCY")
                                             == EINVAL)
                                         return 0;
                         }
@@ -688,7 +704,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         break;
                 }
         default:
-                tuner_dbg("Unimplemented IOCTL 0x%08x(dir=%d,tp=0x%02x,nr=%d,sz=%d)\n",
+                tuner_dbg("Unimplemented IOCTL 0x%08x(dir=%d,tp='%c',nr=%d,sz=%d)\n",
                                          cmd, _IOC_DIR(cmd), _IOC_TYPE(cmd),
                                         _IOC_NR(cmd), _IOC_SIZE(cmd));
                 break;
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 8edd73abe1d8..d832205818f2 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -102,7 +102,7 @@ struct tunertype
  */
 static struct tunertype tuners[] = {
         /* 0-9 */
-        { "Temic PAL (4002 FH5)", TEMIC, PAL,
+        { "Temic PAL (4002 FH5)", TEMIC, PAL,
           16*140.25,16*463.25,0x02,0x04,0x01,0x8e,623},
         { "Philips PAL_I (FI1246 and compatibles)", Philips, PAL_I,
           16*140.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
@@ -118,41 +118,41 @@ static struct tunertype tuners[] = {
           16*157.25,16*463.25,0x02,0x04,0x01,0x8e,732},
         { "Temic PAL_I (4062 FY5)", TEMIC, PAL_I,
           16*170.00,16*450.00,0x02,0x04,0x01,0x8e,623},
-        { "Temic NTSC (4036 FY5)", TEMIC, NTSC,
+        { "Temic NTSC (4036 FY5)", TEMIC, NTSC,
           16*157.25,16*463.25,0xa0,0x90,0x30,0x8e,732},
-        { "Alps HSBH1", TEMIC, NTSC,
+        { "Alps HSBH1", TEMIC, NTSC,
           16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},
 
         /* 10-19 */
-        { "Alps TSBE1", TEMIC, PAL,
+        { "Alps TSBE1", TEMIC, PAL,
           16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},
-        { "Alps TSBB5", Alps, PAL_I, /* tested (UK UHF) with Modulartech MM205 */
+        { "Alps TSBB5", Alps, PAL_I, /* tested (UK UHF) with Modulartech MM205 */
           16*133.25,16*351.25,0x01,0x02,0x08,0x8e,632},
-        { "Alps TSBE5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
+        { "Alps TSBE5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
           16*133.25,16*351.25,0x01,0x02,0x08,0x8e,622},
-        { "Alps TSBC5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
+        { "Alps TSBC5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
           16*133.25,16*351.25,0x01,0x02,0x08,0x8e,608},
         { "Temic PAL_BG (4006FH5)", TEMIC, PAL,
           16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
-        { "Alps TSCH6", Alps, NTSC,
-          16*137.25,16*385.25,0x14,0x12,0x11,0x8e,732},
-        { "Temic PAL_DK (4016 FY5)", TEMIC, PAL,
-          16*168.25,16*456.25,0xa0,0x90,0x30,0x8e,623},
-        { "Philips NTSC_M (MK2)", Philips, NTSC,
-          16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
-        { "Temic PAL_I (4066 FY5)", TEMIC, PAL_I,
-          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
-        { "Temic PAL* auto (4006 FN5)", TEMIC, PAL,
-          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
+        { "Alps TSCH6", Alps, NTSC,
+          16*137.25,16*385.25,0x14,0x12,0x11,0x8e,732},
+        { "Temic PAL_DK (4016 FY5)", TEMIC, PAL,
+          16*168.25,16*456.25,0xa0,0x90,0x30,0x8e,623},
+        { "Philips NTSC_M (MK2)", Philips, NTSC,
+          16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
+        { "Temic PAL_I (4066 FY5)", TEMIC, PAL_I,
+          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
+        { "Temic PAL* auto (4006 FN5)", TEMIC, PAL,
+          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
 
         /* 20-29 */
-        { "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)", TEMIC, PAL,
-          16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
-        { "Temic NTSC (4039 FR5)", TEMIC, NTSC,
-          16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
-        { "Temic PAL/SECAM multi (4046 FM5)", TEMIC, PAL,
-          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
-        { "Philips PAL_DK (FI1256 and compatibles)", Philips, PAL,
+        { "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)", TEMIC, PAL,
+          16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
+        { "Temic NTSC (4039 FR5)", TEMIC, NTSC,
+          16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
+        { "Temic PAL/SECAM multi (4046 FM5)", TEMIC, PAL,
+          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
+        { "Philips PAL_DK (FI1256 and compatibles)", Philips, PAL,
           16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
         { "Philips PAL/SECAM multi (FQ1216ME)", Philips, PAL,
           16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
@@ -173,21 +173,21 @@ static struct tunertype tuners[] = {
         { "SHARP NTSC_JP (2U5JF5540)", SHARP, NTSC, /* 940=16*58.75 NTSC@Japan */
           16*137.25,16*317.25,0x01,0x02,0x08,0x8e,940 },
         { "Samsung PAL TCPM9091PD27", Samsung, PAL, /* from sourceforge v3tv */
-          16*169,16*464,0xA0,0x90,0x30,0x8e,623},
+          16*169,16*464,0xA0,0x90,0x30,0x8e,623},
         { "MT20xx universal", Microtune, PAL|NTSC,
           /* see mt20xx.c for details */ },
         { "Temic PAL_BG (4106 FH5)", TEMIC, PAL,
-          16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
+          16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
         { "Temic PAL_DK/SECAM_L (4012 FY5)", TEMIC, PAL,
-          16*140.25, 16*463.25, 0x02,0x04,0x01,0x8e,623},
+          16*140.25, 16*463.25, 0x02,0x04,0x01,0x8e,623},
         { "Temic NTSC (4136 FY5)", TEMIC, NTSC,
-          16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
-        { "LG PAL (newer TAPC series)", LGINNOTEK, PAL,
-          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,623},
+          16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
+        { "LG PAL (newer TAPC series)", LGINNOTEK, PAL,
+          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,623},
         { "Philips PAL/SECAM multi (FM1216ME MK3)", Philips, PAL,
-          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
+          16*158.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
         { "LG NTSC (newer TAPC series)", LGINNOTEK, NTSC,
-          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,732},
+          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,732},
 
         /* 40-49 */
         { "HITACHI V7-J180AT", HITACHI, NTSC,
@@ -196,24 +196,24 @@ static struct tunertype tuners[] = {
           16*140.25,16*463.25,0x01,0xc2,0xcf,0x8e,623},
         { "Philips 1236D ATSC/NTSC daul in", Philips, ATSC,
           16*157.25,16*454.00,0xa0,0x90,0x30,0x8e,732},
-        { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC,
-          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
-        { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC,
-          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
+        { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC,
+          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
+        { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC,
+          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
         { "Microtune 4049 FM5", Microtune, PAL,
           16*141.00,16*464.00,0xa0,0x90,0x30,0x8e,623},
         { "Panasonic VP27s/ENGE4324D", Panasonic, NTSC,
           16*160.00,16*454.00,0x01,0x02,0x08,0xce,940},
-        { "LG NTSC (TAPE series)", LGINNOTEK, NTSC,
-          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
-        { "Tenna TNF 8831 BGFF)", Philips, PAL,
-          16*161.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
+        { "LG NTSC (TAPE series)", LGINNOTEK, NTSC,
+          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
+        { "Tenna TNF 8831 BGFF)", Philips, PAL,
+          16*161.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
         { "Microtune 4042 FI5 ATSC/NTSC dual in", Microtune, NTSC,
           16*162.00,16*457.00,0xa2,0x94,0x31,0x8e,732},
 
         /* 50-59 */
-        { "TCL 2002N", TCL, NTSC,
-          16*172.00,16*448.00,0x01,0x02,0x08,0x8e,732},
+        { "TCL 2002N", TCL, NTSC,
+          16*172.00,16*448.00,0x01,0x02,0x08,0x8e,732},
         { "Philips PAL/SECAM_D (FM 1256 I-H3)", Philips, PAL,
           16*160.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
         { "Thomson DDT 7610 (ATSC/NTSC)", THOMSON, ATSC,
@@ -222,8 +222,8 @@ static struct tunertype tuners[] = {
           16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, /* UHF band untested */
         { "tda8290+75", Philips, PAL|NTSC,
           /* see tda8290.c for details */ },
-        { "LG PAL (TAPE series)", LGINNOTEK, PAL,
-          16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},
+        { "TCL 2002MB", TCL, PAL,
+          16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},
         { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,
           16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
         { "Philips FQ1236A MK4", Philips, NTSC,
@@ -233,21 +233,25 @@ static struct tunertype tuners[] = {
         { "Ymec TVision TVF-5533MF", Philips, NTSC,
           16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},
 
-        /* 60-66 */
+        /* 60-68 */
         { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,
           16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
         { "Tena TNF9533-D/IF/TNF9533-B/DF", Philips, PAL,
-          16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623},
+          16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623},
         { "Philips TEA5767HN FM Radio", Philips, RADIO,
-          /* see tea5767.c for details */},
+          /* see tea5767.c for details */},
         { "Philips FMD1216ME MK3 Hybrid Tuner", Philips, PAL,
           16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 },
         { "LG TDVS-H062F/TUA6034", LGINNOTEK, ATSC,
           16*160.00,16*455.00,0x01,0x02,0x04,0x8e,732},
         { "Ymec TVF66T5-B/DFF", Philips, PAL,
-          16*160.25,16*464.25,0x01,0x02,0x08,0x8e,623},
-        { "LG NTSC (TALN mini series)", LGINNOTEK, NTSC,
+          16*160.25,16*464.25,0x01,0x02,0x08,0x8e,623},
+        { "LG NTSC (TALN mini series)", LGINNOTEK, NTSC,
           16*137.25,16*373.25,0x01,0x02,0x08,0x8e,732 },
+        { "Philips TD1316 Hybrid Tuner", Philips, PAL,
+          16*160.00,16*442.00,0xa1,0xa2,0xa4,0xc8,623 },
+        { "Philips TUV1236D ATSC/NTSC dual in", Philips, ATSC,
+          16*157.25,16*454.00,0x01,0x02,0x04,0xce,732 },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
@@ -277,7 +281,7 @@ static int tuner_stereo(struct i2c_client *c)
         status = tuner_getstatus (c);
 
         switch (t->type) {
-                case TUNER_PHILIPS_FM1216ME_MK3:
+                case TUNER_PHILIPS_FM1216ME_MK3:
                 case TUNER_PHILIPS_FM1236_MK3:
                 case TUNER_PHILIPS_FM1256_IH3:
                         stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
@@ -295,10 +299,10 @@ static int tuner_stereo(struct i2c_client *c)
 static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
-        u8 config;
+        u8 config, tuneraddr;
         u16 div;
         struct tunertype *tun;
-        unsigned char buffer[4];
+        unsigned char buffer[4];
         int rc;
 
         tun = &tuners[t->type];
@@ -373,6 +377,31 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                 /* Set the charge pump for fast tuning */
                 tun->config |= TUNER_CHARGE_PUMP;
                 break;
+
+        case TUNER_PHILIPS_TUV1236D:
+                /* 0x40 -> ATSC antenna input 1 */
+                /* 0x48 -> ATSC antenna input 2 */
+                /* 0x00 -> NTSC antenna input 1 */
+                /* 0x08 -> NTSC antenna input 2 */
+                buffer[0] = 0x14;
+                buffer[1] = 0x00;
+                buffer[2] = 0x17;
+                buffer[3] = 0x00;
+                config &= ~0x40;
+                if (t->std & V4L2_STD_ATSC) {
+                        config |= 0x40;
+                        buffer[1] = 0x04;
+                }
+                /* set to the correct mode (analog or digital) */
+                tuneraddr = c->addr;
+                c->addr = 0x0a;
+                if (2 != (rc = i2c_master_send(c,&buffer[0],2)))
+                        tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+                if (2 != (rc = i2c_master_send(c,&buffer[2],2)))
+                        tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+                c->addr = tuneraddr;
+                /* FIXME: input */
+                break;
         }
 
         /*
@@ -404,7 +433,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
         tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
                   buffer[0],buffer[1],buffer[2],buffer[3]);
 
-        if (4 != (rc = i2c_master_send(c,buffer,4)))
+        if (4 != (rc = i2c_master_send(c,buffer,4)))
                 tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
 
         if (t->type == TUNER_MICROTUNE_4042FI5) {
@@ -443,7 +472,7 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tunertype *tun;
         struct tuner *t = i2c_get_clientdata(c);
-        unsigned char buffer[4];
+        unsigned char buffer[4];
         unsigned div;
         int rc;
 
@@ -476,13 +505,13 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
                 buffer[3] = 0xa4;
                 break;
         }
-        buffer[0] = (div>>8) & 0x7f;
-        buffer[1] = div      & 0xff;
+        buffer[0] = (div>>8) & 0x7f;
+        buffer[1] = div      & 0xff;
 
         tuner_dbg("radio 0x%02x 0x%02x 0x%02x 0x%02x\n",
                buffer[0],buffer[1],buffer[2],buffer[3]);
 
-        if (4 != (rc = i2c_master_send(c,buffer,4)))
+        if (4 != (rc = i2c_master_send(c,buffer,4)))
                 tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
 }
 
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 1c31ef52f863..c31bf28b73fe 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -31,7 +31,6 @@
 #include <linux/smp_lock.h>
 
 #include <media/audiochip.h>
-#include <media/id.h>
 
 #include "tvaudio.h"
 
@@ -458,8 +457,8 @@ static void tda9840_setmode(struct CHIPSTATE *chip, int mode)
 #define TDA9855_LOUD    1<<5 /* Loudness, 1==off */
 #define TDA9855_SUR     1<<3 /* Surround / Subwoofer 1==.5(L-R) 0==.5(L+R) */
                              /* Bits 0 to 3 select various combinations
-                              * of line in and line out, only the
-                              * interesting ones are defined */
+                              * of line in and line out, only the
+                              * interesting ones are defined */
 #define TDA9855_EXT     1<<2 /* Selects inputs LIR and LIL.  Pins 41 & 12 */
 #define TDA9855_INT     0    /* Selects inputs LOR and LOL.  (internal) */
 
@@ -1028,7 +1027,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
 #define TEA6300_TR         0x03  /* treble */
 #define TEA6300_FA         0x04  /* fader control */
 #define TEA6300_S          0x05  /* switch register */
-                                 /* values for those registers: */
+                                 /* values for those registers: */
 #define TEA6300_S_SA       0x01  /* stereo A input */
 #define TEA6300_S_SB       0x02  /* stereo B */
 #define TEA6300_S_SC       0x04  /* stereo C */
@@ -1042,7 +1041,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
 #define TEA6320_BA         0x05  /* bass (0-4) */
 #define TEA6320_TR         0x06  /* treble (0-4) */
 #define TEA6320_S          0x07  /* switch register */
-                                 /* values for those registers: */
+                                 /* values for those registers: */
 #define TEA6320_S_SA       0x07  /* stereo A input */
 #define TEA6320_S_SB       0x06  /* stereo B */
 #define TEA6320_S_SC       0x05  /* stereo C */
@@ -1082,7 +1081,7 @@ static int tea6320_initialize(struct CHIPSTATE * chip)
 #define TDA8425_BA         0x02  /* bass */
 #define TDA8425_TR         0x03  /* treble */
 #define TDA8425_S1         0x08  /* switch functions */
-                                 /* values for those registers: */
+                                 /* values for those registers: */
 #define TDA8425_S1_OFF     0xEE  /* audio off (mute on) */
 #define TDA8425_S1_CH1     0xCE  /* audio channel 1 (mute off) - "linear stereo" mode */
 #define TDA8425_S1_CH2     0xCF  /* audio channel 2 (mute off) - "linear stereo" mode */
@@ -1148,7 +1147,7 @@ static void tda8425_setmode(struct CHIPSTATE *chip, int mode)
 
 /* bit definition of the RESET register, I2C data. */
 #define PIC16C54_MISC_RESET_REMOTE_CTL 0x01 /* bit 0, Reset to receive the key */
-                                            /*        code of remote controller */
+                                            /*        code of remote controller */
 #define PIC16C54_MISC_MTS_MAIN         0x02 /* bit 1 */
 #define PIC16C54_MISC_MTS_SAP          0x04 /* bit 2 */
 #define PIC16C54_MISC_MTS_BOTH         0x08 /* bit 3 */
@@ -1281,7 +1280,7 @@ static struct CHIPDESC chiplist[] = {
                 .setmode    = tda9840_setmode,
                 .checkmode  = generic_checkmode,
 
-                .init       = { 2, { TDA9840_TEST, TDA9840_TEST_INT1SN
+                .init       = { 2, { TDA9840_TEST, TDA9840_TEST_INT1SN
                                 /* ,TDA9840_SW, TDA9840_MONO */} }
         },
         {
@@ -1438,7 +1437,7 @@ static struct CHIPDESC chiplist[] = {
         },
         {
                 .name       = "pic16c54 (PV951)",
-                .id         = I2C_DRIVERID_PIC16C54_PV951,
+                .id         = I2C_DRIVERID_PIC16C54_PV9,
                 .insmodopt  = &pic16c54,
                 .addr_lo    = I2C_PIC16C54 >> 1,
                 .addr_hi    = I2C_PIC16C54>> 1,
@@ -1467,7 +1466,7 @@ static struct CHIPDESC chiplist[] = {
                 .setmode    = ta8874z_setmode,
                 .checkmode  = generic_checkmode,
 
-                .init       = {2, { TA8874Z_MONO_SET, TA8874Z_SEPARATION_DEFAULT}},
+                .init       = {2, { TA8874Z_MONO_SET, TA8874Z_SEPARATION_DEFAULT}},
         },
         { .name = NULL } /* EOF */
 };
@@ -1486,8 +1485,8 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 return -ENOMEM;
         memset(chip,0,sizeof(*chip));
         memcpy(&chip->c,&client_template,sizeof(struct i2c_client));
-        chip->c.adapter = adap;
-        chip->c.addr = addr;
+        chip->c.adapter = adap;
+        chip->c.addr = addr;
         i2c_set_clientdata(&chip->c, chip);
 
         /* find description for the chip */
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5344d5592199..72e8741e8b59 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -6,12 +6,12 @@
  * which are:
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
-                           & Marcus Metzler (mocm@thp.uni-koeln.de)
+                           & Marcus Metzler (mocm@thp.uni-koeln.de)
     (c) 1999-2001 Gerd Knorr <kraxel@goldbach.in-berlin.de>
 
  * Adjustments to fit a more general model and all bugs:
 
-        Copyright (C) 2003 John Klar <linpvr at projectplasma.com>
+        Copyright (C) 2003 John Klar <linpvr at projectplasma.com>
 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@
 
 #include <media/tuner.h>
 #include <media/tveeprom.h>
+#include <media/audiochip.h>
 
 MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
 MODULE_AUTHOR("John Klar");
@@ -53,14 +54,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 #define tveeprom_info(fmt, arg...) do {\
         printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
-                        c->adapter->nr, c->addr , ##arg); } while (0)
+                        c->adapter->nr, c->addr , ##arg); } while (0)
 #define tveeprom_warn(fmt, arg...) do {\
         printk(KERN_WARNING "tveeprom %d-%04x: " fmt, \
-                        c->adapter->nr, c->addr , ##arg); } while (0)
+                        c->adapter->nr, c->addr , ##arg); } while (0)
 #define tveeprom_dbg(fmt, arg...) do {\
         if (debug) \
-                printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
-                        c->adapter->nr, c->addr , ##arg); } while (0)
+                printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
+                        c->adapter->nr, c->addr , ##arg); } while (0)
 
 
 /* ----------------------------------------------------------------------- */
@@ -134,8 +135,8 @@ hauppauge_tuner[] =
         { TUNER_TEMIC_4039FR5_NTSC, "Temic 4039FR5" },
         { TUNER_PHILIPS_FQ1216ME,   "Philips FQ1216 ME" },
         { TUNER_TEMIC_4066FY5_PAL_I, "Temic 4066FY5" },
-        { TUNER_PHILIPS_NTSC,        "Philips TD1536" },
-        { TUNER_PHILIPS_NTSC,        "Philips TD1536D" },
+        { TUNER_PHILIPS_NTSC,        "Philips TD1536" },
+        { TUNER_PHILIPS_NTSC,        "Philips TD1536D" },
         { TUNER_PHILIPS_NTSC,  "Philips FMR1236" }, /* mono radio */
         { TUNER_ABSENT,        "Philips FI1256MP" },
         /* 40-49 */
@@ -189,7 +190,7 @@ hauppauge_tuner[] =
         { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"},
         { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"},
         { TUNER_TCL_2002N,     "TCL 2002N 6A"},
-        { TUNER_ABSENT,        "Philips FQ1236 MK3"},
+        { TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"},
         { TUNER_ABSENT,        "Samsung TCPN 2121P30A"},
         { TUNER_ABSENT,        "Samsung TCPE 4121P30A"},
         { TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"},
@@ -200,95 +201,137 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,        "Philips FQ1286A MK4"},
         { TUNER_ABSENT,        "Philips FQ1216ME MK5"},
         { TUNER_ABSENT,        "Philips FQ1236 MK5"},
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_LG_PAL_TAPE,   "LG PAL (TAPE Series)"},
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_TCL_2002N,     "TCL 2002N 5H"},
-        /* 100-103 */
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_TEA5767,       "Philips TEA5767HN FM Radio"},
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05 4"},
+        { TUNER_ABSENT,        "Samsung TCPG_6121P30A"},
+        { TUNER_TCL_2002MB,    "TCL 2002MB_3H"},
+        { TUNER_ABSENT,        "TCL 2002MI_3H"},
+        { TUNER_TCL_2002N,     "TCL 2002N 5H"},
+        /* 100-109 */
+        { TUNER_ABSENT,        "Philips FMD1216ME"},
+        { TUNER_TEA5767,       "Philips TEA5768HL FM Radio"},
+        { TUNER_ABSENT,        "Panasonic ENV57H12D5"},
+        { TUNER_ABSENT,        "TCL MFNM05-4"},
+        { TUNER_ABSENT,        "TCL MNM05-4"},
+        { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"},
+        { TUNER_ABSENT,        "TCL MQNM05-4"},
+        { TUNER_ABSENT,        "LG TAPC-W701D"},
+        { TUNER_ABSENT,        "TCL 9886P-WM"},
+        { TUNER_ABSENT,        "TCL 1676NM-WM"},
 };
 
-/* This list is supplied by Hauppauge. Thanks! */
-static const char *audioIC[] = {
-        /* 0-4 */
-        "None", "TEA6300", "TEA6320", "TDA9850", "MSP3400C",
-        /* 5-9 */
-        "MSP3410D", "MSP3415", "MSP3430", "MSP3438", "CS5331",
-        /* 10-14 */
-        "MSP3435", "MSP3440", "MSP3445", "MSP3411", "MSP3416",
-        /* 15-19 */
-        "MSP3425", "MSP3451", "MSP3418", "Type 0x12", "OKI7716",
-        /* 20-24 */
-        "MSP4410", "MSP4420", "MSP4440", "MSP4450", "MSP4408",
-        /* 25-29 */
-        "MSP4418", "MSP4428", "MSP4448", "MSP4458", "Type 0x1d",
-        /* 30-34 */
-        "CX880", "CX881", "CX883", "CX882", "CX25840",
-        /* 35-38 */
-        "CX25841", "CX25842", "CX25843", "CX23418",
+static struct HAUPPAUGE_AUDIOIC
+{
+        enum audiochip  id;
+        char *name;
+}
+audioIC[] =
+{
+        /* 0-4 */
+        {AUDIO_CHIP_NONE,     "None"},
+        {AUDIO_CHIP_TEA6300,  "TEA6300"},
+        {AUDIO_CHIP_TEA6300,  "TEA6320"},
+        {AUDIO_CHIP_TDA985X,  "TDA9850"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3400C"},
+        /* 5-9 */
+        {AUDIO_CHIP_MSP34XX,  "MSP3410D"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3415"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3430"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3438"},
+        {AUDIO_CHIP_UNKNOWN,  "CS5331"},
+        /* 10-14 */
+        {AUDIO_CHIP_MSP34XX,  "MSP3435"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3440"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3445"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3411"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3416"},
+        /* 15-19 */
+        {AUDIO_CHIP_MSP34XX,  "MSP3425"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3451"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3418"},
+        {AUDIO_CHIP_UNKNOWN,  "Type 0x12"},
+        {AUDIO_CHIP_UNKNOWN,  "OKI7716"},
+        /* 20-24 */
+        {AUDIO_CHIP_UNKNOWN,  "MSP4410"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4420"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4440"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4450"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4408"},
+        /* 25-29 */
+        {AUDIO_CHIP_UNKNOWN,  "MSP4418"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4428"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4448"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4458"},
+        {AUDIO_CHIP_UNKNOWN,  "Type 0x1d"},
+        /* 30-34 */
+        {AUDIO_CHIP_INTERNAL, "CX880"},
+        {AUDIO_CHIP_INTERNAL, "CX881"},
+        {AUDIO_CHIP_INTERNAL, "CX883"},
+        {AUDIO_CHIP_INTERNAL, "CX882"},
+        {AUDIO_CHIP_INTERNAL, "CX25840"},
+        /* 35-38 */
+        {AUDIO_CHIP_INTERNAL, "CX25841"},
+        {AUDIO_CHIP_INTERNAL, "CX25842"},
+        {AUDIO_CHIP_INTERNAL, "CX25843"},
+        {AUDIO_CHIP_INTERNAL, "CX23418"},
 };
 
 /* This list is supplied by Hauppauge. Thanks! */
 static const char *decoderIC[] = {
-        /* 0-4 */
-        "None", "BT815", "BT817", "BT819", "BT815A",
-        /* 5-9 */
-        "BT817A", "BT819A", "BT827", "BT829", "BT848",
-        /* 10-14 */
-        "BT848A", "BT849A", "BT829A", "BT827A", "BT878",
-        /* 15-19 */
-        "BT879", "BT880", "VPX3226E", "SAA7114", "SAA7115",
-        /* 20-24 */
-        "CX880", "CX881", "CX883", "SAA7111", "SAA7113",
-        /* 25-29 */
-        "CX882", "TVP5150A", "CX25840", "CX25841", "CX25842",
-        /* 30-31 */
-        "CX25843", "CX23418",
+        /* 0-4 */
+        "None", "BT815", "BT817", "BT819", "BT815A",
+        /* 5-9 */
+        "BT817A", "BT819A", "BT827", "BT829", "BT848",
+        /* 10-14 */
+        "BT848A", "BT849A", "BT829A", "BT827A", "BT878",
+        /* 15-19 */
+        "BT879", "BT880", "VPX3226E", "SAA7114", "SAA7115",
+        /* 20-24 */
+        "CX880", "CX881", "CX883", "SAA7111", "SAA7113",
+        /* 25-29 */
+        "CX882", "TVP5150A", "CX25840", "CX25841", "CX25842",
+        /* 30-31 */
+        "CX25843", "CX23418",
 };
 
 static int hasRadioTuner(int tunerType)
 {
-        switch (tunerType) {
-                case 18: //PNPEnv_TUNER_FR1236_MK2:
-                case 23: //PNPEnv_TUNER_FM1236:
-                case 38: //PNPEnv_TUNER_FMR1236:
-                case 16: //PNPEnv_TUNER_FR1216_MK2:
-                case 19: //PNPEnv_TUNER_FR1246_MK2:
-                case 21: //PNPEnv_TUNER_FM1216:
-                case 24: //PNPEnv_TUNER_FM1246:
-                case 17: //PNPEnv_TUNER_FR1216MF_MK2:
-                case 22: //PNPEnv_TUNER_FM1216MF:
-                case 20: //PNPEnv_TUNER_FR1256_MK2:
-                case 25: //PNPEnv_TUNER_FM1256:
-                case 33: //PNPEnv_TUNER_4039FR5:
-                case 42: //PNPEnv_TUNER_4009FR5:
-                case 52: //PNPEnv_TUNER_4049FM5:
-                case 54: //PNPEnv_TUNER_4049FM5_AltI2C:
-                case 44: //PNPEnv_TUNER_4009FN5:
-                case 31: //PNPEnv_TUNER_TCPB9085P:
-                case 30: //PNPEnv_TUNER_TCPN9085D:
-                case 46: //PNPEnv_TUNER_TP18NSR01F:
-                case 47: //PNPEnv_TUNER_TP18PSB01D:
-                case 49: //PNPEnv_TUNER_TAPC_I001D:
-                case 60: //PNPEnv_TUNER_TAPE_S001D_MK3:
-                case 57: //PNPEnv_TUNER_FM1216ME_MK3:
-                case 59: //PNPEnv_TUNER_FM1216MP_MK3:
-                case 58: //PNPEnv_TUNER_FM1236_MK3:
-                case 68: //PNPEnv_TUNER_TAPE_H001F_MK3:
-                case 61: //PNPEnv_TUNER_TAPE_M001D_MK3:
-                case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM:
-                case 89: //PNPEnv_TUNER_TCL_MFPE05_2:
-                case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4:
-                    return 1;
-        }
-        return 0;
+        switch (tunerType) {
+                case 18: //PNPEnv_TUNER_FR1236_MK2:
+                case 23: //PNPEnv_TUNER_FM1236:
+                case 38: //PNPEnv_TUNER_FMR1236:
+                case 16: //PNPEnv_TUNER_FR1216_MK2:
+                case 19: //PNPEnv_TUNER_FR1246_MK2:
+                case 21: //PNPEnv_TUNER_FM1216:
+                case 24: //PNPEnv_TUNER_FM1246:
+                case 17: //PNPEnv_TUNER_FR1216MF_MK2:
+                case 22: //PNPEnv_TUNER_FM1216MF:
+                case 20: //PNPEnv_TUNER_FR1256_MK2:
+                case 25: //PNPEnv_TUNER_FM1256:
+                case 33: //PNPEnv_TUNER_4039FR5:
+                case 42: //PNPEnv_TUNER_4009FR5:
+                case 52: //PNPEnv_TUNER_4049FM5:
+                case 54: //PNPEnv_TUNER_4049FM5_AltI2C:
+                case 44: //PNPEnv_TUNER_4009FN5:
+                case 31: //PNPEnv_TUNER_TCPB9085P:
+                case 30: //PNPEnv_TUNER_TCPN9085D:
+                case 46: //PNPEnv_TUNER_TP18NSR01F:
+                case 47: //PNPEnv_TUNER_TP18PSB01D:
+                case 49: //PNPEnv_TUNER_TAPC_I001D:
+                case 60: //PNPEnv_TUNER_TAPE_S001D_MK3:
+                case 57: //PNPEnv_TUNER_FM1216ME_MK3:
+                case 59: //PNPEnv_TUNER_FM1216MP_MK3:
+                case 58: //PNPEnv_TUNER_FM1236_MK3:
+                case 68: //PNPEnv_TUNER_TAPE_H001F_MK3:
+                case 61: //PNPEnv_TUNER_TAPE_M001D_MK3:
+                case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM:
+                case 89: //PNPEnv_TUNER_TCL_MFPE05_2:
+                case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4:
+                return 1;
+        }
+        return 0;
 }
 
 void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
-                                unsigned char *eeprom_data)
+                                unsigned char *eeprom_data)
 {
         /* ----------------------------------------------
         ** The hauppauge eeprom format is tagged
@@ -312,19 +355,27 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
         ** # of inputs/outputs ???
         */
 
-        int i, j, len, done, beenhere, tag;
+        int i, j, len, done, beenhere, tag,start;
 
-        int tuner1 = 0, t_format1 = 0;
+        int tuner1 = 0, t_format1 = 0, audioic=-1;
         char *t_name1 = NULL;
-        const char *t_fmt_name1[8] = { " none", "", "", "", "", "", "", "" };
+        const char *t_fmt_name1[8] = { " none", "", "", "", "", "", "", "" };
 
-        int tuner2 = 0, t_format2 = 0;
+        int tuner2 = 0, t_format2 = 0;
         char *t_name2 = NULL;
-        const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
+        const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
 
-        memset(tvee, 0, sizeof(*tvee));
+        memset(tvee, 0, sizeof(*tvee));
         done = len = beenhere = 0;
-        for (i = 0; !done && i < 256; i += len) {
+
+        /* Hack for processing eeprom for em28xx */
+        if ((eeprom_data[0]==0x1a)&&(eeprom_data[1]==0xeb)&&
+                                (eeprom_data[2]==0x67)&&(eeprom_data[3]==0x95))
+                start=0xa0;
+        else
+                start=0;
+
+        for (i = start; !done && i < 256; i += len) {
                 if (eeprom_data[i] == 0x84) {
                         len = eeprom_data[i + 1] + (eeprom_data[i + 2] << 8);
                         i += 3;
@@ -338,28 +389,28 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         ++i;
                 } else {
                         tveeprom_warn("Encountered bad packet header [%02x]. "
-                                   "Corrupt or not a Hauppauge eeprom.\n", eeprom_data[i]);
+                                "Corrupt or not a Hauppauge eeprom.\n", eeprom_data[i]);
                         return;
                 }
 
-                if (debug) {
-                        tveeprom_info("Tag [%02x] + %d bytes:", eeprom_data[i], len - 1);
-                        for(j = 1; j < len; j++) {
-                                printk(" %02x", eeprom_data[i + j]);
-                        }
-                        printk("\n");
-                }
+                if (debug) {
+                        tveeprom_info("Tag [%02x] + %d bytes:", eeprom_data[i], len - 1);
+                        for(j = 1; j < len; j++) {
+                                printk(" %02x", eeprom_data[i + j]);
+                        }
+                        printk("\n");
+                }
 
                 /* process by tag */
                 tag = eeprom_data[i];
                 switch (tag) {
                 case 0x00:
-                        /* tag: 'Comprehensive' */
+                        /* tag: 'Comprehensive' */
                         tuner1 = eeprom_data[i+6];
                         t_format1 = eeprom_data[i+5];
                         tvee->has_radio = eeprom_data[i+len-1];
-                        /* old style tag, don't know how to detect
-                           IR presence, mark as unknown. */
+                        /* old style tag, don't know how to detect
+                        IR presence, mark as unknown. */
                         tvee->has_ir = 2;
                         tvee->model =
                                 eeprom_data[i+8] +
@@ -370,7 +421,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x01:
-                        /* tag: 'SerialID' */
+                        /* tag: 'SerialID' */
                         tvee->serial_number =
                                 eeprom_data[i+6] +
                                 (eeprom_data[i+7] << 8) +
@@ -378,17 +429,21 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x02:
-                        /* tag 'AudioInfo'
-                           Note mask with 0x7F, high bit used on some older models
-                           to indicate 4052 mux was removed in favor of using MSP
-                           inputs directly. */
-                        tvee->audio_processor = eeprom_data[i+2] & 0x7f;
+                        /* tag 'AudioInfo'
+                        Note mask with 0x7F, high bit used on some older models
+                        to indicate 4052 mux was removed in favor of using MSP
+                        inputs directly. */
+                        audioic = eeprom_data[i+2] & 0x7f;
+                        if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                                tvee->audio_processor = audioIC[audioic].id;
+                        else
+                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
                         break;
 
-                /* case 0x03: tag 'EEInfo' */
+                /* case 0x03: tag 'EEInfo' */
 
                 case 0x04:
-                        /* tag 'SerialID2' */
+                        /* tag 'SerialID2' */
                         tvee->serial_number =
                                 eeprom_data[i+5] +
                                 (eeprom_data[i+6] << 8) +
@@ -396,15 +451,20 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x05:
-                        /* tag 'Audio2'
-                           Note mask with 0x7F, high bit used on some older models
-                           to indicate 4052 mux was removed in favor of using MSP
-                           inputs directly. */
-                        tvee->audio_processor = eeprom_data[i+1] & 0x7f;
+                        /* tag 'Audio2'
+                        Note mask with 0x7F, high bit used on some older models
+                        to indicate 4052 mux was removed in favor of using MSP
+                        inputs directly. */
+                        audioic = eeprom_data[i+1] & 0x7f;
+                        if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                                tvee->audio_processor = audioIC[audioic].id;
+                        else
+                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+
                         break;
 
                 case 0x06:
-                        /* tag 'ModelRev' */
+                        /* tag 'ModelRev' */
                         tvee->model =
                                 eeprom_data[i+1] +
                                 (eeprom_data[i+2] << 8);
@@ -414,55 +474,55 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x07:
-                        /* tag 'Details': according to Hauppauge not interesting
-                           on any PCI-era or later boards. */
+                        /* tag 'Details': according to Hauppauge not interesting
+                        on any PCI-era or later boards. */
                         break;
 
-                /* there is no tag 0x08 defined */
+                /* there is no tag 0x08 defined */
 
                 case 0x09:
-                        /* tag 'Video' */
+                        /* tag 'Video' */
                         tvee->decoder_processor = eeprom_data[i + 1];
                         break;
 
                 case 0x0a:
-                        /* tag 'Tuner' */
+                        /* tag 'Tuner' */
                         if (beenhere == 0) {
                                 tuner1 = eeprom_data[i+2];
                                 t_format1 = eeprom_data[i+1];
                                 beenhere = 1;
                         } else {
-                                /* a second (radio) tuner may be present */
+                                /* a second (radio) tuner may be present */
                                 tuner2 = eeprom_data[i+2];
                                 t_format2 = eeprom_data[i+1];
-                                if (t_format2 == 0) {  /* not a TV tuner? */
-                                        tvee->has_radio = 1; /* must be radio */
-                                }
-                        }
+                                if (t_format2 == 0) {  /* not a TV tuner? */
+                                        tvee->has_radio = 1; /* must be radio */
+                                }
+                        }
                         break;
 
-                case 0x0b:
-                        /* tag 'Inputs': according to Hauppauge this is specific
-                           to each driver family, so no good assumptions can be
-                           made. */
-                        break;
+                case 0x0b:
+                        /* tag 'Inputs': according to Hauppauge this is specific
+                        to each driver family, so no good assumptions can be
+                        made. */
+                        break;
 
-                /* case 0x0c: tag 'Balun' */
-                /* case 0x0d: tag 'Teletext' */
+                /* case 0x0c: tag 'Balun' */
+                /* case 0x0d: tag 'Teletext' */
 
                 case 0x0e:
-                        /* tag: 'Radio' */
+                        /* tag: 'Radio' */
                         tvee->has_radio = eeprom_data[i+1];
                         break;
 
-                case 0x0f:
-                        /* tag 'IRInfo' */
-                        tvee->has_ir = eeprom_data[i+1];
-                        break;
+                case 0x0f:
+                        /* tag 'IRInfo' */
+                        tvee->has_ir = eeprom_data[i+1];
+                        break;
 
-                /* case 0x10: tag 'VBIInfo' */
-                /* case 0x11: tag 'QCInfo' */
-                /* case 0x12: tag 'InfoBits' */
+                /* case 0x10: tag 'VBIInfo' */
+                /* case 0x11: tag 'QCInfo' */
+                /* case 0x12: tag 'InfoBits' */
 
                 default:
                         tveeprom_dbg("Not sure what to do with tag [%02x]\n", tag);
@@ -483,11 +543,11 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                 tvee->rev_str[4] = 0;
         }
 
-        if (hasRadioTuner(tuner1) && !tvee->has_radio) {
-            tveeprom_info("The eeprom says no radio is present, but the tuner type\n");
-            tveeprom_info("indicates otherwise. I will assume that radio is present.\n");
-            tvee->has_radio = 1;
-        }
+        if (hasRadioTuner(tuner1) && !tvee->has_radio) {
+                tveeprom_info("The eeprom says no radio is present, but the tuner type\n");
+                tveeprom_info("indicates otherwise. I will assume that radio is present.\n");
+                tvee->has_radio = 1;
+        }
 
         if (tuner1 < sizeof(hauppauge_tuner)/sizeof(struct HAUPPAUGE_TUNER)) {
                 tvee->tuner_type = hauppauge_tuner[tuner1].id;
@@ -510,45 +570,53 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         tvee->tuner_formats |= hauppauge_tuner_fmt[i].id;
                         t_fmt_name1[j++] = hauppauge_tuner_fmt[i].name;
                 }
-                if (t_format2 & (1 << i)) {
-                        tvee->tuner2_formats |= hauppauge_tuner_fmt[i].id;
-                        t_fmt_name2[j++] = hauppauge_tuner_fmt[i].name;
-                }
+                if (t_format2 & (1 << i)) {
+                        tvee->tuner2_formats |= hauppauge_tuner_fmt[i].id;
+                        t_fmt_name2[j++] = hauppauge_tuner_fmt[i].name;
+                }
         }
 
         tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n",
-                   tvee->model, tvee->rev_str, tvee->serial_number);
+                tvee->model, tvee->rev_str, tvee->serial_number);
         tveeprom_info("tuner model is %s (idx %d, type %d)\n",
-                   t_name1, tuner1, tvee->tuner_type);
+                t_name1, tuner1, tvee->tuner_type);
         tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
-                   t_fmt_name1[0], t_fmt_name1[1], t_fmt_name1[2], t_fmt_name1[3],
-                   t_fmt_name1[4], t_fmt_name1[5], t_fmt_name1[6], t_fmt_name1[7],
-                   t_format1);
-        if (tuner2) {
-                tveeprom_info("second tuner model is %s (idx %d, type %d)\n",
-                           t_name2, tuner2, tvee->tuner2_type);
-        }
-        if (t_format2) {
-                tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
-                           t_fmt_name2[0], t_fmt_name2[1], t_fmt_name2[2], t_fmt_name2[3],
-                           t_fmt_name2[4], t_fmt_name2[5], t_fmt_name2[6], t_fmt_name2[7],
-                           t_format2);
-        }
-        tveeprom_info("audio processor is %s (idx %d)\n",
-                   STRM(audioIC, tvee->audio_processor),
-                   tvee->audio_processor);
-        if (tvee->decoder_processor) {
-                tveeprom_info("decoder processor is %s (idx %d)\n",
-                           STRM(decoderIC, tvee->decoder_processor),
-                           tvee->decoder_processor);
-        }
-        if (tvee->has_ir == 2)
-                tveeprom_info("has %sradio\n",
-                                tvee->has_radio ? "" : "no ");
-        else
-                tveeprom_info("has %sradio, has %sIR remote\n",
-                                tvee->has_radio ? "" : "no ",
-                                tvee->has_ir ? "" : "no ");
+                t_fmt_name1[0], t_fmt_name1[1], t_fmt_name1[2], t_fmt_name1[3],
+                t_fmt_name1[4], t_fmt_name1[5], t_fmt_name1[6], t_fmt_name1[7],
+                t_format1);
+        if (tuner2) {
+                tveeprom_info("second tuner model is %s (idx %d, type %d)\n",
+                                        t_name2, tuner2, tvee->tuner2_type);
+        }
+        if (t_format2) {
+                tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
+                        t_fmt_name2[0], t_fmt_name2[1], t_fmt_name2[2], t_fmt_name2[3],
+                        t_fmt_name2[4], t_fmt_name2[5], t_fmt_name2[6], t_fmt_name2[7],
+                        t_format2);
+        }
+        if (audioic<0) {
+                tveeprom_info("audio processor is unknown (no idx)\n");
+                tvee->audio_processor=AUDIO_CHIP_UNKNOWN;
+        } else {
+                if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                        tveeprom_info("audio processor is %s (idx %d)\n",
+                                        audioIC[audioic].name,audioic);
+                else
+                        tveeprom_info("audio processor is unknown (idx %d)\n",
+                                                                audioic);
+        }
+        if (tvee->decoder_processor) {
+                tveeprom_info("decoder processor is %s (idx %d)\n",
+                        STRM(decoderIC, tvee->decoder_processor),
+                        tvee->decoder_processor);
+        }
+        if (tvee->has_ir == 2)
+                tveeprom_info("has %sradio\n",
+                                tvee->has_radio ? "" : "no ");
+        else
+                tveeprom_info("has %sradio, has %sIR remote\n",
+                                tvee->has_radio ? "" : "no ",
+                                tvee->has_ir ? "" : "no ");
 }
 EXPORT_SYMBOL(tveeprom_hauppauge_analog);
 
@@ -569,18 +637,18 @@ int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len)
                 tveeprom_warn("i2c eeprom read error (err=%d)\n", err);
                 return -1;
         }
-        if (debug) {
-                int i;
-
-                tveeprom_info("full 256-byte eeprom dump:\n");
-                for (i = 0; i < len; i++) {
-                        if (0 == (i % 16))
-                                tveeprom_info("%02x:", i);
-                        printk(" %02x", eedata[i]);
-                        if (15 == (i % 16))
-                                printk("\n");
-                }
-        }
+        if (debug) {
+                int i;
+
+                tveeprom_info("full 256-byte eeprom dump:\n");
+                for (i = 0; i < len; i++) {
+                        if (0 == (i % 16))
+                                tveeprom_info("%02x:", i);
+                        printk(" %02x", eedata[i]);
+                        if (15 == (i % 16))
+                                printk("\n");
+                }
+        }
         return 0;
 }
 EXPORT_SYMBOL(tveeprom_read);
@@ -590,10 +658,6 @@ EXPORT_SYMBOL(tveeprom_read);
 /* run, just call the exported tveeprom_* directly, there is no point in   */
 /* using the indirect way via i2c_driver->command()                        */
 
-#ifndef I2C_DRIVERID_TVEEPROM
-# define I2C_DRIVERID_TVEEPROM I2C_DRIVERID_EXP2
-#endif
-
 static unsigned short normal_i2c[] = {
         0xa0 >> 1,
         I2C_CLIENT_END,
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index d86e08ebddfc..8318bd1aad00 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -79,7 +79,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
 {
         struct video_audio va;
         int left,right,ret,val = 0;
-        struct TVMIXER *mix = file->private_data;
+        struct TVMIXER *mix = file->private_data;
         struct i2c_client *client = mix->dev;
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
@@ -87,25 +87,25 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
         if (NULL == client)
                 return -ENODEV;
 
-        if (cmd == SOUND_MIXER_INFO) {
-                mixer_info info;
-                strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, client->name, sizeof(info.name));
-                info.modify_counter = 42 /* FIXME */;
-                if (copy_to_user(argp, &info, sizeof(info)))
-                        return -EFAULT;
-                return 0;
-        }
-        if (cmd == SOUND_OLD_MIXER_INFO) {
-                _old_mixer_info info;
-                strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, client->name, sizeof(info.name));
-                if (copy_to_user(argp, &info, sizeof(info)))
-                        return -EFAULT;
-                return 0;
-        }
-        if (cmd == OSS_GETVERSION)
-                return put_user(SOUND_VERSION, p);
+        if (cmd == SOUND_MIXER_INFO) {
+                mixer_info info;
+                strlcpy(info.id, "tv card", sizeof(info.id));
+                strlcpy(info.name, client->name, sizeof(info.name));
+                info.modify_counter = 42 /* FIXME */;
+                if (copy_to_user(argp, &info, sizeof(info)))
+                        return -EFAULT;
+                return 0;
+        }
+        if (cmd == SOUND_OLD_MIXER_INFO) {
+                _old_mixer_info info;
+                strlcpy(info.id, "tv card", sizeof(info.id));
+                strlcpy(info.name, client->name, sizeof(info.name));
+                if (copy_to_user(argp, &info, sizeof(info)))
+                        return -EFAULT;
+                return 0;
+        }
+        if (cmd == OSS_GETVERSION)
+                return put_user(SOUND_VERSION, p);
 
         if (_SIOC_DIR(cmd) & _SIOC_WRITE)
                 if (get_user(val, p))
@@ -181,8 +181,8 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
 
 static int tvmixer_open(struct inode *inode, struct file *file)
 {
-        int i, minor = iminor(inode);
-        struct TVMIXER *mix = NULL;
+        int i, minor = iminor(inode);
+        struct TVMIXER *mix = NULL;
         struct i2c_client *client = NULL;
 
         for (i = 0; i < DEV_MAX; i++) {
@@ -204,7 +204,7 @@ static int tvmixer_open(struct inode *inode, struct file *file)
 #endif
         if (client->adapter->owner)
                 try_module_get(client->adapter->owner);
-        return 0;
+        return 0;
 }
 
 static int tvmixer_release(struct inode *inode, struct file *file)
@@ -231,15 +231,15 @@ static struct i2c_driver driver = {
         .owner           = THIS_MODULE,
 #endif
         .name            = "tv card mixer driver",
-        .id              = I2C_DRIVERID_TVMIXER,
+        .id              = I2C_DRIVERID_TVMIXER,
 #ifdef I2C_DF_DUMMY
         .flags           = I2C_DF_DUMMY,
 #else
         .flags           = I2C_DF_NOTIFY,
-        .detach_adapter  = tvmixer_adapters,
+        .detach_adapter  = tvmixer_adapters,
 #endif
-        .attach_adapter  = tvmixer_adapters,
-        .detach_client   = tvmixer_clients,
+        .attach_adapter  = tvmixer_adapters,
+        .detach_client   = tvmixer_clients,
 };
 
 static struct file_operations tvmixer_fops = {
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
new file mode 100644
index 000000000000..81e6d4494e7d
--- /dev/null
+++ b/drivers/media/video/tvp5150.c
@@ -0,0 +1,829 @@
+/*
+ * tvp5150 - Texas Instruments TVP5150A(M) video decoder driver
+ *
+ * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
+ * This code is placed under the terms of the GNU General Public License
+ */
+
+#include <linux/i2c.h>
+#include <linux/videodev.h>
+#include <linux/delay.h>
+#include <linux/video_decoder.h>
+
+#include "tvp5150_reg.h"
+
+MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver");  /* standard i2c insmod options */
+MODULE_AUTHOR("Mauro Carvalho Chehab");
+MODULE_LICENSE("GPL");
+
+static unsigned short normal_i2c[] = {
+        0xb8 >> 1,
+        0xba >> 1,
+        I2C_CLIENT_END
+};
+
+I2C_CLIENT_INSMOD;
+
+static int debug = 0;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
+
+#define dprintk(num, format, args...) \
+        do { \
+                if (debug >= num) \
+                        printk(format , ##args); \
+        } while (0)
+
+/* supported controls */
+static struct v4l2_queryctrl tvp5150_qctrl[] = {
+        {
+         .id = V4L2_CID_BRIGHTNESS,
+         .type = V4L2_CTRL_TYPE_INTEGER,
+         .name = "Brightness",
+         .minimum = 0,
+         .maximum = 255,
+         .step = 1,
+         .default_value = 0,
+         .flags = 0,
+         }, {
+             .id = V4L2_CID_CONTRAST,
+             .type = V4L2_CTRL_TYPE_INTEGER,
+             .name = "Contrast",
+             .minimum = 0,
+             .maximum = 255,
+             .step = 0x1,
+             .default_value = 0x10,
+             .flags = 0,
+             }, {
+                 .id = V4L2_CID_SATURATION,
+                 .type = V4L2_CTRL_TYPE_INTEGER,
+                 .name = "Saturation",
+                 .minimum = 0,
+                 .maximum = 255,
+                 .step = 0x1,
+                 .default_value = 0x10,
+                 .flags = 0,
+                 }, {
+                     .id = V4L2_CID_HUE,
+                     .type = V4L2_CTRL_TYPE_INTEGER,
+                     .name = "Hue",
+                     .minimum = -128,
+                     .maximum = 127,
+                     .step = 0x1,
+                     .default_value = 0x10,
+                     .flags = 0,
+                     }
+};
+
+struct tvp5150 {
+        struct i2c_client *client;
+
+        int norm;
+        int input;
+        int enable;
+        int bright;
+        int contrast;
+        int hue;
+        int sat;
+};
+
+static inline int tvp5150_read(struct i2c_client *c, unsigned char addr)
+{
+        unsigned char buffer[1];
+        int rc;
+
+        buffer[0] = addr;
+        if (1 != (rc = i2c_master_send(c, buffer, 1)))
+                dprintk(0, "i2c i/o error: rc == %d (should be 1)\n", rc);
+
+        msleep(10);
+
+        if (1 != (rc = i2c_master_recv(c, buffer, 1)))
+                dprintk(0, "i2c i/o error: rc == %d (should be 1)\n", rc);
+
+        return (buffer[0]);
+}
+
+static inline void tvp5150_write(struct i2c_client *c, unsigned char addr,
+                                 unsigned char value)
+{
+        unsigned char buffer[2];
+        int rc;
+/*      struct tvp5150 *core = i2c_get_clientdata(c); */
+
+        buffer[0] = addr;
+        buffer[1] = value;
+        dprintk(1, "tvp5150: writing 0x%02x 0x%02x\n", buffer[0], buffer[1]);
+        if (2 != (rc = i2c_master_send(c, buffer, 2)))
+                dprintk(0, "i2c i/o error: rc == %d (should be 2)\n", rc);
+}
+
+static void dump_reg(struct i2c_client *c)
+{
+        printk("tvp5150: Video input source selection #1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VD_IN_SRC_SEL_1));
+        printk("tvp5150: Analog channel controls = 0x%02x\n",
+               tvp5150_read(c, TVP5150_ANAL_CHL_CTL));
+        printk("tvp5150: Operation mode controls = 0x%02x\n",
+               tvp5150_read(c, TVP5150_OP_MODE_CTL));
+        printk("tvp5150: Miscellaneous controls = 0x%02x\n",
+               tvp5150_read(c, TVP5150_MISC_CTL));
+        printk("tvp5150: Autoswitch mask: TVP5150A / TVP5150AM = 0x%02x\n",
+               tvp5150_read(c, TVP5150_AUTOSW_MSK));
+        printk("tvp5150: Color killer threshold control = 0x%02x\n",
+               tvp5150_read(c, TVP5150_COLOR_KIL_THSH_CTL));
+        printk("tvp5150: Luminance processing control #1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LUMA_PROC_CTL_1));
+        printk("tvp5150: Luminance processing control #2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LUMA_PROC_CTL_2));
+        printk("tvp5150: Brightness control = 0x%02x\n",
+               tvp5150_read(c, TVP5150_BRIGHT_CTL));
+        printk("tvp5150: Color saturation control = 0x%02x\n",
+               tvp5150_read(c, TVP5150_SATURATION_CTL));
+        printk("tvp5150: Hue control = 0x%02x\n",
+               tvp5150_read(c, TVP5150_HUE_CTL));
+        printk("tvp5150: Contrast control = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CONTRAST_CTL));
+        printk("tvp5150: Outputs and data rates select = 0x%02x\n",
+               tvp5150_read(c, TVP5150_DATA_RATE_SEL));
+        printk("tvp5150: Luminance processing control #3 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LUMA_PROC_CTL_3));
+        printk("tvp5150: Configuration shared pins = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CONF_SHARED_PIN));
+        printk("tvp5150: Active video cropping start MSB = 0x%02x\n",
+               tvp5150_read(c, TVP5150_ACT_VD_CROP_ST_MSB));
+        printk("tvp5150: Active video cropping start LSB = 0x%02x\n",
+               tvp5150_read(c, TVP5150_ACT_VD_CROP_ST_LSB));
+        printk("tvp5150: Active video cropping stop MSB = 0x%02x\n",
+               tvp5150_read(c, TVP5150_ACT_VD_CROP_STP_MSB));
+        printk("tvp5150: Active video cropping stop LSB = 0x%02x\n",
+               tvp5150_read(c, TVP5150_ACT_VD_CROP_STP_LSB));
+        printk("tvp5150: Genlock/RTC = 0x%02x\n",
+               tvp5150_read(c, TVP5150_GENLOCK));
+        printk("tvp5150: Horizontal sync start = 0x%02x\n",
+               tvp5150_read(c, TVP5150_HORIZ_SYNC_START));
+        printk("tvp5150: Vertical blanking start = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VERT_BLANKING_START));
+        printk("tvp5150: Vertical blanking stop = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VERT_BLANKING_STOP));
+        printk("tvp5150: Chrominance processing control #1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CHROMA_PROC_CTL_1));
+        printk("tvp5150: Chrominance processing control #2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CHROMA_PROC_CTL_2));
+        printk("tvp5150: Interrupt reset register B = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INT_RESET_REG_B));
+        printk("tvp5150: Interrupt enable register B = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INT_ENABLE_REG_B));
+        printk("tvp5150: Interrupt configuration register B = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INTT_CONFIG_REG_B));
+        printk("tvp5150: Video standard = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VIDEO_STD));
+        printk("tvp5150: Cb gain factor = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CB_GAIN_FACT));
+        printk("tvp5150: Cr gain factor = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CR_GAIN_FACTOR));
+        printk("tvp5150: Macrovision on counter = 0x%02x\n",
+               tvp5150_read(c, TVP5150_MACROVISION_ON_CTR));
+        printk("tvp5150: Macrovision off counter = 0x%02x\n",
+               tvp5150_read(c, TVP5150_MACROVISION_OFF_CTR));
+        printk("tvp5150: revision select (TVP5150AM1 only) = 0x%02x\n",
+               tvp5150_read(c, TVP5150_REV_SELECT));
+        printk("tvp5150: MSB of device ID = 0x%02x\n",
+               tvp5150_read(c, TVP5150_MSB_DEV_ID));
+        printk("tvp5150: LSB of device ID = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LSB_DEV_ID));
+        printk("tvp5150: ROM major version = 0x%02x\n",
+               tvp5150_read(c, TVP5150_ROM_MAJOR_VER));
+        printk("tvp5150: ROM minor version = 0x%02x\n",
+               tvp5150_read(c, TVP5150_ROM_MINOR_VER));
+        printk("tvp5150: Vertical line count MSB = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VERT_LN_COUNT_MSB));
+        printk("tvp5150: Vertical line count LSB = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VERT_LN_COUNT_LSB));
+        printk("tvp5150: Interrupt status register B = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INT_STATUS_REG_B));
+        printk("tvp5150: Interrupt active register B = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INT_ACTIVE_REG_B));
+        printk("tvp5150: Status register #1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_STATUS_REG_1));
+        printk("tvp5150: Status register #2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_STATUS_REG_2));
+        printk("tvp5150: Status register #3 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_STATUS_REG_3));
+        printk("tvp5150: Status register #4 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_STATUS_REG_4));
+        printk("tvp5150: Status register #5 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_STATUS_REG_5));
+        printk("tvp5150: Closed caption data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CC_DATA_REG1));
+        printk("tvp5150: Closed caption data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CC_DATA_REG2));
+        printk("tvp5150: Closed caption data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CC_DATA_REG3));
+        printk("tvp5150: Closed caption data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CC_DATA_REG4));
+        printk("tvp5150: WSS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_WSS_DATA_REG1));
+        printk("tvp5150: WSS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_WSS_DATA_REG2));
+        printk("tvp5150: WSS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_WSS_DATA_REG3));
+        printk("tvp5150: WSS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_WSS_DATA_REG4));
+        printk("tvp5150: WSS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_WSS_DATA_REG5));
+        printk("tvp5150: WSS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_WSS_DATA_REG6));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG1));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG2));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG3));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG4));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG5));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG6));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG7));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG8));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG9));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG10));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG11));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG12));
+        printk("tvp5150: VPS data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VPS_DATA_REG13));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG1));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG2));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG3));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG4));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG5));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG6));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG7));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG8));
+        printk("tvp5150: VITC data registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VITC_DATA_REG9));
+        printk("tvp5150: VBI FIFO read data = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VBI_FIFO_READ_DATA));
+        printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_1_1));
+        printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_1_2));
+        printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_1_3));
+        printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_1_4));
+        printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_1_5));
+        printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_2_1));
+        printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_2_2));
+        printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_2_3));
+        printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_2_4));
+        printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_2_5));
+        printk("tvp5150: Teletext filter enable = 0x%02x\n",
+               tvp5150_read(c, TVP5150_TELETEXT_FIL_ENA));
+        printk("tvp5150: Interrupt status register A = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INT_STATUS_REG_A));
+        printk("tvp5150: Interrupt enable register A = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INT_ENABLE_REG_A));
+        printk("tvp5150: Interrupt configuration = 0x%02x\n",
+               tvp5150_read(c, TVP5150_INT_CONF));
+        printk("tvp5150: VDP configuration RAM data = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VDP_CONF_RAM_DATA));
+        printk("tvp5150: Configuration RAM address low byte = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CONF_RAM_ADDR_LOW));
+        printk("tvp5150: Configuration RAM address high byte = 0x%02x\n",
+               tvp5150_read(c, TVP5150_CONF_RAM_ADDR_HIGH));
+        printk("tvp5150: VDP status register = 0x%02x\n",
+               tvp5150_read(c, TVP5150_VDP_STATUS_REG));
+        printk("tvp5150: FIFO word count = 0x%02x\n",
+               tvp5150_read(c, TVP5150_FIFO_WORD_COUNT));
+        printk("tvp5150: FIFO interrupt threshold = 0x%02x\n",
+               tvp5150_read(c, TVP5150_FIFO_INT_THRESHOLD));
+        printk("tvp5150: FIFO reset = 0x%02x\n",
+               tvp5150_read(c, TVP5150_FIFO_RESET));
+        printk("tvp5150: Line number interrupt = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_NUMBER_INT));
+        printk("tvp5150: Pixel alignment register low byte = 0x%02x\n",
+               tvp5150_read(c, TVP5150_PIX_ALIGN_REG_LOW));
+        printk("tvp5150: Pixel alignment register high byte = 0x%02x\n",
+               tvp5150_read(c, TVP5150_PIX_ALIGN_REG_HIGH));
+        printk("tvp5150: FIFO output control = 0x%02x\n",
+               tvp5150_read(c, TVP5150_FIFO_OUT_CTRL));
+        printk("tvp5150: Full field enable 1 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_FULL_FIELD_ENA_1));
+        printk("tvp5150: Full field enable 2 = 0x%02x\n",
+               tvp5150_read(c, TVP5150_FULL_FIELD_ENA_2));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_1));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_2));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_3));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_4));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_5));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_6));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_7));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_8));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_9));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_10));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_11));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_12));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_13));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_14));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_15));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_16));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_17));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_18));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_19));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_20));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_21));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_22));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_23));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_24));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_25));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_27));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_28));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_29));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_30));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_31));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_32));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_33));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_34));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_35));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_36));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_37));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_38));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_39));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_40));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_41));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_42));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_43));
+        printk("tvp5150: Line mode registers = 0x%02x\n",
+               tvp5150_read(c, TVP5150_LINE_MODE_REG_44));
+        printk("tvp5150: Full field mode register = 0x%02x\n",
+               tvp5150_read(c, TVP5150_FULL_FIELD_MODE_REG));
+}
+
+/****************************************************************************
+                        Basic functions
+ ****************************************************************************/
+enum tvp5150_input {
+        TVP5150_ANALOG_CH0 = 0,
+        TVP5150_SVIDEO = 1,
+        TVP5150_ANALOG_CH1 = 2,
+        TVP5150_BLACK_SCREEN = 8
+};
+
+static inline void tvp5150_selmux(struct i2c_client *c,
+                                  enum tvp5150_input input)
+{
+        struct tvp5150 *decoder = i2c_get_clientdata(c);
+
+        if (!decoder->enable)
+                input |= TVP5150_BLACK_SCREEN;
+
+        tvp5150_write(c, TVP5150_VD_IN_SRC_SEL_1, input);
+};
+
+static inline void tvp5150_reset(struct i2c_client *c)
+{
+        struct tvp5150 *decoder = i2c_get_clientdata(c);
+
+        tvp5150_write(c, TVP5150_CONF_SHARED_PIN, 2);
+
+        /* Automatic offset and AGC enabled */
+        tvp5150_write(c, TVP5150_ANAL_CHL_CTL, 0x15);
+
+        /* Normal Operation */
+//      tvp5150_write(c, TVP5150_OP_MODE_CTL, 0x00);
+
+        /* Activate YCrCb output 0x9 or 0xd ? */
+        tvp5150_write(c, TVP5150_MISC_CTL, 0x6f);
+
+        /* Activates video std autodetection for all standards */
+        tvp5150_write(c, TVP5150_AUTOSW_MSK, 0x0);
+
+        /* Default format: 0x47, 4:2:2: 0x40 */
+        tvp5150_write(c, TVP5150_DATA_RATE_SEL, 0x47);
+
+        tvp5150_selmux(c, decoder->input);
+
+        tvp5150_write(c, TVP5150_CHROMA_PROC_CTL_1, 0x0c);
+        tvp5150_write(c, TVP5150_CHROMA_PROC_CTL_2, 0x54);
+
+        tvp5150_write(c, 0x27, 0x20);   /* ?????????? */
+
+        tvp5150_write(c, TVP5150_VIDEO_STD, 0x0);       /* Auto switch */
+
+        tvp5150_write(c, TVP5150_BRIGHT_CTL, decoder->bright >> 8);
+        tvp5150_write(c, TVP5150_CONTRAST_CTL, decoder->contrast >> 8);
+        tvp5150_write(c, TVP5150_SATURATION_CTL, decoder->contrast >> 8);
+        tvp5150_write(c, TVP5150_HUE_CTL, (decoder->hue - 32768) >> 8);
+};
+
+static int tvp5150_get_ctrl(struct i2c_client *c, struct v4l2_control *ctrl)
+{
+/*      struct tvp5150 *decoder = i2c_get_clientdata(c); */
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                ctrl->value = tvp5150_read(c, TVP5150_BRIGHT_CTL);
+                return 0;
+        case V4L2_CID_CONTRAST:
+                ctrl->value = tvp5150_read(c, TVP5150_CONTRAST_CTL);
+                return 0;
+        case V4L2_CID_SATURATION:
+                ctrl->value = tvp5150_read(c, TVP5150_SATURATION_CTL);
+                return 0;
+        case V4L2_CID_HUE:
+                ctrl->value = tvp5150_read(c, TVP5150_HUE_CTL);
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int tvp5150_set_ctrl(struct i2c_client *c, struct v4l2_control *ctrl)
+{
+/*      struct tvp5150 *decoder = i2c_get_clientdata(c); */
+
+        switch (ctrl->id) {
+        case V4L2_CID_BRIGHTNESS:
+                tvp5150_write(c, TVP5150_BRIGHT_CTL, ctrl->value);
+                return 0;
+        case V4L2_CID_CONTRAST:
+                tvp5150_write(c, TVP5150_CONTRAST_CTL, ctrl->value);
+                return 0;
+        case V4L2_CID_SATURATION:
+                tvp5150_write(c, TVP5150_SATURATION_CTL, ctrl->value);
+                return 0;
+        case V4L2_CID_HUE:
+                tvp5150_write(c, TVP5150_HUE_CTL, ctrl->value);
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
+/****************************************************************************
+                        I2C Command
+ ****************************************************************************/
+static int tvp5150_command(struct i2c_client *client,
+                           unsigned int cmd, void *arg)
+{
+        struct tvp5150 *decoder = i2c_get_clientdata(client);
+
+        switch (cmd) {
+
+        case 0:
+        case DECODER_INIT:
+                tvp5150_reset(client);
+                break;
+
+        case DECODER_DUMP:
+                dump_reg(client);
+                break;
+
+        case DECODER_GET_CAPABILITIES:
+                {
+                        struct video_decoder_capability *cap = arg;
+
+                        cap->flags = VIDEO_DECODER_PAL |
+                            VIDEO_DECODER_NTSC |
+                            VIDEO_DECODER_SECAM |
+                            VIDEO_DECODER_AUTO | VIDEO_DECODER_CCIR;
+                        cap->inputs = 3;
+                        cap->outputs = 1;
+                        break;
+                }
+        case DECODER_GET_STATUS:
+                {
+                        break;
+                }
+
+        case DECODER_SET_GPIO:
+                break;
+
+        case DECODER_SET_VBI_BYPASS:
+                break;
+
+        case DECODER_SET_NORM:
+                {
+                        int *iarg = arg;
+
+                        switch (*iarg) {
+
+                        case VIDEO_MODE_NTSC:
+                                break;
+
+                        case VIDEO_MODE_PAL:
+                                break;
+
+                        case VIDEO_MODE_SECAM:
+                                break;
+
+                        case VIDEO_MODE_AUTO:
+                                break;
+
+                        default:
+                                return -EINVAL;
+
+                        }
+                        decoder->norm = *iarg;
+                        break;
+                }
+        case DECODER_SET_INPUT:
+                {
+                        int *iarg = arg;
+                        if (*iarg < 0 || *iarg > 3) {
+                                return -EINVAL;
+                        }
+
+                        decoder->input = *iarg;
+                        tvp5150_selmux(client, decoder->input);
+
+                        break;
+                }
+        case DECODER_SET_OUTPUT:
+                {
+                        int *iarg = arg;
+
+                        /* not much choice of outputs */
+                        if (*iarg != 0) {
+                                return -EINVAL;
+                        }
+                        break;
+                }
+        case DECODER_ENABLE_OUTPUT:
+                {
+                        int *iarg = arg;
+
+                        decoder->enable = (*iarg != 0);
+
+                        tvp5150_selmux(client, decoder->input);
+
+                        break;
+                }
+        case VIDIOC_QUERYCTRL:
+                {
+                        struct v4l2_queryctrl *qc = arg;
+                        u8 i, n;
+
+                        dprintk(1, KERN_DEBUG "VIDIOC_QUERYCTRL");
+
+                        n = sizeof(tvp5150_qctrl) / sizeof(tvp5150_qctrl[0]);
+                        for (i = 0; i < n; i++)
+                                if (qc->id && qc->id == tvp5150_qctrl[i].id) {
+                                        memcpy(qc, &(tvp5150_qctrl[i]),
+                                               sizeof(*qc));
+                                        return 0;
+                                }
+
+                        return -EINVAL;
+                }
+        case VIDIOC_G_CTRL:
+                {
+                        struct v4l2_control *ctrl = arg;
+                        dprintk(1, KERN_DEBUG "VIDIOC_G_CTRL");
+
+                        return tvp5150_get_ctrl(client, ctrl);
+                }
+        case VIDIOC_S_CTRL_OLD: /* ??? */
+        case VIDIOC_S_CTRL:
+                {
+                        struct v4l2_control *ctrl = arg;
+                        u8 i, n;
+                        dprintk(1, KERN_DEBUG "VIDIOC_S_CTRL");
+                        n = sizeof(tvp5150_qctrl) / sizeof(tvp5150_qctrl[0]);
+                        for (i = 0; i < n; i++)
+                                if (ctrl->id == tvp5150_qctrl[i].id) {
+                                        if (ctrl->value <
+                                            tvp5150_qctrl[i].minimum
+                                            || ctrl->value >
+                                            tvp5150_qctrl[i].maximum)
+                                                return -ERANGE;
+                                        dprintk(1,
+                                                KERN_DEBUG
+                                                "VIDIOC_S_CTRL: id=%d, value=%d",
+                                                ctrl->id, ctrl->value);
+                                        return tvp5150_set_ctrl(client, ctrl);
+                                }
+                        return -EINVAL;
+                }
+
+        case DECODER_SET_PICTURE:
+                {
+                        struct video_picture *pic = arg;
+                        if (decoder->bright != pic->brightness) {
+                                /* We want 0 to 255 we get 0-65535 */
+                                decoder->bright = pic->brightness;
+                                tvp5150_write(client, TVP5150_BRIGHT_CTL,
+                                              decoder->bright >> 8);
+                        }
+                        if (decoder->contrast != pic->contrast) {
+                                /* We want 0 to 255 we get 0-65535 */
+                                decoder->contrast = pic->contrast;
+                                tvp5150_write(client, TVP5150_CONTRAST_CTL,
+                                              decoder->contrast >> 8);
+                        }
+                        if (decoder->sat != pic->colour) {
+                                /* We want 0 to 255 we get 0-65535 */
+                                decoder->sat = pic->colour;
+                                tvp5150_write(client, TVP5150_SATURATION_CTL,
+                                              decoder->contrast >> 8);
+                        }
+                        if (decoder->hue != pic->hue) {
+                                /* We want -128 to 127 we get 0-65535 */
+                                decoder->hue = pic->hue;
+                                tvp5150_write(client, TVP5150_HUE_CTL,
+                                              (decoder->hue - 32768) >> 8);
+                        }
+                        break;
+                }
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/****************************************************************************
+                        I2C Client & Driver
+ ****************************************************************************/
+static struct i2c_driver driver;
+
+static struct i2c_client client_template = {
+        .name = "(unset)",
+        .flags = I2C_CLIENT_ALLOW_USE,
+        .driver = &driver,
+};
+
+static int tvp5150_detect_client(struct i2c_adapter *adapter,
+                                 int address, int kind)
+{
+        struct i2c_client *client;
+        struct tvp5150 *core;
+        int rv;
+
+        dprintk(1,
+                KERN_INFO
+                "tvp5150.c: detecting tvp5150 client on address 0x%x\n",
+                address << 1);
+
+        client_template.adapter = adapter;
+        client_template.addr = address;
+
+        /* Check if the adapter supports the needed features */
+        if (!i2c_check_functionality
+            (adapter,
+             I2C_FUNC_SMBUS_READ_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
+                return 0;
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (client == 0)
+                return -ENOMEM;
+        memcpy(client, &client_template, sizeof(struct i2c_client));
+
+        core = kmalloc(sizeof(struct tvp5150), GFP_KERNEL);
+        if (core == 0) {
+                kfree(client);
+                return -ENOMEM;
+        }
+        memset(core, 0, sizeof(struct tvp5150));
+        i2c_set_clientdata(client, core);
+
+        rv = i2c_attach_client(client);
+
+        core->norm = VIDEO_MODE_AUTO;
+        core->input = 2;
+        core->enable = 1;
+        core->bright = 32768;
+        core->contrast = 32768;
+        core->hue = 32768;
+        core->sat = 32768;
+
+        if (rv) {
+                kfree(client);
+                kfree(core);
+                return rv;
+        }
+
+        if (debug > 1)
+                dump_reg(client);
+
+        return 0;
+}
+
+static int tvp5150_attach_adapter(struct i2c_adapter *adapter)
+{
+        dprintk(1,
+                KERN_INFO
+                "tvp5150.c: starting probe for adapter %s (0x%x)\n",
+                adapter->name, adapter->id);
+        return i2c_probe(adapter, &addr_data, &tvp5150_detect_client);
+}
+
+static int tvp5150_detach_client(struct i2c_client *client)
+{
+        struct tvp5150 *decoder = i2c_get_clientdata(client);
+        int err;
+
+        err = i2c_detach_client(client);
+        if (err) {
+                return err;
+        }
+
+        kfree(decoder);
+        kfree(client);
+
+        return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+
+static struct i2c_driver driver = {
+        .owner = THIS_MODULE,
+        .name = "tvp5150",
+
+        /* FIXME */
+        .id = I2C_DRIVERID_SAA7110,
+        .flags = I2C_DF_NOTIFY,
+
+        .attach_adapter = tvp5150_attach_adapter,
+        .detach_client = tvp5150_detach_client,
+
+        .command = tvp5150_command,
+};
+
+static int __init tvp5150_init(void)
+{
+        return i2c_add_driver(&driver);
+}
+
+static void __exit tvp5150_exit(void)
+{
+        i2c_del_driver(&driver);
+}
+
+module_init(tvp5150_init);
+module_exit(tvp5150_exit);
diff --git a/drivers/media/video/tvp5150_reg.h b/drivers/media/video/tvp5150_reg.h
new file mode 100644
index 000000000000..cd45c1ded786
--- /dev/null
+++ b/drivers/media/video/tvp5150_reg.h
@@ -0,0 +1,173 @@
+#define TVP5150_VD_IN_SRC_SEL_1      0x00 /* Video input source selection #1 */
+#define TVP5150_ANAL_CHL_CTL         0x01 /* Analog channel controls */
+#define TVP5150_OP_MODE_CTL          0x02 /* Operation mode controls */
+#define TVP5150_MISC_CTL             0x03 /* Miscellaneous controls */
+#define TVP5150_AUTOSW_MSK           0x04 /* Autoswitch mask: TVP5150A / TVP5150AM */
+
+/* Reserved 05h */
+
+#define TVP5150_COLOR_KIL_THSH_CTL   0x06 /* Color killer threshold control */
+#define TVP5150_LUMA_PROC_CTL_1      0x07 /* Luminance processing control #1 */
+#define TVP5150_LUMA_PROC_CTL_2      0x08 /* Luminance processing control #2 */
+#define TVP5150_BRIGHT_CTL           0x09 /* Brightness control */
+#define TVP5150_SATURATION_CTL       0x0a /* Color saturation control */
+#define TVP5150_HUE_CTL              0x0b /* Hue control */
+#define TVP5150_CONTRAST_CTL         0x0c /* Contrast control */
+#define TVP5150_DATA_RATE_SEL        0x0d /* Outputs and data rates select */
+#define TVP5150_LUMA_PROC_CTL_3      0x0e /* Luminance processing control #3 */
+#define TVP5150_CONF_SHARED_PIN      0x0f /* Configuration shared pins */
+
+/* Reserved 10h */
+
+#define TVP5150_ACT_VD_CROP_ST_MSB   0x11 /* Active video cropping start MSB */
+#define TVP5150_ACT_VD_CROP_ST_LSB   0x12 /* Active video cropping start LSB */
+#define TVP5150_ACT_VD_CROP_STP_MSB  0x13 /* Active video cropping stop MSB */
+#define TVP5150_ACT_VD_CROP_STP_LSB  0x14 /* Active video cropping stop LSB */
+#define TVP5150_GENLOCK              0x15 /* Genlock/RTC */
+#define TVP5150_HORIZ_SYNC_START     0x16 /* Horizontal sync start */
+
+/* Reserved 17h */
+
+#define TVP5150_VERT_BLANKING_START 0x18 /* Vertical blanking start */
+#define TVP5150_VERT_BLANKING_STOP  0x19 /* Vertical blanking stop */
+#define TVP5150_CHROMA_PROC_CTL_1   0x1a /* Chrominance processing control #1 */
+#define TVP5150_CHROMA_PROC_CTL_2   0x1b /* Chrominance processing control #2 */
+#define TVP5150_INT_RESET_REG_B     0x1c /* Interrupt reset register B */
+#define TVP5150_INT_ENABLE_REG_B    0x1d /* Interrupt enable register B */
+#define TVP5150_INTT_CONFIG_REG_B   0x1e /* Interrupt configuration register B */
+
+/* Reserved 1Fh-27h */
+
+#define TVP5150_VIDEO_STD           0x28 /* Video standard */
+
+/* Reserved 29h-2bh */
+
+#define TVP5150_CB_GAIN_FACT        0x2c /* Cb gain factor */
+#define TVP5150_CR_GAIN_FACTOR      0x2d /* Cr gain factor */
+#define TVP5150_MACROVISION_ON_CTR  0x2e /* Macrovision on counter */
+#define TVP5150_MACROVISION_OFF_CTR 0x2f /* Macrovision off counter */
+#define TVP5150_REV_SELECT          0x30 /* revision select (TVP5150AM1 only) */
+
+/* Reserved     31h-7Fh */
+
+#define TVP5150_MSB_DEV_ID          0x80 /* MSB of device ID */
+#define TVP5150_LSB_DEV_ID          0x81 /* LSB of device ID */
+#define TVP5150_ROM_MAJOR_VER       0x82 /* ROM major version */
+#define TVP5150_ROM_MINOR_VER       0x83 /* ROM minor version */
+#define TVP5150_VERT_LN_COUNT_MSB   0x84 /* Vertical line count MSB */
+#define TVP5150_VERT_LN_COUNT_LSB   0x85 /* Vertical line count LSB */
+#define TVP5150_INT_STATUS_REG_B    0x86 /* Interrupt status register B */
+#define TVP5150_INT_ACTIVE_REG_B    0x87 /* Interrupt active register B */
+#define TVP5150_STATUS_REG_1        0x88 /* Status register #1 */
+#define TVP5150_STATUS_REG_2        0x89 /* Status register #2 */
+#define TVP5150_STATUS_REG_3        0x8a /* Status register #3 */
+#define TVP5150_STATUS_REG_4        0x8b /* Status register #4 */
+#define TVP5150_STATUS_REG_5        0x8c /* Status register #5 */
+/* Reserved     8Dh-8Fh */
+#define TVP5150_CC_DATA_REG1        0x90 /* Closed caption data registers */
+#define TVP5150_CC_DATA_REG2        0x91 /* Closed caption data registers */
+#define TVP5150_CC_DATA_REG3        0x92 /* Closed caption data registers */
+#define TVP5150_CC_DATA_REG4        0x93 /* Closed caption data registers */
+#define TVP5150_WSS_DATA_REG1       0X94 /* WSS data registers */
+#define TVP5150_WSS_DATA_REG2       0X95 /* WSS data registers */
+#define TVP5150_WSS_DATA_REG3       0X96 /* WSS data registers */
+#define TVP5150_WSS_DATA_REG4       0X97 /* WSS data registers */
+#define TVP5150_WSS_DATA_REG5       0X98 /* WSS data registers */
+#define TVP5150_WSS_DATA_REG6       0X99 /* WSS data registers */
+#define TVP5150_VPS_DATA_REG1       0x9a /* VPS data registers */
+#define TVP5150_VPS_DATA_REG2       0x9b /* VPS data registers */
+#define TVP5150_VPS_DATA_REG3       0x9c /* VPS data registers */
+#define TVP5150_VPS_DATA_REG4       0x9d /* VPS data registers */
+#define TVP5150_VPS_DATA_REG5       0x9e /* VPS data registers */
+#define TVP5150_VPS_DATA_REG6       0x9f /* VPS data registers */
+#define TVP5150_VPS_DATA_REG7       0xa0 /* VPS data registers */
+#define TVP5150_VPS_DATA_REG8       0xa1 /* VPS data registers */
+#define TVP5150_VPS_DATA_REG9       0xa2 /* VPS data registers */
+#define TVP5150_VPS_DATA_REG10      0xa3 /* VPS data registers */
+#define TVP5150_VPS_DATA_REG11      0xa4 /* VPS data registers */
+#define TVP5150_VPS_DATA_REG12      0xa5 /* VPS data registers */
+#define TVP5150_VPS_DATA_REG13      0xa6 /* VPS data registers */
+#define TVP5150_VITC_DATA_REG1      0xa7 /* VITC data registers */
+#define TVP5150_VITC_DATA_REG2      0xa8 /* VITC data registers */
+#define TVP5150_VITC_DATA_REG3      0xa9 /* VITC data registers */
+#define TVP5150_VITC_DATA_REG4      0xaa /* VITC data registers */
+#define TVP5150_VITC_DATA_REG5      0xab /* VITC data registers */
+#define TVP5150_VITC_DATA_REG6      0xac /* VITC data registers */
+#define TVP5150_VITC_DATA_REG7      0xad /* VITC data registers */
+#define TVP5150_VITC_DATA_REG8      0xae /* VITC data registers */
+#define TVP5150_VITC_DATA_REG9      0xaf /* VITC data registers */
+#define TVP5150_VBI_FIFO_READ_DATA  0xb0 /* VBI FIFO read data */
+#define TVP5150_TELETEXT_FIL_1_1    0xb1 /* Teletext filter 1 */
+#define TVP5150_TELETEXT_FIL_1_2    0xb2 /* Teletext filter 1 */
+#define TVP5150_TELETEXT_FIL_1_3    0xb3 /* Teletext filter 1 */
+#define TVP5150_TELETEXT_FIL_1_4    0xb4 /* Teletext filter 1 */
+#define TVP5150_TELETEXT_FIL_1_5    0xb5 /* Teletext filter 1 */
+#define TVP5150_TELETEXT_FIL_2_1    0xb6 /* Teletext filter 2 */
+#define TVP5150_TELETEXT_FIL_2_2    0xb7 /* Teletext filter 2 */
+#define TVP5150_TELETEXT_FIL_2_3    0xb8 /* Teletext filter 2 */
+#define TVP5150_TELETEXT_FIL_2_4    0xb9 /* Teletext filter 2 */
+#define TVP5150_TELETEXT_FIL_2_5    0xba /* Teletext filter 2 */
+#define TVP5150_TELETEXT_FIL_ENA    0xbb /* Teletext filter enable */
+/* Reserved     BCh-BFh */
+#define TVP5150_INT_STATUS_REG_A    0xc0 /* Interrupt status register A */
+#define TVP5150_INT_ENABLE_REG_A    0xc1 /* Interrupt enable register A */
+#define TVP5150_INT_CONF            0xc2 /* Interrupt configuration */
+#define TVP5150_VDP_CONF_RAM_DATA   0xc3 /* VDP configuration RAM data */
+#define TVP5150_CONF_RAM_ADDR_LOW   0xc4 /* Configuration RAM address low byte */
+#define TVP5150_CONF_RAM_ADDR_HIGH  0xc5 /* Configuration RAM address high byte */
+#define TVP5150_VDP_STATUS_REG      0xc6 /* VDP status register */
+#define TVP5150_FIFO_WORD_COUNT     0xc7 /* FIFO word count */
+#define TVP5150_FIFO_INT_THRESHOLD  0xc8 /* FIFO interrupt threshold */
+#define TVP5150_FIFO_RESET          0xc9 /* FIFO reset */
+#define TVP5150_LINE_NUMBER_INT     0xca /* Line number interrupt */
+#define TVP5150_PIX_ALIGN_REG_LOW   0xcb /* Pixel alignment register low byte */
+#define TVP5150_PIX_ALIGN_REG_HIGH  0xcc /* Pixel alignment register high byte */
+#define TVP5150_FIFO_OUT_CTRL       0xcd /* FIFO output control */
+/* Reserved     CEh */
+#define TVP5150_FULL_FIELD_ENA_1    0xcf /* Full field enable 1 */
+#define TVP5150_FULL_FIELD_ENA_2    0xd0 /* Full field enable 2 */
+#define TVP5150_LINE_MODE_REG_1     0xd1 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_2     0xd2 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_3     0xd3 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_4     0xd4 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_5     0xd5 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_6     0xd6 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_7     0xd7 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_8     0xd8 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_9     0xd9 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_10    0xda /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_11    0xdb /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_12    0xdc /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_13    0xdd /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_14    0xde /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_15    0xdf /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_16    0xe0 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_17    0xe1 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_18    0xe2 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_19    0xe3 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_20    0xe4 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_21    0xe5 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_22    0xe6 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_23    0xe7 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_24    0xe8 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_25    0xe9 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_27    0xea /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_28    0xeb /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_29    0xec /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_30    0xed /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_31    0xee /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_32    0xef /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_33    0xf0 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_34    0xf1 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_35    0xf2 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_36    0xf3 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_37    0xf4 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_38    0xf5 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_39    0xf6 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_40    0xf7 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_41    0xf8 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_42    0xf9 /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_43    0xfa /* Line mode registers */
+#define TVP5150_LINE_MODE_REG_44    0xfb /* Line mode registers */
+#define TVP5150_FULL_FIELD_MODE_REG 0xfc /* Full field mode register */
+/* Reserved     FDh-FFh */
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index d679ca23ded7..4134549d11a8 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -708,7 +708,7 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         }
         case VIDIOCGFREQ: /*  get frequency  */
         {
-                int *freq = arg;
+                unsigned long *freq = arg;
 
                 freq2.tuner = 0;
                 err = drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
@@ -720,7 +720,7 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         }
         case VIDIOCSFREQ: /*  set frequency  */
         {
-                int *freq = arg;
+                unsigned long *freq = arg;
 
                 freq2.tuner = 0;
                 drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
@@ -960,7 +960,7 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 fmt->start[1]         = fmt2->fmt.vbi.start[1];
                 fmt->count[1]         = fmt2->fmt.vbi.count[1];
                 fmt->flags            = fmt2->fmt.vbi.flags & 0x03;
-                break;
+                break;
         }
         case VIDIOCSVBIFMT:
         {
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index 574b8e36f3c6..acfd3a103f35 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -147,7 +147,7 @@ int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
                 data,size,dma->nr_pages);
 
         down_read(&current->mm->mmap_sem);
-        err = get_user_pages(current,current->mm,
+        err = get_user_pages(current,current->mm,
                              data & PAGE_MASK, dma->nr_pages,
                              rw == READ, 1, /* force */
                              dma->pages, NULL);
@@ -750,9 +750,9 @@ videobuf_read_zerocopy(struct videobuf_queue *q, char __user *data,
 {
         enum v4l2_field field;
         unsigned long flags;
-        int retval;
+        int retval;
 
-        /* setup stuff */
+        /* setup stuff */
         retval = -ENOMEM;
         q->read_buf = videobuf_alloc(q->msize);
         if (NULL == q->read_buf)
@@ -760,18 +760,18 @@ videobuf_read_zerocopy(struct videobuf_queue *q, char __user *data,
 
         q->read_buf->memory = V4L2_MEMORY_USERPTR;
         q->read_buf->baddr  = (unsigned long)data;
-        q->read_buf->bsize  = count;
+        q->read_buf->bsize  = count;
         field = videobuf_next_field(q);
         retval = q->ops->buf_prepare(q,q->read_buf,field);
         if (0 != retval)
                 goto done;
 
-        /* start capture & wait */
+        /* start capture & wait */
         spin_lock_irqsave(q->irqlock,flags);
         q->ops->buf_queue(q,q->read_buf);
         spin_unlock_irqrestore(q->irqlock,flags);
-        retval = videobuf_waiton(q->read_buf,0,0);
-        if (0 == retval) {
+        retval = videobuf_waiton(q->read_buf,0,0);
+        if (0 == retval) {
                 videobuf_dma_pci_sync(q->pci,&q->read_buf->dma);
                 if (STATE_ERROR == q->read_buf->state)
                         retval = -EIO;
@@ -828,7 +828,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
         }
 
         /* wait until capture is done */
-        retval = videobuf_waiton(q->read_buf, nonblocking, 1);
+        retval = videobuf_waiton(q->read_buf, nonblocking, 1);
         if (0 != retval)
                 goto done;
         videobuf_dma_pci_sync(q->pci,&q->read_buf->dma);
@@ -1096,7 +1096,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
 
         dprintk(3,"nopage: fault @ %08lx [vma %08lx-%08lx]\n",
                 vaddr,vma->vm_start,vma->vm_end);
-        if (vaddr > vma->vm_end)
+        if (vaddr > vma->vm_end)
                 return NOPAGE_SIGBUS;
         page = alloc_page(GFP_USER);
         if (!page)
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
new file mode 100644
index 000000000000..22f286222004
--- /dev/null
+++ b/drivers/media/video/wm8775.c
@@ -0,0 +1,254 @@
+/*
+ * wm8775 - driver version 0.0.1
+ *
+ * Copyright (C) 2004 Ulf Eklund <ivtv at eklund.to>
+ *
+ * Based on saa7115 driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <asm/uaccess.h>
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
+#include <linux/videodev.h>
+#include <media/audiochip.h>
+
+MODULE_DESCRIPTION("wm8775 driver");
+MODULE_AUTHOR("Ulf Eklund");
+MODULE_LICENSE("GPL");
+
+#define wm8775_err(fmt, arg...) do { \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+#define wm8775_info(fmt, arg...) do { \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+
+
+static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END };
+
+
+I2C_CLIENT_INSMOD;
+
+/* ----------------------------------------------------------------------- */
+
+enum {
+        R7 = 7, R11 = 11,
+        R12, R13, R14, R15, R16, R17, R18, R19, R20, R21, R23 = 23,
+        TOT_REGS
+};
+
+struct wm8775_state {
+        u8 input;               /* Last selected input (0-0xf) */
+        u8 muted;
+};
+
+static int wm8775_write(struct i2c_client *client, int reg, u16 val)
+{
+        int i;
+
+        if (reg < 0 || reg >= TOT_REGS) {
+                wm8775_err("Invalid register R%d\n", reg);
+                return -1;
+        }
+
+        for (i = 0; i < 3; i++) {
+                if (i2c_smbus_write_byte_data(client, (reg << 1) |
+                                        (val >> 8), val & 0xff) == 0) {
+                        return 0;
+                }
+        }
+        wm8775_err("I2C: cannot write %03x to register R%d\n", val, reg);
+        return -1;
+}
+
+static int wm8775_command(struct i2c_client *client, unsigned int cmd,
+                          void *arg)
+{
+        struct wm8775_state *state = i2c_get_clientdata(client);
+        int *input = arg;
+
+        switch (cmd) {
+        case AUDC_SET_INPUT:
+                wm8775_write(client, R21, 0x0c0);
+                wm8775_write(client, R14, 0x1d4);
+                wm8775_write(client, R15, 0x1d4);
+
+                if (*input == AUDIO_RADIO) {
+                        wm8775_write(client, R21, 0x108);
+                        state->input = 8;
+                        state->muted = 0;
+                        break;
+                }
+                if (*input == AUDIO_MUTE) {
+                        state->muted = 1;
+                        break;
+                }
+                if (*input == AUDIO_UNMUTE) {
+                        wm8775_write(client, R21, 0x100 + state->input);
+                        state->muted = 0;
+                        break;
+                }
+                /* All other inputs... */
+                wm8775_write(client, R21, 0x102);
+                state->input = 2;
+                state->muted = 0;
+                break;
+
+        case VIDIOC_LOG_STATUS:
+                wm8775_info("Input: %s%s\n",
+                            state->input == 8 ? "radio" : "default",
+                            state->muted ? " (muted)" : "");
+                break;
+
+        case VIDIOC_S_FREQUENCY:
+                /* If I remove this, then it can happen that I have no
+                   sound the first time I tune from static to a valid channel.
+                   It's difficult to reproduce and is almost certainly related
+                   to the zero cross detect circuit. */
+                wm8775_write(client, R21, 0x0c0);
+                wm8775_write(client, R14, 0x1d4);
+                wm8775_write(client, R15, 0x1d4);
+                wm8775_write(client, R21, 0x100 + state->input);
+                break;
+
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+
+/* i2c implementation */
+
+/*
+ * Generic i2c probe
+ * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
+ */
+
+static struct i2c_driver i2c_driver;
+
+static int wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        struct wm8775_state *state;
+
+        /* Check if the adapter supports the needed features */
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                return 0;
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (client == 0)
+                return -ENOMEM;
+
+        memset(client, 0, sizeof(struct i2c_client));
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &i2c_driver;
+        client->flags = I2C_CLIENT_ALLOW_USE;
+        snprintf(client->name, sizeof(client->name) - 1, "wm8775");
+
+        wm8775_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
+
+        state = kmalloc(sizeof(struct wm8775_state), GFP_KERNEL);
+        if (state == NULL) {
+                kfree(client);
+                return -ENOMEM;
+        }
+        state->input = 2;
+        state->muted = 0;
+        i2c_set_clientdata(client, state);
+
+        /* initialize wm8775 */
+        wm8775_write(client, R23, 0x000);       /* RESET */
+        wm8775_write(client, R7, 0x000);        /* Disable zero cross detect timeout */
+        wm8775_write(client, R11, 0x021);       /* Left justified, 24-bit mode */
+        wm8775_write(client, R12, 0x102);       /* Master mode, clock ratio 256fs */
+        wm8775_write(client, R13, 0x000);       /* Powered up */
+        wm8775_write(client, R14, 0x1d4);       /* ADC gain +2.5dB, enable zero cross */
+        wm8775_write(client, R15, 0x1d4);       /* ADC gain +2.5dB, enable zero cross */
+        wm8775_write(client, R16, 0x1bf);       /* ALC Stereo, ALC target level -1dB FS */
+        /* max gain +8dB */
+        wm8775_write(client, R17, 0x185);       /* Enable gain control, use zero cross */
+        /* detection, ALC hold time 42.6 ms */
+        wm8775_write(client, R18, 0x0a2);       /* ALC gain ramp up delay 34 s, */
+        /* ALC gain ramp down delay 33 ms */
+        wm8775_write(client, R19, 0x005);       /* Enable noise gate, threshold -72dBfs */
+        wm8775_write(client, R20, 0x07a);       /* Transient window 4ms, lower PGA gain */
+        /* limit -1dB */
+        wm8775_write(client, R21, 0x102);       /* LRBOTH = 1, use input 2. */
+        i2c_attach_client(client);
+
+        return 0;
+}
+
+static int wm8775_probe(struct i2c_adapter *adapter)
+{
+#ifdef I2C_CLASS_TV_ANALOG
+        if (adapter->class & I2C_CLASS_TV_ANALOG)
+#else
+        if (adapter->id == I2C_HW_B_BT848)
+#endif
+                return i2c_probe(adapter, &addr_data, wm8775_attach);
+        return 0;
+}
+
+static int wm8775_detach(struct i2c_client *client)
+{
+        int err;
+
+        err = i2c_detach_client(client);
+        if (err) {
+                return err;
+        }
+        kfree(client);
+
+        return 0;
+}
+
+/* ----------------------------------------------------------------------- */
+
+/* i2c implementation */
+static struct i2c_driver i2c_driver = {
+        .name = "wm8775",
+
+        .id = I2C_DRIVERID_WM8775,
+        .flags = I2C_DF_NOTIFY,
+
+        .attach_adapter = wm8775_probe,
+        .detach_client = wm8775_detach,
+        .command = wm8775_command,
+        .owner = THIS_MODULE,
+};
+
+
+static int __init wm8775_init_module(void)
+{
+        return i2c_add_driver(&i2c_driver);
+}
+
+static void __exit wm8775_cleanup_module(void)
+{
+        i2c_del_driver(&i2c_driver);
+}
+
+module_init(wm8775_init_module);
+module_exit(wm8775_cleanup_module);
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zr36016.c
index d4740a89cea1..4ed898585c70 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zr36016.c
@@ -26,7 +26,6 @@
 
 #define ZR016_VERSION "v0.7"
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c
index 13b1e7b6fd6e..0144576a6123 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zr36050.c
@@ -26,7 +26,6 @@
 
 #define ZR050_VERSION "v0.7.1"
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c
index b50dc403e6db..129744a07abd 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zr36060.c
@@ -26,7 +26,6 @@
 
 #define ZR060_VERSION "v0.7"
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>